diff --git a/app/modules/app_defaults.php b/app/modules/app_defaults.php index ca82a621af..47ec28fa8b 100644 --- a/app/modules/app_defaults.php +++ b/app/modules/app_defaults.php @@ -32,10 +32,31 @@ $obj->settings(); unset($obj); + //add the module object + $module = new modules; + $module->db = $db; + + //add the access control list to the database + $sql = "select * from v_modules "; + $sql .= "where module_order is null "; + $prep_statement = $db->prepare($sql); + if ($prep_statement) { + $prep_statement->execute(); + $modules = $prep_statement->fetchAll(PDO::FETCH_ASSOC); + foreach ($modules as &$row) { + //get the module details + $mod = $module->info($row['module_name']); + //update the module order + $sql = "update v_modules set "; + $sql .= "module_order = '".$mod['module_order']."', "; + $sql .= "where module_uuid = '".$row['module_uuid']."' "; + $db->exec(check_sql($sql)); + unset($sql); + } + } + //use the module class to get the list of modules from the db and add any missing modules if (isset($_SESSION['switch']['mod']['dir'])) { - $module = new modules; - $module->db = $db; $module->dir = $_SESSION['switch']['mod']['dir']; $module->get_modules(); $module->synch(); diff --git a/app/modules/resources/classes/modules.php b/app/modules/resources/classes/modules.php index 91a5788534..4262a48f0e 100644 --- a/app/modules/resources/classes/modules.php +++ b/app/modules/resources/classes/modules.php @@ -27,18 +27,20 @@ include "root.php"; //define the directory class class modules { - public $db; - public $dir; - public $fp; - public $modules; - public $msg; + //define the variables + public $db; + public $dir; + public $fp; + public $modules; + public $msg; - // get the additional information about a specific module + //get the additional information about a specific module public function info($name) { $module_label = substr($name, 4); $module_label = ucwords(str_replace("_", " ", $module_label)); $mod['module_label'] = $module_label; $mod['module_name'] = $name; + $mod['module_order'] = '800'; $mod['module_enabled'] = 'false'; $mod['module_default_enabled'] = 'false'; $mod['module_description'] = ''; @@ -698,12 +700,7 @@ include "root.php"; //append the module label $modules_new .= "
  • ".$mod['module_label']."
  • \n"; //set the order - if (isset($mod['module_order'])) { - $order = $mod['module_order']; - } - else { - $order = 800; - } + $order = $mod['module_order']; //insert the data $module_uuid = uuid(); $sql = "insert into v_modules ";