Commit 856a43d7 authored by Stuart McDonald's avatar Stuart McDonald Committed by Stuart McDonald

Small changes for fixes to (#3014) and (#3019) - exception handling for when...

Small changes for fixes to (#3014) and (#3019) - exception handling for when curl is missing being the main one
parent 7c290e02
......@@ -92,7 +92,7 @@ $networkingform = pieform(
),
'proxyfieldset' => array(
'type' => 'fieldset',
'legend' => get_string('proxylegend', 'admin'),
'legend' => get_string('proxysettings', 'admin'),
'elements' => array(
'proxyaddress' => array(
'type' => 'text',
......
......@@ -208,7 +208,7 @@ $string['promiscuousmodeenabled'] = 'Auto-register has been enabled. ';
$string['promiscuousmodedescription'] = 'Create an institution record for any host that connects to you, and allow its users to log on to Mahara';
$string['wwwroot'] = 'WWW Root';
$string['wwwrootdescription'] = 'This is the URL at which your users access this Mahara installation, and the URL the SSL keys are generated for';
$string['proxylegend'] = 'Proxy settings';
$string['proxysettings'] = 'Proxy settings';
$string['proxyaddress'] = 'Proxy address';
$string['proxyaddressdescription'] = 'If your site uses a proxy server to access the internet, specify the proxies in <em>hostname:portnumber</em> notation';
$string['proxyaddressset'] = 'Proxy address set';
......
......@@ -36,6 +36,7 @@ $string['xmlextensionnotloaded'] = 'Your server configuration does not include t
$string['gdextensionnotloaded'] = 'Your server configuration does not include the gd extension. Mahara requires this in order to perform resizes and other operations on uploaded images. Please make sure that it is loaded in php.ini, or install it if it is not installed.';
$string['gdfreetypenotloaded'] = 'Your server configuration of the gd extension does not include Freetype support. Mahara requires this to in order to build CAPTCHA images. Please make sure that gd is configured with it.';
$string['sessionextensionnotloaded'] = 'Your server configuration does not include the session extension. Mahara requires this in order to support users logging in. Please make sure that it is loaded in php.ini, or install it if it is not installed.';
$string['curllibrarynotinstalled'] = 'Your server configuration does not include the curl extension. Mahara requires this for Moodle integration and to retrieve external feeds. Please make sure that curl is loaded in php.ini, or install it if it is not installed.';
$string['registerglobals'] = 'You have dangerous PHP settings, register_globals is on. Mahara is trying to work around this, but you should really fix it';
$string['magicquotesgpc'] = 'You have dangerous PHP settings, magic_quotes_gpc is on. Mahara is trying to work around this, but you should really fix it';
$string['magicquotesruntime'] = 'You have dangerous PHP settings, magic_quotes_runtime is on. Mahara is trying to work around this, but you should really fix it';
......
......@@ -69,6 +69,10 @@ function ensure_sanity() {
throw new ConfigSanityException(get_string('sessionextensionnotloaded', 'error'));
}
if(!extension_loaded('curl')) {
throw new ConfigSanityException(get_string('curllibrarynotinstalled', 'error'));
}
//Check for freetype in the gd extension
$gd_info = gd_info();
if (!$gd_info['FreeType Support']) {
......
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