dbp/zarafa
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump

Browse Source 
Package-Manager: portage-2.2.8-r1
RepoMan-Options: --force
This commit is contained in:
Mario Fetka
2014-06-26 15:16:08 +02:00
parent 0623fb3619
commit 019106dc66
6 changed files with 95 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
www-apps/zarafa-webapp/files/zarafa-webapp-phpautologin-1.4.patch Normal file
View File

@@ -0,0 +1,19 @@
diff -rupN zarafa-webapp-1.4-42633/usr/share/zarafa-webapp/index.php zarafa-webapp-1.4-42633.patched/usr/share/zarafa-webapp/index.php
--- zarafa-webapp-1.4-42633/usr/share/zarafa-webapp/index.php 2013-10-01 19:35:05.000000000 +0200
+++ zarafa-webapp-1.4-42633.patched/usr/share/zarafa-webapp/index.php 2013-10-14 20:02:48.644604785 +0200
@@ -122,12 +122,12 @@
// REMOTE_USER is set when apache has authenticated the user
// Don't perform single-signon when $_POST is set, as that implies
// the user was sending us data from a form.
- if (!$_POST && $_SERVER && array_key_exists('REMOTE_USER', $_SERVER)) {
- $_SESSION['username'] = $_SERVER['REMOTE_USER'];
+ if (!$_POST && $_SERVER && array_key_exists('PHP_AUTH_USER', $_SERVER)) {
+ $_SESSION['username'] = $_SERVER['PHP_AUTH_USER'];
if (LOGINNAME_STRIP_DOMAIN) {
$_SESSION['username'] = ereg_replace('@.*', '', $_SESSION['username']);
}
- $_SESSION['password'] = '';
+ $_SESSION['password'] = $_SERVER['PHP_AUTH_PW'];
}
}

28
www-apps/zarafa-webapp/files/zarafa-webapp-phpautologin.patch
View File

@@ -1,28 +0,0 @@
diff -rupN zarafa-webapp-1.3-40290/usr/share/zarafa-webapp/index.php zarafa-webapp-1.3-40290.patched/usr/share/zarafa-webapp/index.php
--- zarafa-webapp-1.3-40290/usr/share/zarafa-webapp/index.php 2013-01-21 13:39:43.000000000 +0100
+++ zarafa-webapp-1.3-40290.patched/usr/share/zarafa-webapp/index.php 2013-01-23 09:53:02.828723573 +0100
@@ -96,7 +96,7 @@
// and request the logon page.
header('Location: index.php' . $actionURI, true, 303);
exit;
- } else if ($logon) {
+ } else if ($logon || !isset($_SESSION['username'])) {
// The user requested to logon. Check if credentials were provided
// or if the a remote user login is possible.
$username = ($_POST && array_key_exists('username', $_POST)) ? $_POST['username'] : '';
@@ -117,12 +117,12 @@
if (!DISABLE_REMOTE_USER_LOGIN){
// REMOTE_USER is set when apache has authenticated the user
- if (!$_POST && $_SERVER && array_key_exists('REMOTE_USER', $_SERVER)) {
- $_SESSION['username'] = $_SERVER['REMOTE_USER'];
+ if (!$_POST && $_SERVER && array_key_exists('PHP_AUTH_USER', $_SERVER)) {
+ $_SESSION['username'] = $_SERVER['PHP_AUTH_USER'];
if (LOGINNAME_STRIP_DOMAIN) {
$_SESSION['username'] = ereg_replace('@.*', '', $_SESSION['username']);
}
- $_SESSION["password"] = '';
+ $_SESSION["password"] = $_SERVER['PHP_AUTH_PW'];
}
}
}