Changeset 5966
- Timestamp:
- 07/08/08 10:46:11 (3 months ago)
- Files:
-
- freepbx/branches/2.4 (modified) (1 prop)
- freepbx/branches/2.4/amp_conf/bin/libfreepbx.confgen.php (modified) (3 diffs)
- freepbx/branches/2.4/amp_conf/bin/retrieve_conf (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/branches/2.4
- Property svnmerge-integrated changed from /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750,5758,5760,5765,5771,5773,5779,5782,5819,5827,5836,5838 to /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750,5758,5760,5765,5771,5773,5779,5782,5819,5827,5836,5838,5965
freepbx/branches/2.4/amp_conf/bin/libfreepbx.confgen.php
r5294 r5966 256 256 $results = $db->getAll($sql, DB_FETCHMODE_ASSOC); 257 257 if(DB::IsError($results)) { 258 die($results->getMessage()); 258 error("queues access failed, queueues may not be installed: ".$results->getMessage()); 259 return true; 259 260 } 260 261 foreach ($results as $result) { … … 268 269 $results = $db->getAll($sql, DB_FETCHMODE_ASSOC); 269 270 if(DB::IsError($results)) { 270 die($results->getMessage()); 271 error("queues access failed, queueues may not be installed: ".$results->getMessage()); 272 return true; 271 273 } 272 274 … … 279 281 $results2 = $db->getAll($sql, DB_FETCHMODE_ASSOC); 280 282 if(DB::IsError($results2)) { 281 die($results2->getMessage()); 283 error("queues access failed, queueues may not be installed: ".$results2->getMessage()); 284 return true; 282 285 } 283 286 $queueschannel=""; freepbx/branches/2.4/amp_conf/bin/retrieve_conf
r5837 r5966 746 746 if (!file_exists($target)) { 747 747 exec("touch $target", $output, $retcode); 748 error("Error code $retcode: trying to create empty file $target"); 748 if ($retcode != 0) { 749 error("Error code $retcode: trying to create empty file $target"); 750 } 749 751 } 750 752 }
