Changeset 6558

Timestamp:

09/04/08 07:16:46 (3 months ago)

Author:

p_lindheimer

Message:

re #3157 Merged revisions 6557 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r6557 | p_lindheimer | 2008-09-04 07:12:30 -0700 (Thu, 04 Sep 2008) | 1 line

fixes #3157 sip info summary display wrong

........

Files:

• modules/branches/2.4 (modified) (1 prop)
• modules/branches/2.4/asteriskinfo/module.xml (modified) (2 diffs)
• modules/branches/2.4/asteriskinfo/page.asteriskinfo.php (modified) (2 diffs)

modules/branches/2.4/asteriskinfo/module.xml

@@ -2 +2 @@
-        <rawname>asteriskinfo</rawname>
-        <name>Asterisk Info</name>
-1
+2
-        <type>tool</type>
-        <category>System Administration</category>
@@ -15 +15 @@
-        </depends>
-        <changelog>
+                *2.4.0.2* #3157 fixes Sip Peers Summary
-                *2.4.0.1* #2704 Asterisk 1.6 tweaks
-                *2.4.0* bumped to 2.4

modules/branches/2.4/asteriskinfo/page.asteriskinfo.php

@@ -237 +237 @@
-function getPeer($peer, $channelType = NULL){
-        global $astver_major, $astver_minor;
+        global $astver;
-        if(count($peer) > 1){   
-                if($channelType == NULL || $channelType == 'SIP'){
@@ -245 +246 @@
-                        $sipPeerInfo_arr2 = explode('[',$sipPeerInfo_string);
-                        $sipPeerInfo_arr3 = explode(' ',$sipPeerInfo_arr2[1]);
-($astver_major == 1 && $astver_minor >= 4){
+ (version_compare($astver, '1.4', 'ge')) { 
-                                $sipPeerInfo_arr['online'] = $sipPeerInfo_arr3[1] + $sipPeerInfo_arr3[6];
-                                $sipPeerInfo_arr['offline'] = $sipPeerInfo_arr3[3] + $sipPeerInfo_arr3[8];