Changeset 6600

Timestamp:

09/07/08 18:33:09 (5 years ago)

Author:

p_lindheimer

Message:

Merged revisions 6539-6598 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.5

........

r6549 | p_lindheimer | 2008-09-03 14:54:37 -0700 (Wed, 03 Sep 2008) | 1 line

fixes #3145 LookupCIDName deprecated in 1.6

........

r6551 | p_lindheimer | 2008-09-03 16:16:11 -0700 (Wed, 03 Sep 2008) | 1 line

fixes #3151 typo in variable name that should not be there at all

........

r6552 | p_lindheimer | 2008-09-03 16:19:08 -0700 (Wed, 03 Sep 2008) | 1 line

fixes #3154 undefined variable needs global directive

........

r6554 | p_lindheimer | 2008-09-03 23:31:18 -0700 (Wed, 03 Sep 2008) | 1 line

fixes #3155 chown should be int not string for permissions

........

r6563 | p_lindheimer | 2008-09-04 14:43:50 -0700 (Thu, 04 Sep 2008) | 1 line

fix SECURITY SQL Injection vulnerability that could allow an authenticated user to access CDR and recorded calls from any other user on the system

........

r6572 | p_lindheimer | 2008-09-04 15:44:55 -0700 (Thu, 04 Sep 2008) | 1 line

re #3156 updated CHANGES MoH Streaming Categories

........

r6573 | p_lindheimer | 2008-09-04 18:05:44 -0700 (Thu, 04 Sep 2008) | 1 line

rearraged to move all classes at begining and fixed bug in mirror annoucements when using wget mode

........

r6574 | p_lindheimer | 2008-09-04 18:26:41 -0700 (Thu, 04 Sep 2008) | 1 line

no changes, just re-organized to move all functions to the bottom

........

r6577 | p_lindheimer | 2008-09-05 23:10:23 -0700 (Fri, 05 Sep 2008) | 1 line

typo in warning banner override mode

........

r6578 | p_lindheimer | 2008-09-05 23:11:39 -0700 (Fri, 05 Sep 2008) | 1 line

closes #3164 sql_formattext issue with sqlite3

........

r6579 | p_lindheimer | 2008-09-06 08:28:11 -0700 (Sat, 06 Sep 2008) | 1 line

additional sanity checks on callmonitor sql paramters

........

r6583 | p_lindheimer | 2008-09-06 17:34:17 -0700 (Sat, 06 Sep 2008) | 1 line

closes #3166 includes compatibility mode. translation using module's i18n is done first. If the translated text is the same as the original text, then translation is done against the the default _() which is amp.po at that point. So for previous translation work, it will continue to pull the old translations. All modules should move towards providing their own translations for menu items as this point despite this.

........

r6584 | p_lindheimer | 2008-09-06 19:37:04 -0700 (Sat, 06 Sep 2008) | 1 line

re #3166 and re #2461 the remove the linefeed that the xml parser inserts before and after an ampersand in menuitems and catagories so that translations can have a better chance of matching

........

r6585 | p_lindheimer | 2008-09-06 19:55:55 -0700 (Sat, 06 Sep 2008) | 1 line

re #3166 and re #2461 also cleanup the name field

........

r6586 | p_lindheimer | 2008-09-06 20:09:38 -0700 (Sat, 06 Sep 2008) | 1 line

re #3166 and re #2461 fixed typo in variable

........

r6587 | p_lindheimer | 2008-09-06 20:21:10 -0700 (Sat, 06 Sep 2008) | 1 line

re #3166 and re #2461 added translations to Module Admin so it can get them out of module's i18n also

........

r6590 | p_lindheimer | 2008-09-07 08:27:08 -0700 (Sun, 07 Sep 2008) | 1 line

re #3166 and re #2461 added ability to translated description and attention module admin xml fields

........

r6591 | p_lindheimer | 2008-09-07 09:51:56 -0700 (Sun, 07 Sep 2008) | 1 line

strip leading/trailingwhitespace and linefeed characters out of module.xml description field so that translations can more consistenly be done and so that when displayed, the text floats properly.

........

r6593 | ethans | 2008-09-07 11:24:20 -0700 (Sun, 07 Sep 2008) | 2 lines

Fixes #3165

........

r6595 | pnlarsson | 2008-09-07 13:42:10 -0700 (Sun, 07 Sep 2008) | 1 line

Fix for #3077 - DAHDI support, commit no 2 for core

........

r6597 | p_lindheimer | 2008-09-07 14:47:58 -0700 (Sun, 07 Sep 2008) | 1 line

re #3077 some tweaks based on version actually tested and update of CHANGES, amportal.conf

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/CHANGES (modified) (2 diffs)
• freepbx/trunk/amp_conf/astetc/chan_dahdi.conf.template (copied) (copied from freepbx/branches/2.5/amp_conf/astetc/chan_dahdi.conf.template)
• freepbx/trunk/amp_conf/bin/freepbx_engine (modified) (1 diff)
• freepbx/trunk/amp_conf/bin/libfreepbx.confgen.php (modified) (3 diffs)
• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (3 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/config.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (36 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (13 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_admin.php (modified) (3 diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/display.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/main.conf.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/recordings/modules/callmonitor.module (modified) (6 diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/modules/followme.module (modified) (2 diffs)
• freepbx/trunk/amportal.conf (modified) (1 diff)

freepbx/trunk/CHANGES

@@ -16 +16 @@
-  ARI updates could be split from other framework updates in order to allow people
-  with highly customized FOP and ARI changes to pull framework updates easier.
+
+- Added Streaming categories to MoH in addition to downloaded files
-
-2.5.0 Added before rc1
@@ -101 +103 @@
- 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
+
+ ZAP2DAHDICOMPAT=true|false
+ DEFAULT VALUE: false
+ If set to true, FreePBX will check if you have chan_dadhi installed. If so, it will
+ automatically use all your ZAP configuration settings (devices and trunks) and
+ silently convert them, under the covers, to DAHDI so no changes are needed. The
+ GUI will continue to refer to these as ZAP but it will use the proper DAHDI channels.
+ This will also keep Zap Channel DIDs working.
-
-

freepbx/trunk/amp_conf/bin/freepbx_engine

@@ -96 +96 @@
-  # Ensure that various hardware devices are owned correctly.
-  [ -e /dev/zap ] && chown -R $AMPDEVUSER:$AMPDEVGROUP /dev/zap 
+  [ -e /dev/dahdi ] && chown -R $AMPDEVUSER:$AMPDEVGROUP /dev/dahdi 
-  [ -e /dev/capi20 ] && chown -R $AMPDEVUSER:$AMPDEVGROUP /dev/capi20
-  [ -e /dev/misdn ] && chown -R $AMPDEVUSER:$AMPDEVGROUP /dev/misdn

freepbx/trunk/amp_conf/bin/libfreepbx.confgen.php

@@ -170 +170 @@
-
-function generate_configurations_zap($ast_version) {
-
+
-  global $amp_conf;
-  global $db;
@@ -177 +177 @@
-
-  $zap_conf = $amp_conf['ASTETCDIR']."/zapata_additional.conf";
+  $channel_name = 'ZAP';
+  if ($chan_dahdi) {
+    $zap_conf = $amp_conf['ASTETCDIR']."/chan_dahdi_additional.conf";
+    $channel_name = 'DAHDI';
+  }
-
-  $table_name = "zap";
@@ -184 +189 @@
-  $zap_conf_fh = fopen($zap_conf,"w");
-  if ($zap_conf_fh === false) {
-ZAP configurations"),sprintf(_("Failed creating/overwriting Zapata
+$channel_name configurations"),sprintf(_("Failed creating/overwriting $channel_name
-  }
-

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -370 +370 @@
-$engine = $engineinfo['engine'];
-$version = $engineinfo['version'];
+$chan_dahdi = ast_with_dahdi();
-
-// Check for and report any extension conflicts
@@ -482 +483 @@
-        freepbx_log('retrieve_conf', 'devel-debug', 'generateConf from '.$classname);
-        if (isset(${$classname}->use_warning_banner)) {
-no
+
-        } else {
-          write_file(${$classname}->get_filename(),${$classname}->generateConf());
@@ -588 +589 @@
-  set_error_handler("report_errors");
-  if (copy($source, $dest)) {
-'0754'
+0754
-  }
-  restore_error_handler();

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

@@ -129 +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) {

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

@@ -929 +929 @@
-class ext_zapbarge extends extension {
-  function output() {
-
+
+
+
+
+
+
+
+
+
-  }
-}
@@ -974 +982 @@
-class ext_lookupcidname extends extension {
-  function output() {
-
-
+
+
+
+
+
+
+
+
+
-}
-

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

@@ -20 +20 @@
-define('MODULE_STATUS_NEEDUPGRADE', 3);
-define('MODULE_STATUS_BROKEN', -1);
+
+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;
+  }
+}
+
+define("NOTIFICATION_TYPE_CRITICAL", 100);
+define("NOTIFICATION_TYPE_SECURITY", 200);
+define("NOTIFICATION_TYPE_UPDATE",  300);
+define("NOTIFICATION_TYPE_ERROR",    400);
+define("NOTIFICATION_TYPE_WARNING" , 500);
+define("NOTIFICATION_TYPE_NOTICE",   600);
+
+class notifications {
+
+  var $not_loaded = true;
+  var $notification_table = array();
+  var $_db;
+    
+  function &create(&$db) {
+    static $obj;
+    if (!isset($obj)) {
+      $obj = new notifications($db);
+    }
+    return $obj;
+  }
+
+  function notifications(&$db) {
+    $this->_db =& $db;
+  }
+
+
+  function add_critical($module, $id, $display_text, $extended_text="", $link="", $reset=true, $candelete=false) {
+    $this->_add_type(NOTIFICATION_TYPE_CRITICAL, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
+  }
+  function add_security($module, $id, $display_text, $extended_text="", $link="", $reset=true, $candelete=false) {
+    $this->_add_type(NOTIFICATION_TYPE_SECURITY, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
+  }
+  function add_update($module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=false) {
+    $this->_add_type(NOTIFICATION_TYPE_UPDATE, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
+  }
+  function add_error($module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=false) {
+    $this->_add_type(NOTIFICATION_TYPE_ERROR, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
+  }
+  function add_warning($module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=false) {
+    $this->_add_type(NOTIFICATION_TYPE_WARNING, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
+  }
+  function add_notice($module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=true) {
+    $this->_add_type(NOTIFICATION_TYPE_NOTICE, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
+  }
+
+
+  function list_critical($show_reset=false) {
+    return $this->_list(NOTIFICATION_TYPE_CRITICAL, $show_reset);
+  }
+  function list_security($show_reset=false) {
+    return $this->_list(NOTIFICATION_TYPE_SECURITY, $show_reset);
+  }
+  function list_update($show_reset=false) {
+    return $this->_list(NOTIFICATION_TYPE_UPDATE, $show_reset);
+  }
+  function list_error($show_reset=false) {
+    return $this->_list(NOTIFICATION_TYPE_ERROR, $show_reset);
+  }
+  function list_warning($show_reset=false) {
+    return $this->_list(NOTIFICATION_TYPE_WARNING, $show_reset);
+  }
+  function list_notice($show_reset=false) {
+    return $this->_list(NOTIFICATION_TYPE_NOTICE, $show_reset);
+  }
+  function list_all($show_reset=false) {
+    return $this->_list("", $show_reset);
+  }
+
+
+  function reset($module, $id) {
+    $module        = q($module);
+    $id            = q($id);
+
+    $sql = "UPDATE notifications SET reset = 1 WHERE module = $module AND id = $id";
+    sql($sql);
+  }
+
+  function delete($module, $id) {
+    $module        = q($module);
+    $id            = q($id);
+
+    $sql = "DELETE FROM notifications WHERE module = $module AND id = $id";
+    sql($sql);
+  }
+
+  function safe_delete($module, $id) {
+    $module        = q($module);
+    $id            = q($id);
+
+    $sql = "DELETE FROM notifications WHERE module = $module AND id = $id AND candelete = 1";
+    sql($sql);
+  }
+
+  /* Internal functions
+   */
+
+  function _add_type($level, $module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=false) {
+    if ($this->not_loaded) {
+      $this->notification_table = $this->_list("",true);
+      $this->not_loaded = false;
+    }
+
+    $existing_row = false;
+    foreach ($this->notification_table as $row) {
+      if ($row['module'] == $module && $row['id'] == $id ) {
+        $existing_row = $row;
+        break;
+      }
+    }
+    // Found an existing row - check if anything changed or if we are suppose to reset it
+    //
+    $candelete = $candelete ? 1 : 0;
+    if ($existing_row) {
+
+      if (($reset && $existing_row['reset'] == 1) || $existing_row['level'] != $level || $existing_row['display_text'] != $display_text || $existing_row['extended_text'] != $extended_text || $existing_row['link'] != $link || $existing_row['candelete'] == $candelete) {
+
+        // If $reset is set to the special case of PASSIVE then the updates will not change it's value in an update
+        //
+        $reset_value = ($reset == 'PASSIVE') ? $existing_row['reset'] : 0;
+
+        $module        = q($module);
+        $id            = q($id);
+        $level         = q($level);
+        $display_text  = q($display_text);
+        $extended_text = q($extended_text);
+        $link          = q($link);
+        $now = time();
+        $sql = "UPDATE notifications SET
+          level = $level,
+          display_text = $display_text,
+          extended_text = $extended_text,
+          link = $link,
+          reset = $reset_value,
+          candelete = $candelete,
+          timestamp = $now
+          WHERE module = $module AND id = $id
+        ";
+        sql($sql);
+
+        // TODO: I should really just add this to the internal cache, but really
+        //       how often does this get called that if is a big deal.
+        $this->not_loaded = true;
+      }
+    } else {
+      // No existing row so insert this new one
+      //
+      $now           = time();
+      $module        = q($module);
+      $id            = q($id);
+      $level         = q($level);
+      $display_text  = q($display_text);
+      $extended_text = q($extended_text);
+      $link          = q($link);
+      $sql = "INSERT INTO notifications 
+        (module, id, level, display_text, extended_text, link, reset, candelete, timestamp)
+        VALUES 
+        ($module, $id, $level, $display_text, $extended_text, $link, 0, $candelete, $now)
+      ";
+      sql($sql);
+
+      // TODO: I should really just add this to the internal cache, but really
+      //       how often does this get called that if is a big deal.
+      $this->not_loaded = true;
+    }
+  }
+
+  function _list($level, $show_reset=false) {
+
+    $level = q($level);
+    $where = array();
+
+    if (!$show_reset) {
+      $where[] = "reset = 0";
+    }
+
+    switch ($level) {
+      case NOTIFICATION_TYPE_CRITICAL:
+      case NOTIFICATION_TYPE_SECURITY:
+      case NOTIFICATION_TYPE_UPDATE:
+      case NOTIFICATION_TYPE_ERROR:
+      case NOTIFICATION_TYPE_WARNING:
+      case NOTIFICATION_TYPE_NOTICE:
+        $where[] = "level = $level ";
+        break;
+      default:
+    }
+    $sql = "SELECT * FROM notifications ";
+    if (count($where)) {
+      $sql .= " WHERE ".implode(" AND ", $where);
+    }
+    $sql .= " ORDER BY level, module";
+
+    $list = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
+    return $list;
+  }
+  /* Returns the number of active notifications
+   */
+  function get_num_active() {
+    $sql = "SELECT COUNT(id) FROM notifications WHERE reset = 0";
+    return sql($sql,'getOne');
+  }
+}
+
+class cronmanager {
+  /**
+   * note: time is the hour time of day a job should run, -1 indicates don't care
+   */
+
+  function &create(&$db) {
+    static $obj;
+    if (!isset($obj)) {
+      $obj = new cronmanager($db);
+    }
+    return $obj;
+  }
+
+  function cronmanager(&$db) {
+    $this->_db =& $db;
+  }
+
+  function save_email($address) {
+    $address = q($address);
+    sql("DELETE FROM admin WHERE variable = 'email'");
+    sql("INSERT INTO admin (variable, value) VALUES ('email', $address)");
+  }
+
+  function get_email() {
+    $sql = "SELECT value FROM admin WHERE variable = 'email'";
+    return sql($sql, 'getOne');
+  }
+
+  function save_hash($id, &$string) {
+    $hash = md5($string);
+    $id = q($id);
+    sql("DELETE FROM admin WHERE variable = $id");
+    sql("INSERT INTO admin (variable, value) VALUE ($id, '$hash')");
+  }
+
+  function check_hash($id, &$string) {
+    $id = q($id);
+    $sql = "SELECT value FROM admin WHERE variable = $id LIMIT 1";
+    $hash = sql($sql, "getOne");
+    return ($hash == md5($string));
+  }
+
+  function enable_updates($freq=24) {
+    global $amp_conf;
+
+    $night_time = array(19,20,21,22,23,0,1,2,3,4,5);
+    $run_time = $night_time[rand(0,10)];
+    $command = $amp_conf['AMPBIN']."/module_admin listonline";
+    $lasttime = 0;
+
+    $sql = "SELECT * FROM cronmanager WHERE module = 'module_admin' AND id = 'UPDATES'";
+    $result = sql($sql, "getAll",DB_FETCHMODE_ASSOC);
+    if (count($result)) {
+      $sql = "UPDATE cronmanager SET
+                freq = '$freq',
+                command = '$command'
+              WHERE
+                module = 'module_admin' AND id = 'UPDATES'  
+             ";
+    } else {
+      $sql = "INSERT INTO cronmanager 
+              (module, id, time, freq, lasttime, command)
+              VALUES
+              ('module_admin', 'UPDATES', '$run_time', $freq, 0, '$command')
+            ";
+    }
+    sql($sql);
+  }
+
+  function disable_updates() {
+    sql("DELETE FROM cronmanager WHERE module = 'module_admin' AND id = 'UPDATES'");
+  }
+
+  function updates_enabled() {
+    $results = sql("SELECT module, id FROM cronmanager WHERE module = 'module_admin' AND id = 'UPDATES'",'getAll');
+    return count($results);
+  }
+
+  /** run_jobs()
+   *  select all entries that need to be run now and run them, then update the times.
+   *  
+   *  1. select all entries
+   *  2. foreach entry, if its paramters indicate it should be run, then run it and
+   *     update it was run in the time stamp.
+   */
+  function run_jobs() {
+
+    $errors = 0;
+    $error_arr = array();
+
+    $now = time();
+    $jobs = sql("SELECT * FROM cronmanager","getAll", DB_FETCHMODE_ASSOC);
+    foreach ($jobs as $job) {
+      $nexttime = $job['lasttime'] + $job['freq']*3600; 
+      if ($nexttime <= $now) {
+        if ($job['time'] >= 0 && $job['time'] < 24) {
+          $date_arr = getdate($now);
+          // Now if lasttime is 0, then we want this kicked off at the proper hour
+          // after wich the frequencey will set the pace for same time each night
+          //
+          if (($date_arr['hours'] != $job['time']) && !$job['lasttime']) {
+            continue;
+          }
+        } 
+      } else {
+        // no need to run job, time is not up yet
+        continue;
+      }
+      // run the job
+      exec($job['command'],$job_out,$ret);
+      if ($ret) {
+        $errors++;
+        $error_arr[] = array($job['command'],$ret);
+
+        // If there where errors, let's print them out in case the script is being debugged or running
+        // from cron which will then put the errors out through the cron system.
+        //
+        foreach ($job_out as $line) {
+          echo $line."\n";
+        }
+      } else {
+        $module = $job['module'];
+        $id =     $job['id'];
+        $sql = "UPDATE cronmanager SET lasttime = $now WHERE module = '$module' AND id = '$id'";
+        sql($sql);
+      }
+    }
+    if ($errors) {
+      $nt =& notifications::create($db);
+      $text = sprintf(_("Cronmanager encountered %s Errors"),$errors);
+      $extext = _("The following commands failed with the listed error");
+      foreach ($error_arr as $item) {
+        $extext .= "<br>".$item[0]." (".$item[1].")";
+      }
+      $nt->add_error('cron_manager', 'EXECFAIL', $text, $extext, '', true, true);
+    }
+  }
+}
+
+class ampuser {
+  var $username;
+  var $_password;
+  var $_extension_high;
+  var $_extension_low;
+  var $_deptname;
+  var $_sections;
+  
+  function ampuser($username) {
+    $this->username = $username;
+    if ($user = getAmpUser($username)) {
+      $this->_password = $user["password"];
+      $this->_extension_high = $user["extension_high"];
+      $this->_extension_low = $user["extension_low"];
+      $this->_deptname = $user["deptname"];
+      $this->_sections = $user["sections"];
+    } else {
+      // user doesn't exist
+      $this->_password = false;
+      $this->_extension_high = "";
+      $this->_extension_low = "";
+      $this->_deptname = "";
+      $this->_sections = array();
+    }
+  }
+  
+  /** Give this user full admin access
+  */
+  function setAdmin() {
+    $this->_extension_high = "";
+    $this->_extension_low = "";
+    $this->_deptname = "";
+    $this->_sections = array("*");
+  }
+  
+  function checkPassword($password) {
+    // strict checking so false will never match
+    return ($this->_password === $password);
+  }
+  
+  function checkSection($section) {
+    // if they have * then it means all sections
+    return in_array("*", $this->_sections) || in_array($section, $this->_sections);
+  }
+}
+
+/* Usage
+Grab some XML data, either from a file, URL, etc. however you want. Assume storage in $strYourXML;
+
+$xml = new xml2Array($strYourXML);
+xml array is in $xml->data;
+  This is basically an array version of the XML data (no attributes), striaght-up. If there are
+  multiple items with the same name, they are split into a numeric sub-array, 
+  eg, <items><item test="123">foo</item><item>bar</item></items>
+  becomes: array('item' => array(0=>array('item'=>'foo'), 1=>array('item'=>'foo'))
+attributes are in $xml->attributes;
+  These are stored with xpath type paths, as $xml->attributes['/items/item/0']["test"] == "123"
+  
+
+Other way (still works, but not as nice):
+
+$objXML = new xml2Array();
+$arrOutput = $objXML->parse($strYourXML);
+print_r($arrOutput); //print it out, or do whatever!
+
+*/
+
+class xml2Array {
+  var $arrOutput = array();
+  var $resParser;
+  var $strXmlData;
+  
+  var $attributes;
+  var $data;
+  
+  function xml2Array($strInputXML = false) {
+    if (!empty($strInputXML)) {
+      $this->data = $this->parseAdvanced($strInputXML);
+    }
+  }
+  
+  function parse($strInputXML) {
+  
+      $this->resParser = xml_parser_create ();
+      xml_set_object($this->resParser,$this);
+      xml_set_element_handler($this->resParser, "tagOpen", "tagClosed");
+      
+      xml_set_character_data_handler($this->resParser, "tagData");
+    
+      $this->strXmlData = xml_parse($this->resParser,$strInputXML );
+      if(!$this->strXmlData) {
+        die_freepbx(sprintf("XML error: %s at line %d",
+      xml_error_string(xml_get_error_code($this->resParser)),
+      xml_get_current_line_number($this->resParser)));
+      }
+              
+      xml_parser_free($this->resParser);
+      
+      return $this->arrOutput;
+  }
+  function tagOpen($parser, $name, $attrs) {
+    $tag=array("name"=>$name,"attrs"=>$attrs); 
+    @array_push($this->arrOutput,$tag);
+  }
+  
+  function tagData($parser, $tagData) {
+    if(trim($tagData)) {
+      if(isset($this->arrOutput[count($this->arrOutput)-1]['tagData'])) {
+        $this->arrOutput[count($this->arrOutput)-1]['tagData'] .= "\n".$tagData;
+      } 
+      else {
+        $this->arrOutput[count($this->arrOutput)-1]['tagData'] = $tagData;
+      }
+    }
+  }
+  
+  function tagClosed($parser, $name) {
+    @$this->arrOutput[count($this->arrOutput)-2]['children'][] = $this->arrOutput[count($this->arrOutput)-1];
+    array_pop($this->arrOutput);
+  }
+  
+  function recursive_parseLevel($items, &$attrs, $path = "") {
+    $array = array();
+    foreach (array_keys($items) as $idx) {
+      @$items[$idx]['name'] = strtolower($items[$idx]['name']);
+      
+      $multi = false;
+      if (isset($array[ $items[$idx]['name'] ])) {
+        // this child is already set, so we're adding multiple items to an array 
+        
+        if (!is_array($array[ $items[$idx]['name'] ]) || !isset($array[ $items[$idx]['name'] ][0])) {
+          // hasn't already been made into a numerically-indexed array, so do that now
+          // we're basically moving the current contents of this item into a 1-item array (at the 
+          // original location) so that we can add a second item in the code below
+          $array[ $items[$idx]['name'] ] = array( $array[ $items[$idx]['name'] ] );
+
+          if (isset($attrs[ $path.'/'.$items[$idx]['name'] ])) {
+            // move the attributes to /0
+            $attrs[ $path.'/'.$items[$idx]['name'].'/0' ] = $attrs[ $path.'/'.$items[$idx]['name'] ];
+            unset($attrs[ $path.'/'.$items[$idx]['name'] ]);
+          }
+        }
+        $multi = true;
+      }
+      
+      if ($multi) { 
+        $newitem = &$array[ $items[$idx]['name'] ][];
+      } else {
+        $newitem = &$array[ $items[$idx]['name'] ];
+      }
+      
+      
+      if (isset($items[$idx]['children']) && is_array($items[$idx]['children'])) {
+        $newitem = $this->recursive_parseLevel($items[$idx]['children'], $attrs, $path.'/'.$items[$idx]['name']);
+      } else if (isset($items[$idx]['tagData'])) {
+        $newitem = $items[$idx]['tagData'];
+      } else {
+        $newitem = false;
+      }
+      
+      if (isset($items[$idx]['attrs']) && is_array($items[$idx]['attrs']) && count($items[$idx]['attrs'])) {
+        $attrpath = $path.'/'.$items[$idx]['name'];
+        if ($multi) {
+          $attrpath .= '/'.(count($array[ $items[$idx]['name'] ])-1);
+        }
+        foreach ($items[$idx]['attrs'] as $name=>$value) {
+          $attrs[ $attrpath ][ strtolower($name) ] = $value;
+        }
+      }
+    }
+    return $array;
+  }
+  
+  function parseAdvanced($strInputXML) {
+    $array = $this->parse($strInputXML);
+    $this->attributes = array();
+    return $this->data = $this->recursive_parseLevel($array, $this->attributes);
+  }
+}
+
+/*
+  Return a much more manageable assoc array with module data.
+*/
+class xml2ModuleArray extends xml2Array {
+  function parseModulesXML($strInputXML) {
+    $array = $this->parseAdvanced($strInputXML);
+    if (isset($array['xml'])) {
+      foreach ($array['xml'] as $key=>$module) {
+        if ($key == 'module') {
+          // copy the structure verbatim
+          $modules[ $module['name'] ] = $module;
+        }
+      }
+    }
+    
+    // if you are confused about what's happening below, uncomment this why we do it
+    // echo "<pre>"; print_r($arrOutput); echo "</pre>";
+    
+    // ignore the regular xml garbage ([0]['children']) & loop through each module
+    if(!is_array($arrOutput[0]['children'])) return false;
+    foreach($arrOutput[0]['children'] as $module) {
+      if(!is_array($module['children'])) return false;
+      // loop through each modules's tags
+      foreach($module['children'] as $modTags) {
+          if(isset($modTags['children']) && is_array($modTags['children'])) {
+            $$modTags['name'] = $modTags['children'];
+            // loop if there are children (menuitems and requirements)
+            foreach($modTags['children'] as $subTag) {
+              $subTags[strtolower($subTag['name'])] = $subTag['tagData'];
+            }
+            $$modTags['name'] = $subTags;
+            unset($subTags);
+          } else {
+            // create a variable for each tag we find
+            $$modTags['name'] = $modTags['tagData'];
+          }
+
+      }
+      // now build our return array
+      $arrModules[$RAWNAME]['rawname'] = $RAWNAME;    // This has to be set
+      $arrModules[$RAWNAME]['displayName'] = $NAME;    // This has to be set
+      $arrModules[$RAWNAME]['version'] = $VERSION;     // This has to be set
+      $arrModules[$RAWNAME]['type'] = isset($TYPE)?$TYPE:'setup';
+      $arrModules[$RAWNAME]['category'] = isset($CATEGORY)?$CATEGORY:'Unknown';
+      $arrModules[$RAWNAME]['info'] = isset($INFO)?$INFO:'http://www.freepbx.org/wiki/'.$RAWNAME;
+      $arrModules[$RAWNAME]['location'] = isset($LOCATION)?$LOCATION:'local';
+      $arrModules[$RAWNAME]['items'] = isset($MENUITEMS)?$MENUITEMS:null;
+      $arrModules[$RAWNAME]['requirements'] = isset($REQUIREMENTS)?$REQUIREMENTS:null;
+      $arrModules[$RAWNAME]['md5sum'] = isset($MD5SUM)?$MD5SUM:null;
+      //print_r($arrModules);
+      //unset our variables
+      unset($NAME);
+      unset($VERSION);
+      unset($TYPE);
+      unset($CATEGORY);
+      unset($AUTHOR);
+      unset($EMAIL);
+      unset($LOCATION);
+      unset($MENUITEMS);
+      unset($REQUIREMENTS);
+      unset($MD5SUM);
+    }
+    //echo "<pre>"; print_r($arrModules); echo "</pre>";
+
+    return $arrModules;
+  }
+}
+
+class moduleHook {
+  var $hookHtml = '';
+  var $arrHooks = array();
+  
+  function install_hooks($viewing_itemid,$target_module,$target_menuid = '') {
+    global $active_modules;
+    // loop through all active modules
+    foreach($active_modules as $this_module) {
+        // look for requested hooks for $module
+        // ie: findme_hook_extensions()
+        $funct = $this_module['rawname'] . '_hook_' . $target_module;
+        if( function_exists( $funct ) ) {
+          // execute the function, appending the 
+          // html output to that of other hooking modules
+          if ($hookReturn = $funct($target_menuid, $viewing_itemid)) {
+            $this->hookHtml .= $hookReturn;
+          }
+          // remember who installed hooks
+          // we need to know this for processing form vars
+          $this->arrHooks[] = $this_module['rawname'];
+        }
+    }
+  }
+  
+  // process the request from the module we hooked
+  function process_hooks($viewing_itemid, $target_module, $target_menuid, $request) {
+    if(is_array($this->arrHooks)) {
+      foreach($this->arrHooks as $hookingMod) {
+        // check if there is a processing function
+        $funct = $hookingMod . '_hookProcess_' . $target_module;
+        if( function_exists( $funct ) ) {
+          $funct($viewing_itemid, $request);
+        }
+      }
+    }
+  }
+}
-
-$amp_conf_defaults = array(
@@ -64 +729 @@
-  'AMPENABLEDEVELDEBUG'=> array('bool' , false),
-  'AMPMPG123'      => array('bool' , true),
+  'ZAP2DAHDICOMPAT' => array('bool' , false),
-);
-
@@ -73 +739 @@
-   * components don't have to keep being 'gun shy' about these variables.
-   * 
-
-   */
-  $file = file($filename);
@@ -118 +783 @@
-    }
-  }
-
-/*      
-  TODO: what was this, should the comment be removed?
-
-  if (($amp_conf["AMPDBENGINE"] == "sqlite") && (!isset($amp_conf["AMPDBENGINE"])))
-    $amp_conf["AMPDBFILE"] = "/var/lib/freepbx/freepbx.sqlite";
-*/
-
-  return $conf;
-}
@@ -160 +817 @@
-  }
-  return $conf;
-}
-
-
-define("NOTIFICATION_TYPE_CRITICAL", 100);
-define("NOTIFICATION_TYPE_SECURITY", 200);
-define("NOTIFICATION_TYPE_UPDATE",  300);
-define("NOTIFICATION_TYPE_ERROR",    400);
-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 {
-
-  var $not_loaded = true;
-  var $notification_table = array();
-  var $_db;
-    
-  function &create(&$db) {
-    static $obj;
-    if (!isset($obj)) {
-      $obj = new notifications($db);
-    }
-    return $obj;
-  }
-
-  function notifications(&$db) {
-    $this->_db =& $db;
-  }
-
-
-  function add_critical($module, $id, $display_text, $extended_text="", $link="", $reset=true, $candelete=false) {
-    $this->_add_type(NOTIFICATION_TYPE_CRITICAL, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
-  }
-  function add_security($module, $id, $display_text, $extended_text="", $link="", $reset=true, $candelete=false) {
-    $this->_add_type(NOTIFICATION_TYPE_SECURITY, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
-  }
-  function add_update($module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=false) {
-    $this->_add_type(NOTIFICATION_TYPE_UPDATE, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
-  }
-  function add_error($module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=false) {
-    $this->_add_type(NOTIFICATION_TYPE_ERROR, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
-  }
-  function add_warning($module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=false) {
-    $this->_add_type(NOTIFICATION_TYPE_WARNING, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
-  }
-  function add_notice($module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=true) {
-    $this->_add_type(NOTIFICATION_TYPE_NOTICE, $module, $id, $display_text, $extended_text, $link, $reset, $candelete);
-  }
-
-
-  function list_critical($show_reset=false) {
-    return $this->_list(NOTIFICATION_TYPE_CRITICAL, $show_reset);
-  }
-  function list_security($show_reset=false) {
-    return $this->_list(NOTIFICATION_TYPE_SECURITY, $show_reset);
-  }
-  function list_update($show_reset=false) {
-    return $this->_list(NOTIFICATION_TYPE_UPDATE, $show_reset);
-  }
-  function list_error($show_reset=false) {
-    return $this->_list(NOTIFICATION_TYPE_ERROR, $show_reset);
-  }
-  function list_warning($show_reset=false) {
-    return $this->_list(NOTIFICATION_TYPE_WARNING, $show_reset);
-  }
-  function list_notice($show_reset=false) {
-    return $this->_list(NOTIFICATION_TYPE_NOTICE, $show_reset);
-  }
-  function list_all($show_reset=false) {
-    return $this->_list("", $show_reset);
-  }
-
-
-  function reset($module, $id) {
-    $module        = q($module);
-    $id            = q($id);
-
-    $sql = "UPDATE notifications SET reset = 1 WHERE module = $module AND id = $id";
-    sql($sql);
-  }
-
-  function delete($module, $id) {
-    $module        = q($module);
-    $id            = q($id);
-
-    $sql = "DELETE FROM notifications WHERE module = $module AND id = $id";
-    sql($sql);
-  }
-
-  function safe_delete($module, $id) {
-    $module        = q($module);
-    $id            = q($id);
-
-    $sql = "DELETE FROM notifications WHERE module = $module AND id = $id AND candelete = 1";
-    sql($sql);
-  }
-
-  /* Internal functions
-   */
-
-  function _add_type($level, $module, $id, $display_text, $extended_text="", $link="", $reset=false, $candelete=false) {
-    if ($this->not_loaded) {
-      $this->notification_table = $this->_list("",true);
-      $this->not_loaded = false;
-    }
-
-    $existing_row = false;
-    foreach ($this->notification_table as $row) {
-      if ($row['module'] == $module && $row['id'] == $id ) {
-        $existing_row = $row;
-        break;
-      }
-    }
-    // Found an existing row - check if anything changed or if we are suppose to reset it
-    //
-    $candelete = $candelete ? 1 : 0;
-    if ($existing_row) {
-
-      if (($reset && $existing_row['reset'] == 1) || $existing_row['level'] != $level || $existing_row['display_text'] != $display_text || $existing_row['extended_text'] != $extended_text || $existing_row['link'] != $link || $existing_row['candelete'] == $candelete) {
-
-        // If $reset is set to the special case of PASSIVE then the updates will not change it's value in an update
-        //
-        $reset_value = ($reset == 'PASSIVE') ? $existing_row['reset'] : 0;
-
-        $module        = q($module);
-        $id            = q($id);
-        $level         = q($level);
-        $display_text  = q($display_text);
-        $extended_text = q($extended_text);
-        $link          = q($link);
-        $now = time();
-        $sql = "UPDATE notifications SET
-          level = $level,
-          display_text = $display_text,
-          extended_text = $extended_text,
-          link = $link,
-          reset = $reset_value,
-          candelete = $candelete,
-          timestamp = $now
-          WHERE module = $module AND id = $id
-        ";
-        sql($sql);
-
-        // TODO: I should really just add this to the internal cache, but really
-        //       how often does this get called that if is a big deal.
-        $this->not_loaded = true;
-      }
-    } else {
-      // No existing row so insert this new one
-      //
-      $now           = time();
-      $module        = q($module);
-      $id            = q($id);
-      $level         = q($level);
-      $display_text  = q($display_text);
-      $extended_text = q($extended_text);
-      $link          = q($link);
-      $sql = "INSERT INTO notifications 
-        (module, id, level, display_text, extended_text, link, reset, candelete, timestamp)
-        VALUES 
-        ($module, $id, $level, $display_text, $extended_text, $link, 0, $candelete, $now)
-      ";
-      sql($sql);
-
-      // TODO: I should really just add this to the internal cache, but really
-      //       how often does this get called that if is a big deal.
-      $this->not_loaded = true;
-    }
-  }
-
-  function _list($level, $show_reset=false) {
-
-    $level = q($level);
-    $where = array();
-
-    if (!$show_reset) {
-      $where[] = "reset = 0";
-    }
-
-    switch ($level) {
-      case NOTIFICATION_TYPE_CRITICAL:
-      case NOTIFICATION_TYPE_SECURITY:
-      case NOTIFICATION_TYPE_UPDATE:
-      case NOTIFICATION_TYPE_ERROR:
-      case NOTIFICATION_TYPE_WARNING:
-      case NOTIFICATION_TYPE_NOTICE:
-        $where[] = "level = $level ";
-        break;
-      default:
-    }
-    $sql = "SELECT * FROM notifications ";
-    if (count($where)) {
-      $sql .= " WHERE ".implode(" AND ", $where);
-    }
-    $sql .= " ORDER BY level, module";
-
-    $list = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-    return $list;
-  }
-  /* Returns the number of active notifications
-   */
-  function get_num_active() {
-    $sql = "SELECT COUNT(id) FROM notifications WHERE reset = 0";
-    return sql($sql,'getOne');
-  }
-}
-
-class cronmanager {
-  /**
-   * note: time is the hour time of day a job should run, -1 indicates don't care
-   */
-
-  function &create(&$db) {
-    static $obj;
-    if (!isset($obj)) {
-      $obj = new cronmanager($db);
-    }
-    return $obj;
-  }
-
-  function cronmanager(&$db) {
-    $this->_db =& $db;
-  }
-
-  function save_email($address) {
-    $address = q($address);
-    sql("DELETE FROM admin WHERE variable = 'email'");
-    sql("INSERT INTO admin (variable, value) VALUES ('email', $address)");
-  }
-
-  function get_email() {
-    $sql = "SELECT value FROM admin WHERE variable = 'email'";
-    return sql($sql, 'getOne');
-  }
-
-  function save_hash($id, &$string) {
-    $hash = md5($string);
-    $id = q($id);
-    sql("DELETE FROM admin WHERE variable = $id");
-    sql("INSERT INTO admin (variable, value) VALUE ($id, '$hash')");
-  }
-
-  function check_hash($id, &$string) {
-    $id = q($id);
-    $sql = "SELECT value FROM admin WHERE variable = $id LIMIT 1";
-    $hash = sql($sql, "getOne");
-    return ($hash == md5($string));
-  }
-
-  function enable_updates($freq=24) {
-    global $amp_conf;
-
-    $night_time = array(19,20,21,22,23,0,1,2,3,4,5);
-    $run_time = $night_time[rand(0,10)];
-    $command = $amp_conf['AMPBIN']."/module_admin listonline";
-    $lasttime = 0;
-
-    $sql = "SELECT * FROM cronmanager WHERE module = 'module_admin' AND id = 'UPDATES'";
-    $result = sql($sql, "getAll",DB_FETCHMODE_ASSOC);
-    if (count($result)) {
-      $sql = "UPDATE cronmanager SET
-                freq = '$freq',
-                command = '$command'
-              WHERE
-                module = 'module_admin' AND id = 'UPDATES'  
-             ";
-    } else {
-      $sql = "INSERT INTO cronmanager 
-              (module, id, time, freq, lasttime, command)
-              VALUES
-              ('module_admin', 'UPDATES', '$run_time', $freq, 0, '$command')
-            ";
-    }
-    sql($sql);
-  }
-
-  function disable_updates() {
-    sql("DELETE FROM cronmanager WHERE module = 'module_admin' AND id = 'UPDATES'");
-  }
-
-  function updates_enabled() {
-    $results = sql("SELECT module, id FROM cronmanager WHERE module = 'module_admin' AND id = 'UPDATES'",'getAll');
-    return count($results);
-  }
-
-  /** run_jobs()
-   *  select all entries that need to be run now and run them, then update the times.
-   *  
-   *  1. select all entries
-   *  2. foreach entry, if its paramters indicate it should be run, then run it and
-   *     update it was run in the time stamp.
-   */
-  function run_jobs() {
-
-    $errors = 0;
-    $error_arr = array();
-
-    $now = time();
-    $jobs = sql("SELECT * FROM cronmanager","getAll", DB_FETCHMODE_ASSOC);
-    foreach ($jobs as $job) {
-      $nexttime = $job['lasttime'] + $job['freq']*3600; 
-      if ($nexttime <= $now) {
-        if ($job['time'] >= 0 && $job['time'] < 24) {
-          $date_arr = getdate($now);
-          // Now if lasttime is 0, then we want this kicked off at the proper hour
-          // after wich the frequencey will set the pace for same time each night
-          //
-          if (($date_arr['hours'] != $job['time']) && !$job['lasttime']) {
-            continue;
-          }
-        } 
-      } else {
-        // no need to run job, time is not up yet
-        continue;
-      }
-      // run the job
-      exec($job['command'],$job_out,$ret);
-      if ($ret) {
-        $errors++;
-        $error_arr[] = array($job['command'],$ret);
-
-        // If there where errors, let's print them out in case the script is being debugged or running
-        // from cron which will then put the errors out through the cron system.
-        //
-        foreach ($job_out as $line) {
-          echo $line."\n";
-        }
-      } else {
-        $module = $job['module'];
-        $id =     $job['id'];
-        $sql = "UPDATE cronmanager SET lasttime = $now WHERE module = '$module' AND id = '$id'";
-        sql($sql);
-      }
-    }
-    if ($errors) {
-      $nt =& notifications::create($db);
-      $text = sprintf(_("Cronmanager encountered %s Errors"),$errors);
-      $extext = _("The following commands failed with the listed error");
-      foreach ($error_arr as $item) {
-        $extext .= "<br>".$item[0]." (".$item[1].")";
-      }
-      $nt->add_error('cron_manager', 'EXECFAIL', $text, $extext, '', true, true);
-    }
-  }
-}
-
@@ -946 +1221 @@
-}
-
+// returns true if extension is within allowed range
+function checkRange($extension){
+  $low = isset($_SESSION["AMP_user"]->_extension_low)?$_SESSION["AMP_user"]->_extension_low:'';
+  $high = isset($_SESSION["AMP_user"]->_extension_high)?$_SESSION["AMP_user"]->_extension_high:'';
+  
+  if ((($extension >= $low) && ($extension <= $high)) || ($low == '' && $high == ''))
+    return true;
+  else
+    return false;
+}
+
-function getAmpAdminUsers() {
-  global $db;
@@ -980 +1266 @@
-}
-
-class ampuser {
-  var $username;
-  var $_password;
-  var $_extension_high;
-  var $_extension_low;
-  var $_deptname;
-  var $_sections;
-  
-  function ampuser($username) {
-    $this->username = $username;
-    if ($user = getAmpUser($username)) {
-      $this->_password = $user["password"];
-      $this->_extension_high = $user["extension_high"];
-      $this->_extension_low = $user["extension_low"];
-      $this->_deptname = $user["deptname"];
-      $this->_sections = $user["sections"];
-    } else {
-      // user doesn't exist
-      $this->_password = false;
-      $this->_extension_high = "";
-      $this->_extension_low = "";
-      $this->_deptname = "";
-      $this->_sections = array();
-    }
-  }
-  
-  /** Give this user full admin access
-  */
-  function setAdmin() {
-    $this->_extension_high = "";
-    $this->_extension_low = "";
-    $this->_deptname = "";
-    $this->_sections = array("*");
-  }
-  
-  function checkPassword($password) {
-    // strict checking so false will never match
-    return ($this->_password === $password);
-  }
-  
-  function checkSection($section) {
-    // if they have * then it means all sections
-    return in_array("*", $this->_sections) || in_array($section, $this->_sections);
-  }
-}
-
-// returns true if extension is within allowed range
-function checkRange($extension){
-  $low = isset($_SESSION["AMP_user"]->_extension_low)?$_SESSION["AMP_user"]->_extension_low:'';
-  $high = isset($_SESSION["AMP_user"]->_extension_high)?$_SESSION["AMP_user"]->_extension_high:'';
-  
-  if ((($extension >= $low) && ($extension <= $high)) || ($low == '' && $high == ''))
-    return true;
-  else
-    return false;
-}
-
-// returns true if department string matches dept for this user
-function checkDept($dept){
@@ -1045 +1274 @@
-  else
-    return false;
+}
+
+/**
+ * returns true if asterisk is running with chan_dahdi
+ *
+ * @return bool
+ */
+function ast_with_dahdi() {
+  global $version;
+  global $astman;
+  global $amp_conf;
+  
+  if (!$amp_conf['ZAP2DAHDICOMPAT']) {
+    return false;
+  }
+  
+  if (empty($version)) {
+    $engine_info = engine_getinfo();
+    $version = $engine_info['version'];
+  }
+    
+  if (version_compare($version, '1.4', 'ge') && $amp_conf['AMPENGINE'] == 'asterisk') {   
+    if (isset($astman) && $astman->connected()) {
+      $response = $astman->send_request('Command', array('Command' => 'module show like chan_dahdi'));
+      if (preg_match('/1 modules loaded/', $response['data'])) {
+        return true;
+      }
+    }
+  }
+  return false;
-}
-
@@ -1084 +1343 @@
-}
-
-
-if (!function_exists('version_compare_freepbx')) {
-  /* verison_compare that works with freePBX version numbers
@@ -1099 +1357 @@
-}
-
-
-/* queries database using PEAR.
-*  $type can be query, getAll, getRow, getCol, getOne, etc
@@ -1122 +1379 @@
- * @return string  A value that can be safely inserted into an SQL query
- */
-  
+
-  global $db;
-  return $db->quoteSmart($value);
@@ -1129 +1386 @@
-// sql text formatting -- couldn't see that one was available already
-function sql_formattext($txt) {
+  global $db;
-  if (isset($txt)) {
-str_replace("'", "''", 
+$db->escapeSimple(
-    $fmt = "'" . $fmt . "'";
-  } else {
@@ -1138 +1396 @@
-  return $fmt;
-}
-
-
-function die_freepbx($text, $extended_text="", $type="FATAL") {
@@ -1395 +1652 @@
-  }
-}
-
-
-/** Recursively read voicemail.conf (and any included files)
@@ -1672 +1928 @@
-      fclose($fd);
-    }
-
-
-
+
-
-// $goto is the current goto destination setting
@@ -1680 +1934 @@
-// esnure that any form that includes this calls the setDestinations() javascript function on submit.
-// ie: if the form name is "edit", and drawselects has been called with $i=2 then use onsubmit="setDestinations(edit,2)"
-  
+
-  global $tabindex;
-  
@@ -1779 +2033 @@
-}
-
-
-/* below are legacy functions required to allow pre 2.0 modules to function (ie: interact with 'extensions' table) */
-
@@ -1804 +2057 @@
-  }
-  
-  
-  //get args for specified exten and priority - primarily used to grab goto destination
-  function legacy_args_get($exten,$priority,$context) {
@@ -1815 +2067 @@
-/* end legacy functions */
-
-/* Usage
-Grab some XML data, either from a file, URL, etc. however you want. Assume storage in $strYourXML;
-
-$xml = new xml2Array($strYourXML);
-xml array is in $xml->data;
-  This is basically an array version of the XML data (no attributes), striaght-up. If there are
-  multiple items with the same name, they are split into a numeric sub-array, 
-  eg, <items><item test="123">foo</item><item>bar</item></items>
-  becomes: array('item' => array(0=>array('item'=>'foo'), 1=>array('item'=>'foo'))
-attributes are in $xml->attributes;
-  These are stored with xpath type paths, as $xml->attributes['/items/item/0']["test"] == "123"
-  
-
-Other way (still works, but not as nice):
-
-$objXML = new xml2Array();
-$arrOutput = $objXML->parse($strYourXML);
-print_r($arrOutput); //print it out, or do whatever!
-
-*/
-
-class xml2Array {
-  var $arrOutput = array();
-  var $resParser;
-  var $strXmlData;
-  
-  var $attributes;
-  var $data;
-  
-  function xml2Array($strInputXML = false) {
-    if (!empty($strInputXML)) {
-      $this->data = $this->parseAdvanced($strInputXML);
-    }
-  }
-  
-  function parse($strInputXML) {
-  
-      $this->resParser = xml_parser_create ();
-      xml_set_object($this->resParser,$this);
-      xml_set_element_handler($this->resParser, "tagOpen", "tagClosed");
-      
-      xml_set_character_data_handler($this->resParser, "tagData");
-    
-      $this->strXmlData = xml_parse($this->resParser,$strInputXML );
-      if(!$this->strXmlData) {
-        die_freepbx(sprintf("XML error: %s at line %d",
-      xml_error_string(xml_get_error_code($this->resParser)),
-      xml_get_current_line_number($this->resParser)));
-      }
-              
-      xml_parser_free($this->resParser);
-      
-      return $this->arrOutput;
-  }
-  function tagOpen($parser, $name, $attrs) {
-    $tag=array("name"=>$name,"attrs"=>$attrs); 
-    @array_push($this->arrOutput,$tag);
-  }
-  
-  function tagData($parser, $tagData) {
-    if(trim($tagData)) {
-      if(isset($this->arrOutput[count($this->arrOutput)-1]['tagData'])) {
-        $this->arrOutput[count($this->arrOutput)-1]['tagData'] .= "\n".$tagData;
-      } 
-      else {
-        $this->arrOutput[count($this->arrOutput)-1]['tagData'] = $tagData;
-      }
-    }
-  }
-  
-  function tagClosed($parser, $name) {
-    @$this->arrOutput[count($this->arrOutput)-2]['children'][] = $this->arrOutput[count($this->arrOutput)-1];
-    array_pop($this->arrOutput);
-  }
-  
-  function recursive_parseLevel($items, &$attrs, $path = "") {
-    $array = array();
-    foreach (array_keys($items) as $idx) {
-      @$items[$idx]['name'] = strtolower($items[$idx]['name']);
-      
-      $multi = false;
-      if (isset($array[ $items[$idx]['name'] ])) {
-        // this child is already set, so we're adding multiple items to an array 
-        
-        if (!is_array($array[ $items[$idx]['name'] ]) || !isset($array[ $items[$idx]['name'] ][0])) {
-          // hasn't already been made into a numerically-indexed array, so do that now
-          // we're basically moving the current contents of this item into a 1-item array (at the 
-          // original location) so that we can add a second item in the code below
-          $array[ $items[$idx]['name'] ] = array( $array[ $items[$idx]['name'] ] );
-
-          if (isset($attrs[ $path.'/'.$items[$idx]['name'] ])) {
-            // move the attributes to /0
-            $attrs[ $path.'/'.$items[$idx]['name'].'/0' ] = $attrs[ $path.'/'.$items[$idx]['name'] ];
-            unset($attrs[ $path.'/'.$items[$idx]['name'] ]);
-          }
-        }
-        $multi = true;
-      }
-      
-      if ($multi) { 
-        $newitem = &$array[ $items[$idx]['name'] ][];
-      } else {
-        $newitem = &$array[ $items[$idx]['name'] ];
-      }
-      
-      
-      if (isset($items[$idx]['children']) && is_array($items[$idx]['children'])) {
-        $newitem = $this->recursive_parseLevel($items[$idx]['children'], $attrs, $path.'/'.$items[$idx]['name']);
-      } else if (isset($items[$idx]['tagData'])) {
-        $newitem = $items[$idx]['tagData'];
-      } else {
-        $newitem = false;
-      }
-      
-      if (isset($items[$idx]['attrs']) && is_array($items[$idx]['attrs']) && count($items[$idx]['attrs'])) {
-        $attrpath = $path.'/'.$items[$idx]['name'];
-        if ($multi) {
-          $attrpath .= '/'.(count($array[ $items[$idx]['name'] ])-1);
-        }
-        foreach ($items[$idx]['attrs'] as $name=>$value) {
-          $attrs[ $attrpath ][ strtolower($name) ] = $value;
-        }
-      }
-    }
-    return $array;
-  }
-  
-  function parseAdvanced($strInputXML) {
-    $array = $this->parse($strInputXML);
-    $this->attributes = array();
-    return $this->data = $this->recursive_parseLevel($array, $this->attributes);
-  }
-}
-
-
-/*
-  Return a much more manageable assoc array with module data.
-*/
-class xml2ModuleArray extends xml2Array {
-  function parseModulesXML($strInputXML) {
-    $array = $this->parseAdvanced($strInputXML);
-    if (isset($array['xml'])) {
-      foreach ($array['xml'] as $key=>$module) {
-        if ($key == 'module') {
-          // copy the structure verbatim
-          $modules[ $module['name'] ] = $module;
-        }
-      }
-    }
-    
-    // if you are confused about what's happening below, uncomment this why we do it
-    // echo "<pre>"; print_r($arrOutput); echo "</pre>";
-    
-    // ignore the regular xml garbage ([0]['children']) & loop through each module
-    if(!is_array($arrOutput[0]['children'])) return false;
-    foreach($arrOutput[0]['children'] as $module) {
-      if(!is_array($module['children'])) return false;
-      // loop through each modules's tags
-      foreach($module['children'] as $modTags) {
-          if(isset($modTags['children']) && is_array($modTags['children'])) {
-            $$modTags['name'] = $modTags['children'];
-            // loop if there are children (menuitems and requirements)
-            foreach($modTags['children'] as $subTag) {
-              $subTags[strtolower($subTag['name'])] = $subTag['tagData'];
-            }
-            $$modTags['name'] = $subTags;
-            unset($subTags);
-          } else {
-            // create a variable for each tag we find
-            $$modTags['name'] = $modTags['tagData'];
-          }
-
-      }
-      // now build our return array
-      $arrModules[$RAWNAME]['rawname'] = $RAWNAME;    // This has to be set
-      $arrModules[$RAWNAME]['displayName'] = $NAME;    // This has to be set
-      $arrModules[$RAWNAME]['version'] = $VERSION;     // This has to be set
-      $arrModules[$RAWNAME]['type'] = isset($TYPE)?$TYPE:'setup';
-      $arrModules[$RAWNAME]['category'] = isset($CATEGORY)?$CATEGORY:'Unknown';
-      $arrModules[$RAWNAME]['info'] = isset($INFO)?$INFO:'http://www.freepbx.org/wiki/'.$RAWNAME;
-      $arrModules[$RAWNAME]['location'] = isset($LOCATION)?$LOCATION:'local';
-      $arrModules[$RAWNAME]['items'] = isset($MENUITEMS)?$MENUITEMS:null;
-      $arrModules[$RAWNAME]['requirements'] = isset($REQUIREMENTS)?$REQUIREMENTS:null;
-      $arrModules[$RAWNAME]['md5sum'] = isset($MD5SUM)?$MD5SUM:null;
-      //print_r($arrModules);
-      //unset our variables
-      unset($NAME);
-      unset($VERSION);
-      unset($TYPE);
-      unset($CATEGORY);
-      unset($AUTHOR);
-      unset($EMAIL);
-      unset($LOCATION);
-      unset($MENUITEMS);
-      unset($REQUIREMENTS);
-      unset($MD5SUM);
-    }
-    //echo "<pre>"; print_r($arrModules); echo "</pre>";
-
-    return $arrModules;
-  }
-}
-
-function get_headers_assoc($url ) {
@@ -2050 +2100 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  global $db;
-  $data = null;
@@ -2115 +2124 @@
-  _module_runscripts($moddir, $type);
-}
-
-
-/** Replaces variables in a string with the values from ampconf
@@ -2158 +2166 @@
-  $got_new = false;
-  
-  //this should be in an upgrade file ... putting here for now.
-  /*
-  sql('CREATE TABLE IF NOT EXISTS module_xml (time INT NOT NULL , data BLOB NOT NULL) TYPE = MYISAM ;');
-  */
-  
-  $result = sql("SELECT * FROM module_xml WHERE id = 'xml'",'getRow',DB_FETCHMODE_ASSOC);
-  $data = $result['data'];
@@ -2216 +2219 @@
-  }
-  
-  //echo time() - $result['time'];
-  $parser = new xml2ModuleArray($data);
-  $xmlarray = $parser->parseAdvanced($data);
-  //$modules = $xmlarray['XML']['MODULE'];
-  
-  if ($got_new) {
@@ -2225 +2226 @@
-  }
-
-
-  //echo "<hr>Raw XML Data<pre>"; print_r(htmlentities($data)); echo "</pre>";
-  //echo "<hr>XML2ARRAY<pre>"; print_r($xmlarray); echo "</pre>";
-  
-  
-  if (isset($xmlarray['xml']['module'])) {
-  
@@ -2240 +2236 @@
-      return null;
-    } else {
-    
-    
-      $modules = array();
-      foreach ($xmlarray['xml']['module'] as $mod) {
@@ -2688 +2682 @@
-}
-
-
-/** Enables a module
- * @param string    The name of the module to enable
@@ -2984 +2977 @@
-  return true;
-}
-
-
-/** Installs or upgrades a module from it's directory
@@ -3188 +3180 @@
-}
-
-
-/** Internal use only */
-function _module_setenabled($modulename, $enabled) {
@@ -3222 +3213 @@
-    if (isset($xmlarray['module'])) {
-      // add a couple fields first
+      $xmlarray['module']['name'] = str_replace("\n&\n","&",$xmlarray['module']['name']);
-      $xmlarray['module']['displayname'] = $xmlarray['module']['name'];
+      if (isset($xmlarray['module']['description'])) {
+        $xmlarray['module']['description'] = trim(str_replace("\n","",$xmlarray['module']['description']));
+      }
-      if (isset($xmlarray['module']['menuitems'])) {
-        
-        foreach ($xmlarray['module']['menuitems'] as $item=>$displayname) {
+          $displayname = str_replace("\n&\n","&",$displayname);
+          $xmlarray['module']['menuitems'][$item] = $displayname;
-          $path = '/module/menuitems/'.$item;
-          
-          // find category
-          if (isset($parser->attributes[$path]['category'])) {
-$parser->attributes[$path]['category']
+str_replace("\n&\n","&",$parser->attributes[$path]['category'])
-          } else if (isset($xmlarray['module']['category'])) {
-$xmlarray['module']['category']
+str_replace("\n&\n","&",$xmlarray['module']['category'])
-          } else {
-            $category = 'Basic';
@@ -3285 +3282 @@
-        }
-      }
-      
-      return $xmlarray['module'];
-    }
@@ -3372 +3368 @@
-  return true;
-}
+
-function _modules_doinclude($filename, $modulename) {
-  // we provide the following variables to the included file (as well as $filename and $modulename)
@@ -3380 +3377 @@
-  }
-}
-  
-
-/* module_get_annoucements()
@@ -3390 +3386 @@
-function module_get_annoucements() {
-  global $db;
+  global $amp_conf;
-  $firstinstall=false;
-  $type=null;
@@ -3440 +3437 @@
-  }
-
+  $fn = "http://mirror.freepbx.org/version-".getversion().".html".$options;
-  if (!$amp_conf['MODULEADMINWGET']) {
-"http://mirror.freepbx.org/version-".getversion().".html".$options
+$fn
-  } else {
-    $announcement = '';
@@ -3451 +3449 @@
-  return $announcement;
-}
-
-
-/* Assumes properly formated input, which is ok since
@@ -3577 +3574 @@
-    $notifications->delete('freepbx', 'modules_broken');
-  }
+}
+
+/** Log a debug message to a debug file
+ * @param  string   debug message to be printed
+ * @param  string   optional mode, default 'a'
+ * @param  string   optinal filename, default /tmp/freepbx_debug.log
+ */
+function freepbx_debug($string, $option='a', $filename='/tmp/freepbx_debug.log') {
+  $fh = fopen($filename,$option);
+  fwrite($fh,$string."\n");
+  fclose($fh);
-}
-

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

@@ -13 +13 @@
-}
-
-
-$extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
+
-// can't go online if external management is on
-$online = (isset($_REQUEST['online']) && !EXTERNAL_PACKAGE_MANAGEMENT) ? $_REQUEST['online'] : false;
+
-// 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;
-/*
@@ -36 +38 @@
-$freepbx_help_url = "http://www.freepbx.org/freepbx-help-system?freepbx_version=".urlencode($freepbx_version);
-
-function pageReload(){
-return "";
-  //return "<script language=\"Javascript\">document.location='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."&foo=".rand()."'</script>";
-}
-
-
-if (!$quietmode) {
-  ?>
@@ -54 +50 @@
-    }
-  }
-
-  function check_upgrade_all() {
-    var re = /^moduleaction\[([a-z0-9_\-]+)\]$/;
@@ -68 +63 @@
-    }
-  }
-
-  function check_download_all() {
-    var re = /^moduleaction\[([a-z0-9_\-]+)\]$/;
@@ -82 +76 @@
-    }
-  }
-
-
-  function showhide_upgrades() {
-    var upgradesonly = document.getElementById('show_upgradable_only').checked;
-    
-    var module_re = /^module_([a-z0-9_]+)$/;   // regex to match a module element id
-    var cat_re = /^category_([a-zA-Z0-9_]+)$/; // regex to match a category element id
-
-    var elements = document.getElementById('modulelist').getElementsByTagName('li');
-
-    // loop through all modules, check if there is an upgrade_<module> radio box 
-    for(i=0; i<elements.length; i++) {
@@ -101 +90 @@
-      }
-    }
-    
-    
-    
-    // hide category headings that don't have any visible modules
-    
-    var elements = document.getElementById('modulelist').getElementsByTagName('div');
-    // loop through category items
@@ -120 +105 @@
-          }
-        }
-        
-        document.getElementById(elements[i].id).style.display = display ? 'block' : 'none';
-      }
-    }
-
-
-
+
-  function process_module_actions(actions) {
-    freepbx_modal_show('moduleBox');
@@ -142 +124 @@
-    }
-  }
-
-  </script>
-  <?php
@@ -155 +136 @@
-  <?php
-}
-
-
-$modules_local = module_getinfo(false,false,true);
@@ -204 +184 @@
-}
-
+//--------------------------------------------------------------------------------------------------------
+switch ($extdisplay) {  // process, confirm, or nothing
+  case 'process':
+    echo "<div id=\"moduleBoxContents\">";
+    echo "<h4>"._("Please wait while module actions are performed")."</h4>\n";
+    echo "<div id=\"moduleprogress\">";
+
+    // stop output buffering, and send output
+    @ ob_end_flush();
+    flush();
+    foreach ($moduleaction as $modulename => $action) { 
+      $didsomething = true; // set to false in default clause of switch() below..
+      
+      switch ($action) {
+        case 'upgrade':
+        case 'downloadinstall':
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            echo sprintf(_('Downloading %s'), $modulename).' <span id="downloadprogress_'.$modulename.'"></span>';
+            if (is_array($errors = module_download($modulename, false, 'download_progress'))) {
+              echo '<span class="error">'.sprintf(_("Error(s) downloading %s"),$modulename).': ';
+              echo '<ul><li>'.implode('</li><li>',$errors).'</li></ul>';
+              echo '</span>';
+            } else {
+              if (is_array($errors = module_install($modulename))) {
+                echo '<span class="error">'.sprintf(_("Error(s) installing %s"),$modulename).': ';
+                echo '<ul><li>'.implode('</li><li>',$errors).'</li></ul>';
+                echo '</span>';
+              } else {
+                echo '<span class="success">'.sprintf(_("%s installed successfully"),$modulename).'</span>';
+              }
+            }
+          }
+        break;
+        case 'install':
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            if (is_array($errors = module_install($modulename))) {
+              echo '<span class="error">'.sprintf(_("Error(s) installing %s"),$modulename).': ';
+              echo '<ul><li>'.implode('</li><li>',$errors).'</li></ul>';
+              echo '</span>';
+            } else {
+              echo '<span class="success">'.sprintf(_("%s installed successfully"),$modulename).'</span>';
+            }
+          }
+        break;
+        case 'enable':
+          if (is_array($errors = module_enable($modulename))) {
+            echo '<span class="error">'.sprintf(_("Error(s) enabling %s"),$modulename).': ';
+            echo '<ul><li>'.implode('</li><li>',$errors).'</li></ul>';
+            echo '</span>';
+          } else {
+            echo '<span class="success">'.sprintf(_("%s enabled successfully"),$modulename).'</span>';
+          }
+        break;
+        case 'disable':
+          if (is_array($errors = module_disable($modulename))) {
+            echo '<span class="error">'.sprintf(_("Error(s) disabling %s"),$modulename).': ';
+            echo '<ul><li>'.implode('</li><li>',$errors).'</li></ul>';
+            echo '</span>';
+          } else {
+            echo '<span class="success">'.sprintf(_("%s disabled successfully"),$modulename).'</span>';
+          }
+        break;
+        case 'uninstall':
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            if (is_array($errors = module_uninstall($modulename))) {
+              echo '<span class="error">'.sprintf(_("Error(s) uninstalling %s"),$modulename).': ';
+              echo '<ul><li>'.implode('</li><li>',$errors).'</li></ul>';
+              echo '</span>';
+            } else {
+              echo '<span class="success">'.sprintf(_("%s uninstalled successfully"),$modulename).'</span>';
+            }
+          }
+        break;
+        default:
+          // just so we don't send an <hr> and flush()
+          $didsomething = false;
+      }
+      
+      if ($didsomething) {
+        echo "<hr /><br />";
+        flush();
+      }
+    }
+    echo "</div>";
+    if ($quietmode) {
+      echo "\t<a href=\"#\" onclick=\"parent.close_module_actions(true);\" />"._("Return")."</a>";
+    } else {
+      echo "\t<input type=\"button\" value=\""._("Return")."\" onclick=\"location.href = 'config.php?display=modules&amp;type=tool&amp;online=".($_REQUEST['online']?1:0)."';\" />";
+    echo "</div>";
+    }
+  break;
+  case 'confirm':
+    ksort($moduleaction);
+    
+    echo "<form name=\"modulesGUI\" action=\"config.php\" method=\"post\">";
+    echo "<input type=\"hidden\" name=\"display\" value=\"".$display."\" />";
+    echo "<input type=\"hidden\" name=\"type\" value=\"".$type."\" />";
+    echo "<input type=\"hidden\" name=\"online\" value=\"".$online."\" />";
+    echo "<input type=\"hidden\" name=\"extdisplay\" value=\"process\" />";
+    
+    echo "\t<script type=\"text/javascript\"> var moduleActions = new Array(); </script>\n";
+    
+    $actionstext = array();
+    $errorstext = array();
+    foreach ($moduleaction as $module => $action) { 
+      $text = false;
+      $skipaction = false;
+
+      // make sure name is set. This is a problem for broken modules
+      if (!isset($modules[$module]['name'])) {
+        $modules[$module]['name'] = $module;
+      }
+      
+      switch ($action) {
+        case 'upgrade':
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            if (is_array($errors = module_checkdepends($modules_online[$module]))) {
+              $skipaction = true;
+              $errorstext[] = sprintf(_("%s cannot be upgraded: %s Please try again after the dependencies have been installed."),  
+                                      $modules[$module]['name'],
+                                      '<ul><li>'.implode('</li><li>',$errors).'</li></ul>');
+            } else {
+              $actionstext[] = sprintf(_("%s %s will be upgraded to online version %s"), $modules[$module]['name'], $modules[$module]['dbversion'], $modules_online[$module]['version']);
+            }
+          }
+        break;
+        case 'downloadinstall':
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            if (is_array($errors = module_checkdepends($modules_online[$module]))) {
+              $skipaction = true;
+              $errorstext[] = sprintf(_("%s cannot be installed: %s Please try again after the dependencies have been installed."),  
+                                      $modules[$module]['name'],
+                                      '<ul><li>'.implode('</li><li>',$errors).'</li></ul>');
+            } else {
+              $actionstext[] =  sprintf(_("%s %s will be downloaded and installed"), $modules[$module]['name'], $modules_online[$module]['version']);
+            }
+          }
+        break;
+        case 'install':
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            if (is_array($errors = module_checkdepends($modules[$module]))) {
+              $skipaction = true;
+              $errorstext[] = sprintf((($modules[$module]['status'] == MODULE_STATUS_NEEDUPGRADE) ?  _("%s cannot be upgraded: %s Please try again after the dependencies have been installed.") : _("%s cannot be installed: %s Please try again after the dependencies have been installed.") ),  
+                                      $modules[$module]['name'],
+                                      '<ul><li>'.implode('</li><li>',$errors).'</li></ul>');
+            } else {
+              if ($modules[$module]['status'] == MODULE_STATUS_NEEDUPGRADE) {
+                $actionstext[] =  sprintf(_("%s %s will be upgraded to %s"), $modules[$module]['name'], $modules[$module]['dbversion'], $modules[$module]['version']);
+              } else {
+                $actionstext[] =  sprintf(_("%s %s will be installed and enabled"), $modules[$module]['name'], $modules[$module]['version']);
+              }
+            }
+          }
+        break;
+        case 'enable':
+          if (is_array($errors = module_checkdepends($modules[$module]))) {
+            $skipaction = true;
+            $errorstext[] = sprintf(_("%s cannot be enabled: %s Please try again after the dependencies have been installed."),  
+                                    $modules[$module]['name'],
+                                    '<ul><li>'.implode('</li><li>',$errors).'</li></ul>');
+          } else {
+            $actionstext[] =  sprintf(_("%s %s will be enabled"), $modules[$module]['name'], $modules[$module]['dbversion']);
+          }
+        break;
+        case 'disable':
+          if (is_array($errors = module_reversedepends($modules[$module]))) {
+            $skipaction = true;
+            $errorstext[] = sprintf(_("%s cannot be disabled because the following modules depend on it: %s Please disable those modules first then try again."),  
+                                    $modules[$module]['name'],
+                                    '<ul><li>'.implode('</li><li>',$errors).'</li></ul>');
+          } else {
+            $actionstext[] =  sprintf(_("%s %s will be disabled"), $modules[$module]['name'], $modules[$module]['dbversion']);
+          }
+        break;
+        case 'uninstall':
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            if (is_array($errors = module_reversedepends($modules[$module]))) {
+              $skipaction = true;
+              $errorstext[] = sprintf(_("%s cannot be uninstalled because the following modules depend on it: %s Please disable those modules first then try again."),  
+                                      $modules[$module]['name'],
+                                      '<ul><li>'.implode('</li><li>',$errors).'</li></ul>');
+            } else {
+              $actionstext[] =  sprintf(_("%s %s will be uninstalled"), $modules[$module]['name'], $modules[$module]['dbversion']);
+            }
+          }
+        break;
+      }
+
+      // If error above we skip this action so we can proceed with the others
+      //
+      if (!$skipaction) { //TODO
+        echo "\t<script type=\"text/javascript\"> moduleActions['".$module."'] = '".$action."'; </script>\n";
+      }
+    }
+    
+    // Write out the erros, if there are additional actions that can be accomplished list those next with the choice to
+    // process which will ignore the ones with errors but process the rest.
+    //
+    if (count($errorstext) > 0) {
+      echo "<h4>"._("Errors with selection:")."</h4>\n";
+      echo "<ul>\n";
+      foreach ($errorstext as $text) {
+        echo "\t<li>".$text."</li>\n";
+      }
+      echo "</ul>";
+    } 
+    if (count($actionstext) > 0) {
+      if (count($errorstext) > 0) {
+        echo "<h4>"._("You may confirm the remaining selection and then try the again for the listed issues once the required dependencies have been met:")."</h4>\n";
+      } else {
+        echo "<h4>"._("Please confirm the following actions:")."</h4>\n";
+      }
+      echo "<ul>\n";
+      foreach ($actionstext as $text) {
+        echo "\t<li>".$text."</li>\n";
+      }
+      echo "</ul>";
+      echo "\t<input type=\"button\" value=\"Confirm\" name=\"process\" onclick=\"process_module_actions(moduleActions);\" />";
+    } else {
+      echo "<h4>"._("No actions to perform")."</h4>\n";
+      echo "<p>"._("Please select at least one action to perform by clicking on the module, and selecting an action on the \"Action\" tab.")."</p>";
+    }
+    echo "\t<input type=\"button\" value=\""._("Cancel")."\" onclick=\"location.href = 'config.php?display=modules&amp;type=tool&amp;online=".($_REQUEST['online']?1:0)."';\" />";
+    echo "</form>";
+    
+  break;
+  case 'upload':
+    // display links
+    echo "<a href='config.php?display=modules&amp;type=tool'>"._("Manage local modules")."</a>\n";
+    if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+      echo " | <a class='info' href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX and Asterisk version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span></a>\n";
+    }
+        
+    if (isset($_FILES['uploadmod']) && !empty($_FILES['uploadmod']['name'])) {
+      // display upload link, only if they did upload something
+      echo " | <a href='config.php?display=modules&amp;type=tool&amp;extdisplay=upload'>"._("Upload module")."</a><br />\n";
+      
+      $res = module_handleupload($_FILES['uploadmod']);
+      if (is_array($res)) {
+        
+        echo '<div class="error"><p>';
+        echo sprintf(_('The following error(s) occurred processing the uploaded file: %s'), 
+             '<ul><li>'.implode('</li><li>',$res).'</li></ul>');
+        echo sprintf(_('You should fix the problem or select another file and %s.'), 
+             "<a href='config.php?display=modules&amp;type=tool'>"._("try again")."</a>");
+        echo "</p></div>\n";
+      } else {
+        
+        echo "<p>".sprintf(_("Module uploaded successfully. You need to enable the module using %s to make it available."),
+             "<a href='config.php?display=modules&amp;type=tool'>"._("local module administration")."</a>")
+           ."</p>\n";
+      }
+      
+    } else {
+      echo "<p>"._('You can upload a tar gzip file containing a FreePBX module from your local system. If a module with the same name already exists, it will be overwritten.')."</p>\n";
+    
+      echo "<form name=\"modulesGUI-upload\" action=\"config.php\" method=\"post\" enctype=\"multipart/form-data\">";
+      echo "<input type=\"hidden\" name=\"display\" value=\"".$display."\" />";
+      echo "<input type=\"hidden\" name=\"type\" value=\"".$type."\" />";
+      echo "<input type=\"hidden\" name=\"extdisplay\" value=\"upload\" />";
+      echo "<input type=\"file\" name=\"uploadmod\" /> ";
+      echo "&nbsp;&nbsp; <input type=\"submit\" value=\"Upload\" />";
+      echo "</form>";
+    }
+    
+  break;
+  case 'online':
+  default:
+    
+    uasort($modules, 'category_sort_callback');
+    
+    if ($online) {
+      // Check for annoucements such as security advisories, required updates, etc.
+      //
+      $announcements = module_get_annoucements();
+      if (isset($announcements) && !empty($announcements)) {
+        echo "<div class='announcements'>$announcements</div>";
+      }
+      
+      if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+        echo "<a href='config.php?display=modules&amp;type=tool&amp;online=0'>"._("Manage local modules")."</a>\n";
+        echo "<input type=\"checkbox\" id=\"show_upgradable_only\" onclick=\"showhide_upgrades();\" /><label for=\"show_upgradable_only\">"._("Show only upgradable")."</label>";
+      }
+    } else {
+      if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+        echo "<a class='info' href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX and Asterisk version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span></a>\n";
+      }
+      echo " | <a href='config.php?display=modules&amp;type=tool&amp;extdisplay=upload'>"._("Upload module")."</a><br />\n";
+    }
+
+    echo "<form name=\"modulesGUI\" action=\"config.php\" method=\"post\">";
+    echo "<input type=\"hidden\" name=\"display\" value=\"".$display."\" />";
+    echo "<input type=\"hidden\" name=\"type\" value=\"".$type."\" />";
+    echo "<input type=\"hidden\" name=\"online\" value=\"".$online."\" />";
+    echo "<input type=\"hidden\" name=\"extdisplay\" value=\"confirm\" />";
+    
+    echo "<div class=\"modulebuttons\">";
+    if ($online) {
+      echo "\t<a href=\"javascript:void(null);\" onclick=\"check_download_all();\">"._("Download all")."</a>";
+      echo "\t<a href=\"javascript:void(null);\" onclick=\"check_upgrade_all();\">"._("Upgrade all")."</a>";
+    }
+    echo "\t<input type=\"reset\" value=\""._("Reset")."\" />";
+    echo "\t<input type=\"submit\" value=\""._("Process")."\" name=\"process\" />";
+    echo "</div>";
+
+    echo "<div id=\"modulelist\">\n";
+
+    echo "\t<div id=\"modulelist-header\">";
+    echo "\t\t<span class=\"modulename\">"._("Module")."</span>\n";
+    echo "\t\t<span class=\"moduletype\">"._("Type")."</span>\n";
+    echo "\t\t<span class=\"moduleversion\">"._("Version")."</span>\n";
+    echo "\t\t<span class=\"clear\">&nbsp;</span>\n";
+    echo "\t</div>";
+
+    $category = false;
+    $numdisplayed = 0;
+    $fd = $amp_conf['ASTETCDIR'].'/freepbx_module_admin.conf';
+    if (file_exists($fd)) {
+      $module_filter = parse_ini_file($fd);
+    } else {
+      $module_filter = array();
+    }
+    foreach (array_keys($modules) as $name) {
+      if (isset($module_filter[$name]) && strtolower(trim($module_filter[$name])) == 'hidden') {
+        continue;
+      }
+      $numdisplayed++;
+      
+      if ($category !== $modules[$name]['category']) {
+        // show category header
+        
+        if ($category !== false) {
+          // not the first one, so end the previous blocks
+          echo "\t</ul></div>\n";
+        }
+        
+        // start a new category header, and associated html blocks
+        $category = $modules[$name]['category'];
+        echo "\t<div class=\"category\" id=\"category_".prep_id($category)."\"><h3>"._($category)."</h3>\n";
+        echo "\t<ul>";
+      }
+
+      // This will load any module's i18n translations that are available and try to use them when printing the
+      // module names with a fall back to using the amp.po master translations for a check if not available in
+      // the local module. For new modules of course, there will be no translations usually.
+      //
+      if (extension_loaded('gettext') && is_dir("modules/".$name."/i18n")) {
+        bindtextdomain($name,"modules/".$name."/i18n");
+        bind_textdomain_codeset($name, 'utf8');
+        $loc_domain = $name;
+
+        $name_text = dgettext($loc_domain,$modules[$name]['name']);
+        if ($name_text == $modules[$name]['name']) {
+          $name_text = _($name_text);
+        }
+      } else {
+        $name_text = _($modules[$name]['name']);
+        $loc_domain = false;
+      }
+
+      echo "\t\t<li id=\"module_".prep_id($name)."\">\n";
+      
+      // ---- module header 
+      echo "\t\t<div class=\"moduleheader\" onclick=\"toggleInfoPane('infopane_".prep_id($name)."');\" >\n";
+      echo "\t\t\t<span class=\"modulename\"><a href=\"javascript:void(null);\">".(!empty($name_text) ? $name_text : $name)."</a></span>\n";
+      echo "\t\t\t<span class=\"moduletype\">".$modules[$name]['type']."</span>\n";
+      echo "\t\t\t<span class=\"moduleversion\">".(isset($modules[$name]['dbversion'])?$modules[$name]['dbversion']:'&nbsp;')."</span>\n";
+      
+      echo "\t\t\t<span class=\"modulestatus\">";
+      switch ($modules[$name]['status']) {
+        case MODULE_STATUS_NOTINSTALLED:
+          if (isset($modules_local[$name])) {
+            echo '<span class="notinstalled">'._('Not Installed (Locally available)').'</span>';
+          } else {
+            echo '<span class="notinstalled">'.sprintf(_('Not Installed (Available online: %s)'), $modules_online[$name]['version']).'</span>';
+          }
+        break;
+        case MODULE_STATUS_DISABLED:
+          if (isset($modules_online[$name]['version'])) {
+            $vercomp = version_compare_freepbx($modules_local[$name]['version'], $modules_online[$name]['version']);
+            if ($vercomp < 0) {
+              echo '<span class="alert">'.sprintf(_('Disabled; Online upgrade available (%s)'),$modules_online[$name]['version']).'</span>';
+            } else if ($vercomp > 0) {
+              echo sprintf(_('Disabled; Newer than online version (%s)'), $modules_online[$name]['version']);
+            } else {
+              echo _('Disabled; up to date');
+            }
+          } else {
+            echo 'Disabled';
+          }
+        break;
+        case MODULE_STATUS_NEEDUPGRADE:
+          echo '<span class="alert">'.sprintf(_('Disabled; Pending upgrade to %s'),$modules_local[$name]['version']).'</span>';
+        break;
+        case MODULE_STATUS_BROKEN:
+          echo '<span class="alert">'._('Broken').'</span>';
+        break;
+        default:
+          // check for online upgrade
+          if (isset($modules_online[$name]['version'])) {
+            $vercomp = version_compare_freepbx($modules_local[$name]['version'], $modules_online[$name]['version']);
+            if ($vercomp < 0) {
+              echo '<span class="alert">'.sprintf(_('Online upgrade available (%s)'), $modules_online[$name]['version']).'</span>';
+            } else if ($vercomp > 0) {
+              echo sprintf(_('Newer than online version (%s)'),$modules_online[$name]['version']);
+            } else {
+              echo _('Enabled and up to date');
+            }
+          } else if (isset($modules_online)) {
+            // we're connected to online, but didn't find this module
+            echo _('Enabled; Not available online');
+          } else {
+            echo _('Enabled');
+          }
+        break;
+      }
+      echo "</span>\n";
+      
+      
+      echo "\t\t\t<span class=\"clear\">&nbsp;</span>\n";
+      echo "\t\t</div>\n";
+      
+      // ---- end of module header
+      
+      // ---- drop-down tab box thingy:
+      
+      echo "\t\t<div class=\"moduleinfopane\" id=\"infopane_".prep_id($name)."\" >\n";
+      echo "\t\t\t<div class=\"tabber\">\n";
+      
+      if (isset($modules_online[$name]['attention']) && !empty($modules_online[$name]['attention'])) {
+        echo "\t\t\t\t<div class=\"tabbertab\" title=\""._("Attention")."\">\n";
+        echo nl2br( $loc_domain ? dgettext($loc_domain,$modules[$name]['attention']) : _($modules[$name]['attention']) );
+        echo "\t\t\t\t</div>\n";
+      }
+      
+      echo "\t\t\t\t<div class=\"tabbertab actiontab\" title=\""._("Action")."\">\n";
+      
+      echo '<input type="radio" checked="CHECKED" id="noaction_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="0" /> '.
+         '<label for="noaction_'.prep_id($name).'">'._('No Action').'</label> <br />';  
+      switch ($modules[$name]['status']) {
+      
+        case MODULE_STATUS_NOTINSTALLED:
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            if (isset($modules_local[$name])) {
+              echo '<input type="radio" id="install_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="install" /> '.
+                 '<label for="install_'.prep_id($name).'">'._('Install').'</label> <br />';
+            } else {
+              echo '<input type="radio" id="upgrade_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="downloadinstall" /> '.
+                 '<label for="upgrade_'.prep_id($name).'">'._('Download and Install').'</label> <br />';
+            }
+          }
+        break;
+        case MODULE_STATUS_DISABLED:
+          echo '<input type="radio" id="enable_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="enable" /> '.
+             '<label for="enable_'.prep_id($name).'">'._('Enable').'</label> <br />';
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            echo '<input type="radio" id="uninstall_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="uninstall" /> '.
+               '<label for="uninstall_'.prep_id($name).'">'._('Uninstall').'</label> <br />';
+            if (isset($modules_online[$name]['version'])) {
+              $vercomp = version_compare_freepbx($modules_local[$name]['version'], $modules_online[$name]['version']);
+              if ($vercomp < 0) {
+                echo '<input type="radio" id="upgrade_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="upgrade" /> '.
+                   '<label for="upgrade_'.prep_id($name).'">'.sprintf(_('Download and Upgrade to %s, and Enable'),$modules_online[$name]['version']).'</label> <br />';
+              }
+            }
+          }
+        break;
+        case MODULE_STATUS_NEEDUPGRADE:
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            echo '<input type="radio" id="install_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="install" /> '.
+               '<label for="install_'.prep_id($name).'">'.sprintf(_('Upgrade to %s and Enable'),$modules_local[$name]['version']).'</label> <br />';
+            echo '<input type="radio" id="uninstall_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="uninstall" /> '.
+               '<label for="uninstall_'.prep_id($name).'">'._('Uninstall').'</label> <br />';
+          }
+        break;
+        case MODULE_STATUS_BROKEN:
+          if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+            echo '<input type="radio" id="install_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="install" /> '.
+               '<label for="install_'.prep_id($name).'">'._('Install').'</label> <br />';
+            echo '<input type="radio" id="uninstall_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="uninstall" /> '.
+               '<label for="uninstall_'.prep_id($name).'">'._('Uninstall').'</label> <br />';
+          }
+        break;
+        default:
+          // check for online upgrade
+          if (isset($modules_online[$name]['version'])) {
+            $vercomp = version_compare_freepbx($modules_local[$name]['version'], $modules_online[$name]['version']);
+            if ($vercomp < 0) {
+              if (!EXTERNAL_PACKAGE_MANAGEMENT) {
+                echo '<input type="radio" id="upgrade_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="upgrade" /> '.
+                   '<label for="upgrade_'.prep_id($name).'">'.sprintf(_('Download and Upgrade to %s'), $modules_online[$name]['version']).'</label> <br />';
+              }
+            }
+          }
+          if (enable_option($name,'candisable')) {
+            echo '<input type="radio" id="disable_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="disable" /> '.
+               '<label for="disable_'.prep_id($name).'">'._('Disable').'</label> <br />';
+          }
+          if (!EXTERNAL_PACKAGE_MANAGEMENT && enable_option($name,'canuninstall')) {
+            echo '<input type="radio" id="uninstall_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="uninstall" /> '.
+               '<label for="uninstall_'.prep_id($name).'">'._('Uninstall').'</label> <br />';
+          }
+        break;
+      }
+      echo "\t\t\t\t</div>\n";
+      
+      echo "\t\t\t\t<div class=\"tabbertab\" title=\""._("Description")."\">\n";
+      if (isset($modules[$name]['description']) && !empty($modules[$name]['description'])) {
+        echo "<h5>".sprintf(_("Description for version %s"),$modules[$name]['version'])."</h5>";
+        echo nl2br( $loc_domain ? dgettext($loc_domain,$modules[$name]['description']) : _($modules[$name]['description']) );
+      } else {
+        echo _("No description is available.");
+      }
+      if (isset($modules[$name]['info']) && !empty($modules[$name]['info'])) {
+        echo '<p>'._('More info').': <a href="'.$modules[$name]['info'].'" target="_new">'.$modules[$name]['info'].'</a></p>';
+      } else {
+        echo '<p>'._('More info').': <a href="'."$freepbx_help_url&freepbx_module=".urlencode($name).'" target="help">'.sprintf(_("Get help for %s"),$name_text).'</a></p>';
+      }
+      echo "\t\t\t\t</div>\n";
+      
+      if (isset($modules[$name]['changelog']) && !empty($modules[$name]['changelog'])) {
+        echo "\t\t\t\t<div class=\"tabbertab\" title=\""._("Changelog")."\">\n";
+        echo "<h5>".sprintf(_("Change Log for version %s"), $modules[$name]['version'])."</h5>";
+
+        // convert "1.x.x:" and "*1.x.x*" into bold, and do nl2br
+        // TODO: need to fix this to convert 1.x.xbetax.x, 1.x.xalphax.x, 1.x.xrcx.x, 1.x.xRCx.x formats as well
+        //
+        $changelog = nl2br($modules[$name]['changelog']);
+        $changelog = preg_replace('/(\d+(\.\d+|\.\d+beta\d+|\.\d+alpha\d+|\.\d+rc\d+|\.\d+RC\d+)+):/', '<strong>$0</strong>', $changelog);
+        $changelog = preg_replace('/\*(\d+(\.\d+|\.\d+beta\d+|\.\d+alpha\d+|\.\d+rc\d+|\.\d+RC\d+)+)\*/', '<strong>$1:</strong>', $changelog);
+
+        // convert '#xxx', 'ticket xxx', 'bug xxx' to ticket links and rxxx to changeset links in trac
+        //
+        $changelog = preg_replace_callback('/(?<!\w)(?:#|bug |ticket )([^&]\d{3,4})(?!\w)/i', 'trac_replace_ticket', $changelog);
+        $changelog = preg_replace_callback('/(?<!\w)r(\d+)(?!\w)/', 'trac_replace_changeset', $changelog);
+        $changelog = preg_replace_callback('/(?<!\w)\[(\d+)\](?!\w)/', 'trac_replace_changeset', $changelog);
+
+        echo $changelog;
+        echo "\t\t\t\t</div>\n";
+      }
+      
+      if ($amp_conf['DEVEL']) {
+        echo "\t\t\t\t<div class=\"tabbertab\" title=\""._("Debug")."\">\n";
+        echo "\t\t\t\t<h5>".$name."</h5><pre>\n";
+        print_r($modules_local[$name]);
+        echo "</pre>";
+        if (isset($modules_online)) {
+          echo "\t\t\t\t<h5>Online info</h5><pre>\n";
+          print_r($modules_online[$name]);
+          echo "</pre>\n";
+        }
+          echo "\t\t\t\t<h5>combined</h5><pre>\n";
+          print_r($modules[$name]);
+          echo "</pre>\n";
+        echo "\t\t\t\t</div>\n";
+      }
+      
+      echo "\t\t\t</div>\n";
+      echo "\t\t</div>\n";
+      
+      // ---- end of drop-down tab box 
+      
+      echo "\t\t</li>\n";
+    }
+    
+    if ($numdisplayed == 0) {
+      if (isset($modules_online) && count($modules_online) > 0) {
+        echo _("All available modules are up-to-date and installed.");
+      } else {
+        echo _("No modules to display.");
+      }
+    }
+    
+    echo "\t</ul></div>\n";
+    echo "</div>";
+
+    echo "<div class=\"modulebuttons\">";
+    if ($online) {
+      echo "\t<a href=\"javascript:void(null);\" onclick=\"check_download_all();\">"._("Download all")."</a>";
+      echo "\t<a href=\"javascript:void(null);\" onclick=\"check_upgrade_all();\">"._("Upgrade all")."</a>";
+    }
+    echo "\t<input type=\"reset\" value=\""._("Reset")."\" />";
+    echo "\t<input type=\"submit\" value=\""._("Process")."\" name=\"process\" />";
+    echo "</div>";
+
+    echo "</form>";
+  break;
+}
+
+if ($quietmode) {
+  echo '</body></html>';
+}
+
+//-------------------------------------------------------------------------------------------
+// Help functions
+//
-
-function category_sort_callback($a, $b) {
@@ -273 +849 @@
-                                        ),
-                   );
-
-  if (isset($modules[$module_name][$option]) && strtolower(trim($modules[$module_name][$option])) == 'no') {
-    $enable=false;
@@ -280 +855 @@
-    $enable=false;
-  }
-
-  return $enable;
-}
@@ -298 +872 @@
-}                                                                                                                                              
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-?>

freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_admin.php

@@ -13 +13 @@
-  $sort_name = Array();
-  $sort_type = Array();
+  $framework_text_domain = Array();
-  // Sorting menu by category and name
-  foreach ($fpbx_menu as $key => $row) {
@@ -19 +20 @@
-    $sort_name[$key] = $row['name'];
-    $sort_type[$key] = $row['type'];
+
+    if (extension_loaded('gettext') && is_dir("modules/".$key."/i18n")) {
+      bindtextdomain($key,"modules/".$key."/i18n");
+      bind_textdomain_codeset($key, 'utf8');
+      $framework_text_domain[$key] = true;
+    } else {
+      $framework_text_domain[$key] = false;
+    }
-  }
-  
@@ -95 +104 @@
-
-    echo "\t<li class=\"".implode(' ',$li_classes)."\">";
+    if ($framework_text_domain[$key]) {
+      $label_text = dgettext($key,$row['name']);
+      if ($label_text == $row['name']) {
+        $label_text = _($label_text);
+      }
+    } else {
+      $label_text = _($row['name']);
+    }
-    if (isset($row['disabled']) && $row['disabled']) {
-_($row['name'])
+$label_text
-    } else {
-_($row['name']).
+ $label_text . 
-    }
-    echo "</li>\n";

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

@@ -171 +171 @@
-  function displayNavigationBlock($m,$q,$url_opts,$start,$span,$total) {
-
-$start=='' ? 0 : $start 
-$span=='' ? 15 : $span 
+($start=='' || !ctype_digit($start)) ? 0 : $start
+($span=='' || !ctype_digit($span)) ? 15 : $span
-
-    $total_pages = ceil($total/$span);

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

@@ -263 +263 @@
-$ASTERISK_PROTOCOLS['sip']['config_files'] = "/etc/asterisk/sip.conf;/etc/asterisk/sip_additional.conf";
-$ASTERISK_PROTOCOLS['zap']['table'] = "zap";
-
+;/etc/asterisk/chan_dahdi.conf;/etc/asterisk/chan_dahdi_additional.conf
-
-# Settings for Follow-Me Select Boxes in seconds

freepbx/trunk/amp_conf/htdocs/recordings/modules/callmonitor.module

@@ -115 +115 @@
-    $duration_filter = getArgument($args,'duration_filter');
-
-$start==''
-$span==''
+($start=='' || !ctype_digit($start))
+($span=='' || !ctype_digit($span))
-    $order = $order=='' ? 'calldate' : $order;
-$sort=='' ? 'desc' : $sort
+($sort=='' || strtolower($sort) == 'desc') ? 'desc' : 'asc'
-
-    $displayname = $_SESSION['ari_user']['displayname'];
@@ -205 +205 @@
-    // table body
-    $playbackRow = 2; // Index to keep track of where playback control rows should be inserted.
-
+if (is_array($data)) 
-
-      // recording file
@@ -407 +407 @@
-    }
-
-
+if (is_array($data)) 
-
-      $recording='';
@@ -573 +573 @@
-  function getSearchText($q,$duration_filter) {
-
+    $duration_filter = ctype_digit($duration_filter) ? $duration_filter : 0;
+
-    // search text
-    if ($q!='*' && $q!=NULL) {
+
+      $dbh = $_SESSION['dbh_cdr'];
-      $searchText .= "WHERE ";
-      $tok = strtok($q," \n\t");
+      $tok = $dbh->escapeSimple($tok);
-      while ($tok) {
-        $searchText .= " (calldate regexp '" . $tok . "'
@@ -590 +595 @@
-                       )";
-        $tok = strtok(" \n\t");
+        $tok = $dbh->escapeSimple($tok);
-        if ($tok) {
-          $searchText .= " AND";
@@ -684 +690 @@
-
-    $dbh = $_SESSION['dbh_cdr'];
+    $order = $dbh->escapeSimple($order);
-    $sql = "SELECT *
-            FROM " . $ASTERISKCDR_DBTABLE . " 

freepbx/trunk/amp_conf/htdocs/recordings/modules/followme.module

@@ -655 +655 @@
-
-  if (isset($_SESSION['dbh_asterisk'])) {
+    $db = $_SESSION['dbh_asterisk'];
-
-    //format for SQL database
@@ -660 +661 @@
-
-    $sql = "UPDATE findmefollow SET grptime = '" . $follow_me_listring_time . "', grplist = '".
-str_replace("'", "''", 
+$db->escapeSimple(
-       "', needsconf = '" . $follow_me_confirm . "' WHERE grpnum = $exten LIMIT 1";
-    $results = $_SESSION['dbh_asterisk']->query($sql);

freepbx/trunk/amportal.conf

@@ -199 +199 @@
-# 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
+
+# ZAP2DAHDICOMPAT=true|false
+# DEFAULT VALUE: false
+# If set to true, FreePBX will check if you have chan_dadhi installed. If so, it will
+# automatically use all your ZAP configuration settings (devices and trunks) and
+# silently convert them, under the covers, to DAHDI so no changes are needed. The
+# GUI will continue to refer to these as ZAP but it will use the proper DAHDI channels.
+# This will also keep Zap Channel DIDs working.