* [MOD] Update version and code cleanup

nuxsmin · Jan 16, 2017 · beaea03 · beaea03
1 parent 03ed3ea
commit beaea03
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 53 deletions.
diff --git a/inc/SP/Account/Account.class.php b/inc/SP/Account/Account.class.php
@@ -32,7 +32,6 @@
 use SP\DataModel\AccountExtData;
 use SP\DataModel\CustomFieldData;
 use SP\DataModel\GroupAccountsData;
-use SP\Html\Html;
 use SP\Log\Email;
 use SP\Log\Log;
 use SP\Mgmt\CustomFields\CustomField;

diff --git a/inc/SP/Api/ApiTokens.class.php b/inc/SP/Api/ApiTokens.class.php
@@ -28,10 +28,6 @@
 
 use SP\Core\Exceptions\SPException;
 use SP\Core\Session;
-use SP\Html\Html;
-use SP\Log\Email;
-use SP\Log\Log;
-use SP\Mgmt\Users\UserUtil;
 use SP\Storage\DB;
 use SP\Storage\QueryData;
 

diff --git a/inc/SP/Auth/AuthUtil.class.php b/inc/SP/Auth/AuthUtil.class.php
@@ -30,7 +30,6 @@
 use SP\DataModel\UserPassRecoverData;
 use SP\Html\Html;
 use SP\Log\Email;
-use SP\Log\Log;
 use SP\Mgmt\Users\UserPassRecover;
 use SP\Storage\DB;
 use SP\Storage\QueryData;

diff --git a/inc/SP/Controller/ConfigActionController.class.php b/inc/SP/Controller/ConfigActionController.class.php
@@ -35,7 +35,6 @@
 use SP\Core\Exceptions\SPException;
 use SP\Core\Session;
 use SP\Core\XmlExport;
-use SP\Html\Html;
 use SP\Http\Request;
 use SP\Import\Import;
 use SP\Import\ImportParams;

diff --git a/inc/SP/Controller/ItemsController.class.php b/inc/SP/Controller/ItemsController.class.php
@@ -24,7 +24,6 @@
 
 namespace SP\Controller;
 
-use SP\Account\AccountUtil;
 use SP\Core\ItemsTypeInterface;
 use SP\DataModel\DataModelInterface;
 use SP\Mgmt\Categories\Category;

diff --git a/inc/SP/Mgmt/Categories/Category.class.php b/inc/SP/Mgmt/Categories/Category.class.php
@@ -31,8 +31,6 @@
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\CategoryData;
 use SP\DataModel\CustomFieldData;
-use SP\Html\Html;
-use SP\Log\Email;
 use SP\Log\Log;
 use SP\Mgmt\CustomFields\CustomField;
 use SP\Mgmt\ItemInterface;

diff --git a/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.class.php b/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.class.php
@@ -28,7 +28,6 @@
 
 use SP\Core\Crypt;
 use SP\Core\Exceptions\SPException;
-use SP\Core\Messages\LogMessage;
 use SP\DataModel\CustomFieldData;
 use SP\DataModel\CustomFieldDefData;
 use SP\Log\Log;

diff --git a/inc/SP/Mgmt/Customers/Customer.class.php b/inc/SP/Mgmt/Customers/Customer.class.php
@@ -31,8 +31,6 @@
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\CustomerData;
 use SP\DataModel\CustomFieldData;
-use SP\Html\Html;
-use SP\Log\Email;
 use SP\Log\Log;
 use SP\Mgmt\CustomFields\CustomField;
 use SP\Mgmt\ItemInterface;

diff --git a/inc/SP/Mgmt/Groups/Group.class.php b/inc/SP/Mgmt/Groups/Group.class.php
@@ -28,8 +28,6 @@
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\GroupData;
 use SP\DataModel\GroupUsersData;
-use SP\Html\Html;
-use SP\Log\Email;
 use SP\Log\Log;
 use SP\Mgmt\ItemInterface;
 use SP\Mgmt\ItemSelectInterface;

diff --git a/inc/SP/Mgmt/Plugins/Plugin.class.php b/inc/SP/Mgmt/Plugins/Plugin.class.php
@@ -26,8 +26,6 @@
 
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\PluginData;
-use SP\Html\Html;
-use SP\Log\Log;
 use SP\Mgmt\ItemInterface;
 use SP\Storage\DB;
 use SP\Storage\QueryData;

diff --git a/inc/SP/Mgmt/Profiles/Profile.class.php b/inc/SP/Mgmt/Profiles/Profile.class.php
@@ -31,9 +31,6 @@
 use SP\Core\Session;
 use SP\DataModel\ProfileBaseData;
 use SP\DataModel\ProfileData;
-use SP\Html\Html;
-use SP\Log\Email;
-use SP\Log\Log;
 use SP\Mgmt\ItemInterface;
 use SP\Mgmt\ItemSelectInterface;
 use SP\Mgmt\ItemTrait;

diff --git a/inc/SP/Mgmt/PublicLinks/PublicLink.class.php b/inc/SP/Mgmt/PublicLinks/PublicLink.class.php
@@ -31,7 +31,6 @@
 use SP\DataModel\PublicLinkBaseData;
 use SP\DataModel\PublicLinkData;
 use SP\DataModel\PublicLinkListData;
-use SP\Html\Html;
 use SP\Log\Email;
 use SP\Log\Log;
 use SP\Mgmt\ItemInterface;

diff --git a/inc/SP/Mgmt/Users/User.class.php b/inc/SP/Mgmt/Users/User.class.php
@@ -26,12 +26,8 @@
 
 defined('APP_ROOT') || die();
 
-use SP\Auth\AuthUtil;
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\UserData;
-use SP\Html\Html;
-use SP\Log\Email;
-use SP\Log\Log;
 use SP\Mgmt\ItemInterface;
 use SP\Mgmt\ItemSelectInterface;
 use SP\Mgmt\ItemTrait;

diff --git a/inc/SP/Mgmt/Users/UserPass.class.php b/inc/SP/Mgmt/Users/UserPass.class.php
@@ -31,7 +31,6 @@
 use SP\Core\Exceptions\SPException;
 use SP\Core\SessionUtil;
 use SP\DataModel\UserPassData;
-use SP\Html\Html;
 use SP\Log\Email;
 use SP\Log\Log;
 use SP\Storage\DB;

diff --git a/inc/SP/Mgmt/Users/UserPreferencesUtil.class.php b/inc/SP/Mgmt/Users/UserPreferencesUtil.class.php
@@ -29,7 +29,6 @@
 use SP\Config\Config;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Init;
-use SP\Core\Session;
 use SP\DataModel\PluginData;
 use SP\DataModel\UserData;
 use SP\DataModel\UserPreferencesData;

diff --git a/inc/SP/Util/Util.class.php b/inc/SP/Util/Util.class.php
@@ -366,7 +366,7 @@ public static function getAppInfo($index = null)
      */
     public static function getVersion($retBuild = false)
     {
-        $build = '17011302';
+        $build = '17011601';
         $version = [2, 0, 0];
 
         if ($retBuild) {

diff --git a/inc/themes/material-blue/js/app-theme.js b/inc/themes/material-blue/js/app-theme.js
@@ -355,6 +355,7 @@ sysPass.Theme = function (Common) {
             };
 
             var $tagsSelect = $frmSearch.find("#tags")[0];
+            var $tagsBar = $frmSearch.find(".search-filters-tags");
             var $showFilter = $frmSearch.find("i.show-filter");
 
             $resContent.on("click", "#data-search-header .sort-down,#data-search-header .sort-up", function () {
@@ -369,7 +370,7 @@ sysPass.Theme = function (Common) {
                     checkFavorite($this);
                 });
             }).on("click", "#search-rows span.tag", function () {
-                if ($showFilter.data("state") == 0) {
+                if ($tagsBar.is(":hidden")) {
                     $showFilter.trigger("click");
                 }
 
@@ -378,13 +379,12 @@ sysPass.Theme = function (Common) {
 
             $showFilter.on("click", function () {
                 var $this = $(this);
-                var $tags = $frmSearch.find(".search-filters-tags");
 
-                if ($tags.is(":hidden")) {
-                    $tags.slideDown("slow");
+                if ($tagsBar.is(":hidden")) {
+                    $tagsBar.slideDown("slow");
                     $this.html($this.data("icon-up"));
                 } else {
-                    $tags.slideUp("slow");
+                    $tagsBar.slideUp("slow");
                     $this.html($this.data("icon-down"));
                 }
             });

diff --git a/inc/themes/material-blue/js/app-theme.min.js b/inc/themes/material-blue/js/app-theme.min.js
diff --git a/js/app-actions.js b/js/app-actions.js
@@ -160,6 +160,10 @@ sysPass.Actions = function (Common) {
         var $content = $("<div id=\"box-popup\" class=\"image\">" + response + "</div>");
         var $image = $content.find("img");
 
+        if ($image.length === 0) {
+            return showFloatingBox($obj, response);
+        }
+
         $image.hide();
 
         $.magnificPopup.open({