Changeset 2993

Timestamp:

11/04/06 19:03:49 (5 years ago)

Author:

qldrob

Message:

Merged revisions 2990-2992 via svnmerge from
https://svn.sourceforge.net/svnroot/amportal/freepbx/trunk

........

r2991 | gregmac | 2006-11-05 05:01:47 +1000 (Sun, 05 Nov 2006) | 2 lines

Require reload after module install/uninstall/enable/disable

........

r2992 | gregmac | 2006-11-05 06:55:03 +1000 (Sun, 05 Nov 2006) | 2 lines

Fix php errors in #1277

........

Files:

• freepbx/branches/2.2 (modified) (1 prop)
• freepbx/branches/2.2/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/branches/2.2/amp_conf/htdocs/admin/functions.inc.php (modified) (6 diffs)

freepbx/branches/2.2/amp_conf/bin/retrieve_conf

@@ -395 +395 @@
-        if ($file[0] != '.') {
-          if (file_exists(addslash($targetdir).$file)) {
-
+
+
+
-              freepbx_log('retrieve-conf', 'error', addslash($targetdir).$file.' already exists, and is linked to something else!');
-            } else {

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

@@ -1456 +1456 @@
-  // disabled (but doesn't needupgrade or need install), and meets dependencies
-  _module_setenabled($modulename, true);
+  needreload();
-  return true;
-}
@@ -1603 +1604 @@
-function module_install($modulename, $force = false) {
-  $modules = module_getinfo($modulename);
-  if (($modules[$modulename]['status'] == MODULE_STATUS_NOTINSTALLED) || 
-      ($modules[$modulename]['status'] == MODULE_STATUS_NEEDUPGRADE)) {
-  }
-  global $db, $amp_conf;
-  
@@ -1671 +1669 @@
-  
-  // module is now installed & enabled
+  needreload();
-  return true;
-}
@@ -1696 +1695 @@
-  
-  _module_setenabled($modulename, false);
+  needreload();
-  return true;
-}
@@ -1732 +1732 @@
-  }
-  
+  needreload();
-  return true;
-}
@@ -1768 +1769 @@
-  }
-  
+  // uninstall will have called needreload() if necessary
-  return true;
-}