Changeset 11449

Timestamp:

02/18/11 16:04:35 (2 years ago)

Author:

p_lindheimer

Message:

remove legacy functions which create crashes during upgrade

Files:

• freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php (modified) (1 diff)
• freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/module.functions.php (modified) (2 diffs)

freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php

@@ -1022 +1022 @@
-  }
-}
-
-
-/**
- * These functions are LEFT OVER Legacy functions very minimally used and should probably be
- * removed and the offending usage eliminated.
- */
-
-/** Replaces variables in a string with the values from ampconf
- * eg, "%AMPWEBROOT%/admin" => "/var/www/html/admin"
- */
-function ampconf_string_replace($string) {
-  $freepbx_conf =& freepbx_conf::create();
-  
-  $target = array();
-  $replace = array();
-  
-  foreach ($freepbx_conf->conf as $key=>$value) {
-    $target[] = '%'.$key.'%';
-    $replace[] = $value;
-  }
-  
-  return str_replace($target, $replace, $string);
-}
-
-/** Expands variables from amportal.conf 
- * Replaces any variables enclosed in percent (%) signs with their value
- * eg, "%AMPWEBROOT%/admin/functions.inc.php"
- */
-//TODO: seems this the exact same as the above function. Should either be removed?
-function expand_variables($string) {
-  return ampconf_string_replace($string);
-}
-?>

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

@@ -509 +509 @@
-          case 'file': // file exists
-            // replace embedded amp_conf %VARIABLES% in string
-
+
+
+
+
+
+
-            
-            if (!file_exists( $file )) {
@@ -1528 +1533 @@
-}
-
+/** Replaces variables in a string with the values from ampconf
+ * eg, "%AMPWEBROOT%/admin" => "/var/www/html/admin"
+ */
+function _module_ampconf_string_replace($string) {
+  $freepbx_conf =& freepbx_conf::create();
+  
+  $target = array();
+  $replace = array();
+  
+  foreach ($freepbx_conf->conf as $key=>$value) {
+    $target[] = '%'.$key.'%';
+    $replace[] = $value;
+  }
+  
+  return str_replace($target, $replace, $string);
+}
-?>