Changeset 8339

Timestamp:

09/07/09 05:05:08 (4 years ago)

Author:

mbrevda

Message:

Merged revisions 8040,8071-8076,8253,8271-8272 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r8040 | mbrevda | 2009-08-14 15:52:22 +0300 (Fri, 14 Aug 2009) | 1 line

include freepbx js libraries in ARI

........

r8071 | mbrevda | 2009-08-16 13:26:47 +0300 (Sun, 16 Aug 2009) | 1 line

add module name to messages

........

r8072 | mbrevda | 2009-08-16 16:20:38 +0300 (Sun, 16 Aug 2009) | 1 line

closes #3807, Cant uninstall modules from command line due to missing functions

........

r8073 | mbrevda | 2009-08-16 19:42:44 +0300 (Sun, 16 Aug 2009) | 1 line

added installall, removeall, mirrorrepo

........

r8074 | mbrevda | 2009-08-16 19:52:17 +0300 (Sun, 16 Aug 2009) | 1 line

_modules_doinclude should include_once (not include) incase the file was already included elsewhere

........

r8075 | mbrevda | 2009-08-17 13:19:12 +0300 (Mon, 17 Aug 2009) | 1 line

reverting r8072, re: #3807, implemented in module_admin instead

........

r8076 | mbrevda | 2009-08-17 14:30:47 +0300 (Mon, 17 Aug 2009) | 1 line

perfect r8073, order module alphabeticaly - ALMOST NO CODE CHANGE

........

r8253 | mbrevda | 2009-08-30 18:07:37 +0300 (Sun, 30 Aug 2009) | 1 line

closes #3843, check for apply_conf.sh befor running

........

r8271 | mbrevda | 2009-09-04 16:33:13 +0300 (Fri, 04 Sep 2009) | 1 line

closes #3856, #3857. Nicer messages, includes when using module_admin

........

r8272 | mbrevda | 2009-09-04 16:36:38 +0300 (Fri, 04 Sep 2009) | 1 line

revert accidental ci's in r8271

........

Files:

• freepbx/branches/2.6 (modified) (2 props)
• freepbx/branches/2.6/amp_conf/astetc/cdr_mysql.conf (modified) (2 diffs)
• freepbx/branches/2.6/amp_conf/bin/module_admin (modified) (11 diffs)
• freepbx/branches/2.6/amp_conf/htdocs/admin/functions.inc.php (modified) (3 diffs)
• freepbx/branches/2.6/amp_conf/htdocs/recordings/theme/page.tpl.php (modified) (1 diff)
• freepbx/branches/2.6/install_amp (modified) (2 diffs)

freepbx/branches/2.6/amp_conf/astetc/cdr_mysql.conf

@@ -2 +2 @@
-; Note - if the database server is hosted on the same machine as the 
-; asterisk server, you can achieve a local Unix socket connection by 
-=localhost 
+ = localhost
-; 
-; port and sock are both optional parameters.  If hostname is specified 
@@ -12 +12 @@
-; 
-[global] 
-=localhost 
+ = localhost
-dbname=asteriskcdrdb 
-=
-=
+ = 
+ = 
-userfield=1
-;port=3306 

freepbx/branches/2.6/amp_conf/bin/module_admin

@@ -90 +90 @@
-}
-
+function doReload() {
+  $result = do_reload();
+
+  if ($result['status'] != true) {
+    out("Error(s) have occured, the following is the retrieve_conf output:");
+    $retrieve_array = explode('<br/>',$result['retrieve_conf']);
+    foreach ($retrieve_array as $line) {
+      out($line);
+    };
+  } else {
+    out($result['message']);
+  }
+}
+
+function doDisable($modulename, $force) {
+  getIncludes();
+  if (is_array($errors = module_disable($modulename, $force))) {
+    out("The following error(s) occured:");
+    out(' - '.implode("\n - ",$errors));
+    exit(2);
+  } else {
+    out("Module ".$modulename." successfully disabled");
+  }
+}
+
+function doEnable($modulename, $force) {
+  getIncludes();
+  if (is_array($errors = module_enable($modulename, $force))) {
+    out("The following error(s) occured:");
+    out(' - '.implode("\n - ",$errors));
+    exit(2);
+  } else {
+    out("Module ".$modulename." successfully enabled");
+  }
+}
+
+function doInstall($modulename, $force) {
+  getIncludes();
+  if (is_array($errors = module_install($modulename, $force))) {
+    out("The following error(s) occured:");
+    out(' - '.implode("\n - ",$errors));
+    exit(2);
+  } else {
+    out("Module ".$modulename." successfully installed");
+  }
+}
+
+function doDelete($modulename, $force) {
+  getIncludes();
+  if (is_array($errors = module_delete($modulename, $force))) {
+    out("The following error(s) occured:");
+    out(' - '.implode("\n - ",$errors));
+    exit(2);
+  } else {
+    out("Module ".$modulename." successfully deleted");
+  }
+}
+
+function doDeleteAll($force=true) {
+  getIncludes(); //get functions from other modules, in case we need them here
+  $modules = module_getinfo(false, false, true);
+  unset($modules['builtin']);//builtin never gets deleted, so remove it from the list
+  $temp = array();
+  if (isset($modules['core'])){ //move core to the end
+    $temp['core']=$modules['core'];
+    unset($modules['core']); 
+    $modules['core']=$temp['core'];
+  }
+  unset($temp);
+    foreach ($modules as $module){
+      if (is_array($errors = module_delete($module['rawname'], true))) {
+        out("The following error(s) occured:");
+        out(' - '.implode("\n - ",$errors));
+        //exit(2);
+      } else {
+        out("Module ".$module['rawname']." successfully deleted");
+      } 
+  }
+    out('All modules successfully removed');
+}
+
+function doDownload($modulename, $force) {
+
+  global $modulexml_path;
+  global $modulerepository_path;
+
+  if (is_array($errors = module_download($modulename, $force, 'download_progress', $modulerepository_path, $modulexml_path))) {
+    out("The following error(s) occured:");
+    out(' - '.implode("\n - ",$errors));
+    exit(2);
+  } else {
+    out("Module ".$modulename." successfully downloaded");
+  }
+}
+
+
+function download_progress($action, $params) {
+  switch ($action) {
+    case 'untar':
+      outn("\nUntaring..");
+    break;
+    case 'downloading':
+      outn("\rDownloading ".$params['read'].' of '.$params['total'].' ('.($params['total'] ? round($params['read']/$params['total']*100) : '0').'%)            ');
+      if ($params['read'] == $params['total']) {
+        out('');
+      }
+    break;
+    case 'done';
+      out('Done');
+    break;
+  }
+}
+
+function doUninstall($modulename, $force) {
+  getIncludes();
+  if (is_array($errors = module_uninstall($modulename, $force))) {
+    out("The following error(s) occured:");
+    out(' - '.implode("\n - ",$errors));
+    exit(2);
+  } else {
+    out("Module ".$modulename." successfully uninstalled");
+  }
+}
+
+function doUpgrade($modulename, $force) {
+  // either will exit() if there's a problem
+  doDownload($modulename, $force);
+  doInstall($modulename, $force);
+}
+
+function doInstallAll($force) {
+  doUpgradeAll(true);
+  $modules = getInstallableModules();
+  if (in_array('core', $modules)){
+    out("Installing core...");
+    doDownload('core', $force);
+    doInstall('core', $force);
+  }
+  if (count($modules) > 0) {
+    out("Installing: ".implode(', ',$modules));
+    sleep(1); // a bit of time to ^C abort..
+    foreach ($modules as $module => $name) {
+      if (($name != 'core')){//we dont want to reinstall core
+        getIncludes(); //get functions from other modules, in case we need them here
+        out("Installing $name...");
+        doDownload($name, $force);
+        doInstall($name, $force);
+      }
+    } 
+    out("Done. All modules installed.");
+  } else {
+    out("All modules up to date.");
+  }
+}
+
+function getIncludes(){
+  $active_modules = module_getinfo(false, MODULE_STATUS_ENABLED);
+  if(is_array($active_modules)){
+    foreach($active_modules as $key => $module) {
+      //include module functions
+      if (is_file("modules/{$key}/functions.inc.php")) {
+        require_once("modules/{$key}/functions.inc.php");
+      }
+    }
+  }
+}
+
+/** 
+ * @param bool Controls if a simple (names only) or extended (array of name,versions) array is returned
+ */
+function getInstallableModules($extarray = false) {
+  $modules_online = module_getonlinexml();
+  $module_info=module_getinfo(false);
+  $modules_installable = array();
+
+  foreach ($modules_online as $name) {
+    if ((!isset($module_info[$name['rawname']]['status'])) || ($module_info[$name['rawname']]['status'] == MODULE_STATUS_NEEDUPGRADE)){
+      $modules_installable[]=$name['rawname'];
+    }
+  }
+  return $modules_installable;
+}
+
+/** 
+ * @param bool Controls if a simple (names only) or extended (array of name,versions) array is returned
+ */
+function getUpgradableModules($extarray = false) {
+  $modules_local = module_getinfo(false, MODULE_STATUS_ENABLED);
+  $modules_online = module_getonlinexml();
+  $modules_upgradable = array();
+  
+  foreach (array_keys($modules_local) as $name) {
+    if (isset($modules_online[$name])) {
+      if (version_compare_freepbx($modules_local[$name]['version'], $modules_online[$name]['version']) < 0) {
+        if ($extarray) {
+          $modules_upgradable[] = array(
+            'name' => $name,
+            'local_version' => $modules_local[$name]['version'],
+            'online_version' => $modules_online[$name]['version'],
+          );
+        } else {
+          $modules_upgradable[] = $name;
+        }
+      }
+    }
+  }
+  return $modules_upgradable;
+}
+
+function doUpgradeAll($force) {
+  $modules = getUpgradableModules();
+  if (count($modules) > 0) {
+    out("Upgrading: ".implode(', ',$modules));
+    sleep(1); // a bit of time to ^C abort..
+    foreach ($modules as $modulename) {
+      out("Upgrading $modulename..");
+      doUpgrade($modulename, $force);
+    }
+    out("All upgrades done!");
+  } else {
+    out("Up to date.");
+  }
+}
+
+function mirrorrepo(){
+  doInstallAll(true);
+  $modules_online = module_getonlinexml();
+  $modules_local = module_getinfo();
+  unset($modules_local['builtin']); //builtin never gets deleted, so remove it from the list
+  foreach ($modules_local as $localmod){
+    if (!module_getonlinexml($localmod['rawname'])){
+      doDelete($localmod['rawname'],1);
+    }
+  }
+}
+
+function showi18n($modulename) {
+  $modules = module_getinfo($modulename);
+  if (!isset($modules[$modulename])) {
+    fatal($modulename.' not found');
+  }
+
+  if (isset($modules[$modulename]['name'])) {
+    echo "# name:\n_(\"".$modules[$modulename]['name']."\")\n";
+  }
+  if (isset($modules[$modulename]['category'])) {
+    echo "# category:\n_(\"".$modules[$modulename]['category']."\")\n";
+  }
+  if (isset($modules[$modulename]['description'])) {
+    echo "# description:\n_(\"".trim(str_replace("\n","",$modules[$modulename]['description']))."\")\n";
+  }
+  if (isset($modules[$modulename]['menuitems'])) {
+    foreach ($modules[$modulename]['menuitems'] as $key => $menuitem) {
+      echo "# $key:\n_(\"$menuitem\")\n";
+    }
+  }
+}
+
+function showCheckDepends($modulename) {
+  $modules = module_getinfo($modulename);
+  if (!isset($modules[$modulename])) {
+    fatal($modulename.' not found');
+  }
+  if (($errors = module_checkdepends($modules[$modulename])) !== true) {
+    out("The following dependencies are not met:");
+    out(' - '.implode("\n - ",$errors));
+    exit(1);
+  } else {
+    out("All dependencies met for module ".$modulename);
+  }
+}
+
+function showEngine() {
+  $engine = engine_getinfo();
+  foreach ($engine as $key=>$value) {
+    out(str_pad($key,15,' ',STR_PAD_LEFT).': '.$value);
+  }
+}
+
-function showHelp() {
-  global $argv;
@@ -102 +381 @@
-  out("  delete <module>");
-  out("      Disable, uninstall, and delete the specified module");
+  out("  deleteall");
+  out("      Disable, uninstall, and delete ALL MODULES");
+  out("      WARNING: Use at your own risk, this will remove ALL MODULES from your system!");
-  out("  disable <module>");
-  out("      Disable the specified module");
@@ -115 +397 @@
-  out("  install <module>");
-  out("      Install the module (must exist in the modules directory)");
+  out("  installall");
+  out("      Installs all module that exist in the repository");
-  out("  list");
-  out("      List all local modules and their current status");
@@ -125 +409 @@
-  out("  showupgrades");
-  out("      Show a list of upgradable modules");
+  out("  showannounce");
+  out("      Shows any annoucements that maybe displayed at freepbx.org for this version");
-  out("  uninstall <module>");
-  out("      Disable and uninstall the specified module");
@@ -131 +417 @@
-  out("  upgradeall");
-  out("      Downloads and upgrades all modules with pending updates");
-
-
-
+
-  out("  --help, -h, -?           Show this help");
+}
+
+function showInfo($modulename) {
+  function recursive_print($array, $parentkey = '', $level=0) {
+    foreach ($array as $key => $value) {
+      if (is_array($value)) {
+        // check if there is a numeric key in the sub-array, if so, we don't print the title
+        if (!isset($value[0])) {
+          out(str_pad($key,15+($level * 3),' ',STR_PAD_LEFT).': ');
+        }
+        recursive_print($value, $key, $level + 1);
+      } else {
+        if (is_numeric($key)) {
+          // its just multiple parent keys, so we don't indent, and print the parentkey instead
+          out(str_pad($parentkey,15+(($level-1) * 3),' ',STR_PAD_LEFT).': '.$value);
+        } else {
+          if ($key == 'status') {
+            switch ($value) {
+              case MODULE_STATUS_NOTINSTALLED: $value = 'Not Installed'; break;
+              case MODULE_STATUS_NEEDUPGRADE: $value = 'Disabled; Needs Upgrade'; break;
+              case MODULE_STATUS_ENABLED: $value = 'Enabled'; break;
+              case MODULE_STATUS_DISABLED: $value = 'Disabled'; break;
+              case MODULE_STATUS_BROKEN: $value = 'Broken'; break;
+            }
+          }
+          out(str_pad($key,15+($level * 3),' ',STR_PAD_LEFT).': '.$value);
+        }
+      }
+    }
+  }
+  $modules = module_getinfo($modulename);
+  if (!isset($modules[$modulename])) {
+    fatal($modulename.' not found');
+  }
+  
+  recursive_print($modules[$modulename]);
+  
-}
-
@@ -216 +537 @@
-  }
-}
-function showCheckDepends($modulename) {
-  $modules = module_getinfo($modulename);
-  if (!isset($modules[$modulename])) {
-    fatal($modulename.' not found');
-  }
-  if (($errors = module_checkdepends($modules[$modulename])) !== true) {
-    out("The following dependencies are not met:");
-    out(' - '.implode("\n - ",$errors));
-    exit(1);
-  } else {
-    out("All dependencies met for this module.");
-  }
-}
-
-function showInfo($modulename) {
-  function recursive_print($array, $parentkey = '', $level=0) {
-    foreach ($array as $key => $value) {
-      if (is_array($value)) {
-        // check if there is a numeric key in the sub-array, if so, we don't print the title
-        if (!isset($value[0])) {
-          out(str_pad($key,15+($level * 3),' ',STR_PAD_LEFT).': ');
-        }
-        recursive_print($value, $key, $level + 1);
-      } else {
-        if (is_numeric($key)) {
-          // its just multiple parent keys, so we don't indent, and print the parentkey instead
-          out(str_pad($parentkey,15+(($level-1) * 3),' ',STR_PAD_LEFT).': '.$value);
-        } else {
-          if ($key == 'status') {
-            switch ($value) {
-              case MODULE_STATUS_NOTINSTALLED: $value = 'Not Installed'; break;
-              case MODULE_STATUS_NEEDUPGRADE: $value = 'Disabled; Needs Upgrade'; break;
-              case MODULE_STATUS_ENABLED: $value = 'Enabled'; break;
-              case MODULE_STATUS_DISABLED: $value = 'Disabled'; break;
-              case MODULE_STATUS_BROKEN: $value = 'Broken'; break;
-            }
-          }
-          out(str_pad($key,15+($level * 3),' ',STR_PAD_LEFT).': '.$value);
-        }
-      }
-    }
-  }
-  $modules = module_getinfo($modulename);
-  if (!isset($modules[$modulename])) {
-    fatal($modulename.' not found');
-  }
-  
-  recursive_print($modules[$modulename]);
-  
-}
-
-function showi18n($modulename) {
-  $modules = module_getinfo($modulename);
-  if (!isset($modules[$modulename])) {
-    fatal($modulename.' not found');
-  }
-
-  if (isset($modules[$modulename]['name'])) {
-    echo "# name:\n_(\"".$modules[$modulename]['name']."\")\n";
-  }
-  if (isset($modules[$modulename]['category'])) {
-    echo "# category:\n_(\"".$modules[$modulename]['category']."\")\n";
-  }
-  if (isset($modules[$modulename]['description'])) {
-    echo "# description:\n_(\"".trim(str_replace("\n","",$modules[$modulename]['description']))."\")\n";
-  }
-  if (isset($modules[$modulename]['menuitems'])) {
-    foreach ($modules[$modulename]['menuitems'] as $key => $menuitem) {
-      echo "# $key:\n_(\"$menuitem\")\n";
-    }
-  }
-}
-
-function doReload() {
-  $result = do_reload();
-
-  if ($result['status'] != true) {
-    out("Error(s) have occured, the following is the retrieve_conf output:");
-    $retrieve_array = explode('<br/>',$result['retrieve_conf']);
-    foreach ($retrieve_array as $line) {
-      out($line);
-    };
-  } else {
-    out($result['message']);
-  }
-}
-
-function doDisable($modulename, $force) {
-  if (is_array($errors = module_disable($modulename, $force))) {
-    out("The following error(s) occured:");
-    out(' - '.implode("\n - ",$errors));
-    exit(2);
-  } else {
-    out("Module successfully disabled");
-  }
-}
-
-function doEnable($modulename, $force) {
-  if (is_array($errors = module_enable($modulename, $force))) {
-    out("The following error(s) occured:");
-    out(' - '.implode("\n - ",$errors));
-    exit(2);
-  } else {
-    out("Module successfully enabled");
-  }
-}
-
-function doInstall($modulename, $force) {
-  if (is_array($errors = module_install($modulename, $force))) {
-    out("The following error(s) occured:");
-    out(' - '.implode("\n - ",$errors));
-    exit(2);
-  } else {
-    out("Module successfully installed");
-  }
-}
-
-function doUninstall($modulename, $force) {
-  if (is_array($errors = module_uninstall($modulename, $force))) {
-    out("The following error(s) occured:");
-    out(' - '.implode("\n - ",$errors));
-    exit(2);
-  } else {
-    out("Module successfully uninstalled");
-  }
-}
-
-function doDelete($modulename, $force) {
-  if (is_array($errors = module_delete($modulename, $force))) {
-    out("The following error(s) occured:");
-    out(' - '.implode("\n - ",$errors));
-    exit(2);
-  } else {
-    out("Module successfully deleted");
-  }
-}
-
-function doDownload($modulename, $force) {
-
-  global $modulexml_path;
-  global $modulerepository_path;
-
-  if (is_array($errors = module_download($modulename, $force, 'download_progress', $modulerepository_path, $modulexml_path))) {
-    out("The following error(s) occured:");
-    out(' - '.implode("\n - ",$errors));
-    exit(2);
-  } else {
-    out("Module successfully downloaded");
-  }
-}
-
-function download_progress($action, $params) {
-  switch ($action) {
-    case 'untar':
-      outn("\nUntaring..");
-    break;
-    case 'downloading':
-      outn("\rDownloading ".$params['read'].' of '.$params['total'].' ('.($params['total'] ? round($params['read']/$params['total']*100) : '0').'%)            ');
-      if ($params['read'] == $params['total']) {
-        out('');
-      }
-    break;
-    case 'done';
-      out('Done');
-    break;
-  }
-}
-
-
-function doUpgrade($modulename, $force) {
-  // either will exit() if there's a problem
-  doDownload($modulename, $force);
-  doInstall($modulename, $force);
-}
-
-/** 
- * @param bool Controls if a simple (names only) or extended (array of name,versions) array is returned
- */
-function getUpgradableModules($extarray = false) {
-  $modules_local = module_getinfo(false, MODULE_STATUS_ENABLED);
-  $modules_online = module_getonlinexml();
-  $modules_upgradable = array();
-  
-  foreach (array_keys($modules_local) as $name) {
-    if (isset($modules_online[$name])) {
-      if (version_compare_freepbx($modules_local[$name]['version'], $modules_online[$name]['version']) < 0) {
-        if ($extarray) {
-          $modules_upgradable[] = array(
-            'name' => $name,
-            'local_version' => $modules_local[$name]['version'],
-            'online_version' => $modules_online[$name]['version'],
-          );
-        } else {
-          $modules_upgradable[] = $name;
-        }
-      }
-    }
-  }
-  return $modules_upgradable;
-}
-
-function doUpgradeAll($force) {
-  $modules = getUpgradableModules();
-  if (count($modules) > 0) {
-    out("Upgrading: ".implode(', ',$modules));
-    sleep(1); // a bit of time to ^C abort..
-    foreach ($modules as $modulename) {
-      out("Upgrading $modulename..");
-      doUpgrade($modulename, $force);
-    }
-    out("Done all upgrades.");
-  } else {
-    out("Up to date.");
-  }
-}
-
-function showUpgrades() {
@@ -444 +550 @@
-  }
-}
-
-function showEngine() {
-  $engine = engine_getinfo();
-  foreach ($engine as $key=>$value) {
-    out(str_pad($key,15,' ',STR_PAD_LEFT).': '.$value);
-  }
-}
-
-/****************************************************************************************************
- ****************************************************************************************************/
@@ -546 +644 @@
-chdir ( $amp_conf["AMPWEBROOT"] . "/admin/" );
-
-// Get annoucment information to use if needed
-//
-
-
-switch ($operation ) {
+  case 'checkdepends':
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    showCheckDepends($param);
+  break;
+  case 'delete':
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    doDelete($param, $force);
+  break;
+  case 'deleteall': case 'removeall':
+    doDeleteAll();
+  break;
+  case 'disable':
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    doDisable($param, $force);
+  break;
+  case 'download':
+    $announcements = module_get_annoucements();
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    doDownload($param, $force);
+  break;
+  case 'enable':
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    doEnable($param, $force);
+  break;
+  case 'i18n':
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    showi18n($param);
+  break;  
+  case 'info':
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    showInfo($param);
+  break;
+  case 'install':
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    doInstall($param, $force);
+  break;
+  case 'installall':
+    doInstallAll(true);
+  break;  
-  case 'list':
-    showList();
@@ -558 +708 @@
-    showList(true);
-  break;
+  case 'mirrorrepo': case 'mirrorrepro':
+    mirrorrepo();
+  break;
-  case 'reload':
-    doReload();
-  break;
-  case 'checkdepends':
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    showCheckDepends($param);
-  break;
-  case 'reversedepends':
-    if (empty($param)) {
@@ -572 +719 @@
-    }
-    showReverseDepends($param);
-  break;
-  case 'info':
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    showInfo($param);
-  break;
-  case 'i18n':
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    showi18n($param);
-  break;
-  case 'download':
-    $announcements = module_get_annoucements();
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    doDownload($param, $force);
-  break;
-  case 'install':
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    doInstall($param, $force);
-  break;
-  case 'enable':
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    doEnable($param, $force);
-  break;
-  case 'disable':
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    doDisable($param, $force);
-  break;
-  case 'uninstall':
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    doUninstall($param, $force);
-  break;
-  case 'delete':
-    if (empty($param)) {
-      fatal("Missing module name");
-    }
-    doDelete($param, $force);
-  break;
-  case 'upgrade':
-    doUpgrade($param, $force);
-  break;
-  case 'upgradeall':
-    doUpgradeAll($force);
-  break;
-  case 'showupgrade':
-  case 'showupgrades':
-    showUpgrades();
-  break;
-  case 'showengine':
-    showEngine();
-  break;
-  case 'showannounce';
@@ -645 +730 @@
-
-  break;
+  case 'showengine':
+    showEngine();
+  break;
+  case 'showupgrade':
+  case 'showupgrades':
+    showUpgrades();
+  break;
+  case 'uninstall':
+    if (empty($param)) {
+      fatal("Missing module name");
+    }
+    doUninstall($param, $force);
+  break;
+  case 'upgrade':
+    doUpgrade($param, $force);
+  break;
+  case 'upgradeall':
+    doUpgradeAll($force);
+  break;
-  default:
-  case 'help':

freepbx/branches/2.6/amp_conf/htdocs/admin/functions.inc.php

@@ -2791 +2791 @@
-  
-  if ($modules[$modulename]['status'] == MODULE_STATUS_ENABLED) {
-
+".$modulename." 
-  }
-  
-  // doesn't make sense to skip this on $force - eg, we can't enable a non-installed or broken module
-  if ($modules[$modulename]['status'] != MODULE_STATUS_DISABLED) {
-
+".$modulename." 
-  }
-  
@@ -3107 +3107 @@
-  // don't force this bit - we can't install a broken module (missing files) 
-  if ($modules[$modulename]['status'] == MODULE_STATUS_BROKEN) {
-This module
+Module ".$modules[$modulename]['rawname']."
-  }
-  
@@ -3452 +3452 @@
-  
-  if (file_exists($filename) && is_file($filename)) {
-
+_once
-  }
-}

freepbx/branches/2.6/amp_conf/htdocs/recordings/theme/page.tpl.php

@@ -5 +5 @@
-    <link rel="stylesheet" href="theme/main.css" type="text/css">
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <script  type="text/javascript" src="../../admin/common/libfreepbx.javascripts.js"></script>
-  </head>
-  <body>

freepbx/branches/2.6/install_amp

@@ -1042 +1042 @@
-
-// **** Apply amportal.conf configuration to files
-
+
+
+
+
-outn("Configuring install for your environment..");
-if (!$dryrun) {
@@ -1062 +1065 @@
-  //
-  outn("apply username/password changes to conf files..");
-
+
+
+
-  out("done");
-
-s
+
-    we need to make sure that we have such for everything that is in our configs. We will simply
-    look for the #include statements and touch the files vs. trying to inventory everything we may