Changeset 10626

Timestamp:

11/29/10 10:19:02 (2 years ago)

Author:

mbrevda

Message:

re #4566 - merge bootstrap settings in to proper modules branch

Files:

• modules/branches/bootstrap-2.9/backup/bin/ampbackup.php (modified) (4 diffs)
• modules/branches/bootstrap-2.9/backup/bin/dumpastdb.php (modified) (2 diffs)
• modules/branches/bootstrap-2.9/backup/bin/restoreastdb.php (modified) (2 diffs)
• modules/branches/bootstrap-2.9/callback/bin/callback (modified) (4 diffs)
• modules/branches/bootstrap-2.9/directory/agi-bin/directory.lib.php (modified) (1 diff)
• modules/branches/bootstrap-2.9/queues/agi-bin/queue_devstate.agi (modified) (1 diff)

modules/branches/bootstrap-2.9/backup/bin/ampbackup.php

@@ -28 +28 @@
-*/
-
-
-
-
-
-
-
-
+
-
-switch (true){
@@ -103 +97 @@
-  //if the ssh completed with exit code 0, copy backup over to this server
-  if($execok==0){
-, 0755, true
+
-    $exec='/usr/bin/scp -i '.$opts['remotesshkey'].' -c blowfish '.$user.$opts['remotesshhost'].':'.$rbudir[0].'/backups/'.$opts['name'].'/'.$opts['now'].'.tar.gz '.$opts['budir'].'/'.$opts['name'];
-    exec($exec,$ret);
@@ -265 +259 @@
-}
-
-function getconf($filename) {
-  $file = file($filename);
-  foreach($file as $line => $cont){
-    if(substr($cont,0,1)!='#'){
-      $d=explode('=',$cont);
-      if(isset($d['0'])&& isset($d['1'])){$conf[trim($d['0'])]=trim($d['1']);}
-    }
-  }
-  return $conf;
-}
-
-function getOpts(){
-  array_shift($_SERVER['argv']);
@@ -287 +270 @@
-}
-
-
-function dbug(){
-  $opts=func_get_args();
-  //call_user_func_array('freepbx_debug',$opts);
-  $dump=0;
-  //sort arguments
-  switch(count($opts)){
-    case 1:
-      $msg=$opts[0];
-    break;
-    case 2:
-      if(is_array($opts[0])||is_object($opts[0])){
-        $msg=$opts[0];
-        $dump=$opts[1];
-      }else{
-        $disc=$opts[0];
-        $msg=$opts[1];
-      }
-    break;
-    case 3:
-      $disc=$opts[0];
-      $msg=$opts[1];
-      $dump=$opts[2];
-    break;  
-  }
-  if($disc){$disc=' \''.$disc.'\':';}
-  $txt=date("Y-M-d H:i:s").$disc."\n"; //add timestamp
-  dbug_write($txt,1);
-  if($dump==1){//force output via var_dump
-    ob_start();
-    var_dump($msg);
-    $msg=ob_get_contents();
-    ob_end_clean();
-    dbug_write($msg."\n");
-  }elseif(is_array($msg)||is_object($msg)){
-    dbug_write(print_r($msg,true)."\n");
-  }else{
-    dbug_write($msg."\n");
-  }
-}
-
-function dbug_write($txt,$check=''){
-  global $amp_conf;
-  $append=FILE_APPEND;
-  //optionaly ensure that dbug file is smaller than $max_size
-  if($check){
-    $max_size=52428800;//hardcoded to 50MB. is that bad? not enough?
-    $size=filesize('/tmp/freepbx_debug.log');
-    $append=(($size > $max_size)?'':FILE_APPEND);
-  }
-  file_put_contents('/tmp/freepbx_debug.log',$txt, $append);
-}
-
-?>

modules/branches/bootstrap-2.9/backup/bin/dumpastdb.php

@@ -17 +17 @@
-//    along with FreePBX.  If not, see <http://www.gnu.org/licenses/>.
-//
-
+
-global $argv;
-
-function getconf($filename) {
-        $file = file($filename);
-        foreach ($file as $line) {
-                if (preg_match("/^\s*([\w]+)\s*=\s*\"?([\w\/\:\.\%-]*)\"?\s*([;#].*)?/",$line,$matches)) {
-                        $conf[ $matches[1] ] = $matches[2];
-                }
-        }
-        return $conf;
-}
-
-$amportalconf = (isset($_ENV["FREEPBXCONFIG"]) && strlen($_ENV["FREEPBXCONFIG"])) ? $_ENV["FREEPBXCONFIG"] : "/etc/amportal.conf";
-$amp_conf = getconf($amportalconf);
-
-if (!isset($amp_conf["ASTMANAGERHOST"])) {
@@ -40 +28 @@
-}
-
-require_once($amp_conf['AMPWEBROOT']."/admin/functions.inc.php");
-require_once($amp_conf['AMPWEBROOT']."/admin/common/php-asmanager.php");
-$astman         = new AGI_AsteriskManager();
-if (! $res = $astman->connect($amp_conf["ASTMANAGERHOST"] . ":".$amp_conf["ASTMANAGERPORT"], $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {
-        unset( $astman );
-        echo "failed to open using".$amp_conf["ASTMANAGERHOST"] .":".$amp_conf["ASTMANAGERPORT"]." ". $amp_conf["AMPMGRUSER"] ." ". $amp_conf["AMPMGRPASS"]."\n";
-}
-
-if (!$argv[1] || strstr($argv[1], "/") || strstr($argv[1], "..")) {

modules/branches/bootstrap-2.9/backup/bin/restoreastdb.php

@@ -18 +18 @@
-//
-
+require_once(getenv('FREEPBX_CONF') ? getenv('FREEPBX_CONF') : '/etc/freepbx.php');
-global $argv;
-
@@ -33 +34 @@
-);
-
-function getconf($filename) {
-        $file = file($filename);
-        foreach ($file as $line) {
-                if (preg_match("/^\s*([\w]+)\s*=\s*\"?([\w\/\:\.\%-]*)\"?\s*([;#].*)?/",$line,$matches)) {
-                        $conf[ $matches[1] ] = $matches[2];
-                }
-        }
-        return $conf;
-}
-
-# Get configuration
-$amportalconf = (isset($_ENV["FREEPBXCONFIG"]) && strlen($_ENV["FREEPBXCONFIG"])) ? $_ENV["FREEPBXCONFIG"] : "/etc/amportal.conf";
-$amp_conf = getconf($amportalconf);
-
-if (!isset($amp_conf["ASTMANAGERHOST"])) {
-  $amp_conf["ASTMANAGERHOST"] = '127.0.0.1';
-}
-if (!isset($amp_conf["ASTMANAGERPORT"])) {
-  $amp_conf["ASTMANAGERPORT"] = '5038';
-}
-
-require_once($amp_conf['AMPWEBROOT']."/admin/functions.inc.php");
-require_once($amp_conf['AMPWEBROOT']."/admin/common/php-asmanager.php");
-
-$astman         = new AGI_AsteriskManager();
-if (! $res = $astman->connect($amp_conf["ASTMANAGERHOST"] . ":".$amp_conf["ASTMANAGERPORT"], $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {
-  unset( $astman );
-  exit(10);
-}
-
-if (!$argv[1] || strstr($argv[1], "/") || strstr($argv[1], "..")) {

modules/branches/bootstrap-2.9/callback/bin/callback

@@ -2 +2 @@
-<?php
-/*
-7
+3
-1- number to dial
-2- context.exten.priority to dump number into
-3- time in seconds to sleep before calling back
-
-
-
-
+
-
-eg: callback 14032448089 ext-meetme.200.1
@@ -29 +26 @@
-//    You should have received a copy of the GNU General Public License
-//    along with FreePBX.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-
-
-
-
+
+
+
-}
-echo "args: $argc\n";
@@ -41 +36 @@
-$callback_destination = $argv[2];
-$pause_seconds = $argv[3];
-
-$amp_conf['AMPWEBROOT'] = $argv[4];
-$amp_conf['ASTETCDIR']  = $argv[5];
-$amp_conf['AMPMGRUSER'] = $argv[6];
-$amp_conf['AMPMGRPASS'] = $argv[7];
-
-// include manager functions
-include $amp_conf['AMPWEBROOT'].'/admin/common/php-asmanager.php';
-
-if($pause_seconds)
@@ -71 +58 @@
-$data = "";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-?>

modules/branches/bootstrap-2.9/directory/agi-bin/directory.lib.php

@@ -1 +1 @@
-<?php
+//will be enabled when I (or someone) gose through this to ensure that we dont break anything
+//require_once(getenv('FREEPBX_CONF') ? getenv('FREEPBX_CONF') : '/etc/freepbx.php');
+
-class Dir{
-  //agi class handler

modules/branches/bootstrap-2.9/queues/agi-bin/queue_devstate.agi

@@ -1 +1 @@
-#!/usr/bin/php -q
-<?php
-
+
+
-  require_once "phpagi.php";
-  require_once "phpagi-asmanager.php";