- Moved the locale settings from the user module to the locale module.

  Patch by Stefan.

- Moved the theme settings from the user module to the system module and
  made the code more intelligent.  Patch by Stefan.

1 files changed, 16 insertions, 0 deletions

diff --git a/modules/system/system.module b/modules/system/system.module
index cd25b0d79..ef465d1d7 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -84,6 +84,22 @@ function system_link($type) {
   }
 }
 
+function system_user($type, &$edit, $user) {
+  $options = "<option value=\"\"". (("" == $key) ? " selected=\"selected\"" : "") .">". t("Default theme") ."</option>\n";
+  if ($type == "edit_form" && count($themes = theme_list()) > 1) {
+    foreach ($themes as $key => $value) {
+      $options .= "<option value=\"$key\"". (($edit["theme"] == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n";
+    }
+    $output .= form_item(t("Theme"), "<select name=\"edit[theme]\">$options</select>", t("Selecting a different theme will change the look and feel of the site."));
+  }
+  if ($type == "edit_form") {
+    for ($zone = -43200; $zone <= 46800; $zone += 3600) $zones[$zone] = date(variable_get("date_format_long", "l, F dS, Y - g:ia"), time() - date("Z") + $zone) ." (GMT ". $zone / 3600 .")";
+    $output .= form_select(t("Time zone"), "timezone", $edit["timezone"], $zones, t("Select what time you currently have and your time zone settings will be set appropriate."));
+  }
+
+  return $output;
+}
+
 function system_view_general() {
   global $conf, $cmodes, $corder;