Changeset 6539

Timestamp:

09/02/08 18:41:54 (3 years ago)

Author:

p_lindheimer

Message:

Merged revisions 6492-6538 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.5

........

r6504 | p_lindheimer | 2008-08-29 11:13:55 -0700 (Fri, 29 Aug 2008) | 1 line

don't define WEBROOT if AMPWEBADDRESS is not defined, it breaks the graphing libraries (which seem to otherwise function fine without it defined)

........

r6505 | p_lindheimer | 2008-08-29 14:55:13 -0700 (Fri, 29 Aug 2008) | 1 line

make max files for call monitor configurable within main.conf.php, default remains the same

........

r6506 | p_lindheimer | 2008-08-29 15:16:05 -0700 (Fri, 29 Aug 2008) | 1 line

return the raw Asterisk version info obtained from checking the version info re #2750 and re #3128

........

r6513 | p_lindheimer | 2008-08-30 20:53:16 -0700 (Sat, 30 Aug 2008) | 1 line

re #3124 put url in auto-generated warnings to reference further help, still need to update all the fixed files with similar warnings but they should consider including some custom instructions such as sip.conf can suggest what sort of sip settings go in which includes files, etc.

........

r6515 | p_lindheimer | 2008-08-31 07:35:02 -0700 (Sun, 31 Aug 2008) | 1 line

re #3134 makes ajax refresh rates for dashboard configurable

........

r6519 | p_lindheimer | 2008-08-31 15:40:00 -0700 (Sun, 31 Aug 2008) | 1 line

re #3131 add Mixmonitor and Stopmonitor to extension class

........

r6525 | p_lindheimer | 2008-08-31 16:36:33 -0700 (Sun, 31 Aug 2008) | 49 lines

closes #3137

db_connect.php:

• removed all checks for notification panel when in quietmode since
  it's usually used for ajax calls and other light weight calls
  that can do without the overhead.
  
  

config.php:

• added restrictmods parameter, populated with '/' separted module
  names. If passed, only these modules will have their functions.inc.php
  files included. Used for light weight ajax and similar calls, to
  avoid the overhead if we know we don't need those.
  
  
• removed all checks for notification panel when in quietmode. Removed
  the inclusion of hooks when in quietmode.
  
  

functions.inc.php:

• added modulelist class, used to cache the module xml structure which
  is now serialized and saved to the db to avoid the heavy xml processing
  overhead of reading all the module.xml files. (should probably move
  most of module_getinfo() into the class but for starters just did minimal
  changes to avoid introducing bugs since this is pretty sensitive).
  
• fixed several instances of using " instead of ' in sql satements which
  breaks sqlite3 queries often.
  
• replaced all instances of addslashes() with $db->escapeSimple() since
  sqlite3 is not compatible with addslashes() and this makes it db
  independent through pear.
  
• added third argument to module_getinfo() defaulting in false. Setting to
  true forces a read of all the module.xml files. Module Admin and
  module_admin should always set this to true.
  
  

header.php

• removed all checks for notification panel when in quietmode
  

page.modules.php

• added third true paramter to module_getinfo
  

........

r6526 | p_lindheimer | 2008-08-31 17:16:27 -0700 (Sun, 31 Aug 2008) | 49 lines

closes #3137

module_admin

• added third true paramter to module_getinfo
  

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/CHANGES (modified) (2 diffs)
• freepbx/trunk/amp_conf/bin/module_admin (modified) (1 diff)
• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/cdr/lib/defines.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/config.php (modified) (6 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (18 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/header.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/bootstrap.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/main.conf.php (modified) (1 diff)
• freepbx/trunk/amportal.conf (modified) (1 diff)

freepbx/trunk/CHANGES

@@ -1 +1 @@
-2.5.0 Added in rc2
+
-- Add queue weights setting and autfill setting per queue. Set persistentmember=yes
-  in queues general section to apply to all queues.
@@ -92 +93 @@
- CDRDBTYPE: mysql or postgres mysql is default
- CDRDBTABLENAME: Name of the table in the db where the cdr is stored cdr is default 
+
+ DASHBOARD_STATS_UPDATE_TIME=integer_seconds
+ DEFAULT VALUE: 6
+ DASHBOARD_INFO_UPDATE_TIME=integer_seconds
+ DEFAULT VALUE: 20
+ These can be used to change the refresh rate of the System Status Panel. Most of
+ the stats are updated based on the STATS interval but a few items are checked
+ less frequently (such as Astersisk Uptime) based on the INFO value
-
-

freepbx/trunk/amp_conf/bin/module_admin

@@ -136 +136 @@
-
-function showList($online = false) {
-
+false,false,true
-  $modules = $modules_local;
-  if ($online) {

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -15 +15 @@
-
-//define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
-"; "._("do not edit this file, this is an auto-generated file by freepbx\n")."; "._("all modifications must be done from the web gui")."\n\n\n"
+_(";--------------------------------------------------------------------------------;\n; Do NOT edit this file as it is auto-generated by FreePBX. All modifications to ;\n; this file must be done via the web gui. There are alternative files to make    ;\n; custom modifications, details at: http://freepbx.org/configuration_files       ;\n;--------------------------------------------------------------------------------;\n;\n\n")
-
-// Emulate gettext extension functions if gettext is not available

freepbx/trunk/amp_conf/htdocs/admin/cdr/lib/defines.php

@@ -16 +16 @@
-
-
-
+
+
+
-define ("FSROOT", $amp_conf["AMPWEBROOT"]."/admin/cdr/");
-

freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php

@@ -72 +72 @@
-// Now send or delete warning wrt to default passwords:
-//
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-// Check and increase php memory_limit if needed and if allowed on the system
-//
-$current_memory_limit = rtrim(ini_get('memory_limit'),'M');
-$proper_memory_limit = '100';
-if ($current_memory_limit < $proper_memory_limit) {
-  if (ini_set('memory_limit',$proper_memory_limit.'M') !== false) {
-    $nt->add_notice('core', 'MEMLIMIT', _("Memory Limit Changed"), sprintf(_("Your memory_limit, %sM, is set too low and has been increased to %sM. You may want to change this in you php.ini config file"),$current_memory_limit,$proper_memory_limit));
-  } else {
-    $nt->add_warning('core', 'MEMERR', _("Low Memory Limit"), sprintf(_("Your memory_limit, %sM, is set too low and may cause problems. FreePBX is not able to change this on your system. You should increase this to %sM in you php.ini config file"),$current_memory_limit,$proper_memory_limit));
-  }
-} else {
-  $nt->delete('core', 'MEMLIMIT');
-}
-
-// send error if magic_quotes_gpc is enabled on this system as much of the code base assumes not
-//
-if(get_magic_quotes_gpc()) {
-  $nt->add_error('core', 'MQGPC', _("Magic Quotes GPC"), _("You have magic_quotes_gpc enabled in your php.ini, http or .htaccess file which will cause errors in some modules. FreePBX expects this to be off and runs under that assumption"));
-} else {
-  $nt->delete('core', 'MQGPC');
-}

freepbx/trunk/amp_conf/htdocs/admin/config.php

@@ -23 +23 @@
-$action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
-$quietmode = isset($_REQUEST['quietmode'])?$_REQUEST['quietmode']:'';
+if (isset($_REQUEST['restrictmods'])) {
+  $restrict_mods = explode('/',$_REQUEST['restrictmods']);
+  $restrict_mods = array_flip($restrict_mods);
+} else {
+  $restrict_mods = false;
+}
-
-// determine module type to show, default to 'setup'
@@ -96 +102 @@
-}
-
-
-
+
+
+
-
-$framework_asterisk_running =  checkAstMan();
@@ -116 +123 @@
-  foreach($active_modules as $key => $module) {
-    //include module functions
-
+(!$restrict_mods || isset($restrict_mods[$key])) && 
-      require_once("modules/{$key}/functions.inc.php");
-    }
@@ -122 +129 @@
-    //create an array of module sections to display
-    // stored as [items][$type][$category][$name] = $displayvalue
-
+!$quitemode && 
-      // loop through the types
-      foreach($module['items'] as $itemKey => $item) {
@@ -175 +182 @@
-
-// new gui hooks
-
+!$quietmode && 
-  foreach($active_modules as $key => $module) {
+
-    if (isset($module['items']) && is_array($module['items'])) {
-      foreach($module['items'] as $itemKey => $itemName) {
@@ -195 +203 @@
-
-// extensions vs device/users ... this is a bad design, but hey, it works
-
-
-
-
-
+
+
+
+
+
+
+
-}
-

freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php

@@ -1183 +1183 @@
-}
-
+class ext_mixmonitor extends extension {
+  var $file;
+  var $options;
+  var $postcommand;
+  
+  function ext_mixmonitor($file, $options = "", $postcommand = "") {
+    $this->file = $file;
+    $this->options = $options;
+    $this->postcommand = $postcommand;
+  }
+  
+  function output() {
+    return "MixMonitor(".$this->file.",".$this->options.",".$this->postcommand.")";
+  }
+}
+
+class ext_stopmonitor extends extension {
+  function output() {
+    return "StopMonitor(".$this->data.")";
+  }
+}
+
+
-
-/* example usage

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

@@ -169 +169 @@
-define("NOTIFICATION_TYPE_WARNING" , 500);
-define("NOTIFICATION_TYPE_NOTICE",   600);
+
+class modulelist {
+  var $_loaded = false;
+  var $module_array = array();
+  var $_db;
+
+  function &create(&$db) {
+    static $obj;
+    if (!isset($obj)) {
+      $obj = new modulelist($db);
+    }
+    return $obj;
+  }
+  function modulelist(&$db) {
+    $this->_db =& $db;
+    $module_serialized = sql("SELECT `data` FROM `module_xml` WHERE `id` = 'mod_serialized'","getOne");
+    if (isset($module_serialized) && $module_serialized) {
+      $this->module_array = (unserialize($module_serialized));
+      $this->_loaded = true;
+    }
+  }
+  function is_loaded() {
+    return $this->_loaded;
+  }
+  function initialize(&$module_list) {
+    $this->module_array = $module_list;
+    $module_serialized = $this->_db->escapeSimple(serialize($this->module_array));
+    sql("DELETE FROM `module_xml` WHERE `id` = 'mod_serialized'");
+    sql("INSERT INTO `module_xml` (`id`, `time`, `data`) VALUES ('mod_serialized', '".time()."','".$module_serialized."')");
+    $this->_loaded = true;
+  }
+  function invalidate() {
+    unset($this->module_array);
+    sql("DELETE FROM `module_xml` WHERE `id` = 'mod_serialized'");
+    $this->_loaded = false;
+  }
+}
+
+
-
-class notifications {
@@ -921 +960 @@
-  global $db;
-  
-addslashes
+$db->escapeSimple
-  $results = $db->getAll($sql);
-  if(DB::IsError($results)) {
@@ -1028 +1067 @@
-      
-      if (preg_match('/Asterisk (\d+(\.\d+)*)(-?(\S*))/', $verinfo, $matches)) {
-
+, 'raw' => $verinfo
-      } elseif (preg_match('/Asterisk SVN-(\d+(\.\d+)*)(-?(\S*))/', $verinfo, $matches)) {
-
+, 'raw' => $verinfo
-      } elseif (preg_match('/Asterisk SVN-branch-(\d+(\.\d+)*)-r(-?(\S*))/', $verinfo, $matches)) {
-
+, 'raw' => $verinfo
-      } elseif (preg_match('/Asterisk SVN-trunk-r(-?(\S*))/', $verinfo, $matches)) {
-
+, 'raw' => $verinfo
-      } elseif (preg_match('/Asterisk SVN-.+-(\d+(\.\d+)*)-r(-?(\S*))-(.+)/', $verinfo, $matches)) {
-
-
-
-
+, 'raw' => $verinfo
+
+
+, 'raw' => $verinfo
-    break;
-  }
-
+, 'raw' => $verinfo
-}
-
@@ -1757 +1796 @@
-  function legacy_extensions_del($context,$exten) {
-    global $db;
-addslashes($context)."' AND `extension` = '".addslashes
+$db->escapeSimple($context)."' AND `extension` = '".$db->escapeSimple
-    $result = $db->query($sql);
-    if(DB::IsError($result)) {
@@ -1769 +1808 @@
-  function legacy_args_get($exten,$priority,$context) {
-    global $db;
-addslashes($exten)."' AND priority = '".addslashes($priority)."' AND context = '".addslashes
+$db->escapeSimple($exten)."' AND priority = '".$db->escapeSimple($priority)."' AND context = '".$db->escapeSimple
-    list($args) = $db->getRow($sql);
-    return $args;
@@ -2113 +2152 @@
-function module_getonlinexml($module = false, $override_xml = false) { // was getModuleXml()
-  global $amp_conf;
+  global $db;
-  
-  global $module_getonlinexml_error;  // okay, yeah, this sucks, but there's no other good way to do it without breaking BC
@@ -2123 +2163 @@
-  */
-  
-'SELECT * FROM module_xml WHERE id = "xml"'
+"SELECT * FROM module_xml WHERE id = 'xml'"
-  $data = $result['data'];
-  
@@ -2160 +2200 @@
-      // Compare the download to our current XML to see if anything changed for the notification system.
-      //
-'SELECT data FROM module_xml WHERE id = "xml"'
+"SELECT data FROM module_xml WHERE id = 'xml'"
-      $old_xml = sql($sql, "getOne");
-      $got_new = true;
-      // remove the old xml
-'DELETE FROM module_xml WHERE id = "xml"'
+"DELETE FROM module_xml WHERE id = 'xml'"
-      // update the db with the new xml
-addslashes
-'INSERT INTO module_xml (id,time,data) VALUES ("xml",'.time().',"'.$data4sql.'")'
+$db->escapeSimple
+"INSERT INTO module_xml (id,time,data) VALUES ('xml',".time().",'".$data4sql."')"
-    }
-  }
@@ -2305 +2345 @@
- *                either be one value, or an array of values.
- */
-
+
+
-  global $amp_conf, $db;
-  $modules = array();
@@ -2321 +2362 @@
-    $sql = 'SELECT * FROM modules WHERE modulename = "'.$module.'"';
-  } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  // determine details about this module from database
-  // modulename should match the directory name
-  
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-          
-
-
-
-
+
+
+
+
+
+
+
+
-          } else {
-NEEDUPGRADE
+DISABLED
-          }
-          
-        } else {
-
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (!is_array($status)) {
-      // make a one element array so we can use in_array below
-      $status = array($status);
-    }
-    
-    foreach (array_keys($modules) as $name) {
-      if (!in_array($modules[$name]['status'], $status)) {
@@ -2395 +2458 @@
-      }
-    }
-
-
-
+
+
-}
-
@@ -2985 +3047 @@
-        $new_id = $results[0];
-        $new_id ++;
-addslashes($modules[$modulename]['rawname'])."','".addslashes
+$db->escapeSimple($modules[$modulename]['rawname'])."','".$db->escapeSimple
-        break;
-      
-      default:
-addslashes($modules[$modulename]['rawname'])."','".addslashes
+$db->escapeSimple($modules[$modulename]['rawname'])."','".$db->escapeSimple
-      break;
-    }
-  } else {
-    // just need to update the version
-addslashes($modules[$modulename]['version'])."' WHERE modulename = '".addslashes
+$db->escapeSimple($modules[$modulename]['version'])."' WHERE modulename = '".$db->escapeSimple
-  }
-  
@@ -3003 +3065 @@
-  }
-  
-
+
+
+
-
-  // edit the notification table to list any remaining upgrades available or clear
@@ -3073 +3137 @@
-  }
-  
-addslashes
+$db->escapeSimple
-  $results = $db->query($sql);
-  if(DB::IsError($results)) {
@@ -3128 +3192 @@
-function _module_setenabled($modulename, $enabled) {
-  global $db;
-addslashes
+$db->escapeSimple
-  $results = $db->query($sql);
-  if(DB::IsError($results)) {
-    die_freepbx($results->getMessage());
-  }
+  $modulelist =& modulelist::create($db);
+  $modulelist->invalidate();
-}
-
@@ -3237 +3303 @@
-  global $db;
-
-addslashes
+$db->escapeSimple
-  $results = $db->getRow($sql,DB_FETCHMODE_ASSOC);
-  if (isset($results['version'])) 
@@ -3323 +3389 @@
-*/
-function module_get_annoucements() {
+  global $db;
-  $firstinstall=false;
-  $type=null;
@@ -3341 +3408 @@
-    // save the hash so we remeber this is a first time install
-    //
-addslashes
-'INSERT INTO module_xml (id,time,data) VALUES ("installid",'.time().',"'.$data4sql.'")'
-addslashes
-'INSERT INTO module_xml (id,time,data) VALUES ("type",'.time().',"'.$data4sql.'")'
+$db->escapeSimple
+"INSERT INTO module_xml (id,time,data) VALUES ('installid',".time().",'".$data4sql."')"
+$db->escapeSimple
+"INSERT INTO module_xml (id,time,data) VALUES ('type',".time().",'".$data4sql."')"
-
-  // Not a first time so save the queried hash and check if there is a type set

freepbx/trunk/amp_conf/htdocs/admin/header.php

@@ -129 +129 @@
-
-// default password check
-
-
-
-
-
+
+
+
+
+
+
+
-}
-

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

@@ -157 +157 @@
-
-
-
+false,false,true
-
-if ($online) {

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

@@ -98 +98 @@
- */
-function getFiles($path,$filter,$recursive_max,$recursive_count) {
+  global $SETTINGS_MAX_FILES;
+  $SETTINGS_MAX_FILES = isset($SETTINGS_MAX_FILES) ? $SETTINGS_MAX_FILES : 3000;
-
-  $files = array();
@@ -110 +112 @@
-
-        $fileCount++;
-3000
+$SETTINGS_MAX_FILES
-          $_SESSION['ari_error'] 
-            .= _("To many files in $msg_path Not all files processed") . "<br>";

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

@@ -326 +326 @@
-$SETTINGS_ALLOW_PHONE_SETTINGS = 1;
-
-
+
+
+
+
+
-
-?>

freepbx/trunk/amportal.conf

@@ -192 +192 @@
-#             voicemail files. If changed, some of the voicemail directory strucuters may have to be manually changed.
-
+# DASHBOARD_STATS_UPDATE_TIME=integer_seconds
+# DEFAULT VALUE: 6
+# DASHBOARD_INFO_UPDATE_TIME=integer_seconds
+# DEFAULT VALUE: 20
+# These can be used to change the refresh rate of the System Status Panel. Most of
+# the stats are updated based on the STATS interval but a few items are checked
+# less frequently (such as Astersisk Uptime) based on the INFO value