Changeset 12993 for freepbx/branches

Timestamp:

12/05/11 14:32:06 (1 year ago)

Author:

mbrevda

Message:

upstream changes

Files:

• freepbx/branches/2.10/amp_conf/bin/freepbx_engine (modified) (1 diff)
• freepbx/branches/2.10/amp_conf/bin/module_admin (modified) (5 diffs)
• freepbx/branches/2.10/amp_conf/bin/retrieve_conf (modified) (2 diffs)
• freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/module.functions.php (modified) (1 diff)
• freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/utility.functions.php (modified) (2 diffs)
• freepbx/branches/2.10/upgrades/2.10.0beta2/migration.php (modified) (1 diff)

freepbx/branches/2.10/amp_conf/bin/freepbx_engine

@@ -57 +57 @@
-AMPVMUMASK=077
-ASTETCDIR=/etc/asterisk
-tmp/freepbx_debug.lo
+var/log/asterisk/freepbx_debu
-ASTSTOPTIMEOUT=120
-ASTSTOPPOLLINT=2

freepbx/branches/2.10/amp_conf/bin/module_admin

@@ -356 +356 @@
-}
-
+function setPerms() {
+  //If were running as root, attempt to set proper permissions 
+  //on the freshly installed files. For simplicity, we run the 
+  // freepbx defualt utility for setting freepbx perms
+  $current_user = posix_getpwuid(posix_geteuid());
+  if ($current_user['uid'] === 0) {
+    system($amp_conf['AMPBIN'] . '/freepbx_engine chown');
+  }
+}
-function check_active_repos() {
-  global $no_warnings;
@@ -685 +694 @@
-    }
-    doDownload($param, $force);
+    setPerms();
-  break;
-  case 'enable':
@@ -709 +719 @@
-    }
-    doInstall($param, $force);
+    setPerms();
-  break;
-  case 'installlocal':
-    doInstallLocal(true);
+    setPerms();
-  break;
-  case 'installall':
-    doInstallAll(true);
+    setPerms();
-  break;  
-  case 'list':
@@ -725 +738 @@
-  case 'mirrorrepo': case 'mirrorrepro':
-    mirrorrepo();
+    setPerms();
-  break;
-  case 'reload':
@@ -760 +774 @@
-  case 'upgrade':
-    doUpgrade($param, $force);
+    setPerms();
-  break;
-  case 'upgradeall':
-    doUpgradeAll($force);
+    setPerms();
-  break;
-  default:

freepbx/branches/2.10/amp_conf/bin/retrieve_conf

@@ -677 +677 @@
-        foreach(${$classname}->get_filename() as $modconf) {
-          if (isset(${$classname}->use_warning_banner)) {
-
+
+
+
-          } else {
-            write_file($modconf,${$classname}->generateConf($modconf));
@@ -684 +686 @@
-      } else {
-        if (isset(${$classname}->use_warning_banner)) {
-
+
+
+
-        } else {
-
+ 
-        }
-      }

freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/module.functions.php

@@ -1073 +1073 @@
-  needreload();
-  
-  //If were running as root, atempt to set proper permissions 
-  //on the freshly installed files. For simplicity, we run the 
-  // freepbx defualt utility for setting freepbx perms
-  $current_user = posix_getpwuid(posix_geteuid());
-  if ($current_user['uid'] === 0) {
-    system($amp_conf['AMPBIN'] . '/freepbx_engine chown');
-  }
-  return true;
-}

freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/utility.functions.php

@@ -566 +566 @@
-  //
-  if (!isset($amp_conf['FPBXDBUGFILE'])) {
-tmp/freepbx_debug.lo
+var/log/asterisk/freepbx_debu
-  }
-
@@ -721 +721 @@
-}
-
+/**
+ * Prints an array as a "tree" of data
+ */
-function dbug_printtree($dir, $indent = "\t") {
-  static $t = 0;

freepbx/branches/2.10/upgrades/2.10.0beta2/migration.php

@@ -30 +30 @@
-  $freepbx_conf->define_conf_setting('FOPPASSWORD',$set); // comitted below
-}
+
+//move freepbx debug log
+$freepbx_conf->set_conf_values(array('FPBXDBUGFILE' => '/var/log/asterisk/freepbx_debug'), true);
-
-$outdated = array(