Merge branch 'bareos-15.2'

bareos · May 6, 2016 · ed936ea · ed936ea
2 parents cbffcf7 + c4bab8b
commit ed936ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/config/autoload/global.php b/config/autoload/global.php
@@ -148,11 +148,12 @@ function read_dir_config($config, $file)
    'directors' => read_dir_config($config, $file),
    'service_manager' => array(
       'factories' => array(
-         'Zend\Db\Adapter\Adapter' => 'Zend\Db\Adapter\AdapterServiceFactory',
+         'Zend\Session\Config\ConfigInterface' => 'Zend\Session\Service\SessionConfigFactory',
+         //'Zend\Db\Adapter\Adapter' => 'Zend\Db\Adapter\AdapterServiceFactory',
       ),
       'abstract_factories' => array(
          // to allow other adapters to be called by $sm->get('adaptername')
-         'Zend\Db\Adapter\AdapterAbstractServiceFactory',
+         //'Zend\Db\Adapter\AdapterAbstractServiceFactory',
       ),
    ),
    'session' => array(
@@ -161,7 +162,7 @@ function read_dir_config($config, $file)
          'options' => array(
             'name' => 'bareos',
             'use_cookies' => true,
-            'cookie_lifetime' => '3600',
+            'cookie_lifetime' => '0', // to reset lifetime to maximum at every click
             'gc_maxlifetime' => '3600',
             'cache_expire' => 3600,
             'remember_me_seconds' => 3600,

diff --git a/module/Application/src/Application/Controller/Plugin/SessionTimeoutPlugin.php b/module/Application/src/Application/Controller/Plugin/SessionTimeoutPlugin.php
@@ -10,8 +10,7 @@ class SessionTimeoutPlugin extends AbstractPlugin
    public function timeout()
    {
       // preparation for setting timeout via config file:
-      $config = $this->getController()->getServiceLocator()->get('config');
-
+      $this->getController()->getServiceLocator()->get('config');
       $timeout = 3600;
 
       if($timeout === 0) {

diff --git a/module/Restore/src/Restore/Controller/RestoreController.php b/module/Restore/src/Restore/Controller/RestoreController.php
@@ -222,7 +222,7 @@ private function buildSubtree()
                --$dnum;
                $items .= '{';
                $items .= '"id":"-' . $dir['pathid'] . '"';
-               $items .= ',"text":"' . $dir["name"] . '"';
+               $items .= ',"text":"' . preg_replace('/[\x00-\x1F\x7F]/', '', $dir["name"]) . '"';
                $items .= ',"icon":"glyphicon glyphicon-folder-close"';
                $items .= ',"state":""';
                $items .= ',"data":' . \Zend\Json\Json::encode($dir, \Zend\Json\Json::TYPE_OBJECT);
@@ -245,7 +245,7 @@ private function buildSubtree()
          foreach($files as $file) {
             $items .= '{';
             $items .= '"id":"' . $file["fileid"] . '"';
-            $items .= ',"text":"' . $file["name"] . '"';
+            $items .= ',"text":"' . preg_replace('/[\x00-\x1F\x7F]/', '', $file["name"]) . '"';
             $items .= ',"icon":"glyphicon glyphicon-file"';
             $items .= ',"state":""';
             $items .= ',"data":' . \Zend\Json\Json::encode($file, \Zend\Json\Json::TYPE_OBJECT);