projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy 2014
[squirrelmail.git]
/
plugins
/
administrator
/
options.php
diff --git
a/plugins/administrator/options.php
b/plugins/administrator/options.php
index 1fcf1fc5897faa79237f739656fc2b6358309976..059b0981c751d61ccbdccd7c6db48a919344c578 100644
(file)
--- a/
plugins/administrator/options.php
+++ b/
plugins/administrator/options.php
@@
-7,13
+7,15
@@
* SquirrelMail configuration file.
*
* @author Philippe Mingo
* SquirrelMail configuration file.
*
* @author Philippe Mingo
- * @copyright
© 1999-2007
The SquirrelMail Project Team
+ * @copyright
1999-2014
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* @subpackage administrator
*/
* @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
*
/**
* parse the config file
*
@@
-170,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'
* 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'
*
* /absolute/path/logo.gif --> '/absolute/path/logo.gif'
* http://whatever/ --> 'http://whatever'
*
@@
-180,7
+183,8
@@
function change_to_rel_path($old_path) {
function change_to_sm_path($old_path) {
if ( $old_path === '' || $old_path == "''" ) {
return "''";
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;
return "'" . $old_path . "'";
} elseif ( preg_match("/^(\$|SM_PATH)/", $old_path) ) {
return $old_path;
@@
-418,7
+422,7
@@
foreach ( $newcfg as $k => $v ) {
}
echo "<tr><td valign=\"top\">$name</td><td>"
."<textarea cols=\"$size\" rows=\"4\" name=\"adm_$n\">"
}
echo "<tr><td valign=\"top\">$name</td><td>"
."<textarea cols=\"$size\" rows=\"4\" name=\"adm_$n\">"
- .
htmlspecial
chars(stripslashes(substr( $v, 1, strlen( $v ) - 2 )))
+ .
sm_encode_html_special_
chars(stripslashes(substr( $v, 1, strlen( $v ) - 2 )))
."</textarea>";
if ( isset( $defcfg[$k]['comment'] ) ) {
echo ' ' . $defcfg[$k]['comment'];
."</textarea>";
if ( isset( $defcfg[$k]['comment'] ) ) {
echo ' ' . $defcfg[$k]['comment'];
@@
-436,7
+440,7
@@
foreach ( $newcfg as $k => $v ) {
}
echo "<tr><td>$name</td><td>"
."<input size=\"$size\" name=\"adm_$n\" value=\""
}
echo "<tr><td>$name</td><td>"
."<input size=\"$size\" name=\"adm_$n\" value=\""
- .
htmlspecial
chars(stripslashes(substr( $v, 1, strlen( $v ) - 2 )))
+ .
sm_encode_html_special_
chars(stripslashes(substr( $v, 1, strlen( $v ) - 2 )))
.'" />';
if ( isset( $defcfg[$k]['comment'] ) ) {
echo ' ' . $defcfg[$k]['comment'];
.'" />';
if ( isset( $defcfg[$k]['comment'] ) ) {
echo ' ' . $defcfg[$k]['comment'];