Changeset 24895

Timestamp:

11/20/08 21:07:43 (7 weeks ago)

Author:

Landseer

Message:

added more InterCom? detection, this refs #397

Location:

development/zikula-1/system

Files:

• Theme/plugins/function.displaygreeting.php (modified) (1 diff)
• Users/pnblocks/online.php (modified) (1 diff)
• Users/pntemplates/users_block_online.htm (modified) (1 diff)

development/zikula-1/system/Theme/plugins/function.displaygreeting.php

@@ -87 +87 @@
         }
 
-        if (pnModAvailable('pnMessages') && ($displayMsgs || $displayAllMsgs)) {
-            $messages = pnModAPIFunc('pnMessages', 'user', 'getmessagecount');
-            $inboxurl = DataUtil::formatForDisplay(pnModURL('pnMessages', 'user', 'inbox'));
+        $msgmodule = '';
+        if (pnModAvailable('pnMessages')) {
+            $msgmodule = 'pnMessages';
+        } else if (pnModAvailable('InterCom')) {
+            $msgmodule = 'InterCom';
+        }
+        if (!empty($msgmodule) && ($displayMsgs || $displayAllMsgs)) {
+            $messages = pnModAPIFunc($msgmodule, 'user', 'getmessagecount');
+            $inboxurl = DataUtil::formatForDisplay(pnModURL($msgmodule, 'user', 'inbox'));
             if ($multiline) {
                 $greeting .= "<br />\n";

development/zikula-1/system/Users/pnblocks/online.php

@@ -85 +85 @@
     if (pnUserLoggedIn()) {
         $pnr->assign('username', pnUserGetVar('uname'));
-        // check if pnMessages is available and add the necessary info
-        $pnmessages = pnModAvailable('pnMessages');
-        $pnr->assign('pnmessages', $pnmessages);
-        if ($pnmessages) {
-            pnModLangLoad('pnMessages', 'user');
+        // check if pnMessages/InterCom are available and add the necessary info
+        if (pnModAvailable('pnMessages')) {
+            $pnr->assign('msgmodule', 'pnMessages');
             $pnr->assign('messages', pnModAPIFunc('pnMessages', 'user', 'getmessagecount'));
+        } else if (pnModAvailable('InterCom')) {
+            $pnr->assign('msgmodule', 'InterCom');
+            $pnr->assign('messages', pnModAPIFunc('InterCom', 'user', 'getmessagecount'));
+        } else {
+            $pnr->assign('msgmodule', '');
+            $pnr->assign('messages', array());
         }
     }

development/zikula-1/system/Users/pntemplates/users_block_online.htm

@@ -4 +4 @@
 <p><!--[pnml name="_USERS_ONLINEBLOCK_CURRENTLYONLINE" g=$guestcount gs=$gueststring m=$userscount ms=$memberstring]--></p>
 <!--[if $loggedin eq 1]-->
-        <!--[if $pnmessages neq 0]-->
+        <!--[if $msgmodule eq 'pnMessages']-->
         <!--[pnmodurl modname="pnMessages" func="inbox" assign="messageslink"]-->
+        <p><!--[if $messages.unread eq 0]--><!--[pnml name=_USERS_ONLINEBLOCK_PRIVATEMSGS0]--><!--[elseif $messages.unread eq 1]--><!--[pnml name=_USERS_ONLINEBLOCK_PRIVATEMSGS1 l=$messageslink html=1]--><!--[else]--><!--[pnml name=_USERS_ONLINEBLOCK_PRIVATEMSGS l=$messageslink m=$messages.unread html=1]--><!--[/if]--></p>
+        <!--[/if]-->
+        <!--[if $msgmodule eq 'InterCom']-->
+        <!--[pnmodurl modname="InterCom" func="inbox" assign="messageslink"]-->
         <p><!--[if $messages.unread eq 0]--><!--[pnml name=_USERS_ONLINEBLOCK_PRIVATEMSGS0]--><!--[elseif $messages.unread eq 1]--><!--[pnml name=_USERS_ONLINEBLOCK_PRIVATEMSGS1 l=$messageslink html=1]--><!--[else]--><!--[pnml name=_USERS_ONLINEBLOCK_PRIVATEMSGS l=$messageslink m=$messages.unread html=1]--><!--[/if]--></p>
         <!--[/if]-->