drop some unneeded globals / variables

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12564 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 170a97de0ea81af4ca880892c6f4c68216248416..dc53c9abfb0d534ecb9c89c49fa73632233df4e0 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -210,7 +210,7 @@ function start_filters($hook_args) {
         $spamfilters = load_spam_filters();
 
         $AllowSpamFilters = false;
         $spamfilters = load_spam_filters();
 
         $AllowSpamFilters = false;

-        foreach($spamfilters as $filterskey=>$value) {
+        foreach($spamfilters as $value) {

             if ($value['enabled'] == SMPREF_ON) {
                 $AllowSpamFilters = true;
                 break;
             if ($value['enabled'] == SMPREF_ON) {
                 $AllowSpamFilters = true;
                 break;


@@ -429,7 +429,7 @@ function spam_filters($imap_stream) {
 
     $run = false;
 
 
     $run = false;
 

-    foreach ($filters as $Key => $Value) {
+    foreach ($filters as $Value) {

         if ($Value['enabled']) {
             $run = true;
             break;
         if ($Value['enabled']) {
             $run = true;
             break;

diff --git a/plugins/info/functions.php b/plugins/info/functions.php
index e48276b6294c1f7dde728b56041692ef11c1eb2a..4b7df25c25f1323fcb4911250b7c3264ee1b4c85 100644 (file)
--- a/plugins/info/functions.php
+++ b/plugins/info/functions.php
@@ -50,7 +50,7 @@ function imap_test($imap_stream, $string) {
  * @access private
  */
 function print_response($response) {
  * @access private
  */
 function print_response($response) {

-    foreach($response as $index=>$value) {
+    foreach($response as $value) {

         if (is_array($value)) {
             print_response($value);
         }
         if (is_array($value)) {
             print_response($value);
         }

diff --git a/plugins/listcommands/functions.php b/plugins/listcommands/functions.php
index 66a4f99bf93b83d98c5eb7ff5a4b03cc8a51a7fe..f2e6b8d29f463a6b28461cbce6521ea6600a1701 100644 (file)
--- a/plugins/listcommands/functions.php
+++ b/plugins/listcommands/functions.php
@@ -42,7 +42,6 @@ function get_non_rfc_lists() {
   */
 function plugin_listcommands_optpage_register_block_do()
 {
   */
 function plugin_listcommands_optpage_register_block_do()
 {

-

     global $optpage_blocks, $listcommands_allow_non_rfc_list_management;
 
     // only allow management of non-RFC lists if admin deems necessary
     global $optpage_blocks, $listcommands_allow_non_rfc_list_management;
 
     // only allow management of non-RFC lists if admin deems necessary


@@ -64,7 +63,7 @@ function plugin_listcommands_optpage_register_block_do()
  * internal function that builds mailing list links
  */
 function plugin_listcommands_menu_do() {
  * internal function that builds mailing list links
  */
 function plugin_listcommands_menu_do() {

-    global $passed_id, $passed_ent_id, $color, $mailbox, $message, 
+    global $passed_id, $passed_ent_id, $mailbox, $message, 

            $startMessage, $oTemplate, $listcommands_allow_non_rfc_list_management;
 
     @include_once(SM_PATH . 'plugins/listcommands/config.php');
            $startMessage, $oTemplate, $listcommands_allow_non_rfc_list_management;
 
     @include_once(SM_PATH . 'plugins/listcommands/config.php');

diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php
index 5ea8f17281fbba6338ec470b455203669625dab1..201d34b0f96b0a403564f974a463419d90cb6094 100644 (file)
--- a/plugins/sent_subfolders/setup.php
+++ b/plugins/sent_subfolders/setup.php
@@ -190,7 +190,7 @@ function save_option_sent_subfolders_setting($option) {
 function sent_subfolders_update_sentfolder() {
     global $sent_folder, $username;
     global $sent_subfolders_base, $sent_subfolders_setting;
 function sent_subfolders_update_sentfolder() {
     global $sent_folder, $username;
     global $sent_subfolders_base, $sent_subfolders_setting;

-    global $data_dir, $imapServerAddress, $imapPort, $color;
+    global $data_dir, $imapServerAddress, $imapPort;

     global $use_sent_subfolders, $move_to_sent;
 
     sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
     global $use_sent_subfolders, $move_to_sent;
 
     sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);