diff --git a/dmsctl.sh b/dmsctl.sh index 92fd8b9..b571fd9 100755 --- a/dmsctl.sh +++ b/dmsctl.sh @@ -32,7 +32,7 @@ SOFFICE_PIDFILE=$INSTALL_PATH/var/log/soffice.bin.pid SOFFICE_PID="" SOFFICE_PORT="8100" SOFFICEBIN=/usr/bin/soffice -SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -\"accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager\"" +SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager" SOFFICE_STATUS="" # Lucene diff --git a/webservice/clienttools/ajaxhandler.php b/webservice/clienttools/ajaxhandler.php index 1538e47..829f521 100644 --- a/webservice/clienttools/ajaxhandler.php +++ b/webservice/clienttools/ajaxhandler.php @@ -13,6 +13,7 @@ class ajaxHandler{ public $authenticator=NULL; public $noAuthRequireList=array(); public $standardServices=array('system'); + public $parameters=array(); protected $errors=array(); @@ -70,6 +71,7 @@ class ajaxHandler{ $add_params=array_merge($_GET,$_POST); unset($add_params['request'],$add_params['datasource']); $this->request['parameters']=array_merge($this->request['parameters'],$add_params); + $this->parameters=$this->request['parameters']; if(!$this->auth['debug'])$this->ret->includeDebug=false; @@ -183,6 +185,7 @@ class ajaxHandler{ //TODO: Alter this to verify whether token was used before or whether it is new protected function checkTokenValidity(){ + if($this->parameters['permanentURL'])return true; $token=$this->auth['token']; $tokenList=$_SESSION['JAPI_TOKEN_STORE']?$_SESSION['JAPI_TOKEN_STORE']:array(); $valid=!in_array($token,$tokenList);