From: Paul L. <pdo...@us...> - 2013-06-07 20:02:25
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19630 Modified Files: config_default.php config_example.php functions.php make_release.sh setup.php version Log Message: Minor bug fix for sites with an empty $default_folder_prefix Index: make_release.sh =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/make_release.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** make_release.sh 11 Jan 2011 02:00:50 -0000 1.2 --- make_release.sh 7 Jun 2013 20:02:23 -0000 1.3 *************** *** 4,8 **** # Generic shell script for building SquirrelMail plugin release # ! # Copyright (c) 2004-2011 Paul Lesniewski <pa...@sq...> # Licensed under the GNU GPL. For full terms see the file COPYING. # --- 4,8 ---- # Generic shell script for building SquirrelMail plugin release # ! # Copyright (c) 2004-2013 Paul Lesniewski <pa...@sq...> # Licensed under the GNU GPL. For full terms see the file COPYING. # Index: functions.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions.php 7 May 2011 06:49:16 -0000 1.3 --- functions.php 7 Jun 2013 20:02:23 -0000 1.4 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. *************** *** 404,412 **** // $rule['TARGET_FOLDER'] = preg_replace('/' . str_replace('.', '', $default_folder_prefix) . '/', '', $rule['TARGET_FOLDER']); // ! $test_folder_prefix = $default_folder_prefix; ! if ($test_folder_prefix{strlen($test_folder_prefix) - 1} == $delimiter) ! $test_folder_prefix = substr($test_folder_prefix, 0, -1); ! if (strpos($rule['TARGET_FOLDER'], $test_folder_prefix) === 0) ! $rule['TARGET_FOLDER'] = substr($rule['TARGET_FOLDER'], strlen($test_folder_prefix)); --- 404,415 ---- // $rule['TARGET_FOLDER'] = preg_replace('/' . str_replace('.', '', $default_folder_prefix) . '/', '', $rule['TARGET_FOLDER']); // ! if (!empty($default_folder_prefix)) ! { ! $test_folder_prefix = $default_folder_prefix; ! if ($test_folder_prefix{strlen($test_folder_prefix) - 1} == $delimiter) ! $test_folder_prefix = substr($test_folder_prefix, 0, -1); ! if (strpos($rule['TARGET_FOLDER'], $test_folder_prefix) === 0) ! $rule['TARGET_FOLDER'] = substr($rule['TARGET_FOLDER'], strlen($test_folder_prefix)); ! } Index: config_default.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/config_default.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config_default.php 11 Jan 2011 02:00:50 -0000 1.2 --- config_default.php 7 Jun 2013 20:02:22 -0000 1.3 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/setup.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** setup.php 11 Jan 2011 02:02:22 -0000 1.3 --- setup.php 7 Jun 2013 20:02:23 -0000 1.4 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. *************** *** 61,65 **** ), ), ! 'version' => '1.1', 'required_sm_version' => '1.4.0', 'requires_configuration' => 0, --- 61,65 ---- ), ), ! 'version' => '1.1.1', 'required_sm_version' => '1.4.0', 'requires_configuration' => 0, Index: version =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/version,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** version 11 Jan 2011 02:02:22 -0000 1.2 --- version 7 Jun 2013 20:02:23 -0000 1.3 *************** *** 1,2 **** Server Side Filters Maildrop ! 1.1 --- 1,2 ---- Server Side Filters Maildrop ! 1.1.1 Index: config_example.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/config_example.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config_example.php 11 Jan 2011 02:00:50 -0000 1.2 --- config_example.php 7 Jun 2013 20:02:23 -0000 1.3 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. |