Commit eb8070d3 authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie

Added checking for if the internal plugins are installed.

parent be38eb8f
...@@ -100,6 +100,7 @@ try { ...@@ -100,6 +100,7 @@ try {
$db->SetFetchMode(ADODB_FETCH_ASSOC); $db->SetFetchMode(ADODB_FETCH_ASSOC);
configure_dbconnection(); configure_dbconnection();
ensure_internal_plugins_exist();
ob_end_clean(); ob_end_clean();
} }
......
...@@ -58,7 +58,7 @@ function ensure_sanity() { ...@@ -58,7 +58,7 @@ function ensure_sanity() {
// register globals workaround // register globals workaround
if (ini_get_bool('register_globals')) { if (ini_get_bool('register_globals')) {
log_environ(get_string('registerglobals', 'error')); log_environ(get_string('registerglobals', 'error'));
$massivearray = array_keys(array_merge($_POST,$_GET,$_COOKIE,$_SERVER,$_REQUEST,$_FILES)); $massivearray = array_keys(array_merge($_POST, $_GET, $_COOKIE, $_SERVER, $_REQUEST, $_FILES));
foreach ($massivearray as $tounset) { foreach ($massivearray as $tounset) {
unset($GLOBALS[$tounset]); unset($GLOBALS[$tounset]);
} }
...@@ -120,16 +120,26 @@ function ensure_sanity() { ...@@ -120,16 +120,26 @@ function ensure_sanity() {
throw new ConfigSanityException(get_string('datarootnotwritable', 'error', get_config('dataroot'))); throw new ConfigSanityException(get_string('datarootnotwritable', 'error', get_config('dataroot')));
} }
// Json functions not available // @todo the results of these should be checked
//if (!function_exists('json_encode') || !function_exists('json_decode')) {
// throw new ConfigSanityException(get_string('jsonextensionnotloaded', 'error'));
//}
check_dir_exists(get_config('dataroot').'smarty/compile'); check_dir_exists(get_config('dataroot').'smarty/compile');
check_dir_exists(get_config('dataroot').'smarty/cache'); check_dir_exists(get_config('dataroot').'smarty/cache');
} }
/**
* Check to see if the internal plugins are installed. Die if they are not.
*/
function ensure_internal_plugins_exist() {
// Internal things installed
if (!get_config('installed')) {
foreach (plugin_types() as $type) {
if (!record_exists($type . '_installed', 'name', 'internal')) {
throw new ConfigSanityException(get_string($type . 'notinstalled'));
}
}
}
}
function get_string($identifier, $section='mahara') { function get_string($identifier, $section='mahara') {
$langconfigstrs = array('parentlanguage', 'strftimedate', 'strftimedateshort', 'strftimedatetime', $langconfigstrs = array('parentlanguage', 'strftimedate', 'strftimedateshort', 'strftimedatetime',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment