Changeset 24892

Timestamp:

11/20/08 20:29:05 (7 weeks ago)

Author:

Landseer

Message:

added InterCom? detection, this fixes #397 (part one for 1.0.3)

Location:

branches/zikula-1.0

Files:

• modules/Members_List/pnblocks/membersonline.php (modified) (1 diff)
• modules/Members_List/pntemplates/memberslist_block_membersonline.htm (modified) (1 diff)
• modules/Members_List/pntemplates/memberslist_user_online.htm (modified) (2 diffs)
• modules/Members_List/pntemplates/memberslist_user_recent.htm (modified) (2 diffs)
• modules/Members_List/pntemplates/memberslist_user_view.htm (modified) (2 diffs)
• modules/Members_List/pnuserapi.php (modified) (1 diff)
• modules/Members_List/pnuser.php (modified) (3 diffs)
• system/Theme/plugins/function.pncountnewmessages.php (modified) (1 diff)

branches/zikula-1.0/modules/Members_List/pnblocks/membersonline.php

@@ -92 +92 @@
     $pnRender = pnRender::getInstance('Members_List', false);
 
-    // check if pnMessages is available and add the necessary info
-    $pnmessages = pnModAvailable('pnMessages');
-    $pnRender->assign('pnmessages', $pnmessages);
-    if ($pnmessages && pnUserLoggedIn()) {
-        pnModLangLoad('pnMessages', 'user');
-        $pnRender->assign('messages', pnModAPIFunc('pnMessages', 'user', 'getmessagecount'));
+    // check which messaging module is available and add the necessary info
+    $msgmodule = pnModAPIFunc('Members_List', 'user', 'getmessagingmodule');
+    $pnRender->assign('msgmodule', $msgmodule);
+    if (!empty($msgmodule) && pnUserLoggedIn()) {
+        $pnRender->assign('messages', pnModAPIFunc($msgmodule, 'user', 'getmessagecount'));
     }
 

branches/zikula-1.0/modules/Members_List/pntemplates/memberslist_block_membersonline.htm

@@ -6 +6 @@
             <li>
                         <a href="<!--[pnmodurl modname=Profile func=view uname=$user.uname]-->" title="<!--[$user.uname]-->"><!--[$user.unameshort]--></a>
-                        <!--[if $pnmessages]-->
+                        <!--[if $msgmodule eq 'pnMessages']-->
                                 <!--[if $user.uid eq $uid]-->
                                         (<a href="<!--[pnmodurl modname="pnMessages" func="inbox"]-->" title="<!--[pnml name='_PNMESSAGES_UNREAD']-->"><!--[$messages.totalin]--></a> | <a href="<!--[pnmodurl modname="pnMessages" func="inbox"]-->" title="<!--[pnml name='_PNMESSAGES_TOTAL']-->"><!--[$messages.unread]--></a>)
                                 <!--[/if]-->
-                                <a href="<!--[pnmodurl modname="pnMessages" func="newpm" uname="`$user.uname`"]-->" title="<!--[pnml name='_PNMESSAGES_PM']--> <!--[$user.uname]-->"><!--[pnimg modname=pnMessages src='pm.gif' alt=_PNMESSAGES_PM altml=true style='vertical-align:middle; margin-left:2px;']--></a>
+                                <a href="<!--[pnmodurl modname="pnMessages" func="newpm" uid="`$user.uid`"]-->" title="<!--[pnml name='_PNMESSAGES_PM']--> <!--[$user.uname]-->"><!--[pnimg modname=pnMessages src='pm.gif' alt=_PNMESSAGES_PM altml=true style='vertical-align:middle; margin-left:2px;']--></a>
+                        <!--[/if]-->
+                        <!--[if $msgmodule eq 'InterCom']-->
+                                <!--[if $user.uid eq $uid]-->
+                                        (<a href="<!--[pnmodurl modname="InterCom" func="inbox"]-->" title="<!--[pnml name='_IC_UNREAD']-->"><!--[$messages.totalin]--></a> | <a href="<!--[pnmodurl modname="InterCom" func="inbox"]-->" title="<!--[pnml name='_IC_TOTAL']-->"><!--[$messages.unread]--></a>)
+                                <!--[/if]-->
+                                <a href="<!--[pnmodurl modname="InterCom" func="newpm" uid="`$user.uid`"]-->" title="<!--[pnml name='_IC_PM']--> <!--[$user.uname]-->"><!--[pnimg modname=InterCom src='pm.gif' alt=_IC_PM altml=true style='vertical-align:middle; margin-left:2px;']--></a>
                         <!--[/if]-->
                 </li>

branches/zikula-1.0/modules/Members_List/pntemplates/memberslist_user_online.htm

@@ -9 +9 @@
         <th><!--[pnml name="_USERNAME"]--></th>
         <th><!--[pnml name="_UREALNAME"]--></th>
-        <!--[if $pnmessages eq true]-->
+        <!--[if $msgmodule eq 'pnMessages']-->
         <th><!--[pnml name="_PNMESSAGES_PM"]--></th>
+                <!--[/if]-->
+        <!--[if $msgmodule eq 'InterCom']-->
+        <th><!--[pnml name="_IC_PM"]--></th>
                 <!--[/if]-->
         <th><!--[pnml name="_URL"]--></th>
@@ -25 +28 @@
     <!--[ /if ]-->
         <td><strong><!--[$user.uname|userprofilelink]--></strong></td>
-        <td><!--[$users._UREALNAME|default:"&nbsp;"]--></td>
-       <!--[if $pnmessages eq true]-->
+        <td><!--[$user._UREALNAME|default:"&nbsp;"]--></td>
+        <!--[if $msgmodule eq 'pnMessages']-->
         <td><a href="<!--[pnmodurl modname="pnMessages" func="newpm" uid="`$user.uid`"]-->"><!--[pnimg modname=core set=icons/extrasmall src="mail_new.gif" alt=_PNMESSAGES_SENDPM altml=true]--></a></td>
+                <!--[/if]-->
+        <!--[if $msgmodule eq 'InterCom']-->
+        <td><a href="<!--[pnmodurl modname="InterCom" func="newpm" uid="`$user.uid`"]-->"><!--[pnimg modname=core set=icons/extrasmall src="mail_new.gif" alt=_IC_SENDPM altml=true]--></a></td>
                 <!--[/if]-->
         <td>

branches/zikula-1.0/modules/Members_List/pntemplates/memberslist_user_recent.htm

@@ -13 +13 @@
         <th><!--[pnml name="_UREALNAME"]--></th>
                 <!--[/if]-->
-        <!--[if $pnmessages eq true]-->
+        <!--[if $msgmodule eq 'pnMessages']-->
         <th><!--[pnml name="_PNMESSAGES_PM"]--></th>
+                <!--[/if]-->
+        <!--[if $msgmodule eq 'InterCom']-->
+        <th><!--[pnml name="_IC_PM"]--></th>
                 <!--[/if]-->
         <!--[ if @in_array('_YOURHOMEPAGE', $dudarray) ]-->
@@ -45 +48 @@
         <td><!--[$users[users]._UREALNAME|default:"&nbsp;"]--></td>
                 <!--[/if]-->
-        <!--[if $pnmessages eq true]-->
+        <!--[if $msgmodule eq 'pnMessages']-->
         <td><a href="<!--[pnmodurl modname="pnMessages" func="newpm" uid="`$users[users].uid`"]-->"><!--[pnimg modname=core set=icons/extrasmall src="mail_new.gif" alt=_PNMESSAGES_SENDPM altml=true]--></a></td>
+                <!--[/if]-->
+        <!--[if $msgmodule eq 'InterCom']-->
+        <td><a href="<!--[pnmodurl modname="InterCom" func="newpm" uid="`$users[users].uid`"]-->"><!--[pnimg modname=core set=icons/extrasmall src="mail_new.gif" alt=_IC_SENDPM altml=true]--></a></td>
                 <!--[/if]-->
         <!--[ if @in_array('_YOURHOMEPAGE', $dudarray) ]-->

branches/zikula-1.0/modules/Members_List/pntemplates/memberslist_user_view.htm

@@ -29 +29 @@
         <th><!--[pnml name="_UREALNAME"]--></th>
         <!--[ /if ]-->
-        <!--[if $pnmessages eq true]-->
+        <!--[if $msgmodule eq 'pnMessages']-->
         <th><!--[pnml name="_PNMESSAGES_PM"]--></th>
+                <!--[/if]-->
+        <!--[if $msgmodule eq 'InterCom']-->
+        <th><!--[pnml name="_IC_PM"]--></th>
                 <!--[/if]-->
         <!--[ if @in_array('_YOURHOMEPAGE', $dudarray) ]-->
@@ -60 +63 @@
         <td><!--[$users[users]._UREALNAME|pnvarprepfordisplay|default:"&nbsp;"]--></td>
         <!--[ /if ]-->
-        <!--[if $pnmessages eq true]-->
+        <!--[if $msgmodule eq 'pnMessages']-->
         <td><a href="<!--[pnmodurl modname="pnMessages" func="newpm" uid="`$users[users].uid`"]-->"><!--[pnimg modname=core set=icons/extrasmall src="mail_new.gif" alt=_PNMESSAGES_SENDPM altml=true]--></a></td>
+                <!--[/if]-->
+        <!--[if $msgmodule eq 'InterCom']-->
+        <td><a href="<!--[pnmodurl modname="InterCom" func="newpm" uid="`$users[users].uid`"]-->"><!--[pnimg modname=core set=icons/extrasmall src="mail_new.gif" alt=_IC_SENDPM altml=true]--></a></td>
                 <!--[/if]-->
         <!--[ if @in_array('_YOURHOMEPAGE', $dudarray) ]-->

branches/zikula-1.0/modules/Members_List/pnuserapi.php

@@ -495 +495 @@
     return $items;
 }
+
+/**
+ * Utility function to find out which messages module is installed
+ * can find pnMessages and InterCom
+ * @author Frank Schmmertz
+ * @return string name of the messaging module found, empty if none
+ */
+function Members_List_userapi_getmessagingmodule()
+{
+    $modname = '';
+    if (pnModAvailable('pnMessages')) {
+        pnModLangLoad('pnMessages', 'user');
+        $modname = 'pnMessages';
+    } else if (pnModAvailable('InterCom')) {
+        pnModLangLoad('InterCom');
+        $modname = 'InterCom';
+    }
+    return $modname;    
+}

branches/zikula-1.0/modules/Members_List/pnuser.php

@@ -147 +147 @@
     pnModLangLoad('Profile', 'user');
 
-    // check if pnMessages is available and add the necessary info
-    $pnmessages = pnModAvailable('pnMessages');
-    $pnRender->assign('pnmessages', $pnmessages);
-    if ($pnmessages) {
-        pnModLangLoad('pnMessages', 'user');
-    }
+    // check which messaging module is available and add the necessary info
+    $pnRender->assign('msgmodule', pnModAPIFunc('Members_List', 'user', 'getmessagingmodule'));
 
     // Assign the values for the smarty plugin to produce a pager
@@ -231 +227 @@
     pnModLangLoad('Profile', 'user');
 
-    // check if pnMessages is available and add the necessary info
-    $pnmessages = pnModAvailable('pnMessages');
-    $pnRender->assign('pnmessages', $pnmessages);
-    if ($pnmessages) {
-        pnModLangLoad('pnMessages', 'user');
-    }
+    // check which messaging module is available and add the necessary info
+    $pnRender->assign('msgmodule', pnModAPIFunc('Members_List', 'user', 'getmessagingmodule'));
 
     // get all active profile fields
@@ -286 +278 @@
     pnModLangLoad('Profile', 'user');
 
-    // check if pnMessages is available and add the necessary info
-    $pnmessages = pnModAvailable('pnMessages');
-    $pnRender->assign('pnmessages', $pnmessages);
-    if ($pnmessages) {
-        pnModLangLoad('pnMessages', 'user');
-    }
+    // check which messaging module is available and add the necessary info
+    $pnRender->assign('msgmodule', pnModAPIFunc('Members_List', 'user', 'getmessagingmodule'));
 
     // get all active profile fields

branches/zikula-1.0/system/Theme/plugins/function.pncountnewmessages.php

@@ -32 +32 @@
     unset($params);
 
-    $newmessages = 0;
+    $unread = 0;
     if (pnUserLoggedIn()) {
-        if (pnModAvailable('Messages'))    {
-            $dbconn = pnDBGetConn(true);
-            $pntable = pnDBGetTables();
-            $column = &$pntable['priv_msgs_column'];
-            // get unread messages
-            $result = $dbconn->Execute("SELECT count(*) FROM $pntable[priv_msgs] WHERE $column[to_userid]='" . DataUtil::formatForStore(pnUserGetVar('uid')) . "' AND $column[read_msg]='0'");
-            list($newmessages) = $result->fields;  // new messages
-            $result->Close();
+        if (pnModAvailable('pnMessages')) {
+            $messages = pnModAPIFunc('pnMessages', 'user', 'getmessagecount');
+            $unread = $messages['unread'];
+        } else if (pnModAvailable('InterCom')) {
+            $messages = pnModAPIFunc('InterCom', 'user', 'getmessagecount');
+            $unread = $messages['unread'];
         }
     }
 
     if (isset($assign)) {
-        $smarty->assign($assign, $newmessages);
+        $smarty->assign($assign, $unread);
     } else {
-        return $newmessages;
+        return $unread;
     }
 }