Changeset 6272 for freepbx/trunk

Show
Ignore:
Timestamp:
08/02/08 22:18:11 (5 years ago)
Author:
p_lindheimer
Message:

fixes #2635 and fixes error introduced re #2963

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/cdr/graph_pie.php

    r5360 r6272  
    139139 
    140140 
    141 for ($i=0; $i<$months_compare+1; $i++){ 
     141for ($i=0; $i<=$months_compare; $i++){ 
    142142  // creer un table legende  
    143143  $current_mymonth = $mymonth -$i; 
    144   if ($current_mymonth<=0) { 
     144  if ($current_mymonth<=1) { 
    145145    $current_mymonth=$current_mymonth+12;    
    146146    $minus_oneyar = 1; 
    …… 
    208208 
    209209$p1 = new PiePlot3D($data); 
    210 $p1->ExplodeSlice(1); 
     210$p1->ExplodeSlice(0); 
    211211$p1->SetCenter(0.35); 
    212212//print_r($gDateLocale->GetShortMonth()); 

  • freepbx/trunk/amp_conf/htdocs/admin/cdr/lib/defines.php

    r6239 r6272  
    2323define ("LIBDIR", FSROOT."lib/"); 
    2424 
    25 define ("HOST", (( $amp_conf["CDRDBHOST"] == NULL ? $amp_conf["AMPDBHOST"] : $amp_conf["CDRDBHOST"] )) ); 
    26 define ("PORT", (( $amp_conf["CDRDBPORT"] == NULL ? "5432" : $amp_conf["CDRDBPORT"] )) ); 
    27 define ("USER", (( $amp_conf["CDRDBUSER"] == NULL ? $amp_conf["AMPDBUSER"] : $amp_conf["CDRDBUSER"] )) ); 
    28 define ("PASS", (( $amp_conf["CDRDBPASS"] == NULL ? $amp_conf["AMPDBPASS"] : $amp_conf["CDRDBPASS"] )) ); 
    29 define ("DBNAME", (( $amp_conf["CDRDBNAME"] == NULL ? "asteriskcdrdb" : $amp_conf["CDRDBNAME"] )) ); 
    30 define ("DB_TYPE", (( $amp_conf["CDRDBTYPE"] == NULL ? $amp_conf["AMPDBENGINE"] : $amp_conf["CDRDBTYPE"] )) ); // mysql or postgres 
    31 define ("DB_TABLENAME", (( $amp_conf["CDRDBTABLENAME"] == NULL ? "cdr" : $amp_conf["CDRDBTABLENAME"] )) ); 
     25define ("HOST", (( !isset($amp_conf["CDRDBHOST"]) ? $amp_conf["AMPDBHOST"] : $amp_conf["CDRDBHOST"] )) ); 
     26define ("PORT", (( !isset($amp_conf["CDRDBPORT"]) ? "5432" : $amp_conf["CDRDBPORT"] )) ); 
     27define ("USER", (( !isset($amp_conf["CDRDBUSER"]) ? $amp_conf["AMPDBUSER"] : $amp_conf["CDRDBUSER"] )) ); 
     28define ("PASS", (( !isset($amp_conf["CDRDBPASS"]) ? $amp_conf["AMPDBPASS"] : $amp_conf["CDRDBPASS"] )) ); 
     29define ("DBNAME", (( !isset($amp_conf["CDRDBNAME"]) ? "asteriskcdrdb" : $amp_conf["CDRDBNAME"] )) ); 
     30define ("DB_TYPE", (( !isset($amp_conf["CDRDBTYPE"]) ? $amp_conf["AMPDBENGINE"] : $amp_conf["CDRDBTYPE"] )) ); // mysql or postgres 
     31define ("DB_TABLENAME", (( !isset($amp_conf["CDRDBTABLENAME"]) ? "cdr" : $amp_conf["CDRDBTABLENAME"] )) ); 
    3232  
    3333// Regarding to the dst you can setup an application name