Changeset 5965

Show
Ignore:
Timestamp:
07/08/08 13:44:47 (5 years ago)
Author:
p_lindheimer
Message:

#2890, #2891 don't write error if empty file create, don't die if queues table not there

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/bin/libfreepbx.confgen.php

    r5294 r5965  
    256256  $results = $db->getAll($sql, DB_FETCHMODE_ASSOC); 
    257257  if(DB::IsError($results)) { 
    258     die($results->getMessage()); 
     258    error("queues access failed, queueues may not be installed: ".$results->getMessage()); 
     259    return true; 
    259260  } 
    260261  foreach ($results as $result) { 
    …… 
    268269  $results = $db->getAll($sql, DB_FETCHMODE_ASSOC); 
    269270  if(DB::IsError($results)) { 
    270     die($results->getMessage()); 
     271    error("queues access failed, queueues may not be installed: ".$results->getMessage()); 
     272    return true; 
    271273  } 
    272274 
    …… 
    279281    $results2 = $db->getAll($sql, DB_FETCHMODE_ASSOC); 
    280282    if(DB::IsError($results2)) { 
    281       die($results2->getMessage()); 
     283      error("queues access failed, queueues may not be installed: ".$results2->getMessage()); 
     284      return true; 
    282285    } 
    283286    $queueschannel=""; 

  • freepbx/trunk/amp_conf/bin/retrieve_conf

    r5869 r5965  
    761761  if (!file_exists($target)) { 
    762762    exec("touch $target", $output, $retcode); 
    763     error("Error code $retcode: trying to create empty file $target"); 
     763    if ($retcode != 0) { 
     764      error("Error code $retcode: trying to create empty file $target"); 
     765    } 
    764766  } 
    765767}