Management of timezones at user level (see CT#599)

main/inc/lib/main_api.lib.php

@@ -4510,10 +4510,14 @@ function api_get_local_time($time, $format=null, $to_timezone=null, $from_timezo
 		if ($timezone_value !== null) {
 			$to_timezone = $timezone_value;
 		}
-		// Third, get the timezone based on user preference, if it exists
-		$timezone_user = UserManager::get_extra_user_data_by_field($_user['user_id'],'timezone');
-		if ($timezone_user['timezone'] != null) {
-			$to_timezone = $timezone_user['timezone'];
+		// If allowed by the administrator
+		$use_users_timezone = api_get_setting('use_users_timezone', 'timezones');
+		if ($use_users_timezone == 'true') {
+			// Get the timezone based on user preference, if it exists
+			$timezone_user = UserManager::get_extra_user_data_by_field($_user['user_id'],'timezone');
+			if ($timezone_user['timezone'] != null) {
+				$to_timezone = $timezone_user['timezone'];
+			}
 		}
 	}
 	// Determine the format

main/install/migrate-db-1.8.6.2-1.8.7-pre.sql

@@ -27,9 +27,9 @@ ALTER TABLE block ADD UNIQUE(path);
 INSERT INTO user_field(field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES(1, 'dashboard', 'Dashboard', 0, 0);
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES('show_tabs', 'dashboard', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsDashboard', 1);
 
-INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES('users_can_change_timezone', 'timezones', 'radio', 'Timezones', 'true', 'AllowUsersTimezoneTitle','AllowUsersTimezoneComment',NULL,'Timezones', 1);
-INSERT INTO settings_options (variable, value, display_text) VALUES ('users_can_change_timezone', 'true', 'Yes');
-INSERT INTO settings_options (variable, value, display_text) VALUES ('users_can_change_timezone', 'false', 'No');
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES('use_users_timezone', 'timezones', 'radio', 'Timezones', 'true', 'UseUsersTimezoneTitle','UseUsersTimezoneComment',NULL,'Timezones', 1);
+INSERT INTO settings_options (variable, value, display_text) VALUES ('use_users_timezone', 'true', 'Yes');
+INSERT INTO settings_options (variable, value, display_text) VALUES ('use_users_timezone', 'false', 'No');
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES('timezone_value', 'timezones', 'select', 'Timezones', 'UTC', 'TimezoneValueTitle','TimezoneValueComment',NULL,'Timezones', 1);
 
 ALTER TABLE user_field CHANGE tms tms DATETIME NOT NULL default '0000-00-00 00:00:00';

main/mySpace/myStudents.php

@@ -419,10 +419,11 @@ if (!empty ($_GET['student'])) {
 									</td>
 								</tr>
 <?php
-// Display timezone if the user selected one
+// Display timezone if the user selected one and if the admin allows the use of user's timezone
 $timezone = null;
 $timezone_user = UserManager::get_extra_user_data_by_field($info_user['user_id'],'timezone');
-if ($timezone_user['timezone'] != null) {
+$use_users_timezone = api_get_setting('use_users_timezone', 'timezones');
+if ($timezone_user['timezone'] != null && $use_users_timezone == 'true') {
 	$timezone = $timezone_user['timezone'];
 }
 if ($timezone !== null) {