Changeset 24896

Timestamp:

11/20/08 21:08:19 (7 weeks ago)

Author:

Landseer

Message:

added more InterCom? detection, this refs #397

Location:

development/main/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/main/system/Theme/plugins/function.displaygreeting.php

@@ -84 +84 @@
         }
 
-        if (ModuleUtil::available('pnMessages') && ($displayMsgs || $displayAllMsgs)) {
-            $messages = ModuleUtil::execAPI('pnMessages', 'user', 'getmessagecount');
-            $inboxurl = DataUtil::formatForDisplay(ModuleUtil::URL('pnMessages', 'user', 'inbox'));
+        $msgmodule = '';
+        if (ModuleUtil::available('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/main/system/Users/pnblocks/online.php

@@ -91 +91 @@
     if (UserUtil::isLoggedIn()) {
         $pnr->assign('username', UserUtil::getVar('uname'));
-        // check if pnMessages is available and add the necessary info
-        $pnmessages = ModuleUtil::available('pnMessages');
-        $pnr->assign('pnmessages', $pnmessages); 
-        // we can show 0 new messages if there are no messages at all       
-//        if (!$pnmessages) {
-            ModuleUtil::loadLangFile('pnMessages', 'user');            
+        // check if pnMessages/InterCom are available and add the necessary info
+        if (ModuleUtil::available('pnMessages')) {
             $messages = ModuleUtil::execAPI('pnMessages', 'user', 'getmessagecount');
-            if(!$messages) $messages['unread'] = 0;
-                                $msg= sprintf(ngettext("You have %s new message.", "You have %s new messages", $messages['unread']), $messages['unread']);            
-            $pnr->assign('messstring', $msg);
-//        }
+        } else if (ModuleUtil::available('InterCom')) {
+            $messages = ModuleUtil::execAPI('InterCom', 'user', 'getmessagecount');
+        } else {
+            $messages['unread'] = 0;
+        }
+        $msg= sprintf(ngettext("You have %s new message.", "You have %s new messages", $messages['unread']), $messages['unread']);            
+        $pnr->assign('messstring', $msg);
     }
     

development/main/system/Users/pntemplates/users_block_online.htm

@@ -2 +2 @@
 <!--[$userstring]--></p>
 <!--[if $loggedin eq 1]-->
-        <!--[*if $pnmessages neq 0*]-->
+        <!--[ if $messstring ]-->
         <p><!--[$messstring]--></p>
-        <!--[*/if*]-->
+        <!--[ /if ]-->
         <p><!--[gt text="You are logged in as <strong>%s</strong>." tag=$username  html="1"]--></p>
 <!--[else]-->