Changeset 5248

Show
Ignore:
Timestamp:
11/17/07 12:49:12 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5247 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r5247 | p_lindheimer | 2007-11-17 09:47:00 -0800 (Sat, 17 Nov 2007) | 1 line


fix database_get not working in this version of phpagi-asmanager.php (we really need to merge all these different versions)

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.3

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/trunk:1-4133,4135-4136,4140-5015,5017-5035,5040-5042,5068,5076,5095,5107,5117,5122,5124,5132,5151,5153,5215,5235 to /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/trunk:1-4133,4135-4136,4140-5015,5017-5035,5040-5042,5068,5076,5095,5107,5117,5122,5124,5132,5151,5153,5215,5235,5247

  • freepbx/branches/2.3/amp_conf/agi-bin/phpagi-asmanager.php

    r2192 r5248  
    845845  function database_get($family, $key) { 
    846846    $r = $this->command("database get ".str_replace(" ","/",$family)." ".str_replace(" ","/",$key)); 
    847     if (substr($r["data"],0,6) == "Value:") { 
    848       return trim(substr($r["data"],6)); 
     847    $data = strpos($r["data"],"Value:"); 
     848    if ($data !== false) { 
     849      return trim(substr($r["data"],6+$data)); 
    849850    } else { 
    850851      return false;