1
0
forked from pool/roundcubemail

Accepting request 140829 from server:php:applications

last submit broke roundcube, this fixes it; notice: I had to manually remove my browser cookies after update to 0.8.3 before I was able to login again :-( (forwarded request 140828 from wrosenauer)

OBS-URL: https://build.opensuse.org/request/show/140829
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/roundcubemail?expand=0&rev=7
This commit is contained in:
Stephan Kulow 2012-11-12 06:05:56 +00:00 committed by Git OBS Bridge
commit 1f8aa38c5f
5 changed files with 21 additions and 20 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43d2d7c86171eb317af7d165803aab76f01de5ad06564cbeb77eb07147f72a61
size 3722844

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27f9583b92eebaa7cbb70088443cdc3f27ebaea966c6ddac7aadc7948285e503
size 3723551

View File

@ -1,5 +1,5 @@
diff --git a/installer/index.php b/installer/index.php
index bb1b1ba..572ef80 100644
index 4c94fea..204cdf4 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
@ -8,27 +8,19 @@ index bb1b1ba..572ef80 100644
define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
define('RCMAIL_CHARSET', 'UTF-8');
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
$include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
diff --git a/program/include/iniset.php b/program/include/iniset.php
index f223b0d..630001f 100644
index 3809479..5004448 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -46,15 +46,12 @@ define('RCMAIL_VERSION', '0.8.1');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
define('RCMAIL_START', microtime(true));
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
if (!defined('INSTALL_PATH')) {
define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
@@ -52,7 +52,7 @@ if (!defined('INSTALL_PATH')) {
}
-if (!defined('RCMAIL_CONFIG_DIR')) {
if (!defined('RCMAIL_CONFIG_DIR')) {
- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
-}
-
+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
}
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {
define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Nov 10 21:12:16 UTC 2012 - wr@rosenauer.org
- Update to version 0.8.3
* This update adds small bug fixes and improvements to the 0.8
stable series. It also fixes a possible, although unintended,
DoS to the webserver running Roundcube. See the included
CHANGELOG file for details.
-------------------------------------------------------------------
Mon Oct 29 07:00:08 UTC 2012 - wr@rosenauer.org

View File

@ -21,7 +21,7 @@ Summary: A modern browser-based multilingual IMAP client
License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause
Group: Productivity/Networking/Email/Clients
Url: http://www.roundcube.net/
Version: 0.8.2
Version: 0.8.3
Release: 0
BuildRequires: apache2-devel
BuildRequires: fdupes