Changeset 4301

Timestamp:

07/03/07 14:35:55 (2 years ago)

Author:

p_lindheimer

Message:

Auto Check-in of any outstanding patches

Files:

• modules/branches/2.3/core/agi-bin/dialparties.agi (modified) (4 diffs)
• modules/branches/2.3/core/agi-bin/directory (modified) (5 diffs)
• modules/branches/2.3/core/agi-bin/fixlocalprefix (modified) (3 diffs)
• modules/branches/2.3/core/etc/extensions.conf (modified) (5 diffs)
• modules/branches/2.3/core/functions.inc.php (modified) (3 diffs)

modules/branches/2.3/core/agi-bin/dialparties.agi

@@ -27 +27 @@
- * to keep it from getting changed.
- */
-
-$config = parse_amportal_conf( "/etc/amportal.conf" );
-
-require_once "phpagi.php";
@@ -49 +47 @@
-debug("Starting New Dialparties.agi", 1);
-
+// Get required channels variables that used to come from amportal.conf
+$ampmgruser  = get_var( $AGI, "AMPMGRUSER" );
+$ampmgrpass  = get_var( $AGI, "AMPMGRPASS" );
+
+
+// get cwinusebusy, and just to make sure it has been set until testing has been done
+// and assured this channel variable is set consistantly, make sure it is valid.
+//
+// TODO: take out the checking after confirmed it is always done righto
+//
+$cwinusebusy = get_var( $AGI, "CWINUSEBUSY" );
+$cwinusebusy = (trim($cwinusebusy) == "false") ? false : true;
+
+
-$astman = new AGI_AsteriskManager( );   
-config["AMPMGRUSER"] , $config["AMPMGRPASS"]
+ampmgruser , $ampmgrpass
-        exit (1);
-}
@@ -403 +415 @@
-                                debug("Extension $extnum is available",1);
-                        }
-strtoupper(trim($config['CWINUSEBUSY'])) == "YES"
+$cwinusebusy
-
-                        $extstate = is_ext_avail($extnum);
@@ -704 +716 @@
-function is_ext_avail( $extnum )
-{
-        global $config;
-        global $astman;
-        

modules/branches/2.3/core/agi-bin/directory

@@ -24 +24 @@
- * to keep it from getting changed.
- */
-
-// TODO: These are all hardcoded, means we are going to have to parse!
-//       or maybe retrieve_conf can special handle them at cp time.
-//
-
-define("DIRECTORY_FILE", "/etc/asterisk/voicemail.conf");
-
-// where is voicemail stored?
-define("VOICEMAIL_DIR", "/var/spool/asterisk/voicemail/%s/%d");
-
-// where shold we store logs? (fixes #1912)
-define("LOG_DIR", "/var/log/asterisk/");
-
-// set to 1 to say "zed" instead of "zee"
@@ -66 +54 @@
-
-include("phpagi.php");
+
+function get_var( $agi, $value)
+{
+        $r = $agi->get_variable( $value );
+        
+        if ($r['result'] == 1)
+        {
+                $result = $r['data'];
+                return $result;
+        }
+        else
+                return '';
+}
-
-function output(&$var) {
@@ -321 +322 @@
-                                $match = & $directory[$digits][$i];
-                                
-VOICEMAIL_DIR
+$voicemail_dir
-
-                                if (sound_file_exists($maindirname."/greet")) {
@@ -399 +400 @@
-$agi = new AGI;
-
-
+
+
+
+
+
+
+
+
+
-
-$vmconf = array();
-$null = null;
-DIRECTORY_FILE
+$directory_file
-
-
@@ -415 +424 @@
-if (!isset($vmconf[$vm_context]) && ($vm_context != "general")) {
-        // we make an exception for "general" context,as it just includes other contexts
-DIRECTORY_FILE
+$directory_file
-        exit(1);
-}

modules/branches/2.3/core/agi-bin/fixlocalprefix

@@ -30 +30 @@
-DIAL_TRUNK - the trunk number to use
-
-LOCALPREFIX_FILE
+$localprefix_file
-file has the format:
-
@@ -76 +76 @@
-*/
-
-// TODO: Hardcoded path, this needs removing (means we need to parse amprotal.conf or change where these are stored!
-//       or maybe retrieve_conf can special handle them at install time.
-//
-define("LOCALPREFIX_FILE", "/etc/asterisk/localprefixes.conf");
-
-include("phpagi.php");
+
+function get_var( $agi, $value)
+{
+        $r = $agi->get_variable( $value );
+        
+        if ($r['result'] == 1)
+        {
+                $result = $r['data'];
+                return $result;
+        }
+        else
+                return '';
+}
-
-function parse_conf($filename, &$conf, &$section) {
@@ -188 +196 @@
-$agi = new AGI();
-
-
-
+
+
+
+
-        if (count($conf) == 0) {
-LOCALPREFIX_FILE
+$localprefix_file
-                exit(1);
-        }
-} else {
-LOCALPREFIX_FILE
+$localprefix_file
-        exit(1);
-}

modules/branches/2.3/core/etc/extensions.conf

@@ -290 +290 @@
-; If the required voicemail file does not exist, then abort and go to normal voicemail behavior
-; TODO: figure out which is proper file (.wav or .WAV) and maybe find a better way
+;       still want to find something better than 'ls' but for now, it checks either
-;
-exten => vmx,n,Macro(get-vmcontext,${ARG1})
-/var/spool/asterisk/voicemail/${VMCONTEXT}/${ARG1}/${MODE}.wav
+${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1}/${MODE}.[wW][aA][vV]
-
-; Get the repeat, timeout and loop times to use if they are overriden form the global settings
@@ -308 +309 @@
-; then we go to the timeout. Otherwise handle invalid options by looping until the limit until a valid option is played.
-;
-/var/spool/asterisk
+${ASTSPOOLDIR}
-exten => vmx,n,GotoIf($["${EXISTS(${ACTION})}" = "1"]?checkopt)
-
@@ -591 +592 @@
-
-[macro-faxreceive]
-/var/spool/asterisk
+${ASTSPOOLDIR}
-exten => s,2,Set(EMAILADDR=${FAX_RX_EMAIL})
-exten => s,3,rxfax(${FAXFILE})
@@ -853 +854 @@
-exten => s,20,Set(DB(DEVICE/${CALLERID(number)}/user)=${AMPUSER})
-; create symlink from dummy device mailbox to user's mailbox
-/var/spool/asterisk/voicemail/default/${AMPUSER}/ /var/spool/asterisk
+${ASTSPOOLDIR}/voicemail/default/${AMPUSER}/ ${ASTSPOOLDIR}
-
-exten => s-FIXED,1,NoOp(Device is FIXED and cannot be logged into)
@@ -877 +878 @@
-; remove entry from user's DEVICE key
-; delete the symlink to user's voicemail box
-/var/spool/asterisk
+${ASTSPOOLDIR}
-exten => s,4,Set(DEVAMPUSER=${DB(DEVICE/${CALLERID(number)}/user)})
-exten => s,5,Set(AMPUSERDEVICES=${DB(AMPUSER/${DEVAMPUSER}/device)})

modules/branches/2.3/core/functions.inc.php

@@ -57 +57 @@
-        global $ext;  // is this the best way to pass this?
-        global $version;  // this is not the best way to pass this, this should be passetd together with $engine
+        global $amp_conf;
-
-        $modulename = "core";
@@ -384 +385 @@
-                        // modules should use $ext->addGlobal("testvar","testval"); in their module_get_config() function instead
-                        // I'm cheating for core functionality - do as I say, not as I do ;-)           
+
+                        // Auto add these globals to give access to agi scripts and other needs, unless defined in the global table.
+                        //
+                        $amp_conf_globals = array( 
+                                "ASTETCDIR", 
+                                "ASTMODDIR", 
+                                "ASTVARLIBDIR", 
+                                "ASTAGIDIR", 
+                                "ASTSPOOLDIR", 
+                                "ASTRUNDIR", 
+                                "ASTLOGDIR",
+                                "CWINUSEBUSY",
+                                "AMPMGRUSER",
+                                "AMPMGRPASS"
+                        );
+
-                        $sql = "SELECT * FROM globals";
-                        $globals = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-                        foreach($globals as $global) {
-                                $ext->addGlobal($global['variable'],$global['value']);
+
+                                // now if for some reason we have a variable in the global table
+                                // that is in our $amp_conf_globals list, then remove it so we
+                                // don't duplicate, the sql table will take precedence
+                                //
+                                if (array_key_exists($global['variable'],$amp_conf_globals)) {
+                                        $rm_keys = array_keys($amp_conf_globals,$global['variable']);
+                                        foreach ($rm_keys as $index) {
+                                                unset($amp_conf_globals[$index]);
+                                        }
+                                }
+                        }
+                        foreach ($amp_conf_globals as $global) {
+                                if (isset($amp_conf[$global])) {
+                                        $value = $amp_conf[$global];
+                                        if ($value === true || $value === false) {
+                                                $value = ($value) ? 'true':'false';
+                                        }
+                                        $ext->addGlobal($global, $value);
+                                        out("Added to globals: $global = $value");
+                                }
-                        }
-                        
@@ -1310 +1348 @@
-                $astman->database_put("AMPUSER",$extension."/voicemail","\"".isset($voicemail)?$voicemail:''."\"");
-                $astman->database_put("AMPUSER",$extension."/device","\"".isset($device)?$device:''."\"");
-!isset($amp_conf['ENABLECW']) || strtolower($amp_conf['ENABLECW']) != "no"
+$amp_conf['ENABLECW']
-                        $astman->database_put("CW",$extension,"\"ENABLED\"");
-                }