Indentation and XHTML fix

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

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index 08aad32bec9156c4bf37278ce8d0bcfae477909f..c7af2d8bbf067243a2c67f979ec1c710f1caa0da 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -45,7 +45,7 @@ function parseConfig( $cfg_file ) {
                 break;
             case 'K':
                 // Key detect
                 break;
             case 'K':
                 // Key detect

-                if( $line{$j} == ' ' ) {
+                if ( $line{$j} == ' ' ) {

                     $mode = '=';
                 } else {
                     $key .= $line{$j};
                     $mode = '=';
                 } else {
                     $key .= $line{$j};


@@ -172,43 +172,43 @@ function change_to_rel_path($old_path) {
  * @access private
 */     
 function change_to_sm_path($old_path) {
  * @access private
 */     
 function change_to_sm_path($old_path) {

-   if ( $old_path === '' || $old_path == "''" ) {
-     return "''";
-   } elseif ( preg_match("/^(\/|http)/", $old_path) ) {
-     return "'" . $old_path . "'";
-   } elseif ( preg_match("/^(\$|SM_PATH)/", $old_path) ) {
-     return $old_path;
-   }
+    if ( $old_path === '' || $old_path == "''" ) {
+        return "''";
+    } elseif ( preg_match("/^(\/|http)/", $old_path) ) {
+        return "'" . $old_path . "'";
+    } elseif ( preg_match("/^(\$|SM_PATH)/", $old_path) ) {
+        return $old_path;
+    }

    
    

-   $new_path = '';
-   $rel_path = explode("../", $old_path);
-   if ( count($rel_path) > 2 ) {
-     // Since we're relative to the config dir, 
-     // more than 1 ../ puts us OUTSIDE the SM tree.
-     // get full path to config.php, then pop the filename
-     $abs_path = explode('/', realpath (SM_PATH . 'config/config.php'));
-     array_pop ($abs_path); 
-     foreach ( $rel_path as $subdir ) {
-       if ( $subdir === '' ) {
-         array_pop ($abs_path);
-       } else {
-         array_push($abs_path, $subdir);
-       }
-     }
-     foreach ($abs_path as $subdir) {
-       $new_path .= $subdir . '/';
-     }
-     $new_path = "'$new_path'";
-   } elseif ( count($rel_path) > 1 ) {
-     // we're within the SM tree, prepend SM_PATH
-     $new_path = str_replace('../',"SM_PATH . '", $old_path . "'");
-   } else {
-     // Last, if it's a relative path without a .. prefix, 
-     // we're somewhere within the config dir, so prepend
-     //  SM_PATH . 'config/  
-     $new_path = "SM_PATH . 'config/" . $old_path . "'";
-   }
-   return $new_path;
+    $new_path = '';
+    $rel_path = explode("../", $old_path);
+    if ( count($rel_path) > 2 ) {
+        // Since we're relative to the config dir, 
+        // more than 1 ../ puts us OUTSIDE the SM tree.
+        // get full path to config.php, then pop the filename
+        $abs_path = explode('/', realpath (SM_PATH . 'config/config.php'));
+        array_pop ($abs_path); 
+        foreach ( $rel_path as $subdir ) {
+            if ( $subdir === '' ) {
+                array_pop ($abs_path);
+            } else {
+                array_push($abs_path, $subdir);
+            }
+        }
+        foreach ($abs_path as $subdir) {
+            $new_path .= $subdir . '/';
+        }
+        $new_path = "'$new_path'";
+    } elseif ( count($rel_path) > 1 ) {
+        // we're within the SM tree, prepend SM_PATH
+        $new_path = str_replace('../',"SM_PATH . '", $old_path . "'");
+    } else {
+        // Last, if it's a relative path without a .. prefix, 
+        // we're somewhere within the config dir, so prepend
+        //  SM_PATH . 'config/  
+        $new_path = "SM_PATH . 'config/" . $old_path . "'";
+    }
+    return $new_path;

 }
 
 
 }
 
 


@@ -259,24 +259,23 @@ $colapse = array( 'Titles' => 'off',
 /* look in $_GET array for 'switch' */
 if ( sqgetGlobalVar('switch', $switch, SQ_GET) ) {
     if ( $colapse[$switch] == 'on' ) {
 /* look in $_GET array for 'switch' */
 if ( sqgetGlobalVar('switch', $switch, SQ_GET) ) {
     if ( $colapse[$switch] == 'on' ) {

-       $colapse[$switch] = 'off';
+        $colapse[$switch] = 'off';

     } else {
     } else {

-       $colapse[$switch] = 'on';
+        $colapse[$switch] = 'on';

     }
     setPref($data_dir, $username, "adm_$switch", $colapse[$switch] );
 }
 
 echo '<form action="options.php" method="post" name="options">' .
     }
     setPref($data_dir, $username, "adm_$switch", $colapse[$switch] );
 }
 
 echo '<form action="options.php" method="post" name="options">' .

-    "<center><table width=\"95%\" bgcolor=\"$color[5]\"><tr><td>".
-    "<table width=\"100%\" cellspacing=\"0\" bgcolor=\"$color[4]\">" ,
-    "<tr bgcolor=\"$color[5]\"><th colspan=\"2\">" . _("Configuration Administrator") . "</th></tr>",
-    "<tr bgcolor=\"$color[5]\"><td colspan=\"2\" align=\"center\">";
-
-echo "<small>";
-echo _("Note: it is recommended that you configure your system using conf.pl, and not this plugin. conf.pl contains additional information regarding the purpose of variables and appropriate values, as well as additional verification steps.");
-echo "<br />";
-echo _("Run or consult conf.pl should you run into difficulty with your configuration.");
-echo "</small></td></tr>";
+     '<center><table width="95%" bgcolor="'.$color[5].'"><tr><td>'.
+     '<table width="100%" cellspacing="0" bgcolor="'.$color[4].'">'.
+     '<tr bgcolor="'.$color[5].'"><th colspan="2">'.
+     _("Configuration Administrator").'</th></tr>'.
+     '<tr bgcolor="'.$color[5].'"><td colspan="2" align="center"><small>'.
+     _("Note: it is recommended that you configure your system using conf.pl, and not this plugin. conf.pl contains additional information regarding the purpose of variables and appropriate values, as well as additional verification steps.").
+     '<br />'.
+     _("Run or consult conf.pl should you run into difficulty with your configuration.").
+     '</small></td></tr>';

 
 
 $act_grp = 'Titles';  /* Active group */
 
 
 $act_grp = 'Titles';  /* Active group */


@@ -318,7 +317,7 @@ foreach ( $newcfg as $k => $v ) {
         $type = SMOPT_TYPE_LDAP;
     }
 
         $type = SMOPT_TYPE_LDAP;
     }
 

-    if( $type == SMOPT_TYPE_TITLE || $colapse[$act_grp] == 'off' ) {
+    if ( $type == SMOPT_TYPE_TITLE || $colapse[$act_grp] == 'off' ) {

 
         switch ( $type ) {
         case SMOPT_TYPE_LDAP:
 
         switch ( $type ) {
         case SMOPT_TYPE_LDAP:


@@ -329,7 +328,7 @@ foreach ( $newcfg as $k => $v ) {
         case SMOPT_TYPE_EXTERNAL:
             echo "<tr><td>$name</td><td><b>" .
                  $defcfg[$k]['value'] .
         case SMOPT_TYPE_EXTERNAL:
             echo "<tr><td>$name</td><td><b>" .
                  $defcfg[$k]['value'] .

-                 "</b></td></tr>";
+                 '</b></td></tr>';

             break;
         case SMOPT_TYPE_TITLE:
             if ( $colapse[$k] == 'on' ) {
             break;
         case SMOPT_TYPE_TITLE:
             if ( $colapse[$k] == 'on' ) {


@@ -337,9 +336,9 @@ foreach ( $newcfg as $k => $v ) {
             } else {
                 $sw = '(-)';
             }
             } else {
                 $sw = '(-)';
             }

-            echo "<tr bgcolor=\"$color[0]\"><th colspan=\"2\">" .
-                 "<a href=\"options.php?switch=$k\" style=\"text-decoration:none\"><b>$sw</b> </a>" .
-                 "$name</th></tr>";
+            echo '<tr bgcolor="'.$color[0].'"><th colspan="2">'.
+                 "<a href=\"options.php?switch=$k\" style=\"text-decoration:none\">".
+                 '<b>'.$sw.'</b></a> '.$name.'</th></tr>';

             $act_grp = $k;
             break;
         case SMOPT_TYPE_COMMENT:
             $act_grp = $k;
             break;
         case SMOPT_TYPE_COMMENT:


@@ -353,13 +352,13 @@ foreach ( $newcfg as $k => $v ) {
             echo "</td></tr>\n";
             break;
         case SMOPT_TYPE_INTEGER:
             echo "</td></tr>\n";
             break;
         case SMOPT_TYPE_INTEGER:

-           /* look for variable $e in POST, fill into $v */
+            /* look for variable $e in POST, fill into $v */

             if ( sqgetGlobalVar($e, $v, SQ_POST) ) {
                 $v = intval( $v );
                 $newcfg[$k] = $v;
             }
             echo "<tr><td>$name</td><td>".
             if ( sqgetGlobalVar($e, $v, SQ_POST) ) {
                 $v = intval( $v );
                 $newcfg[$k] = $v;
             }
             echo "<tr><td>$name</td><td>".

-                 "<input size=\"10\" name=\"adm_$n\" value=\"$v\">";
+                 "<input size=\"10\" name=\"adm_$n\" value=\"$v\" />";

             if ( isset( $defcfg[$k]['comment'] ) ) {
                 echo ' &nbsp; ' . $defcfg[$k]['comment'];
             }
             if ( isset( $defcfg[$k]['comment'] ) ) {
                 echo ' &nbsp; ' . $defcfg[$k]['comment'];
             }


@@ -374,7 +373,7 @@ foreach ( $newcfg as $k => $v ) {
             foreach ( $defcfg[$k]['posvals'] as $kp => $vp ) {
                 echo "<option value=\"$kp\"";
                 if ( $kp == $v ) {
             foreach ( $defcfg[$k]['posvals'] as $kp => $vp ) {
                 echo "<option value=\"$kp\"";
                 if ( $kp == $v ) {

-                    echo ' selected';
+                    echo ' selected="selected"';

                 }
                 echo ">$vp</option>";
             }
                 }
                 echo ">$vp</option>";
             }


@@ -394,7 +393,7 @@ foreach ( $newcfg as $k => $v ) {
             foreach ( $defcfg[$k]['posvals'] as $kp => $vp ) {
                 echo "<option value=\"$kp\"";
                 if ( $kp == substr( $v, 1, strlen( $v ) - 2 ) ) {
             foreach ( $defcfg[$k]['posvals'] as $kp => $vp ) {
                 echo "<option value=\"$kp\"";
                 if ( $kp == substr( $v, 1, strlen( $v ) - 2 ) ) {

-                    echo ' selected';
+                    echo ' selected="selected"';

                 }
                 echo ">$vp</option>";
             }
                 }
                 echo ">$vp</option>";
             }


@@ -427,7 +426,7 @@ foreach ( $newcfg as $k => $v ) {
                 $newcfg[$k] = $v;
             }
             echo "<tr><td>$name</td><td>".
                 $newcfg[$k] = $v;
             }
             echo "<tr><td>$name</td><td>".

-                 "<input size=\"$size\" name=\"adm_$n\" value=\"" . substr( $v, 1, strlen( $v ) - 2 ) . "\">";
+                 "<input size=\"$size\" name=\"adm_$n\" value=\"" . substr( $v, 1, strlen( $v ) - 2 ) . '" />';

             if ( isset( $defcfg[$k]['comment'] ) ) {
                 echo ' &nbsp; ' . $defcfg[$k]['comment'];
             }
             if ( isset( $defcfg[$k]['comment'] ) ) {
                 echo ' &nbsp; ' . $defcfg[$k]['comment'];
             }


@@ -440,21 +439,21 @@ foreach ( $newcfg as $k => $v ) {
                 $v = strtoupper( $v );
             }
             if ( $v == 'TRUE' ) {
                 $v = strtoupper( $v );
             }
             if ( $v == 'TRUE' ) {

-                $ct = ' checked';
+                $ct = ' checked="checked"';

                 $cf = '';
             } else {
                 $ct = '';
                 $cf = '';
             } else {
                 $ct = '';

-                $cf = ' checked';
+                $cf = ' checked="checked"';

             }
             echo "<tr><td>$name</td><td>" .
             }
             echo "<tr><td>$name</td><td>" .

-                 "<input$ct type=\"radio\" name=\"adm_$n\" value=\"TRUE\">" . _("Yes") .
-                 "<input$cf type=\"radio\" name=\"adm_$n\" value=\"FALSE\">" . _("No");
+                 "<input$ct type=\"radio\" name=\"adm_$n\" value=\"TRUE\" />" . _("Yes") .
+                 "<input$cf type=\"radio\" name=\"adm_$n\" value=\"FALSE\" />" . _("No");

             if ( isset( $defcfg[$k]['comment'] ) ) {
                 echo ' &nbsp; ' . $defcfg[$k]['comment'];
             }
             echo "</td></tr>\n";
             break;
             if ( isset( $defcfg[$k]['comment'] ) ) {
                 echo ' &nbsp; ' . $defcfg[$k]['comment'];
             }
             echo "</td></tr>\n";
             break;

-       case SMOPT_TYPE_PATH:
+        case SMOPT_TYPE_PATH:

             if (  sqgetGlobalVar($e, $v, SQ_POST) ) {
                $v = change_to_sm_path($v);
                $newcfg[$k] = $v;
             if (  sqgetGlobalVar($e, $v, SQ_POST) ) {
                $v = change_to_sm_path($v);
                $newcfg[$k] = $v;


@@ -463,13 +462,13 @@ foreach ( $newcfg as $k => $v ) {
                $v = change_to_sm_path($defcfg[$k]['default']);
                $newcfg[$k] = $v;
             }
                $v = change_to_sm_path($defcfg[$k]['default']);
                $newcfg[$k] = $v;
             }

-           echo "<tr><td>$name</td><td>".
-                 "<input size=\"$size\" name=\"adm_$n\" value=\"" . change_to_rel_path($v) . "\">";
+            echo "<tr><td>$name</td><td>".
+                 "<input size=\"$size\" name=\"adm_$n\" value=\"" . change_to_rel_path($v) . '" />';

             if ( isset( $defcfg[$k]['comment'] ) ) {
                  echo ' &nbsp; ' . $defcfg[$k]['comment'];
             }
             if ( isset( $defcfg[$k]['comment'] ) ) {
                  echo ' &nbsp; ' . $defcfg[$k]['comment'];
             }

-           echo "</td></tr>\n";
-           break;
+            echo "</td></tr>\n";
+            break;

         default:
             echo "<tr><td>$name</td><td>" .
                  "<b><i>$v</i></b>";
         default:
             echo "<tr><td>$name</td><td>" .
                  "<b><i>$v</i></b>";


@@ -501,15 +500,15 @@ if ( $colapse['Group7'] == 'off' ) {
         $e2 = "theme_path_$i";
         if (  sqgetGlobalVar($e, $v2, SQ_POST) ) {
             $v2 = change_to_sm_path($v2);
         $e2 = "theme_path_$i";
         if (  sqgetGlobalVar($e, $v2, SQ_POST) ) {
             $v2 = change_to_sm_path($v2);

-           $newcfg[$k2] = $v2;
+            $newcfg[$k2] = $v2;

         } else {
             $v2 = $newcfg[$k2];
         }
         $name = substr( $v1, 1, strlen( $v1 ) - 2 );
         $path = change_to_rel_path($v2);
         echo '<tr>'.
         } else {
             $v2 = $newcfg[$k2];
         }
         $name = substr( $v1, 1, strlen( $v1 ) - 2 );
         $path = change_to_rel_path($v2);
         echo '<tr>'.

-             "<td align=\"right\">$i. <input name=\"$e1\" value=\"$name\" size=\"30\"></td>".
-             "<td><input name=\"$e2\" value=\"$path\" size=\"40\"></td>".
+             "<td align=\"right\">$i. <input name=\"$e1\" value=\"$name\" size=\"30\" /></td>".
+             "<td><input name=\"$e2\" value=\"$path\" size=\"40\" /></td>".

              "</tr>\n";
         $i++;
 
              "</tr>\n";
         $i++;
 


@@ -522,88 +521,90 @@ if ( $colapse['Group8'] == 'on' ) {
 } else {
     $sw = '(-)';
 }
 } else {
     $sw = '(-)';
 }

-echo "<tr bgcolor=\"$color[0]\"><th colspan=\"2\">" .
-     "<a href=\"options.php?switch=Group8\" style=\"text-decoration:none\"><b>$sw</b> </a>" .
-     _("Plugins") . '</th></tr>';
-
-if( $colapse['Group8'] == 'off' ) {
-
-  $plugpath = SM_PATH . 'plugins/';
-  if ( file_exists($plugpath) ) {
-      $fd = opendir( $plugpath );
-      $op_plugin = array();
-      $p_count = 0;
-      while (false !== ($file = readdir($fd))) {
-        if ($file != '.' && $file != '..' && $file != 'CVS' && is_dir($plugpath . $file) ) {
-            $op_plugin[] = $file;
-            $p_count++;
-        }
-      }
-      closedir($fd);
-      asort( $op_plugin );
-
-      /* Lets get the plugins that are active */
-      $plugins = array();
-      if (  sqgetGlobalVar('plg', $v, SQ_POST) ) {
-        foreach ( $op_plugin as $plg ) {
-            if (  sqgetGlobalVar("plgs_$plg", $v, SQ_POST) && $v == 'on' ) {
-                $plugins[] = $plg;
+echo '<tr bgcolor="'.$color[0].'"><th colspan="2">'.
+     '<a href="options.php?switch=Group8" style="text-decoration:none"><b>'.
+     $sw.'</b></a> '._("Plugins").'</th></tr>';
+
+if ( $colapse['Group8'] == 'off' ) {
+
+    $plugpath = SM_PATH . 'plugins/';
+    if ( file_exists($plugpath) ) {
+        $fd = opendir( $plugpath );
+        $op_plugin = array();
+        $p_count = 0;
+        while (false !== ($file = readdir($fd))) {
+            if ($file != '.' && $file != '..' && $file != 'CVS' && is_dir($plugpath . $file) ) {
+                $op_plugin[] = $file;
+                $p_count++;

             }
         }
             }
         }

-        $i = 0;
-        foreach ( $plugins as $plg ) {
-            $k = "\$plugins[$i]";
-            $newcfg[$k] = "'$plg'";
-            $i++;
-        }
-        while ( isset( $newcfg["\$plugins[$i]"] ) ) {
-            $k = "\$plugins[$i]";
-            $newcfg[$k] = '';
-            $i++;
-        }
-      } else {
-        $i = 0;
-        while ( isset( $newcfg["\$plugins[$i]"] ) ) {
-            $k = "\$plugins[$i]";
-            $v = $newcfg[$k];
-            $plugins[] = substr( $v, 1, strlen( $v ) - 2 );
-            $i++;
-        }
-      }
-      echo "<tr><td colspan=\"2\"><input type=\"hidden\" name=\"plg\" value=\"on\"><center><table>";
-      foreach ( $op_plugin as $plg ) {
-        if ( in_array( $plg, $plugins ) ) {
-            $sw = ' checked';
+        closedir($fd);
+        asort( $op_plugin );
+
+        /* Lets get the plugins that are active */
+        $plugins = array();
+        if (  sqgetGlobalVar('plg', $v, SQ_POST) ) {
+            foreach ( $op_plugin as $plg ) {
+                if (  sqgetGlobalVar("plgs_$plg", $v, SQ_POST) && $v == 'on' ) {
+                    $plugins[] = $plg;
+                }
+            }
+            $i = 0;
+            foreach ( $plugins as $plg ) {
+                $k = "\$plugins[$i]";
+                $newcfg[$k] = "'$plg'";
+                $i++;
+            }
+            while ( isset( $newcfg["\$plugins[$i]"] ) ) {
+                $k = "\$plugins[$i]";
+                $newcfg[$k] = '';
+                $i++;
+            }

         } else {
         } else {

-            $sw = '';
+            $i = 0;
+            while ( isset( $newcfg["\$plugins[$i]"] ) ) {
+                $k = "\$plugins[$i]";
+                $v = $newcfg[$k];
+                $plugins[] = substr( $v, 1, strlen( $v ) - 2 );
+                $i++;
+            }

         }
         }

-        echo '<tr><td>';
-       if (file_exists(SM_PATH . "plugins/$plg/README")) {
-           echo "<a href=\"../$plg/README\" target=\"_blank\">$plg</a>";
-       } else {
-           echo $plg;
-       }
-       echo "</td>\n".
-            "<td><input$sw type=\"checkbox\" name=\"plgs_$plg\"></td>".
-             "</tr>\n";
-      }
-      echo '</table></center></td></tr>';
-  } else {
-      echo '<tr><td colspan="2" align="center">' . sprintf(_("Plugin directory could not be found: %s"),$plugpath) . "</td></tr>\n";
-  }
+        echo '<tr><td colspan="2"><input type="hidden" name="plg" value="on" /><center><table>';
+        foreach ( $op_plugin as $plg ) {
+            if ( in_array( $plg, $plugins ) ) {
+                $sw = ' checked="checked"';
+            } else {
+                $sw = '';
+            }
+            echo '<tr><td>';
+            if (file_exists(SM_PATH . "plugins/$plg/README")) {
+                echo "<a href=\"../$plg/README\" target=\"_blank\">$plg</a>";
+            } else {
+                echo $plg;
+            }
+            echo "</td>\n".
+                 "<td><input$sw type=\"checkbox\" name=\"plgs_$plg\" /></td>".
+                 "</tr>\n";
+        }
+        echo '</table></center></td></tr>';
+    } else {
+        echo '<tr><td colspan="2" align="center">'.
+             sprintf(_("Plugin directory could not be found: %s"), $plugpath).
+             "</td></tr>\n";
+    }

 }
 }

-echo "<tr bgcolor=\"$color[5]\"><th colspan=\"2\"><input value=\"" .
-     _("Change Settings") . '" type="submit"><br />'.
-     '<a href="'.SM_PATH.'src/configtest.php" target="_blank">'._("Test Configuration").
-     "</a></th></tr>\n" ,
+echo '<tr bgcolor="'.$color[5].'"><th colspan="2"><input value="'.
+     _("Change Settings").'" type="submit" /><br />'.
+     '<a href="'.SM_PATH.'src/configtest.php" target="_blank">'.
+     _("Test Configuration")."</a></th></tr>\n".

      '</table></td></tr></table></center></form>';
 
 /*
     Write the options to the file.
 */
 
      '</table></td></tr></table></center></form>';
 
 /*
     Write the options to the file.
 */
 

-if( $fp = @fopen( $cfgfile, 'w' ) ) {
-    fwrite( $fp, "<?PHP\n".
+if ( $fp = @fopen( $cfgfile, 'w' ) ) {
+    fwrite( $fp, "<?php\n".

     "/**\n".
     " * SquirrelMail Configuration File\n".
     " * Created using the Administrator Plugin\n".
     "/**\n".
     " * SquirrelMail Configuration File\n".
     " * Created using the Administrator Plugin\n".


@@ -619,7 +620,7 @@ if( $fp = @fopen( $cfgfile, 'w' ) ) {
                 $v = str_replace( "',", "',\n\t", $v );
             }
             fwrite( $fp, "$k = $v;\n" );
                 $v = str_replace( "',", "',\n\t", $v );
             }
             fwrite( $fp, "$k = $v;\n" );

-       }
+        }

     }
     fwrite( $fp, '?>' );
     fclose( $fp );
     }
     fwrite( $fp, '?>' );
     fclose( $fp );