Commit 77a5317d authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie
Browse files
parents 562a3f7e 55722a64
......@@ -42,6 +42,12 @@ $siteoptionform = form(array(
'action' => '',
'ajaxpost' => true,
'elements' => array(
'sitename' => array(
'type' => 'text',
'title' => get_string('sitename'),
'description' => get_string('sitenamedescription'),
'defaultvalue' => get_config('sitename'),
),
'language' => array(
'type' => 'select',
'title' => get_string('language'),
......@@ -109,7 +115,7 @@ function siteoptions_fail($field) {
}
function siteoptions_submit($values) {
$fields = array('language','theme','pathtoclam',
$fields = array('sitename','language','theme','pathtoclam',
'allowpublicviews','artefactviewinactivitytime',
'contactaddress');
foreach ($fields as $field) {
......
......@@ -90,8 +90,8 @@ function contactus_submit($values) {
}
$to = new StdClass;
$to->firstname = 'sitename';
$to->lastname = 'Contact';
$to->firstname = get_config('sitename');
$to->lastname = 'contact email';
$to->email = $contactemail;
$fromnames = explode(' ',$values['name']);
......@@ -99,6 +99,7 @@ function contactus_submit($values) {
json_reply('local', get_string('nosendernamefound'));
}
$from = new StdClass;
//$from->preferredname = $values['name'];
$from->firstname = $fromnames[0];
$from->lastname = count($fromnames) < 2 ? $fromnames[0] : implode(' ',array_slice($fromnames,1));
$from->email = $values['email'];
......
......@@ -116,18 +116,20 @@ $string['artefactviewinactivitytimedescription'] = 'The time after which an inac
$string['contactaddress'] = 'Contact address';
$string['contactaddressdescription'] = 'The email address to which messages from the Contact Us form will be sent';
$string['language'] = 'Language';
$string['sitelanguagedescription'] = 'The default language for the site';
$string['pathtoclam'] = 'Path to clam';
$string['pathtoclamdescription'] = 'The filesystem path to clamscan or clamdscan';
$string['sessionlifetime'] = 'Session lifetime';
$string['sessionlifetimedescription'] = 'Time in minutes after which an inactive logged in user will be automatically logged out';
$string['theme'] = 'Theme';
$string['setsiteoptionsfailed'] = 'Failed setting the %s option';
$string['sitelanguagedescription'] = 'The default language for the site';
$string['sitename'] = 'Site name';
$string['sitenamedescription'] = 'The overall name of the site';
$string['siteoptionsset'] = 'Site options have been updated';
$string['sitethemedescription'] = 'The theme for the site';
$string['theme'] = 'Theme';
$string['updatesiteoptions'] = 'Update site options';
$string['viruschecking'] = 'Virus checking';
$string['viruscheckingdescription'] = 'If checked, virus checking will be enabled for all uploaded files using ClamAV';
$string['updatesiteoptions'] = 'Update site options';
$string['siteoptionsset'] = 'Site options have been updated';
$string['setsiteoptionsfailed'] = 'Failed setting the %s option';
// Expiry times
$string['noenddate'] = 'No end date';
$string['days'] = 'days';
......
......@@ -109,6 +109,9 @@ function &smarty($javascript = array(), $headers = array(), $strings = array())
$smarty->assign('THEMEURL', get_config('themeurl'));
$smarty->assign('WWWROOT', get_config('wwwroot'));
$sitename = get_config('sitename');
$smarty->assign('title', $sitename);
$smarty->assign('heading', $sitename);
if (defined('PUBLIC')) {
$smarty->assign('PUBLIC', true);
......
Supports Markdown
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