From ab3fe5771fc506f98f5120990cea01bc2b879302 Mon Sep 17 00:00:00 2001 From: jervfors Date: Sat, 3 Jul 2004 07:19:08 +0000 Subject: [PATCH] Indentation and XHTML fix git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7740 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/administrator/options.php | 287 +++++++++++++++--------------- 1 file changed, 144 insertions(+), 143 deletions(-) diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php index 08aad32b..c7af2d8b 100644 --- a/plugins/administrator/options.php +++ b/plugins/administrator/options.php @@ -45,7 +45,7 @@ function parseConfig( $cfg_file ) { break; case 'K': // Key detect - if( $line{$j} == ' ' ) { + if ( $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) { - 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' ) { - $colapse[$switch] = 'off'; + $colapse[$switch] = 'off'; } else { - $colapse[$switch] = 'on'; + $colapse[$switch] = 'on'; } setPref($data_dir, $username, "adm_$switch", $colapse[$switch] ); } echo '
' . - "
". - "" , - "", - ""; + '
" . _("Configuration Administrator") . "
"; - -echo ""; -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 "
"; -echo _("Run or consult conf.pl should you run into difficulty with your configuration."); -echo "
'. + ''. + ''. + ''; $act_grp = 'Titles'; /* Active group */ @@ -318,7 +317,7 @@ foreach ( $newcfg as $k => $v ) { $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: @@ -329,7 +328,7 @@ foreach ( $newcfg as $k => $v ) { case SMOPT_TYPE_EXTERNAL: echo ""; + ''; break; case SMOPT_TYPE_TITLE: if ( $colapse[$k] == 'on' ) { @@ -337,9 +336,9 @@ foreach ( $newcfg as $k => $v ) { } else { $sw = '(-)'; } - echo ""; + echo ''; $act_grp = $k; break; case SMOPT_TYPE_COMMENT: @@ -353,13 +352,13 @@ foreach ( $newcfg as $k => $v ) { echo "\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 "\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; @@ -463,13 +462,13 @@ foreach ( $newcfg as $k => $v ) { $v = change_to_sm_path($defcfg[$k]['default']); $newcfg[$k] = $v; } - echo "\n"; - break; + echo "\n"; + break; default: echo "'. - "". - "". + "". + "". "\n"; $i++; @@ -522,88 +521,90 @@ if ( $colapse['Group8'] == 'on' ) { } else { $sw = '(-)'; } -echo "'; - -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 ''; + +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 "'; - } else { - echo '\n"; - } + echo ''; + } else { + echo '\n"; + } } -echo "\n" , +echo '\n". '
'. + _("Configuration Administrator").'
'. + _("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."). + '
'. + _("Run or consult conf.pl should you run into difficulty with your configuration."). + '
$name" . $defcfg[$k]['value'] . - "
" . - "$sw " . - "$name
'. + "". + ''.$sw.' '.$name.'
$name". - ""; + ""; if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } @@ -374,7 +373,7 @@ foreach ( $newcfg as $k => $v ) { foreach ( $defcfg[$k]['posvals'] as $kp => $vp ) { echo ""; } @@ -394,7 +393,7 @@ foreach ( $newcfg as $k => $v ) { foreach ( $defcfg[$k]['posvals'] as $kp => $vp ) { echo ""; } @@ -427,7 +426,7 @@ foreach ( $newcfg as $k => $v ) { $newcfg[$k] = $v; } echo "
$name". - ""; + "'; if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } @@ -440,21 +439,21 @@ foreach ( $newcfg as $k => $v ) { $v = strtoupper( $v ); } if ( $v == 'TRUE' ) { - $ct = ' checked'; + $ct = ' checked="checked"'; $cf = ''; } else { $ct = ''; - $cf = ' checked'; + $cf = ' checked="checked"'; } echo "
$name" . - "" . _("Yes") . - "" . _("No"); + "" . _("Yes") . + "" . _("No"); if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } echo "
$name". - ""; + echo "
$name". + "'; if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } - echo "
$name" . "$v"; @@ -501,15 +500,15 @@ if ( $colapse['Group7'] == 'off' ) { $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 '
$i. $i.
" . - "$sw " . - _("Plugins") . '
'. + ''. + $sw.' '._("Plugins").'
"; - 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 { - $sw = ''; + $i = 0; + while ( isset( $newcfg["\$plugins[$i]"] ) ) { + $k = "\$plugins[$i]"; + $v = $newcfg[$k]; + $plugins[] = substr( $v, 1, strlen( $v ) - 2 ); + $i++; + } } - echo '\n". - "". - "\n"; - } - echo '
'; - if (file_exists(SM_PATH . "plugins/$plg/README")) { - echo "$plg"; - } else { - echo $plg; - } - echo "
' . sprintf(_("Plugin directory could not be found: %s"),$plugpath) . "
'; + foreach ( $op_plugin as $plg ) { + if ( in_array( $plg, $plugins ) ) { + $sw = ' checked="checked"'; + } else { + $sw = ''; + } + echo '\n". + "". + "\n"; + } + echo '
'; + if (file_exists(SM_PATH . "plugins/$plg/README")) { + echo "$plg"; + } else { + echo $plg; + } + echo "
'. + sprintf(_("Plugin directory could not be found: %s"), $plugpath). + "

'. - ''._("Test Configuration"). - "

'. + ''. + _("Test Configuration")."
'; /* Write the options to the file. */ -if( $fp = @fopen( $cfgfile, 'w' ) ) { - fwrite( $fp, "' ); fclose( $fp ); -- 2.25.1