X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fadministrator%2Foptions.php;h=1bfaf784cd37a826269827e8a53324e2f433a73a;hp=3b7e1a82ff0fc13f3cec07be784e2e08a5fba7af;hb=59927db317c6b031765a88ca3508edeb7ccbcc6e;hpb=91e0dccca7b2452d8b450791cae3aa4125e8889e diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php index 3b7e1a82..1bfaf784 100644 --- a/plugins/administrator/options.php +++ b/plugins/administrator/options.php @@ -6,14 +6,16 @@ * This script creates separate page, that allows to review and modify * SquirrelMail configuration file. * - * @version $Id$ * @author Philippe Mingo - * @copyright (c) 1999-2004 The SquirrelMail Project Team + * @copyright 1999-2018 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ * @package plugins * @subpackage administrator */ +define('PAGE_NAME', 'administrator_options'); + /** * parse the config file * @@ -28,6 +30,7 @@ function parseConfig( $cfg_file ) { $mode = ''; $l = count( $cfg ); $modifier = FALSE; + $arraykey = 0; for ($i=0;$i<$l;$i++) { $line = trim( $cfg[$i] ); @@ -49,6 +52,11 @@ function parseConfig( $cfg_file ) { $mode = '='; } else { $key .= $line{$j}; + // FIXME: this is only pour workaround for plugins[] array. + if ($line{$j}=='[' && $line{($j+1)}==']') { + $key .= $arraykey; + $arraykey++; + } } break; case ';': @@ -164,6 +172,7 @@ function change_to_rel_path($old_path) { * empty_string --> '' * ../images/logo.gif --> SM_PATH . 'images/logo.gif' * images/logo.gif --> SM_PATH . 'config/images/logo.gif' + * C:/absolute/win/path --> 'C:/absolute/win/path' * /absolute/path/logo.gif --> '/absolute/path/logo.gif' * http://whatever/ --> 'http://whatever' * @@ -174,7 +183,8 @@ function change_to_rel_path($old_path) { function change_to_sm_path($old_path) { if ( $old_path === '' || $old_path == "''" ) { return "''"; - } elseif ( preg_match("/^(\/|http)/", $old_path) ) { + } elseif ( preg_match("/^(\/|http)/", $old_path) || + substr($old_path,1,2) == ':/' ) { return "'" . $old_path . "'"; } elseif ( preg_match("/^(\$|SM_PATH)/", $old_path) ) { return $old_path; @@ -213,17 +223,12 @@ function change_to_sm_path($old_path) { /* ---------------------- main -------------------------- */ - -/** @ignore */ -define('SM_PATH','../../'); - -/* SquirrelMail required files. */ -require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'functions/imap.php'); -require_once(SM_PATH . 'include/load_prefs.php'); -require_once(SM_PATH . 'plugins/administrator/defines.php'); -require_once(SM_PATH . 'plugins/administrator/auth.php'); +/** main SquirrelMail include */ +require('../../include/init.php'); +/* configuration definitions */ +include_once(SM_PATH . 'plugins/administrator/defines.php'); +/* additional functions */ +include_once(SM_PATH . 'plugins/administrator/auth.php'); global $data_dir, $username; @@ -232,7 +237,7 @@ if ( !adm_check_user() ) { exit; } -displayPageHeader($color, 'None'); +displayPageHeader($color); $newcfg = array( ); @@ -255,7 +260,7 @@ $colapse = array( 'Titles' => 'off', 'Group8' => getPref($data_dir, $username, 'adm_Group8', 'on' ), 'Group9' => getPref($data_dir, $username, 'adm_Group9', 'on' ), 'Group10' => getPref($data_dir, $username, 'adm_Group10', 'on' ), - 'Group11' => getPref($data_dir, $username, 'adm_Group10', 'on' ) ); + 'Group11' => getPref($data_dir, $username, 'adm_Group11', 'on' ) ); /* look in $_GET array for 'switch' */ if ( sqgetGlobalVar('switch', $switch, SQ_GET) ) { @@ -268,7 +273,7 @@ if ( sqgetGlobalVar('switch', $switch, SQ_GET) ) { } echo '
' . - '
'. + '
'. ''. ''. @@ -316,12 +321,16 @@ foreach ( $newcfg as $k => $v ) { $type = SMOPT_TYPE_PLUGINS; } else if ( substr( $k, 0, 13 ) == '$ldap_server[' ) { $type = SMOPT_TYPE_LDAP; + } else if ( substr( $k, 0, 9 ) == '$fontsets' || + substr( $k, 0, 13 ) == '$aTemplateSet' ) { + $type = SMOPT_TYPE_CUSTOM; } if ( $type == SMOPT_TYPE_TITLE || $colapse[$act_grp] == 'off' ) { switch ( $type ) { case SMOPT_TYPE_LDAP: + case SMOPT_TYPE_CUSTOM: case SMOPT_TYPE_PLUGINS: case SMOPT_TYPE_THEME: case SMOPT_TYPE_HIDDEN: @@ -354,8 +363,8 @@ foreach ( $newcfg as $k => $v ) { break; case SMOPT_TYPE_INTEGER: /* look for variable $e in POST, fill into $v */ - if ( sqgetGlobalVar($e, $v, SQ_POST) ) { - $v = intval( $v ); + if ( sqgetGlobalVar($e, $new_v, SQ_POST) ) { + $v = intval( $new_v ); $newcfg[$k] = $v; } echo "\n"; break; case SMOPT_TYPE_NUMLIST: - if ( sqgetGlobalVar($e, $v, SQ_POST) ) { + if ( sqgetGlobalVar($e, $new_v, SQ_POST) ) { + $v = $new_v; $newcfg[$k] = $v; } echo "\n"; break; case SMOPT_TYPE_STRLIST: - if ( sqgetGlobalVar($e, $v, SQ_POST) ) { - $v = '"' . $v . '"'; + if ( sqgetGlobalVar($e, $new_v, SQ_POST) ) { + $v = '"' . $new_v . '"'; $newcfg[$k] = $v; } echo "\n"; break; case SMOPT_TYPE_STRING: - if ( sqgetGlobalVar($e, $v, SQ_POST) ) { - $v = '"' . $v . '"'; + if ( sqgetGlobalVar($e, $new_v, SQ_POST) ) { + $v = '"' . addslashes($new_v) . '"'; $newcfg[$k] = $v; } if ( $v == '""' && isset( $defcfg[$k]['default'] ) ) { $v = "'" . $defcfg[$k]['default'] . "'"; $newcfg[$k] = $v; } - echo "\n"; break; case SMOPT_TYPE_BOOLEAN: - if ( sqgetGlobalVar($e, $v, SQ_POST) ) { + if ( sqgetGlobalVar($e, $new_v, SQ_POST) ) { + $v = $new_v; $newcfg[$k] = $v; } else { $v = strtoupper( $v ); @@ -455,9 +470,10 @@ foreach ( $newcfg as $k => $v ) { echo "\n"; break; case SMOPT_TYPE_PATH: - if ( sqgetGlobalVar($e, $v, SQ_POST) ) { - $v = change_to_sm_path($v); - $newcfg[$k] = $v; + if ( sqgetGlobalVar($e, $new_v, SQ_POST) ) { + // FIXME: fix use of $data_dir in $attachment_dir + $v = change_to_sm_path($new_v); + $newcfg[$k] = $v; } if ( $v == "''" && isset( $defcfg[$k]['default'] ) ) { $v = change_to_sm_path($defcfg[$k]['default']); @@ -544,9 +560,9 @@ if ( $colapse['Group8'] == 'off' ) { /* Lets get the plugins that are active */ $plugins = array(); - if ( sqgetGlobalVar('plg', $v, SQ_POST) ) { + if ( sqgetGlobalVar('plg', $v, SQ_POST) ) { foreach ( $op_plugin as $plg ) { - if ( sqgetGlobalVar("plgs_$plg", $v, SQ_POST) && $v == 'on' ) { + if ( sqgetGlobalVar("plgs_$plg", $v2, SQ_POST) && $v2 == 'on' ) { $plugins[] = $plg; } } @@ -570,7 +586,7 @@ if ( $colapse['Group8'] == 'off' ) { $i++; } } - echo ''; } else { echo '\n". - '
'. _("Configuration Administrator").'
$name". @@ -366,7 +375,8 @@ foreach ( $newcfg as $k => $v ) { echo "
$name"; @@ -385,8 +395,8 @@ foreach ( $newcfg as $k => $v ) { echo "
$name". @@ -406,35 +416,40 @@ foreach ( $newcfg as $k => $v ) { break; case SMOPT_TYPE_TEXTAREA: - if ( sqgetGlobalVar($e, $v, SQ_POST) ) { - $v = '"' . $v . '"'; + if ( sqgetGlobalVar($e, $new_v, SQ_POST) ) { + $v = '"' . addslashes($new_v) . '"'; $newcfg[$k] = str_replace( "\n", '', $v ); } - echo "
$name". - ""; + echo "
$name" + .""; if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } echo "
$name". - "'; + echo "
$name" + ."'; if ( isset( $defcfg[$k]['comment'] ) ) { echo '   ' . $defcfg[$k]['comment']; } echo "
'; + echo ''; + echo '
'; foreach ( $op_plugin as $plg ) { if ( in_array( $plg, $plugins ) ) { $sw = ' checked="checked"'; @@ -587,7 +603,7 @@ if ( $colapse['Group8'] == 'off' ) { "". "\n"; } - echo '
'. sprintf(_("Plugin directory could not be found: %s"), $plugpath). @@ -598,20 +614,21 @@ echo '

'. ''. _("Test Configuration")."
'; + '
'; /* Write the options to the file. */ +// Test/debug +// $cfgfile = '/tmp/config.php'; if ( $fp = @fopen( $cfgfile, 'w' ) ) { fwrite( $fp, " $v ) { if ( $k{0} == '$' && $v <> '' || is_int($v)) { @@ -620,9 +637,11 @@ if ( $fp = @fopen( $cfgfile, 'w' ) ) { $v = str_replace( 'array(', "array(\n\t", $v ); $v = str_replace( "',", "',\n\t", $v ); } + /* FIXME: add elseif that reverts plugins[#] to plugins[] */ fwrite( $fp, "$k = $v;\n" ); } } + // close php fwrite( $fp, '?>' ); fclose( $fp ); } else { @@ -630,5 +649,6 @@ if ( $fp = @fopen( $cfgfile, 'w' ) ) { _("Config file can't be opened. Please check config.php."). '

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