Changeset 10635

Timestamp:

11/29/10 17:21:23 (2 years ago)

Author:

p_lindheimer

Message:

Merged revisions 10416-10493,10495-10634 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.8

........

r10443 | mbrevda | 2010-10-24 10:49:06 -0700 (Sun, 24 Oct 2010) | 1 line

re #4603 - no need to connect to asterisk to archive recoded calls

........

r10453 | p_lindheimer | 2010-11-01 10:34:27 -0700 (Mon, 01 Nov 2010) | 1 line

fixes #4615 XSS to Module Admin

........

r10513 | GameGamer?43 | 2010-11-01 15:39:24 -0700 (Mon, 01 Nov 2010) | 1 line

closes #4616 - if trunk, assume 1.8 not 1.6

........

r10602 | p_lindheimer | 2010-11-20 13:13:57 -0800 (Sat, 20 Nov 2010) | 1 line

undefined variable could be resulting in hints not being defined when in DYNAMICHINTS mode

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/amp_conf/bin/archive_recordings (modified) (5 diffs)
• freepbx/trunk/amp_conf/bin/generate_hints.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (6 diffs)

freepbx/trunk/amp_conf/bin/archive_recordings

@@ -3 +3 @@
-
-define("AMP_CONF", "/etc/amportal.conf");
-define("PHP_ASMANAGER", "php-asmanager.php");
-define("MONITOR_DIR", "/var/spool/asterisk/monitor");
-
@@ -47 +46 @@
-    'USECATEGORIES' => true,
-    'ASTETCDIR' => '/etc/asterisk',
-    'ASTMANAGERPORT' => '5038',
-    'CDRDBNAME' => 'asteriskcdrdb',
-    );
@@ -242 +240 @@
-    $cdrRecord['extension']=substr($cdrRecord['dstchannel'],strpos($cdrRecord['dstchannel'],"/")+1,(strpos($cdrRecord['dstchannel'],"-")-strpos($cdrRecord['dstchannel'],"/")-1)); //cut out the channel number
-    outn("Checking if ".$cdrRecord['extension']." has recordings enabled..");
-    $extrecord = check_recording_option($cdrRecord['extension']);
-    $cdrRecord['direction']="in";
-    if ($extrecord == "ENABLED") {
-      out("YES");
-    } else {
-      out("NO");
-      unset($cdrRecord['extension']);
-    }
-  } else if (strpos($calltype,"queue") === 0) {
-    if($debug) debug("Getting queue destination from dst: ".$cdrRecord['dst']);
@@ -262 +253 @@
-  return($cdrRecord);
-}
-
-
-function check_recording_option($extension) {
-  global $amp_conf;
-  global $astman;
-
-  if ($astman) {
-    return $astman->database_get("RECORD-IN",$extension);
-  } else {
-    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);  
-  }
-  
-}
-
-
-// Create list of all files 
@@ -412 +389 @@
-out("OK");
-
-// **** Make sure we have php-asmanager.php, and include it
-
-outn("Checking for PHP_ASMANAGER..");
-$myfile = $amp_conf['AMPWEBROOT'] . "/admin/common/" .  PHP_ASMANAGER ;
-if (! @ include( $myfile  ) ) {
-  out("FAILED");
-  fatal("Cannot include $myfile");
-}
-out("OK");
-
-// **** now make the global manager connection
-$astman = new AGI_AsteriskManager();
-$res = $astman->connect("127.0.0.1", $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"] );
-if (!$res) {
-  fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
-}
-
-
-// **** Connect to database
-outn("Connecting to database..");

freepbx/trunk/amp_conf/bin/generate_hints.php

@@ -92 +92 @@
-
-    $device_array = explode( '&', $devices );
+    $dialstring = '';
-    foreach ($device_array as $adevice) {
-      $dds = $astman->database_get('DEVICE',$adevice.'/dial');

freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

@@ -155 +155 @@
-        return array('engine'=>'asterisk', 'version' => $matches[1].'.'.$matches[4], 'additional' => $matches[4], 'raw' => $verinfo);
-      } elseif (preg_match('/Asterisk SVN-trunk-r(-?(\S*))/', $verinfo, $matches)) {
-6
+8
-      } elseif (preg_match('/Asterisk SVN-.+-(\d+(\.\d+)*)-r(-?(\S*))-(.+)/', $verinfo, $matches)) {
-        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[3], 'raw' => $verinfo);

freepbx/trunk/amp_conf/htdocs/admin/page.modules.php

@@ -14 +14 @@
-
-$extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
-$_REQUEST['module_repo']
+htmlentities($_REQUEST['module_repo'])
-$repo = "http://mirror.freepbx.org/";
-if ($module_repo == "extended") {
@@ -21 +21 @@
-
-// can't go online if external management is on
-$_REQUEST['online'] : false
+1 : 0
-
-// fix php errors from undefined variable. Not sure if we can just change the reference below to use
-// online since it changes values so just setting to what we decided it is here.
-$_REQUEST['online'] = $online ? 1 : 0;
-
-$moduleaction = isset($_REQUEST['moduleaction'])?$_REQUEST['moduleaction']:false;
@@ -126 +125 @@
-    freepbx_modal_hide('moduleBox');
-    if (goback) {
-($_REQUEST['online']?1:0)
+$online
-    }
-  }
@@ -153 +152 @@
-  if ($module_getonlinexml_error) {
-    echo "<div class=\"warning\"><p>".sprintf(_("Warning: Cannot connect to online repository (%s). Online modules are not available."), "mirror.freepbx.org")."</p></div><br />";
-false
+0
-    unset($modules_online);
-  } else if (!is_array($modules_online)) {
-    echo "<div class=\"warning\"><p>".sprintf(_("Warning: Error retrieving updates from online repository (%s). Online modules are not available."), "mirror.freepbx.org")."</p></div><br />";
-false
+0
-    unset($modules_online);
-  } else {
@@ -280 +279 @@
-      echo "\t<a href=\"#\" onclick=\"parent.close_module_actions(true);\" />"._("Return")."</a>";
-    } else {
-($_REQUEST['online']?1:0)
+$online
-    echo "</div>";
-    }
@@ -447 +446 @@
-      echo "<p>"._("Please select at least one action to perform by clicking on the module, and selecting an action on the \"Action\" tab.")."</p>";
-    }
-".($_REQUEST['online']?1:0)."
+$online
-    echo "</form>";
-