Peter M. Groen / knowledgetree

Commit 43fac34149eef5b49c43514252c70e04d3528731

Authored by Megan Watson
2 parents cbee9f22 b29316f4

Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
dmsctl.sh
  View file @43fac34
@@ -32,7 +32,7 @@ SOFFICE_PIDFILE=$INSTALL_PATH/var/log/soffice.bin.pid @@ -32,7 +32,7 @@ SOFFICE_PIDFILE=$INSTALL_PATH/var/log/soffice.bin.pid
32 SOFFICE_PID="" 32 SOFFICE_PID=""
33 SOFFICE_PORT="8100" 33 SOFFICE_PORT="8100"
34 SOFFICEBIN=/usr/bin/soffice 34 SOFFICEBIN=/usr/bin/soffice
35 -SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -\"accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager\"" 35 +SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager"
36 SOFFICE_STATUS="" 36 SOFFICE_STATUS=""
37 37
38 # Lucene 38 # Lucene
webservice/clienttools/ajaxhandler.php
  View file @43fac34
@@ -13,6 +13,7 @@ class ajaxHandler{ @@ -13,6 +13,7 @@ class ajaxHandler{
13 public $authenticator=NULL; 13 public $authenticator=NULL;
14 public $noAuthRequireList=array(); 14 public $noAuthRequireList=array();
15 public $standardServices=array('system'); 15 public $standardServices=array('system');
  16 + public $parameters=array();
16 17
17 protected $errors=array(); 18 protected $errors=array();
18 19
@@ -70,6 +71,7 @@ class ajaxHandler{ @@ -70,6 +71,7 @@ class ajaxHandler{
70 $add_params=array_merge($_GET,$_POST); 71 $add_params=array_merge($_GET,$_POST);
71 unset($add_params['request'],$add_params['datasource']); 72 unset($add_params['request'],$add_params['datasource']);
72 $this->request['parameters']=array_merge($this->request['parameters'],$add_params); 73 $this->request['parameters']=array_merge($this->request['parameters'],$add_params);
  74 + $this->parameters=$this->request['parameters'];
73 75
74 if(!$this->auth['debug'])$this->ret->includeDebug=false; 76 if(!$this->auth['debug'])$this->ret->includeDebug=false;
75 77
@@ -183,6 +185,7 @@ class ajaxHandler{ @@ -183,6 +185,7 @@ class ajaxHandler{
183 185
184 //TODO: Alter this to verify whether token was used before or whether it is new 186 //TODO: Alter this to verify whether token was used before or whether it is new
185 protected function checkTokenValidity(){ 187 protected function checkTokenValidity(){
  188 + if($this->parameters['permanentURL'])return true;
186 $token=$this->auth['token']; 189 $token=$this->auth['token'];
187 $tokenList=$_SESSION['JAPI_TOKEN_STORE']?$_SESSION['JAPI_TOKEN_STORE']:array(); 190 $tokenList=$_SESSION['JAPI_TOKEN_STORE']?$_SESSION['JAPI_TOKEN_STORE']:array();
188 $valid=!in_array($token,$tokenList); 191 $valid=!in_array($token,$tokenList);