From: Philippe M. <phi...@us...> - 2002-01-31 12:00:03
|
Update of /cvsroot/squirrelmail/squirrelmail/src In directory usw-pr-cvs1:/tmp/cvs-serv3852/src Modified Files: load_prefs.php Log Message: All globals removed. hmmmm .... fasten seat belts .... Index: load_prefs.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/load_prefs.php,v retrieving revision 1.85 retrieving revision 1.86 diff -u -w -r1.85 -r1.86 --- load_prefs.php 2002/01/11 12:17:49 1.85 +++ load_prefs.php 2002/01/31 11:35:18 1.86 @@ -19,8 +19,6 @@ $username = ( !isset($username) ? '' : $username ); -global $theme, $chosen_theme, $color, $custom_css; - $custom_css = getPref($data_dir, $username, 'custom_css', 'none' ); $theme = ( !isset($theme) ? array() : $theme ); @@ -64,14 +62,12 @@ } } -if (!defined('download_php')) { session_register('theme_css'); } +if (!defined('download_php')) { + session_register('theme_css'); +} -global $use_javascript_addr_book; $use_javascript_addr_book = getPref($data_dir, $username, 'use_javascript_addr_book', $default_use_javascript_addr_book); -/* Declare the global variables for the special folders. */ -global $move_to_sent, $move_to_trash, $save_as_draft; - /* Load the user's special folder preferences */ $move_to_sent = getPref($data_dir, $username, 'move_to_sent', $default_move_to_sent); @@ -80,21 +76,20 @@ $save_as_draft = getPref($data_dir, $username, 'save_as_draft', $default_save_as_draft); -global $unseen_type, $unseen_notify; -if ($default_unseen_type == '') { $default_unseen_type = 1; } -if ($default_unseen_notify == '') { $default_unseen_notify = 2; } +if ($default_unseen_type == '') { + $default_unseen_type = 1; +} +if ($default_unseen_notify == '') { + $default_unseen_notify = 2; +} $unseen_type = getPref($data_dir, $username, 'unseen_type', $default_unseen_type); $unseen_notify = getPref($data_dir, $username, 'unseen_notify', $default_unseen_notify); -global $folder_prefix; $folder_prefix = getPref($data_dir, $username, 'folder_prefix', $default_folder_prefix); -/* Declare global variables for special folders. */ -global $trash_folder, $sent_folder, $draft_folder; - /* Load special folder - trash */ $load_trash_folder = getPref($data_dir, $username, 'trash_folder'); if (($load_trash_folder == '') && ($move_to_trash)) { @@ -119,7 +114,6 @@ $draft_folder = $load_draft_folder; } -global $show_num, $wrap_at, $left_size; $show_num = getPref($data_dir, $username, 'show_num', 15 ); $wrap_at = getPref( $data_dir, $username, 'wrap_at', 86 ); @@ -134,25 +128,21 @@ } } -global $editor_size, $use_signature, $prefix_sig; $editor_size = getPref($data_dir, $username, 'editor_size', 76 ); $use_signature = getPref($data_dir, $username, 'use_signature', SMPREF_OFF ); $prefix_sig = getPref($data_dir, $username, 'prefix_sig'); /* Load preferences for reply citation style. */ -global $reply_citation_style, $reply_citation_start, $reply_citation_end; $reply_citation_style = getPref($data_dir, $username, 'reply_citation_style', SMPREF_NONE ); $reply_citation_start = getPref($data_dir, $username, 'reply_citation_start'); $reply_citation_end = getPref($data_dir, $username, 'reply_citation_end'); -global $left_refresh, $sort; $left_refresh = getPref($data_dir, $username, 'left_refresh', SMPREF_NONE ); $sort = getPref($data_dir, $username, 'sort', 6 ); /** Load up the Signature file **/ -global $signature_abs; if ($use_signature) { $signature_abs = $signature = getSig($data_dir, $username); } else { @@ -160,7 +150,6 @@ } /* Highlight comes in with the form: name, color, header, value. */ -global $message_highlight_list; for ($i = 0; $hlt = getPref($data_dir, $username, "highlight$i"); ++$i) { $highlight_array = explode(',', $hlt); $message_highlight_list[$i]['name'] = $highlight_array[0]; @@ -170,7 +159,6 @@ } /* Index order lets you change the order of the message index */ -global $index_order; $order = getPref($data_dir, $username, 'order1'); for ($i = 1; $order; ++$i) { $index_order[$i] = $order; @@ -184,18 +172,14 @@ $index_order[5] = 4; } -global $alt_index_colors; $alt_index_colors = getPref($data_dir, $username, 'alt_index_colors', SMPREF_ON ); -global $location_of_bar, $location_of_buttons; $location_of_bar = getPref($data_dir, $username, 'location_of_bar', SMPREF_LOC_LEFT); $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons', SMPREF_LOC_BETWEEN); -global $collapse_folders, $show_html_default, $show_xmailer_default; -global $attachment_common_show_images, $pf_subtle_link, $pf_cleandisplay; $collapse_folders = getPref($data_dir, $username, 'collapse_folders', SMPREF_ON); @@ -209,26 +193,22 @@ $pf_subtle_link = getPref($data_dir, $username, 'pf_subtle_link', SMPREF_ON); $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', SMPREF_OFF); -global $include_self_reply_all; $include_self_reply_all = getPref($data_dir, $username, 'include_self_reply_all', SMPREF_ON); -global $page_selector, $page_selector_max; $page_selector = getPref($data_dir, $username, 'page_selector', SMPREF_ON); $page_selector_max = getPref($data_dir, $username, 'page_selector_max', 10); /* SqClock now in the core */ -global $date_format, $hour_format, $username, $data_dir; $date_format = getPref($data_dir, $username, 'date_format', 3); $hour_format = getPref($data_dir, $username, 'hour_format', 2); /* Load the javascript settings. */ -global $javascript_setting, $javascript_on; $javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT); $javascript_on = getPref($data_dir, $username, 'javascript_on', SMPREF_ON); + -global $search_memory; $search_memory = getPref($data_dir, $username, 'search_memory', 0); do_hook('loading_prefs'); |