diff --git a/cron/modules/com_vtiger_workflow/com_vtiger_workflow.service b/cron/modules/com_vtiger_workflow/com_vtiger_workflow.service
index 7486268dfab03c4791f8492f241fa2eaf33c916c..4ae43246aa80c124c1a52e3e0b33d42b19cdaaf8 100644
--- a/cron/modules/com_vtiger_workflow/com_vtiger_workflow.service
+++ b/cron/modules/com_vtiger_workflow/com_vtiger_workflow.service
@@ -13,7 +13,7 @@ ini_set('include_path',ini_get('include_path'). PATH_SEPARATOR . '../..');
require_once 'include/utils/utils.php';
require_once('include/utils/CommonUtils.php');
require_once("config.inc.php");
-require_once("libraries/HTTP_Session/Session.php");
+require_once("libraries/HTTP_Session2/HTTP/Session2.php");
require_once('include/database/PearDatabase.php');
require_once 'include/Webservices/Utils.php';
require_once("modules/Users/Users.php");
diff --git a/include/Webservices/SessionManager.php b/include/Webservices/SessionManager.php
index c8914bd4a66305a70bd5a96b2a215e3f5eeba932..fff4e25cb30f034aa4f993f633b2e90309bd005c 100644
--- a/include/Webservices/SessionManager.php
+++ b/include/Webservices/SessionManager.php
@@ -8,7 +8,7 @@
* All Rights Reserved.
*************************************************************************************/
- require_once("libraries/HTTP_Session/Session.php");
+ require_once("libraries/HTTP_Session2/HTTP/Session2.php");
// Later may we can move this to config file.
global $maxWebServiceSessionLifeSpan, $maxWebServiceSessionIdleTime;
@@ -34,37 +34,37 @@
$this->maxLife = $now + $maxWebServiceSessionLifeSpan;
$this->idleLife = $now + $maxWebServiceSessionIdleTime;
- HTTP_Session::useCookies(false); //disable cookie usage. may this could be moved out constructor?
+ HTTP_Session2::useCookies(false); //disable cookie usage. may this could be moved out constructor?
// only first invocation of following method, which is setExpire
//have an effect and any further invocation will be have no effect.
- HTTP_Session::setExpire($this->maxLife);
+ HTTP_Session2::setExpire($this->maxLife);
// this method replaces the new with old time if second params is true
//otherwise it subtracts the time from previous time
- HTTP_Session::setIdle($this->idleLife, true);
+ HTTP_Session2::setIdle($this->idleLife, true);
}
function isValid(){
$valid = true;
// expired
- if (HTTP_Session::isExpired()) {
+ if (HTTP_Session2::isExpired()) {
$valid = false;
- HTTP_Session::destroy();
+ HTTP_Session2::destroy();
throw new WebServiceException(WebServiceErrorCode::$SESSLIFEOVER,"Session has life span over please login again");
}
// idled
- if (HTTP_Session::isIdle()) {
+ if (HTTP_Session2::isIdle()) {
$valid = false;
- HTTP_Session::destroy();
+ HTTP_Session2::destroy();
throw new WebServiceException(WebServiceErrorCode::$SESSIONIDLE,"Session has been invalidated to due lack activity");
}
- //echo "<br>is new: ", HTTP_Session::isNew();
+ //echo "<br>is new: ", HTTP_Session2::isNew();
//invalid sessionId provided.
//echo "<br>get: ",$this->get($this->sessionVar);
- if(!$this->get($this->sessionVar) && !HTTP_Session::isNew()){
+ if(!$this->get($this->sessionVar) && !HTTP_Session2::isNew()){
$valid = false;
- HTTP_Session::destroy();
+ HTTP_Session2::destroy();
throw new WebServiceException(WebServiceErrorCode::$SESSIONIDINVALID,"Session Identifier provided is Invalid");
}
@@ -74,7 +74,7 @@
function startSession($sid = null,$adoptSession=false){
// if($sid){
-// HTTP_Session::id($sid);
+// HTTP_Session2::id($sid);
// }
if(!$sid || strlen($sid) ===0){
@@ -82,15 +82,15 @@
}
//session name is used for guessing the session id by http_session so pass null.
- HTTP_Session::start(null, $sid);
+ HTTP_Session2::start(null, $sid);
- $newSID = HTTP_Session::id();
+ $newSID = HTTP_Session2::id();
if(!$sid || $adoptSession==true){
$this->set($this->sessionVar,"true");
}else{
if(!$this->get($this->sessionVar)){
- HTTP_Session::destroy();
+ HTTP_Session2::destroy();
throw new WebServiceException(WebServiceErrorCode::$SESSIONIDINVALID,"Session Identifier provided is Invalid");
$newSID = null;
}
@@ -105,18 +105,18 @@
}
function getSessionId(){
- return HTTP_Session::id();
+ return HTTP_Session2::id();
}
function set($var_name, $var_value){
//TODO test setRef and getRef combination
//echo "<br>setting name: ",$var_name," :value: ",$var_value;
- HTTP_Session::set($var_name, $var_value);
+ HTTP_Session2::set($var_name, $var_value);
}
function get($name){
- //echo "<br> getting for: ",$name," :value: ",HTTP_Session::get($name);
- return HTTP_Session::get($name);
+ //echo "<br> getting for: ",$name," :value: ",HTTP_Session2::get($name);
+ return HTTP_Session2::get($name);
}
FUNCTION getError(){
@@ -124,7 +124,7 @@
}
function destroy(){
- HTTP_Session::destroy();
+ HTTP_Session2::destroy();
}
}
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/api/Session.php b/pkg/vtiger/modules/Mobile/modules/Mobile/api/Session.php
index 08250a5ca9cb65978a1d90809c31bade6feee9a9..cb491992992527fed356fa74f24581bc46011bbd 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/api/Session.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/api/Session.php
@@ -7,7 +7,7 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************/
-include_once 'libraries/HTTP_Session/Session.php';
+include_once 'libraries/HTTP_Session2/HTTP/Session2.php';
class Mobile_API_Session {
@@ -20,24 +20,24 @@ class Mobile_API_Session {
static function init($sessionid = false) {
if(empty($sessionid)) {
- HTTP_Session::start(null, null);
- $sessionid = HTTP_Session::id();
+ HTTP_Session2::start(null, null);
+ $sessionid = HTTP_Session2::id();
} else {
- HTTP_Session::start(null, $sessionid);
+ HTTP_Session2::start(null, $sessionid);
}
- if(HTTP_Session::isIdle() || HTTP_Session::isExpired()) {
+ if(HTTP_Session2::isIdle() || HTTP_Session2::isExpired()) {
return false;
}
return $sessionid;
}
static function get($key, $defvalue = '') {
- return HTTP_Session::get($key, $defvalue);
+ return HTTP_Session2::get($key, $defvalue);
}
static function set($key, $value) {
- HTTP_Session::set($key, $value);
+ HTTP_Session2::set($key, $value);
}
}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/index.php b/pkg/vtiger/modules/Mobile/modules/Mobile/index.php
index d3d8ba7c62d7c8c56f5a78df4d7a52cbee8e377b..0e300d87c25785b396407eea4c37155c7e381ad9 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/index.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/index.php
@@ -45,7 +45,7 @@ class Mobile_Index_Controller {
static function process(Mobile_API_Request $request) {
$operation = $request->getOperation();
- $sessionid = HTTP_Session::detectId(); //$request->getSession();
+ $sessionid = HTTP_Session2::detectId(); //$request->getSession();
if (empty($operation)) $operation = 'login';
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/ui/Logout.php b/pkg/vtiger/modules/Mobile/modules/Mobile/ui/Logout.php
index da958a6ceae577444005560a6dde382d4e95bce2..280cfadbd9004cd7747e6bd1f1ee92db4ae73556 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/ui/Logout.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/ui/Logout.php
@@ -11,7 +11,7 @@
class Mobile_UI_Logout extends Mobile_WS_Controller {
function process(Mobile_API_Request $request) {
- HTTP_Session::destroy(HTTP_Session::detectId());
+ HTTP_Session2::destroy(HTTP_Session2::detectId());
header('Location: index.php');
exit;
}
diff --git a/webservice.php b/webservice.php
index 68890e852abe3d193ae6a840d7e3c9a7690ce1aa..ca5a6735b7bea1e4c0555d96961bd9a3e833cfae 100644
--- a/webservice.php
+++ b/webservice.php
@@ -23,7 +23,7 @@
include_once 'vtlib/Vtiger/Module.php';
include_once 'includes/main/WebUI.php';
- require_once("libraries/HTTP_Session/Session.php");
+ require_once("libraries/HTTP_Session2/HTTP/Session2.php");
require_once 'include/Webservices/Utils.php';
require_once("include/Webservices/State.php");
require_once("include/Webservices/OperationManager.php");