dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the class name from switch_modules to modules.

Browse Source
This commit is contained in:
Mark Crane
2014-11-23 09:45:10 +00:00
parent ed2e1da871
commit e3dd425f8f
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/app_defaults.php
+1 -1
View File
@@ -27,7 +27,7 @@
//use the module class to get the list of modules from the db and add any missing modules //use the module class to get the list of modules from the db and add any missing modules
if ($domains_processed == 1) { if ($domains_processed == 1) {
$mod = new switch_modules; $mod = new modules;
$mod->db = $db; $mod->db = $db;
$mod->dir = $_SESSION['switch']['mod']['dir']; $mod->dir = $_SESSION['switch']['mod']['dir'];
$mod->get_modules(); $mod->get_modules();
app/modules/modules.php
+1 -1
View File
@@ -69,7 +69,7 @@ if (strlen($_GET["a"]) > 0) {
} }
//use the module class to get the list of modules from the db and add any missing modules //use the module class to get the list of modules from the db and add any missing modules
$mod = new switch_modules; $mod = new modules;
$mod->db = $db; $mod->db = $db;
$mod->dir = $_SESSION['switch']['mod']['dir']; $mod->dir = $_SESSION['switch']['mod']['dir'];
$mod->get_modules(); $mod->get_modules();
app/modules/resources/classes/modules.php
+2 -2
View File
@@ -28,7 +28,7 @@ include "root.php";
//add the database structure //add the database structure
/* /*
require_once "resources/classes/modules.php"; require_once "resources/classes/modules.php";
$mod = new switch_modules; $mod = new modules;
$mod->dir = $_SESSION['switch']['mod']['dir']; $mod->dir = $_SESSION['switch']['mod']['dir'];
echo $mod->dir."\n"; echo $mod->dir."\n";
//database connection object //database connection object
@@ -65,7 +65,7 @@ echo $mod->dir."\n";
*/ */
//define the directory class //define the directory class
class switch_modules { class modules {
public $db; public $db;
public $dir; public $dir;
public $fp; public $fp;
app/system/system.php
+1 -6
View File
@@ -336,14 +336,9 @@ echo "<br />";
echo " </tr>\n"; echo " </tr>\n";
$mc_fail = false; $mc_fail = false;
$mod = new modules;
require_once "resources/classes/modules.php";
$mod = new switch_modules;
if ($mod -> active("mod_memcache")) { if ($mod -> active("mod_memcache")) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
if ($fp) { if ($fp) {
$switch_cmd = "memcache status verbose"; $switch_cmd = "memcache status verbose";
$switch_result = event_socket_request($fp, 'api '.$switch_cmd); $switch_result = event_socket_request($fp, 'api '.$switch_cmd);