Changeset 9651

Timestamp:

05/19/10 01:18:29 (3 years ago)

Author:

mickecarlsson

Message:

Close #4282, remove hardcoded paths in ARI, replace with parse_amportal. Thank you kurtlidl

Files:

• freepbx/trunk/amp_conf/htdocs/recordings/includes/bootstrap.php (modified) (3 diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/main.conf.php (modified) (5 diffs)

freepbx/trunk/amp_conf/htdocs/recordings/includes/bootstrap.php

@@ -114 +114 @@
-        if ($fileCount>$SETTINGS_MAX_FILES) {
-          $_SESSION['ari_error'] 
-_("To many files in $msg_path Not all files processed"
+sprintf(_("Too many files in %s. Not all files processed"),$msg_path
-          return;
-        }
@@ -123 +123 @@
-          if ($dirCount>10) {
-            $_SESSION['ari_error'] 
- many directories in %s
+o many directories in %s.
-            return;
-          }
@@ -309 +309 @@
-setARIRoot();
-
+include_once("./includes/common.php");
-include_once("./includes/main.conf.php");
-include_once("./version.php");

freepbx/trunk/amp_conf/htdocs/recordings/includes/main.conf.php

@@ -15 +15 @@
-$AMPORTAL_CONF_FILE = "/etc/amportal.conf";
-
+$amp_conf = parse_amportal_conf($AMPORTAL_CONF_FILE);
-#
-# Host for Asterisk Manager Interface
@@ -130 +131 @@
-# voicemail config.
-#
-"/etc/asterisk
+$amp_conf["ASTETCDIR"]."
-
-#
@@ -142 +143 @@
-#    Use semi-colon for multiple paths
-#
-
+
+
-
-#
@@ -165 +167 @@
-# Location of asterisk call monitor recordings on server
-#
-"/var/spool/asterisk
+$amp_conf["ASTSPOOLDIR"]."
-
-#
@@ -260 +262 @@
-$ASTERISK_PROTOCOLS = array();
-$ASTERISK_PROTOCOLS['iax']['table'] = "iax";
-"/etc/asterisk/iax.conf;/etc/asterisk
+$amp_conf["ASTETCDIR"]."/iax.conf;".$amp_conf["ASTETCDIR"]."
-$ASTERISK_PROTOCOLS['sip']['table'] = "sip";
-"/etc/asterisk/sip.conf;/etc/asterisk
+$amp_conf["ASTETCDIR"]."/sip.conf;".$amp_conf["ASTETCDIR"]."
-$ASTERISK_PROTOCOLS['zap']['table'] = "zap";
-
-
+
-# Settings for Follow-Me Select Boxes in seconds
-#