[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17334] Merge 17331:17333 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17334] Merge 17331:17333 from trunk |
|
Date: |
Sun, 19 Nov 2017 13:54:48 -0500 (EST) |
Revision: 17334
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17334
Author: sigurdne
Date: 2017-11-19 13:54:48 -0500 (Sun, 19 Nov 2017)
Log Message:
-----------
Merge 17331:17333 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/logout.php
branches/Version-2_0-branch/mobilefrontend/logout.php
branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/property/inc/class.fileuploader.inc.php
branches/Version-2_0-branch/property/login.php
branches/Version-2_0-branch/redirect.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-11-19 16:08:35 UTC (rev 17333)
+++ branches/Version-2_0-branch 2017-11-19 18:54:48 UTC (rev 17334)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333
\ No newline at end of property
Modified: branches/Version-2_0-branch/logout.php
===================================================================
--- branches/Version-2_0-branch/logout.php 2017-11-19 16:08:35 UTC (rev
17333)
+++ branches/Version-2_0-branch/logout.php 2017-11-19 18:54:48 UTC (rev
17334)
@@ -25,7 +25,7 @@
*/
include_once('header.inc.php');
- $sessionid = phpgw::get_var('sessionphpgwsessid');
+ $sessionid = $GLOBALS['phpgw']->session->get_session_id();
$verified = $GLOBALS['phpgw']->session->verify();
if ($verified)
@@ -63,7 +63,7 @@
if ( isset($GLOBALS['phpgw_info']['server']['usecookies'])
&& $GLOBALS['phpgw_info']['server']['usecookies'] )
{
-
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionphpgwsessid');
+ $GLOBALS['phpgw']->session->phpgw_setcookie(session_name());
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
}
Modified: branches/Version-2_0-branch/mobilefrontend/logout.php
===================================================================
--- branches/Version-2_0-branch/mobilefrontend/logout.php 2017-11-19
16:08:35 UTC (rev 17333)
+++ branches/Version-2_0-branch/mobilefrontend/logout.php 2017-11-19
18:54:48 UTC (rev 17334)
@@ -24,7 +24,7 @@
*/
include_once('../header.inc.php');
- $sessionid = phpgw::get_var('sessionphpgwsessid');
+ $sessionid = $GLOBALS['phpgw']->session->get_session_id();
$verified = $GLOBALS['phpgw']->session->verify();
if ($verified)
@@ -61,7 +61,7 @@
if (isset($GLOBALS['phpgw_info']['server']['usecookies']) &&
$GLOBALS['phpgw_info']['server']['usecookies'])
{
-
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionphpgwsessid');
+ $GLOBALS['phpgw']->session->phpgw_setcookie(session_name());
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2017-11-19 16:08:35 UTC (rev 17333)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2017-11-19 18:54:48 UTC (rev 17334)
@@ -38,7 +38,25 @@
}
else
{
- session_name('sessionphpgwsessid');
+// if(isset($_POST['logindomain']))
+// {
+// $_logindomain = phpgw::get_var('logindomain', 'string',
'POST', $GLOBALS['phpgw_info']['server']['default_domain']);
+// $_GET['domain'] = $_logindomain;
+// }
+//
+// if(!$session_prefix = phpgw::get_var('domain', 'string', 'GET',
false))
+// {
+// if(!$session_prefix = phpgw::get_var('domain',
'string', 'POST', false))
+// {
+// if(!$session_prefix = phpgw::get_var('domain',
'string', 'COOKIE', false))
+// {
+// $session_identifier = 'phpgw';
+// }
+// }
+// }
+// $session_identifier = str_replace('_', '' ,$session_prefix);
+ $session_identifier = 'phpgw';
+ session_name("session{$session_identifier}sessid");
}
/*
@@ -157,7 +175,7 @@
public function __construct()
{
$this->_db =&
$GLOBALS['phpgw']->db;
- $use_cookies = false;
+ $this->_use_cookies = false;
$GLOBALS['phpgw']->hooks->process('set_cookie_domain',
array('eventplannerfrontend','mobilefrontend', 'bookingfrontend',
'activitycalendarfrontend'));
if (
isset($GLOBALS['phpgw_info']['server']['usecookies'])
&&
$GLOBALS['phpgw_info']['server']['usecookies'] == 'True' )
@@ -186,6 +204,11 @@
ini_set('url_rewriter.tags', '');
}
+ public function get_session_id()
+ {
+ return $this->_sessionid;
+ }
+
/**
* Cache data for the user's current session
*
@@ -1160,18 +1183,7 @@
{
if(empty($sessionid) || !$sessionid)
{
- if($this->_use_cookies)
- {
- $sessionid =
phpgw::get_var(session_name());
- }
- else if ($_GET[session_name()])
- {
- $sessionid =
phpgw::get_var(session_name(),'string', 'GET');
- }
- else
- {
- $sessionid =
phpgw::get_var(session_name(), 'string', 'POST');
- }
+ $sessionid = $this->get_session_id();
}
if(!$sessionid)
Modified: branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-11-19
16:08:35 UTC (rev 17333)
+++ branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-11-19
18:54:48 UTC (rev 17334)
@@ -538,9 +538,10 @@
if (isset($_POST['login'])) // on login
{
$GLOBALS['login'] = $_POST['login'];
+ $_logindomain = phpgw::get_var('logindomain', 'string', 'POST',
$GLOBALS['phpgw_info']['server']['default_domain']);
if (strstr($GLOBALS['login'],'#') === False)
{
- $GLOBALS['login'] .= '#' .
phpgw::get_var('logindomain', 'string', 'POST',
$GLOBALS['phpgw_info']['server']['default_domain']);
+ $GLOBALS['login'] .= '#' . $_logindomain;
}
list(,$GLOBALS['phpgw_info']['user']['domain']) =
explode('#',$GLOBALS['login']);
}
Modified: branches/Version-2_0-branch/property/inc/class.fileuploader.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.fileuploader.inc.php
2017-11-19 16:08:35 UTC (rev 17333)
+++ branches/Version-2_0-branch/property/inc/class.fileuploader.inc.php
2017-11-19 18:54:48 UTC (rev 17334)
@@ -51,11 +51,12 @@
$upload_target = phpgw::get_var('upload_target');
$id = phpgw::get_var('id');
+ $session_name = session_name();
$oArgs = "{'menuaction':'$upload_target',"
. "'id':'$id',"
. "'last_loginid':'" .
phpgw::get_var('last_loginid') . "',"
. "'last_domain':'" .
phpgw::get_var('last_domain') . "',"
- . "'sessionphpgwsessid':'" .
phpgw::get_var('sessionphpgwsessid') . "',"
+ . "'{$session_name}':'" .
$GLOBALS['phpgw']->session->get_session_id() . "',"
. "'domain':'" . phpgw::get_var('domain') . "'";
foreach ($_GET as $varname => $value)
Modified: branches/Version-2_0-branch/property/login.php
===================================================================
--- branches/Version-2_0-branch/property/login.php 2017-11-19 16:08:35 UTC
(rev 17333)
+++ branches/Version-2_0-branch/property/login.php 2017-11-19 18:54:48 UTC
(rev 17334)
@@ -82,37 +82,37 @@
{
switch($code)
{
- case 1:
- return lang('You have been successfully
logged out');
- case 2:
- return lang('Sorry, your login has
expired');
- case 5:
- return lang('Bad login or password');
- case 20:
- return lang('Cannot find the mapping !
(please advice your adminstrator)');
- case 21:
- return lang('you had inactive mapping
to %1 account', phpgw::get_var('phpgw_account', 'string', 'GET', ''));
- case 22:
-
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
-
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
-
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
- return lang('you seemed to have an
active session elsewhere for the domain "%1", now set to expired - please try
again', phpgw::get_var('domain', 'string', 'COOKIE'));
- case 99:
- return lang('Blocked, too many
attempts');
- case 10:
-
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
-
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
-
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
-
- // fix for bug php4 expired sessions bug
-
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php')
- {
-
$GLOBALS['phpgw']->session->phpgw_setcookie('phpgwsessid');
- }
-
- return lang('Your session could not be
verified.');
- default:
- return ' ';
+ case 1:
+ return lang('You have been successfully
logged out');
+ case 2:
+ return lang('Sorry, your login has
expired');
+ case 5:
+ return lang('Bad login or password');
+ case 20:
+ return lang('Cannot find the mapping !
(please advice your adminstrator)');
+ case 21:
+ return lang('you had inactive mapping
to %1 account', phpgw::get_var('phpgw_account', 'string', 'GET', ''));
+ case 22:
+
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
+
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
+ return lang('you seemed to have an
active session elsewhere for the domain "%1", now set to expired - please try
again', phpgw::get_var('domain', 'string', 'COOKIE'));
+ case 99:
+ return lang('Blocked, too many
attempts');
+ case 10:
+
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
+
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
+
+ // fix for bug php4 expired sessions bug
+
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php')
+ {
+
$GLOBALS['phpgw']->session->phpgw_setcookie('phpgwsessid');
+ }
+
+ return lang('Your session could not be
verified.');
+ default:
+ return ' ';
}
}
@@ -179,11 +179,11 @@
include(PHPGW_SERVER_ROOT . '/setup/lang.php');
}
/* Program starts here */
- $GLOBALS['phpgw']->session->phpgw_setcookie('sessionphpgwsessid');
-// $GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
- $GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
- $GLOBALS['phpgw']->session->phpgw_setcookie('domain');
-
+ $GLOBALS['phpgw']->session->phpgw_setcookie(session_name());
+// $GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
+ $GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+ $GLOBALS['phpgw']->session->phpgw_setcookie('domain');
+
$login = phpgw::get_var('login', 'string', 'POST');
$passwd = phpgw::get_var('passwd', 'string', 'POST');
@@ -252,11 +252,11 @@
$_passwd = md5($passwd);
- $db->query("SELECT fm_tenant.id,
phpgw_accounts.account_lid,phpgw_accounts.account_pwd"
- . " FROM fm_tenant {$join} phpgw_accounts ON
fm_tenant.phpgw_account_id = phpgw_accounts.account_id"
- . " WHERE phpgw_accounts.account_status = 'A'
AND"
+ $db->query("SELECT fm_tenant.id,
phpgw_accounts.account_lid,phpgw_accounts.account_pwd"
+ . " FROM fm_tenant {$join} phpgw_accounts ON
fm_tenant.phpgw_account_id = phpgw_accounts.account_id"
+ . " WHERE phpgw_accounts.account_status = 'A'
AND"
. " fm_tenant.account_lid = '{$login}' AND"
- . " fm_tenant.account_pwd='{$_passwd}' AND"
+ . " fm_tenant.account_pwd='{$_passwd}' AND"
. " fm_tenant.account_status =1", __LINE__, __FILE__);
$db->next_record();
Modified: branches/Version-2_0-branch/redirect.php
===================================================================
--- branches/Version-2_0-branch/redirect.php 2017-11-19 16:08:35 UTC (rev
17333)
+++ branches/Version-2_0-branch/redirect.php 2017-11-19 18:54:48 UTC (rev
17334)
@@ -13,8 +13,23 @@
*/
+ $GLOBALS['phpgw_info']['flags'] = array
+ (
+ 'currentapp' => 'logout',
+ 'noheader' => True,
+ 'nonavbar' => True,
+ 'noappheader' => True,
+ 'noappfooter' => True,
+ 'nofooter' => True
+ );
+
+ /**
+ * Include phpgroupware header
+ */
+ include_once('header.inc.php');
+
//Get the session variables set for non cookie based sessions
- if ( !isset($_COOKIES['sessionphpgwsessid']) ||
isset($_COOKIES['sessionid']) )
+ if ( !isset($_COOKIES[session_name()]) || isset($_COOKIES['sessionid'])
)
{
// nothing else we can do
if ( !isset($_SERVER['HTTP_REFERER']) && isset($_GET['go']) )
@@ -33,21 +48,6 @@
}
- $GLOBALS['phpgw_info']['flags'] = array
- (
- 'currentapp' => 'home',
- 'noheader' => True,
- 'nonavbar' => True,
- 'noappheader' => True,
- 'noappfooter' => True,
- 'nofooter' => True
- );
-
- /**
- * Include phpgroupware header
- */
- include_once('header.inc.php');
-
if( isset($_GET['go']) )
{
$_GET['go'] = htmlspecialchars_decode(urldecode($_GET['go']));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17334] Merge 17331:17333 from trunk,
sigurdne <=