Changeset 5273

Show
Ignore:
Timestamp:
11/23/07 21:29:59 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5271-5272 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5271 | p_lindheimer | 2007-11-23 18:27:27 -0800 (Fri, 23 Nov 2007) | 1 line


#2469 fix division my zero in cpu usage

........

r5272 | p_lindheimer | 2007-11-23 18:28:07 -0800 (Fri, 23 Nov 2007) | 1 line


Module Publish Script: dashboard 0.3.3.2

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272

  • modules/branches/2.3/dashboard/module.xml

    r4889 r5273  
    22  <rawname>dashboard</rawname> 
    33  <name>System Dashboard</name> 
    4   <version>0.3.3.1</version> 
     4  <version>0.3.3.2</version> 
    55  <candisable>no</candisable> 
    66  <canuninstall>no</canuninstall> 
    …… 
    1818  </depends> 
    1919  <changelog> 
     20    *0.3.3.2* #2469 fix division my zero in cpu usage 
    2021    *0.3.3.1* Cosmetic fix (#2278 - long mount point paths) 
    2122    *0.3.3* Improved detection of webserver failing, More MySQL detection fixes 
    …… 
    3637    *0.1.0* Initial release 
    3738  </changelog> 
    38   <location>release/2.3/dashboard-0.3.3.1.tgz</location> 
    39   <md5sum>6346813086933063e70d004b20059924</md5sum> 
     39  <location>release/2.4/dashboard-0.3.3.2.tgz</location> 
     40  <md5sum>913befd1d633fa4f884ec409db410a71</md5sum> 
    4041</module> 

  • modules/branches/2.3/dashboard/phpsysinfo/class.Linux.inc.php

    r4523 r5273  
    133133  $load2 = $ab + $ac + $ad; 
    134134  $total2 = $ab + $ac + $ad + $ae; 
    135   $results['cpupercent'] = (100*($load2 - $load)) / ($total2 - $total); 
     135  $results['cpupercent'] = ($total2 != $total)?((100*($load2 - $load)) / ($total2 - $total)):0; 
    136136      } 
    137137    }