X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fadministrator%2Foptions.php;h=08aad32bec9156c4bf37278ce8d0bcfae477909f;hb=4f00b9539a3bce5fe5eeaed3c0433d5368b5cabf;hp=cf9cb62a13ec404952e042d13fbe237ba4c933fe;hpb=f0b554f994b11c89139e3f13021b3b3c4cbcf45f;p=squirrelmail.git diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php index cf9cb62a..08aad32b 100644 --- a/plugins/administrator/options.php +++ b/plugins/administrator/options.php @@ -1,16 +1,25 @@ - SM_PATH . 'images/logo.gif' --> ../images/logo.gif - '/absolute/path/logo.gif' --> /absolute/path/logo.gif - 'http://whatever/' --> http://whatever - Note removal of quotes in returned value -*/ +/** + * Change paths containing SM_PATH to admin-friendly paths + * relative to the config dir, i.e.: + * '' --> + * SM_PATH . 'images/logo.gif' --> ../images/logo.gif + * '/absolute/path/logo.gif' --> /absolute/path/logo.gif + * 'http://whatever/' --> http://whatever + * Note removal of quotes in returned value + * + * @param string $old_path path that has to be converted + * @return string new path + * @access private + */ function change_to_rel_path($old_path) { $new_path = str_replace("SM_PATH . '", "../", $old_path); $new_path = str_replace("../config/","", $new_path); @@ -144,13 +158,18 @@ function change_to_rel_path($old_path) { return $new_path; } -/* Change relative path (relative to config dir) to - internal SM_PATH, i.e.: - empty_string --> '' - ../images/logo.gif --> SM_PATH . 'images/logo.gif' - images/logo.gif --> SM_PATH . 'config/images/logo.gif' - /absolute/path/logo.gif --> '/absolute/path/logo.gif' - http://whatever/ --> 'http://whatever' +/** + * Change relative path (relative to config dir) to + * internal SM_PATH, i.e.: + * empty_string --> '' + * ../images/logo.gif --> SM_PATH . 'images/logo.gif' + * images/logo.gif --> SM_PATH . 'config/images/logo.gif' + * /absolute/path/logo.gif --> '/absolute/path/logo.gif' + * http://whatever/ --> 'http://whatever' + * + * @param string $old_path path that has to be converted + * @return string new path + * @access private */ function change_to_sm_path($old_path) { if ( $old_path === '' || $old_path == "''" ) { @@ -195,6 +214,7 @@ function change_to_sm_path($old_path) { /* ---------------------- main -------------------------- */ +/** @ignore */ define('SM_PATH','../../'); /* SquirrelMail required files. */ @@ -205,7 +225,7 @@ require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'plugins/administrator/defines.php'); require_once(SM_PATH . 'plugins/administrator/auth.php'); -GLOBAL $data_dir, $username; +global $data_dir, $username; if ( !adm_check_user() ) { header('Location: ' . SM_PATH . 'src/options.php') ; @@ -232,10 +252,12 @@ $colapse = array( 'Titles' => 'off', 'Group5' => getPref($data_dir, $username, 'adm_Group5', 'on' ), 'Group6' => getPref($data_dir, $username, 'adm_Group6', 'on' ), 'Group7' => getPref($data_dir, $username, 'adm_Group7', 'on' ), - 'Group8' => getPref($data_dir, $username, 'adm_Group8', 'on' ) ); + 'Group8' => getPref($data_dir, $username, 'adm_Group8', 'on' ), + 'Group9' => getPref($data_dir, $username, 'adm_Group9', 'on' ), + 'Group10' => getPref($data_dir, $username, 'adm_Group10', 'on' ) ); -if ( isset( $_GET['switch'] ) ) { - $switch = $_GET['switch']; +/* look in $_GET array for 'switch' */ +if ( sqgetGlobalVar('switch', $switch, SQ_GET) ) { if ( $colapse[$switch] == 'on' ) { $colapse[$switch] = 'off'; } else { @@ -244,18 +266,18 @@ if ( isset( $_GET['switch'] ) ) { setPref($data_dir, $username, "adm_$switch", $colapse[$switch] ); } -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. -
". + "" , + "", + ""; + $act_grp = 'Titles'; /* Active group */ @@ -315,8 +337,8 @@ foreach ( $newcfg as $k => $v ) { } else { $sw = '(-)'; } - echo ""; $act_grp = $k; break; @@ -331,20 +353,20 @@ foreach ( $newcfg as $k => $v ) { echo "\n"; break; case SMOPT_TYPE_INTEGER: - if ( isset( $HTTP_POST_VARS[$e] ) ) { - $v = intval( $HTTP_POST_VARS[$e] ); + /* 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_NUMLIST: - if ( isset( $HTTP_POST_VARS[$e] ) ) { - $v = $HTTP_POST_VARS[$e]; + if ( sqgetGlobalVar($e, $v, SQ_POST) ) { $newcfg[$k] = $v; } echo "\n"; break; case SMOPT_TYPE_STRLIST: - if ( isset( $HTTP_POST_VARS[$e] ) ) { - $v = '"' . $HTTP_POST_VARS[$e] . '"'; + if ( sqgetGlobalVar($e, $v, SQ_POST) ) { + $v = '"' . $v . '"'; $newcfg[$k] = $v; } echo "\n"; break; case SMOPT_TYPE_STRING: - if ( isset( $HTTP_POST_VARS[$e] ) ) { - $v = '"' . $HTTP_POST_VARS[$e] . '"'; + if ( sqgetGlobalVar($e, $v, SQ_POST) ) { + $v = '"' . $v . '"'; $newcfg[$k] = $v; } if ( $v == '""' && isset( $defcfg[$k]['default'] ) ) { @@ -412,8 +434,7 @@ foreach ( $newcfg as $k => $v ) { echo "\n"; break; case SMOPT_TYPE_BOOLEAN: - if ( isset( $HTTP_POST_VARS[$e] ) ) { - $v = $HTTP_POST_VARS[$e]; + if ( sqgetGlobalVar($e, $v, SQ_POST) ) { $newcfg[$k] = $v; } else { $v = strtoupper( $v ); @@ -426,16 +447,16 @@ foreach ( $newcfg as $k => $v ) { $cf = ' checked'; } echo "\n"; break; case SMOPT_TYPE_PATH: - if ( isset( $HTTP_POST_VARS[$e] ) ) { - $v = change_to_sm_path($HTTP_POST_VARS[$e]); + if ( sqgetGlobalVar($e, $v, SQ_POST) ) { + $v = change_to_sm_path($v); $newcfg[$k] = $v; } if ( $v == "''" && isset( $defcfg[$k]['default'] ) ) { @@ -469,8 +490,8 @@ if ( $colapse['Group7'] == 'off' ) { while ( isset( $newcfg["\$theme[$i]['NAME']"] ) ) { $k1 = "\$theme[$i]['NAME']"; $e1 = "theme_name_$i"; - if ( isset( $HTTP_POST_VARS[$e1] ) ) { - $v1 = '"' . str_replace( '\"', '"', $HTTP_POST_VARS[$e1] ) . '"'; + if ( sqgetGlobalVar($e, $v1, SQ_POST) ) { + $v1 = '"' . str_replace( '\"', '"', $v1 ) . '"'; $v1 = '"' . str_replace( '"', '\"', $v1 ) . '"'; $newcfg[$k1] = $v1; } else { @@ -478,8 +499,8 @@ if ( $colapse['Group7'] == 'off' ) { } $k2 = "\$theme[$i]['PATH']"; $e2 = "theme_path_$i"; - if ( isset( $HTTP_POST_VARS[$e2] ) ) { - $v2 = change_to_sm_path($HTTP_POST_VARS[$e2]); + if ( sqgetGlobalVar($e, $v2, SQ_POST) ) { + $v2 = change_to_sm_path($v2); $newcfg[$k2] = $v2; } else { $v2 = $newcfg[$k2]; @@ -487,8 +508,8 @@ if ( $colapse['Group7'] == 'off' ) { $name = substr( $v1, 1, strlen( $v1 ) - 2 ); $path = change_to_rel_path($v2); echo ''. - "". - "". + "". + "". "\n"; $i++; @@ -501,8 +522,8 @@ if ( $colapse['Group8'] == 'on' ) { } else { $sw = '(-)'; } -echo "'; if( $colapse['Group8'] == 'off' ) { @@ -523,10 +544,9 @@ if( $colapse['Group8'] == 'off' ) { /* Lets get the plugins that are active */ $plugins = array(); - if ( isset( $HTTP_POST_VARS['plg'] ) ) { + if ( sqgetGlobalVar('plg', $v, SQ_POST) ) { foreach ( $op_plugin as $plg ) { - if ( isset( $HTTP_POST_VARS["plgs_$plg"] ) && - $HTTP_POST_VARS["plgs_$plg"] == 'on' ) { + if ( sqgetGlobalVar("plgs_$plg", $v, SQ_POST) && $v == 'on' ) { $plugins[] = $plg; } } @@ -550,25 +570,33 @@ if( $colapse['Group8'] == 'off' ) { $i++; } } - echo "'; } else { - echo '\n"; + echo '\n"; } } -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 "
" . - "$sw " . + echo "
" . + "$sw " . "$name
$name". - ""; + ""; if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } echo "
$name"; @@ -363,8 +385,8 @@ foreach ( $newcfg as $k => $v ) { echo "
$name". @@ -384,20 +406,20 @@ foreach ( $newcfg as $k => $v ) { break; case SMOPT_TYPE_TEXTAREA: - if ( isset( $HTTP_POST_VARS[$e] ) ) { - $v = '"' . $HTTP_POST_VARS[$e] . '"'; + if ( sqgetGlobalVar($e, $v, SQ_POST) ) { + $v = '"' . $v . '"'; $newcfg[$k] = str_replace( "\n", '', $v ); } - echo "
$name". - ""; + echo "
$name". + ""; if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } echo "
$name" . - "" . _("Yes") . - "" . _("No"); + "" . _("Yes") . + "" . _("No"); if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } echo "
$i. $i.
" . - "$sw " . +echo "
" . + "$sw " . _("Plugins") . '
'; + echo '
"; + echo "
"; foreach ( $op_plugin as $plg ) { if ( in_array( $plg, $plugins ) ) { $sw = ' checked'; } else { $sw = ''; } - echo '' . - "". + echo '\n". + "". "\n"; } - echo '
$plg
'; + if (file_exists(SM_PATH . "plugins/$plg/README")) { + echo "$plg"; + } else { + echo $plg; + } + echo "
Plugin directory could not be found: ' . $plugpath . "
' . sprintf(_("Plugin directory could not be found: %s"),$plugpath) . "
'; +echo "

'. + ''._("Test Configuration"). + "
'; /* Write the options to the file. @@ -579,23 +607,26 @@ if( $fp = @fopen( $cfgfile, 'w' ) ) { "/**\n". " * SquirrelMail Configuration File\n". " * Created using the Administrator Plugin\n". - " */\n" ); + " */\n". + "\n". + "global \$version;\n" ); foreach ( $newcfg as $k => $v ) { - if ( $k{0} == '$' && $v <> '' ) { + if ( $k{0} == '$' && $v <> '' || is_int($v)) { if ( substr( $k, 1, 11 ) == 'ldap_server' ) { $v = substr( $v, 0, strlen( $v ) - 1 ) . "\n)"; $v = str_replace( 'array(', "array(\n\t", $v ); $v = str_replace( "',", "',\n\t", $v ); } fwrite( $fp, "$k = $v;\n" ); - } + } } fwrite( $fp, '?>' ); fclose( $fp ); } else { - echo '
'. + echo '

'. _("Config file can't be opened. Please check config.php."). - ''; + '

'; } ?> + \ No newline at end of file