Merge "Provide sanity check warning for broken timezone formatting"

htdocs/admin/index.php

@@ -94,6 +94,16 @@ if (isset($register)) {
 $smarty->assign('closed', $closed);
 $smarty->assign('closeform', $closeform);
 
+// site warnings for the admin to consider
+$warnings = array();
+
+// Check if the host returns a usable value for the timezone identifier %z
+$tz_count = preg_match("/\+[0-9]{4}/", strftime("%z"));
+if ($tz_count == 0 || $tz_count == FALSE) {
+    $warnings[] = get_string('timezoneidentifierunusable', 'error');
+}
+$smarty->assign('warnings', $warnings);
+
 $smarty->display('admin/index.tpl');
 
 function close_site_submit(Pieform $form, $values) {

htdocs/lang/en.utf8/admin.php

@@ -128,6 +128,8 @@ $string['newfiltersdescription'] = 'If you have downloaded a new set of HTML fil
 $string['filtersinstalled'] = 'Filters installed.';
 $string['nofiltersinstalled'] = 'No html filters installed.';
 
+// sanity check warnings
+$string['warnings'] = 'Warning';
 
 // Group management
 $string['groupcategories'] = 'Group Categories';

htdocs/lang/en.utf8/error.php

@@ -118,4 +118,6 @@ $string['missingparamorder'] = 'Missing order specification';
 $string['missingparamid'] = 'Missing id';
 
 $string['themenameinvalid'] = "The name of the theme '%s' contains invalid characters.";
+
+$string['timezoneidentifierunusable'] = 'PHP on your website host does not return a useful value for the timezone identifier (%%z) - certain date formatting, such as the LEAP2A export, will be broken.';
 ?>

htdocs/lang/en.utf8/langconfig.php

@@ -41,7 +41,7 @@ $string['strftimerecent'] = '%%d %%b, %%k:%%M';
 $string['strftimerecentfull'] = '%%a, %%d %%b %%Y, %%l:%%M %%p';
 $string['strftimetime'] = '%%l:%%M %%p';
 $string['strfdaymonthyearshort'] = '%%d/%%m/%%Y';
-$string['strftimew3cdatetime'] = '%%Y-%%m-%%dT%%T%%z';
+$string['strftimew3cdatetime'] = '%%Y-%%m-%%dT%%H:%%I:%%S%%z';
 $string['strftimew3cdate'] = '%%Y-%%m-%%d';
 $string['thislanguage'] = 'English';
 $string['locales'] = 'en_US.utf8,en_GB.utf8,en,english-us,english-uk,english';

htdocs/theme/raw/static/style/admin.css

@@ -664,3 +664,15 @@ form#uploadcsv {
 #edituser_institution tr.submit td {
 	padding-top: 5px;
 }
+
+/* warnings for the admin screen */
+.admin-warning-box {
+    border: 1px solid #e98a88;
+    background: #fbeceb;
+    margin-bottom: 5px;
+    padding: 5px;
+}
+
+.admin-warning-box h3 {
+    color: #CA0000;
+}

htdocs/theme/raw/templates/admin/index.tpl

 {include file='header.tpl'}
 
+{if $warnings}
+<div class="admin-warning-box">
+<h3>{str tag="warnings" section=admin}</h3>
+<ul>
+{foreach from=$warnings key=key item=warning}
+    <li>{$warning}</li>
+{/foreach}
+</ul>
+</div>
+{/if}
+
 <div id="adminhome">
 {if $register}
 <div class="message" id="register-site">