From: fidian Date: Thu, 19 Apr 2001 18:11:50 +0000 (+0000) Subject: * Made everything here global too to work with new include system X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=786923816699d76b81fed432d200878de17438c4 * Made everything here global too to work with new include system git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1258 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/config/conf.pl b/config/conf.pl index 1c03facb..1f221145 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1551,18 +1551,25 @@ sub save_data { print FILE "if (defined('config_php'))\n return;\n"; print FILE "define('config_php', true);\n\n"; + print FILE "\tglobal \$print_config_version, \$config_version, \$config_use_color;\n"; + if ($print_config_version) { print FILE "\t\$config_version = \"$print_config_version\";\n"; } print FILE "\t\$config_use_color = $config_use_color;\n"; print FILE "\n"; - + + print FILE "\tglobal \$org_name, \$org_logo, \$org_title;\n"; print FILE "\t\$org_name = \"$org_name\";\n"; print FILE "\t\$org_logo = \"$org_logo\";\n"; print FILE "\t\$org_title = \"$org_title\";\n"; print FILE "\n"; + print FILE "\tglobal \$domain, \$imapServerAddress, \$imapPort;\n"; + print FILE "\tglobal \$useSendmail, \$smtpServerAddress, \$smtpPort;\n"; + print FILE "\tglobal \$sendmail_path, \$use_authenticated_smtp, \$imap_server_type;\n"; + print FILE "\tglobal \$invert_time, \$optional_delimiter;\n"; print FILE "\t\$domain = \"$domain\";\n"; print FILE "\t\$imapServerAddress = \"$imapServerAddress\";\n"; print FILE "\t\$imapPort = $imapPort;\n"; @@ -1577,6 +1584,12 @@ sub save_data { print FILE "\n"; + print FILE "\tglobal \$default_folder_prefix, \$trash_folder, \$sent_folder;\n"; + print FILE "\tglobal \$default_move_to_trash, \$default_move_to_sent;\n"; + print FILE "\tglobal \$show_prefix_option, \$list_special_folders_first;\n"; + print FILE "\tglobal \$use_special_folder_color, \$auto_expunge, \$default_sub_of_inbox;\n"; + print FILE "\tglobal \$show_contain_subfolders_option, \$default_unseen_notify;\n"; + print FILE "\tglobal \$default_unseen_type;\n"; print FILE "\t\$default_folder_prefix = \"$default_folder_prefix\";\n"; print FILE "\t\$trash_folder = \"$trash_folder\";\n"; print FILE "\t\$sent_folder = \"$sent_folder\";\n"; @@ -1592,6 +1605,8 @@ sub save_data { print FILE "\t\$default_unseen_type = $default_unseen_type;\n"; print FILE "\n"; + print FILE "\tglobal \$default_charset, \$data_dir, \$attachment_dir;\n"; + print FILE "\tglobal \$default_left_size, \$force_username_lowercase;\n"; print FILE "\t\$default_charset = \"$default_charset\";\n"; print FILE "\t\$data_dir = \"$data_dir\";\n"; print FILE "\t\$attachment_dir = \"$attachment_dir\";\n"; @@ -1600,12 +1615,14 @@ sub save_data { print FILE "\n"; + print FILE "\tglobal \$plugins;\n"; for ($ct=0; $ct <= $#plugins; $ct++) { print FILE "\t\$plugins[$ct] = \"$plugins[$ct]\";\n"; } print FILE "\n"; + print FILE "\tglobal \$theme_css, \$theme;\n"; print FILE "\t\$theme_css = \"$theme_css\";\n"; for ($count=0; $count <= $#theme_name; $count++) { print FILE "\t\$theme[$count][\"PATH\"] = \"$theme_path[$count]\";\n"; @@ -1617,6 +1634,7 @@ sub save_data { if ($default_use_javascript_addr_book ne "true") { $default_use_javascript_addr_book = "false"; } + print FILE "\tglobal \$default_use_javascript_addr_book, \$ldap_server;\n"; print FILE "\t\$default_use_javascript_addr_book = $default_use_javascript_addr_book;\n"; for ($count=0; $count <= $#ldap_host; $count++) { print FILE "\t\$ldap_server[$count] = Array(\n"; @@ -1637,6 +1655,7 @@ sub save_data { print FILE ");\n\n"; } + print FILE "\tglobal \$motd;\n"; print FILE "\t\$motd = \"$motd\";\n"; print FILE "?>\n"; diff --git a/config/config_default.php b/config/config_default.php index 6e8fc5c4..6c227599 100644 --- a/config/config_default.php +++ b/config/config_default.php @@ -15,19 +15,24 @@ define('config_php', true); // don't change + global $config_version; $config_version = "x62"; // Organization's logo picture (blank if none) + global $org_logo; $org_logo = "../images/sm_logo.jpg"; // Organization's name + global $org_name; $org_name = "SquirrelMail"; // Webmail Title // This is the title that goes at the top of the browser window + global $org_title; $org_title = "SquirrelMail $version"; // The server that your imap server is on + global $imapServerAddress, $imapPort; $imapServerAddress = "localhost"; $imapPort = 143; @@ -35,22 +40,27 @@ // Example: in "luke@usa.om.org", usa.om.org is the domain. // this is for all the messages sent out. Reply address // is generated by $username@$domain + global $domain; $domain = "mydomain.com"; // Your SMTP server and port number (usually the same as the IMAP server) + global $smtpServerAddress, $smtpPort; $smtpServerAddress = "localhost"; $smtpPort = 25; // Uncomment this if you want to deliver locally using sendmail instead // of connecting to a SMTP-server +// global $useSendmail, $sendmail_path; // $useSendmail = true; // $sendmail_path = "/usr/sbin/sendmail"; // This is displayed right after they log in + global $motd; $motd = ""; // Whether or not to use a special color for special folders. If not, special // folders will be the same color as the other folders + global $use_special_folder_color; $use_special_folder_color = true; // The type of IMAP server you are running @@ -60,6 +70,7 @@ // cyrus // exchange // uw + global $imap_server_type; $imap_server_type = "cyrus"; // Many servers store mail in your home directory. With this, they @@ -74,9 +85,11 @@ // $default_folder_prefix = "Mail/folders/"; // // If you do not use this, please set it to "". + global $default_folder_prefix; $default_folder_prefix = ""; // If you do not wish to give them the option to change this, set it to false. // Otherwise, if it is true, they can change the folder prefix to be anything. + global $show_prefix_option; $show_prefix_option = false; // The following are related to deleting messages. @@ -96,6 +109,8 @@ // $sent_folder // - This is the path to where Sent messages will be stored. + global $default_move_to_trash, $default_move_to_sent, $trash_folder, + $auto_expunge, $sent_folder; $default_move_to_trash = true; $default_move_to_sent = true; $trash_folder = "INBOX.Trash"; @@ -108,6 +123,7 @@ // default mailboxes, but this obviously can be changed. To add one, // just add a new number to the array. + global $special_folders; $special_folders[0] = "INBOX"; // The first one has to be the inbox (whatever the name is) $special_folders[1] = $trash_folder; $special_folders[2] = $sent_folder; @@ -115,10 +131,12 @@ $special_folders[4] = "INBOX.Templates"; // Whether or not to list the special folders first (true/false) + global $list_special_folders_first; $list_special_folders_first = true; // Are all your folders subfolders of INBOX (i.e. cyrus IMAP server) // If you are not sure, set it to false. + global $default_sub_of_inbox; $default_sub_of_inbox = true; // Some IMAP daemons (UW) handle folders weird. They only allow a @@ -130,13 +148,14 @@ // If this option confuses you, make it "true". You can't hurt // anything if it's true, but some servers will respond weird if it's // false. (Cyrus works fine whether it's true OR false). - + global $show_contain_subfolders_option; $show_contain_subfolders_option = false; // This option controls what character set is used when sending mail // and when sending HTMl to the browser. Do not set this to US-ASCII, // use ISO-8859-1 instead. For cyrillic it is best to use KOI8-R, // since this implementation is faster than the alternatives. + global $default_charset; $default_charset = "iso-8859-1"; // Path to the data/ directory @@ -152,7 +171,7 @@ // // Relative (to the config directory): // $data_dir = "../data/"; - + global $data_dir; $data_dir = "../data/"; // Path to directory used for storing attachments while a mail is @@ -166,19 +185,19 @@ // is also impossible for the webserver to delete files lying around // there for too long. // - It should probably be another directory than data_dir. - + global $attachment_dir; $attachment_dir = $data_dir; // This is the default size of the folder list. Default is 150, // but you can set it to whatever you wish. - + global $default_left_size; $default_left_size = 150; // Some IMAP servers allow a username (like "bob") to log in if they use // uppercase in their name (like "Bob" or "BOB"). This creates extra // preference files. Toggling this option to true will transparently // change all usernames to lowercase. - + global $force_username_lowercase; $force_username_lowercase = false; @@ -190,6 +209,7 @@ // // To add a new theme to the options that users can choose from, just add // a new number to the array at the bottom, and follow the pattern. + global $theme; // The first one HAS to be here, and is your system's default theme. // It can be any theme you want @@ -247,6 +267,8 @@ // functions/abook_ldap_server.php for a list of possible // parameters // +global $ldap_server; +// // EXAMPLE: // // $ldap_server[0] = Array( @@ -260,7 +282,7 @@ // address book searching. // true = javascript // false = html - + global $default_use_javascript_addr_book; $default_use_javascript_addr_book = false; // these next two options set the defaults for the way that the users see @@ -272,7 +294,7 @@ // $default_unseen_type specifies the type of notification to give the // users by default. // 1=(4), 2=(4,25) - + global $default_unseen_notify, $default_unseen_type; $default_unseen_notify = 2; $default_unseen_type = 1; @@ -280,9 +302,10 @@ // value in your time structure and if you are in a time zone that // has a negative offset, you need to set this value to 1. // This is typically people in the US that are running Solaris 7. - + global $invert_time; $invert_time = false; + global $plugins; // To install plugins, just add elements to this array that have // the plugin directory name relative to the /plugins/ directory. // For instance, for the "sqclock" plugin, you'd put a line like