PEP: A couple minor edits needed for testing PEP over s2s connections.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches/pep@8893 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/pep/PEPService.java

@@ -336,9 +336,10 @@ public class PEPService implements PubSubService {
                 recipientFullJIDs.add(clientSession.getAddress());
             }
         }
-        else {
+        // TODO: Try to get presence info even if not local...
+        /*else {
             recipientFullJIDs.add(recipientJID);
-        }
+        }*/
 
         if (recipientFullJIDs.isEmpty()) {
             message.setTo(recipientJID);

src/java/org/jivesoftware/openfire/user/UserManager.java

@@ -377,7 +377,9 @@ public class UserManager implements IQResultListener {
                 for (Iterator it=child.elementIterator("identity"); it.hasNext();) {
                     Element identity = (Element) it.next();
                     String accountType = identity.attributeValue("type");
-                    if ("registered".equals(accountType) || "admin".equals(accountType)) {
+                    // FIXME: Not all servers provide these identity types for their regged users.
+                    //        So for PEP testing purposes, let's just assume everyone is registered.
+                    if (true /*"registered".equals(accountType) || "admin".equals(accountType)*/) {
                         isRegistered = Boolean.TRUE;
                         break;
                     }