Merge branch 'master' of /home/rdb/DEV/PhpstormProjects/sysPass with conflicts.

2026-03-22 00:06:53 +01:00 · 2019-01-15 16:21:15 +01:00
parent 12dc771f84
commit 1c9e5e48bf
290 changed files with 74421 additions and 44683 deletions
--- a/inc/SP/Controller/TabControllerBase.class.php
+++ b/inc/SP/Controller/TabControllerBase.class.php
@@ -1,66 +1,66 @@
-<?php
-/**
- * sysPass
- *
- * @author nuxsmin 
- * @link http://syspass.org
- * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org
- *
- * This file is part of sysPass.
- *
- * sysPass is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sysPass is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace SP\Controller;
-
-
-/**
- * Class TabControllerBase
- *
- * @package SP\Controller
- */
-abstract class TabControllerBase extends ControllerBase implements TabsInterface
-{
-    /**
-     * Pestañas
-     *
-     * @var array
-     */
-    private $tabs = [];
-
-    /**
-     * Añadir una nueva pestaña
-     *
-     * @param string $title
-     * @return int Índice de la última pestaña añadida
-     */
-    public function addTab($title)
-    {
-        $this->tabs[] = ['title' => $title];
-
-        $this->view->assign('tabs', $this->tabs);
-
-        return count($this->tabs) - 1;
-    }
-
-    /**
-     * Devuelve las pestañas
-     *
-     * @return array
-     */
-    public function getTabs()
-    {
-        return $this->tabs;
-    }
+<?php
+/**
+ * sysPass
+ *
+ * @author    nuxsmin
+ * @link      https://syspass.org
+ * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\DataModel\Dto;
+
+
+/**
+ * Class ConfigRequest
+ *
+ * @package SP\DataModel\Dto
+ */
+class ConfigRequest
+{
+    /**
+     * @var array
+     */
+    private $data = [];
+
+    /**
+     * @param $param
+     * @param $value
+     */
+    public function add($param, $value)
+    {
+        $this->data[$param] = $value;
+    }
+
+    /**
+     * @param $param
+     *
+     * @return mixed|null
+     */
+    public function get($param)
+    {
+        return isset($this->data[$param]) ? $this->data[$param] : null;
+    }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
 }