From beaea030417e414689cbc435f20cb25eeb884f17 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Mon, 16 Jan 2017 02:31:51 +0100 Subject: [PATCH] * [MOD] Update version and code cleanup --- inc/SP/Account/Account.class.php | 1 - inc/SP/Api/ApiTokens.class.php | 4 ---- inc/SP/Auth/AuthUtil.class.php | 1 - .../ConfigActionController.class.php | 1 - inc/SP/Controller/ItemsController.class.php | 1 - inc/SP/Mgmt/Categories/Category.class.php | 2 -- .../CustomFields/CustomFieldsUtil.class.php | 1 - inc/SP/Mgmt/Customers/Customer.class.php | 2 -- inc/SP/Mgmt/Groups/Group.class.php | 2 -- inc/SP/Mgmt/Plugins/Plugin.class.php | 2 -- inc/SP/Mgmt/Profiles/Profile.class.php | 3 --- inc/SP/Mgmt/PublicLinks/PublicLink.class.php | 1 - inc/SP/Mgmt/Users/User.class.php | 4 ---- inc/SP/Mgmt/Users/UserPass.class.php | 1 - .../Mgmt/Users/UserPreferencesUtil.class.php | 1 - inc/SP/Util/Util.class.php | 2 +- inc/themes/material-blue/js/app-theme.js | 10 ++++----- inc/themes/material-blue/js/app-theme.min.js | 22 +++++++++---------- js/app-actions.js | 4 ++++ js/app-actions.min.js | 18 +++++++-------- 20 files changed, 30 insertions(+), 53 deletions(-) diff --git a/inc/SP/Account/Account.class.php b/inc/SP/Account/Account.class.php index 0a3fbccd..1b250749 100644 --- a/inc/SP/Account/Account.class.php +++ b/inc/SP/Account/Account.class.php @@ -32,7 +32,6 @@ use SP\DataModel\AccountData; 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 index 61fed896..95ff682e 100644 --- a/inc/SP/Api/ApiTokens.class.php +++ b/inc/SP/Api/ApiTokens.class.php @@ -28,10 +28,6 @@ defined('APP_ROOT') || die(); 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 index 3daced2d..9c4fa6ce 100644 --- a/inc/SP/Auth/AuthUtil.class.php +++ b/inc/SP/Auth/AuthUtil.class.php @@ -30,7 +30,6 @@ use SP\DataModel\UserData; 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 index 3bd308ef..2121767a 100644 --- a/inc/SP/Controller/ConfigActionController.class.php +++ b/inc/SP/Controller/ConfigActionController.class.php @@ -35,7 +35,6 @@ use SP\Core\CryptMasterPass; 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 index 7adb71e9..638e776e 100644 --- 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 index 7fbfb840..d443e46b 100644 --- a/inc/SP/Mgmt/Categories/Category.class.php +++ b/inc/SP/Mgmt/Categories/Category.class.php @@ -31,8 +31,6 @@ use SP\Core\ActionsInterface; 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 index 4e13da17..5143e433 100644 --- a/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.class.php +++ b/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.class.php @@ -28,7 +28,6 @@ defined('APP_ROOT') || die(); 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 index de53bd92..624b0900 100644 --- a/inc/SP/Mgmt/Customers/Customer.class.php +++ b/inc/SP/Mgmt/Customers/Customer.class.php @@ -31,8 +31,6 @@ use SP\Core\ActionsInterface; 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 index 424e658e..185912d8 100644 --- a/inc/SP/Mgmt/Groups/Group.class.php +++ b/inc/SP/Mgmt/Groups/Group.class.php @@ -28,8 +28,6 @@ namespace SP\Mgmt\Groups; 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 index 2217a89c..56c2073a 100644 --- a/inc/SP/Mgmt/Plugins/Plugin.class.php +++ b/inc/SP/Mgmt/Plugins/Plugin.class.php @@ -26,8 +26,6 @@ namespace SP\Mgmt\Plugins; 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 index 01dd668d..488abfa8 100644 --- a/inc/SP/Mgmt/Profiles/Profile.class.php +++ b/inc/SP/Mgmt/Profiles/Profile.class.php @@ -31,9 +31,6 @@ use SP\Core\Exceptions\SPException; 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 index 1fc4c99d..5d1d8400 100644 --- a/inc/SP/Mgmt/PublicLinks/PublicLink.class.php +++ b/inc/SP/Mgmt/PublicLinks/PublicLink.class.php @@ -31,7 +31,6 @@ use SP\Core\Session; 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 index d3a50541..1221a82c 100644 --- a/inc/SP/Mgmt/Users/User.class.php +++ b/inc/SP/Mgmt/Users/User.class.php @@ -26,12 +26,8 @@ namespace SP\Mgmt\Users; 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 index 933f1d34..c85d9018 100644 --- a/inc/SP/Mgmt/Users/UserPass.class.php +++ b/inc/SP/Mgmt/Users/UserPass.class.php @@ -31,7 +31,6 @@ use SP\Core\Crypt; 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 index 78fed563..86bae16e 100644 --- a/inc/SP/Mgmt/Users/UserPreferencesUtil.class.php +++ b/inc/SP/Mgmt/Users/UserPreferencesUtil.class.php @@ -29,7 +29,6 @@ use Plugins\Authenticator\AuthenticatorPlugin; 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 index b1487d9f..deb0b615 100644 --- a/inc/SP/Util/Util.class.php +++ b/inc/SP/Util/Util.class.php @@ -366,7 +366,7 @@ class Util */ 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 index aa45bcd1..7df67b16 100644 --- 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 index e7e0e794..0ee47bdf 100644 --- a/inc/themes/material-blue/js/app-theme.min.js +++ b/inc/themes/material-blue/js/app-theme.min.js @@ -1,18 +1,18 @@ -var $jscomp={scope:{},findInternal:function(a,f,d){a instanceof String&&(a=String(a));for(var h=a.length,g=0;g=c||58<=c&&64>=c||91<=c&&96>=c||123<=c&&126>=c)||!a.passwordData.complexity.numbers&&48<=c&&57>=c||!a.passwordData.complexity.uppercase&&65<=c&&90>=c||(l++,e+=String.fromCharCode(c));$("#viewPass").attr("title",e);var k=zxcvbn(e);a.passwordData.passLength=e.length;b?(l=b.parent(),c=$("#"+b.attr("id")+"R"), -a.outputResult(k,b),b=new MaterialTextfield,l.find("input:password").val(e),l.addClass(b.CssClasses_.IS_DIRTY).removeClass(b.CssClasses_.IS_INVALID),c.val(e).parent().addClass(b.CssClasses_.IS_DIRTY).removeClass(b.CssClasses_.IS_INVALID),a.encryptFormValue(c),l.find("#passLevel").show(500)):(a.outputResult(k),$("input:password, input.password").val(e),$("#passLevel").show(500))},h=function(){$("
").dialog({modal:!0,title:a.config().LANG[29],width:"400px",open:function(){var b=$(this),l= +sysPass.Theme=function(a){var f=a.log,d=function(b){for(var l=0,e="",c;l=c||58<=c&&64>=c||91<=c&&96>=c||123<=c&&126>=c)||!a.passwordData.complexity.numbers&&48<=c&&57>=c||!a.passwordData.complexity.uppercase&&65<=c&&90>=c||(l++,e+=String.fromCharCode(c));$("#viewPass").attr("title",e);var d=zxcvbn(e);a.passwordData.passLength=e.length;b?(l=b.parent(),c=$("#"+b.attr("id")+"R"), +a.outputResult(d,b),b=new MaterialTextfield,l.find("input:password").val(e),l.addClass(b.CssClasses_.IS_DIRTY).removeClass(b.CssClasses_.IS_INVALID),c.val(e).parent().addClass(b.CssClasses_.IS_DIRTY).removeClass(b.CssClasses_.IS_INVALID),a.encryptFormValue(c),l.find("#passLevel").show(500)):(a.outputResult(d),$("input:password, input.password").val(e),$("#passLevel").show(500))},k=function(){$("
").dialog({modal:!0,title:a.config().LANG[29],width:"400px",open:function(){var b=$(this),l= '
'; b.html(l);b.dialog("option","position","center");b.ready(function(){$("#checkbox-numbers").prop("checked",a.passwordData.complexity.numbers);$("#checkbox-uppercase").prop("checked",a.passwordData.complexity.uppercase);$("#checkbox-symbols").prop("checked",a.passwordData.complexity.symbols);$("#passlength").val(a.passwordData.complexity.numlength);$("#btn-complexity").click(function(){a.passwordData.complexity.numbers=$(" #checkbox-numbers").is(":checked");a.passwordData.complexity.uppercase=$("#checkbox-uppercase").is(":checked"); -a.passwordData.complexity.symbols=$("#checkbox-symbols").is(":checked");a.passwordData.complexity.numlength=parseInt($("#passlength").val());b.dialog("close")});componentHandler.upgradeDom()})},close:function(){$(this).dialog("destroy")}})},g=function(b){b.find(".passwordfield__input").each(function(){var b=$(this);if("true"!==b.attr("data-pass-upgraded")){var e=b.parent(),c=b.attr("id"),k=$("#"+c+"R"),m='',m=m+('
    ')+('
  • settings'+a.config().LANG[28]+"
    • "),m=m+('
  • vpn_key'+a.config().LANG[29]+"
    • "),m=m+('
  • refresh'+a.config().LANG[30]+"
    • ");e.after('
    '); -e.next(".password-actions").prepend('').prepend('remove_red_eye').prepend(m);b.on("keyup",function(){a.checkPassLevel(b)});e=b.parent().next();e.find(".passGen").on("click",function(){d(b);b.focus()});e.find(".passComplexity").on("click",function(){h()});e.find(".showpass").on("mouseover",function(){$(this).attr("title",b.val())});e.find(".reset").on("click", -function(){b.val("");k.val("");componentHandler.upgradeDom()});b.attr("data-pass-upgraded","true")}});b.find(".passwordfield__input-show").each(function(){var b=$(this),e=$('remove_red_eye');b.parent().after(e);e.on("mouseover",function(){e.attr("title",b.val())})})},n=function(b){f.info("setupDatePicker");var d={format:"YYYY-MM-DD",lang:a.config().LOCALE.substr(0,2),time:!1,cancelText:a.config().LANG[44], +a.passwordData.complexity.symbols=$("#checkbox-symbols").is(":checked");a.passwordData.complexity.numlength=parseInt($("#passlength").val());b.dialog("close")});componentHandler.upgradeDom()})},close:function(){$(this).dialog("destroy")}})},g=function(b){b.find(".passwordfield__input").each(function(){var b=$(this);if("true"!==b.attr("data-pass-upgraded")){var e=b.parent(),c=b.attr("id"),f=$("#"+c+"R"),h='',h=h+('
      ')+('
    • settings'+a.config().LANG[28]+"
      • "),h=h+('
    • vpn_key'+a.config().LANG[29]+"
      • "),h=h+('
    • refresh'+a.config().LANG[30]+"
      • ");e.after('
      '); +e.next(".password-actions").prepend('').prepend('remove_red_eye').prepend(h);b.on("keyup",function(){a.checkPassLevel(b)});e=b.parent().next();e.find(".passGen").on("click",function(){d(b);b.focus()});e.find(".passComplexity").on("click",function(){k()});e.find(".showpass").on("mouseover",function(){$(this).attr("title",b.val())});e.find(".reset").on("click", +function(){b.val("");f.val("");componentHandler.upgradeDom()});b.attr("data-pass-upgraded","true")}});b.find(".passwordfield__input-show").each(function(){var b=$(this),e=$('remove_red_eye');b.parent().after(e);e.on("mouseover",function(){e.attr("title",b.val())})})},m=function(b){f.info("setupDatePicker");var d={format:"YYYY-MM-DD",lang:a.config().LOCALE.substr(0,2),time:!1,cancelText:a.config().LANG[44], okText:a.config().LANG[43],clearText:a.config().LANG[30],nowText:a.config().LANG[56],minDate:new Date,triggerEvent:"dateIconClick"},e=function(b){f.info(moment.tz("UTC"));f.info(a.config().TIMEZONE);return moment(b).tz(a.config().TIMEZONE).format("X")};b.find(".password-datefield__input").each(function(){var a=$(this);a.bootstrapMaterialDatePicker(d);a.parent().append("");a.parent().next("i").on("click",function(){a.trigger("dateIconClick")}); -a.on("change",function(){var b;b=e(a.val());a.parent().find("input[name='passworddatechange_unix']").val(b)})})};return{passwordDetect:g,password:d,viewsTriggers:{search:function(){var b=$("#frmSearch"),d=$("#res-content");b.find(".icon-searchfav").on("click",function(){var k=$(this).find("i"),c=b.find("input[name='searchfav']");0==c.val()?(k.addClass("mdl-color-text--amber-A200"),k.attr("title",a.config().LANG[53]),c.val(1)):(k.removeClass("mdl-color-text--amber-A200"),k.attr("title",a.config().LANG[52]), -c.val(0));b.submit()});var e=b.find("#tags")[0],c=b.find("i.show-filter");d.on("click","#data-search-header .sort-down,#data-search-header .sort-up",function(){var b=$(this);b.parent().find("a").addClass("filterOn");a.appActions().account.sort(b)}).on("click","#search-rows i.icon-favorite",function(){var b=$(this);a.appActions().account.savefavorite(b,function(){"on"===b.data("status")?(b.addClass("mdl-color-text--amber-A100"),b.attr("title",a.config().LANG[50]),b.html("star")):(b.removeClass("mdl-color-text--amber-A100"), -b.attr("title",a.config().LANG[49]),b.html("star_border"))})}).on("click","#search-rows span.tag",function(){0==c.data("state")&&c.trigger("click");e.selectize.addItem($(this).data("tag-id"))});c.on("click",function(){var a=$(this),c=b.find(".search-filters-tags");c.is(":hidden")?(c.slideDown("slow"),a.html(a.data("icon-up"))):(c.slideUp("slow"),a.html(a.data("icon-down")))});0
    '),e=$('
  • '),c=$('');a.forEach(function(a){var d=c.clone();d.append('person');d.append(a);a= e.clone().append(d);b.append(a)});return b},tabs:{add:function(a,d,e,c){a=$(a);var b="";1===c&&(a.parent().find("#tabs-"+d).addClass("is-active"),b="is-active");a.append(''+e+"")}}}}}; diff --git a/js/app-actions.js b/js/app-actions.js index d48cf00d..6e7492d1 100644 --- a/js/app-actions.js +++ b/js/app-actions.js @@ -160,6 +160,10 @@ sysPass.Actions = function (Common) { var $content = $("
    " + response + "
    "); var $image = $content.find("img"); + if ($image.length === 0) { + return showFloatingBox($obj, response); + } + $image.hide(); $.magnificPopup.open({ diff --git a/js/app-actions.min.js b/js/app-actions.min.js index 41faad0b..d49dcd65 100644 --- a/js/app-actions.min.js +++ b/js/app-actions.min.js @@ -4,20 +4,20 @@ $jscomp.polyfill("Array.prototype.find",function(c){return c?c:function(c,h){ret sysPass.Actions=function(c){var d=c.log,h=0,e={doAction:"/ajax/ajax_getContent.php",updateItems:"/ajax/ajax_getItems.php",user:{savePreferences:"/ajax/ajax_userPrefsSave.php",password:"/ajax/ajax_usrpass.php",passreset:"/ajax/ajax_passReset.php"},main:{login:"/ajax/ajax_doLogin.php",install:"/ajax/ajax_install.php",getUpdates:"/ajax/ajax_checkUpds.php"},checks:"/ajax/ajax_checkConnection.php",config:{save:"/ajax/ajax_configSave.php","export":"/ajax/ajax_configSave.php","import":"/ajax/ajax_configSave.php"}, file:"/ajax/ajax_filesMgmt.php",link:"/ajax/ajax_itemSave.php",plugin:"/ajax/ajax_itemSave.php",account:{save:"/ajax/ajax_itemSave.php",showPass:"/ajax/ajax_accViewPass.php",saveFavorite:"/ajax/ajax_itemSave.php",request:"/ajax/ajax_itemSave.php",getFiles:"/ajax/ajax_accGetFiles.php",search:"/ajax/ajax_accSearch.php"},appMgmt:{show:"/ajax/ajax_itemShow.php",save:"/ajax/ajax_itemSave.php",search:"/ajax/ajax_itemSearch.php"},eventlog:"/ajax/ajax_eventlog.php",wiki:{show:"/ajax/ajax_wiki.php"},notice:{show:"/ajax/ajax_noticeShow.php", search:"/ajax/ajax_noticeSearch.php"}},g=function(a){a={actionId:a.actionId,itemId:"undefined"!==a.itemId?a.itemId:0,isAjax:1};var b=c.appRequests().getRequestOpts();b.url=e.doAction;b.type="html";b.addHistory=!0;b.data=a;c.appRequests().getActionCall(b,function(a){$("#content").empty().html(a)})},n=function(a){d.info("updateItems");var b=$("#"+a.data("item-dst"))[0].selectize;b.clearOptions();b.load(function(b){var f=c.appRequests().getRequestOpts();f.url=e.updateItems;f.method="get";f.data={sk:c.sk.get(), -itemType:a.data("item-type")};c.appRequests().getActionCall(f,function(a){b(a.items)})})},l=function(a,b){$.magnificPopup.open({items:{src:b,type:"inline"},callbacks:{open:function(){c.appTriggers().views.common("#box-popup");$("#box-popup").find(":input:text:visible:first").focus()},close:function(){a.data("item-dst")&&n(a)}},showCloseBtn:!1})},r=function(a,b){var f=$('
    '+b+"
    "),d=f.find("img");d.hide();$.magnificPopup.open({items:{src:f,type:"inline"},callbacks:{open:function(){var a= -this;d.on("click",function(){a.close()});setTimeout(function(){var a=c.resizeImage(d);f.css({backgroundColor:"#fff",width:a.width,height:"auto"});d.show("slow")},500)}}})},q={logout:function(){var a=window.location.search;c.redirect(0'+b+"
    "),d=f.find("img");if(0===d.length)return k(a,b);d.hide();$.magnificPopup.open({items:{src:f, +type:"inline"},callbacks:{open:function(){var a=this;d.on("click",function(){a.close()});setTimeout(function(){var a=c.resizeImage(d);f.css({backgroundColor:"#fff",width:a.width,height:"auto"});d.show("slow")},500)}}})},q={logout:function(){var a=window.location.search;c.redirect(0";showDialog({text:b,negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43],onClick:function(b){b=c.appRequests().getRequestOpts();b.url=e.account.save;b.data={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get()};c.appRequests().getActionCall(b,function(a){c.msg.out(a);m.search()})}}})},showpass:function(a){d.info("account:showpass");var b=a.data("parent-id"),f= -c.appRequests().getRequestOpts();f.url=e.appMgmt.show;f.data={itemId:0==b?a.data("item-id"):b,actionId:a.data("action-id"),isHistory:a.data("history"),isFull:1,sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(f,function(b){0!==b.status?c.msg.out(b):(b=$(b.data.html),l(a,b),b.on("mouseleave",function(){clearTimeout(h);h=setTimeout(function(){$.magnificPopup.close()},3E4)}).on("mouseenter",function(){0!==h&&clearTimeout(h)}))})},copypass:function(a){d.info("account:copypass");var b=a.data("parent-id"), -f=c.appRequests().getRequestOpts();f.url=e.appMgmt.show;f.async=!1;f.data={itemId:0==b?a.data("item-id"):b,actionId:a.data("action-id"),isHistory:a.data("history"),isFull:0,sk:c.sk.get(),isAjax:1};a=c.appRequests().getActionCall(f);void 0!==a.responseJSON.csrf&&c.sk.set(a.responseJSON.csrf);return a},copy:function(a){d.info("account:copy");g({actionId:a.data("action-id"),itemId:a.data("item-id")})},savefavorite:function(a,b){d.info("account:saveFavorite");var f="on"===a.data("status"),k={actionId:f? -a.data("action-id-off"):a.data("action-id-on"),itemId:a.data("item-id"),sk:c.sk.get(),isAjax:1},g=c.appRequests().getRequestOpts();g.url=e.account.saveFavorite;g.data=k;c.appRequests().getActionCall(g,function(d){c.msg.out(d);0===d.status&&(a.data("status",f?"off":"on"),"function"===typeof b&&b())})},request:function(a){d.info("account:request");var b=c.appRequests().getRequestOpts();b.url=e.account.request;b.data=a.serialize();c.appRequests().getActionCall(b,function(a){c.msg.out(a)})},menu:function(a){a.hide(); +c.appRequests().getRequestOpts();f.url=e.appMgmt.show;f.data={itemId:0==b?a.data("item-id"):b,actionId:a.data("action-id"),isHistory:a.data("history"),isFull:1,sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(f,function(b){0!==b.status?c.msg.out(b):(b=$(b.data.html),k(a,b),b.on("mouseleave",function(){clearTimeout(h);h=setTimeout(function(){$.magnificPopup.close()},3E4)}).on("mouseenter",function(){0!==h&&clearTimeout(h)}))})},copypass:function(a){d.info("account:copypass");var b=a.data("parent-id"), +f=c.appRequests().getRequestOpts();f.url=e.appMgmt.show;f.async=!1;f.data={itemId:0==b?a.data("item-id"):b,actionId:a.data("action-id"),isHistory:a.data("history"),isFull:0,sk:c.sk.get(),isAjax:1};a=c.appRequests().getActionCall(f);void 0!==a.responseJSON.csrf&&c.sk.set(a.responseJSON.csrf);return a},copy:function(a){d.info("account:copy");g({actionId:a.data("action-id"),itemId:a.data("item-id")})},savefavorite:function(a,b){d.info("account:saveFavorite");var f="on"===a.data("status"),l={actionId:f? +a.data("action-id-off"):a.data("action-id-on"),itemId:a.data("item-id"),sk:c.sk.get(),isAjax:1},g=c.appRequests().getRequestOpts();g.url=e.account.saveFavorite;g.data=l;c.appRequests().getActionCall(g,function(d){c.msg.out(d);0===d.status&&(a.data("status",f?"off":"on"),"function"===typeof b&&b())})},request:function(a){d.info("account:request");var b=c.appRequests().getRequestOpts();b.url=e.account.request;b.data=a.serialize();c.appRequests().getActionCall(b,function(a){c.msg.out(a)})},menu:function(a){a.hide(); a.parent().children(".actions-optional").show(250)},sort:function(a){d.info("account:sort");var c=$("#frmSearch");c.find('input[name="skey"]').val(a.data("key"));c.find('input[name="sorder"]').val(a.data("dir"));c.find('input[name="start"]').val(a.data("start"));m.search()},editpass:function(a){d.info("account:editpass");var c=a.data("parent-id");g({actionId:a.data("action-id"),itemId:0==c?a.data("item-id"):c})},restore:function(a){d.info("account:restore");m.save(a)},getfiles:function(a){d.info("account:getfiles"); var b=c.appRequests().getRequestOpts();b.method="get";b.type="html";b.url=e.account.getFiles;b.data={id:a.data("item-id"),del:a.data("delete"),sk:c.sk.get()};c.appRequests().getActionCall(b,function(c){a.html(c)})},search:function(){d.info("account:search");var a=$("#frmSearch");a.find("input[name='sk']").val(c.sk.get());a.find("input[name='skey']").val();a.find("input[name='sorder']").val();var b=c.appRequests().getRequestOpts();b.url=e.account.search;b.data=a.serialize();c.appRequests().getActionCall(b, function(b){10===b.status&&c.msg.out(b);c.sk.set(b.sk);$("#res-content").empty().html(b.html);a.find("input:first").focus()})},save:function(a){d.info("account:save");var b=c.appRequests().getRequestOpts();b.url=e.account.save;b.data=a.serialize();c.appRequests().getActionCall(b,function(a){c.msg.out(a)})}},p={refreshTab:!0,show:function(a){d.info("appMgmt:show");if(a.data("item-dst")||void 0===a.data("activetab"))d.info(a.data("activetab")),p.refreshTab=!1;var b=c.appRequests().getRequestOpts(); -b.url=e.appMgmt.show;b.data={itemId:a.data("item-id"),actionId:a.data("action-id"),activeTab:a.data("activetab"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){0!==b.status?c.msg.out(b):l(a,b.data.html)})},"delete":function(a){d.info("appMgmt:delete");var b='

    '+c.config().LANG[12]+"

    ",f=a.data("selection"),k=[];if(f&&($(f).find(".is-selected").each(function(a,c){var b=$(this);k.push(b.data("item-id"))}),0===k.length))return;showDialog({text:b, -negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43],onClick:function(b){b.preventDefault();b=c.appRequests().getRequestOpts();b.url=e.appMgmt.save;b.data={itemId:f?k:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){c.msg.out(b);a.data("nextaction-id")&&g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")})})}}})},save:function(a){d.info("appMgmt:save"); +b.url=e.appMgmt.show;b.data={itemId:a.data("item-id"),actionId:a.data("action-id"),activeTab:a.data("activetab"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){0!==b.status?c.msg.out(b):k(a,b.data.html)})},"delete":function(a){d.info("appMgmt:delete");var b='

    '+c.config().LANG[12]+"

    ",f=a.data("selection"),l=[];if(f&&($(f).find(".is-selected").each(function(a,c){var b=$(this);l.push(b.data("item-id"))}),0===l.length))return;showDialog({text:b, +negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43],onClick:function(b){b.preventDefault();b=c.appRequests().getRequestOpts();b.url=e.appMgmt.save;b.data={itemId:f?l:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){c.msg.out(b);a.data("nextaction-id")&&g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")})})}}})},save:function(a){d.info("appMgmt:save"); var b=c.appRequests().getRequestOpts();b.url=e.appMgmt.save;b.data=a.serialize();c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&(!0===p.refreshTab&&g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")}),$.magnificPopup.close())})},search:function(a){d.info("appMgmt:search");var b=$(a.data("target")),f=c.appRequests().getRequestOpts();f.url=e.appMgmt.search;f.data=a.serialize();c.appRequests().getActionCall(f,function(a){0===a.status?b.html(a.data.html):b.html(c.msg.html.error(a.description)); c.sk.set(a.csrf)})},nav:function(a){d.info("appMgmt:nav");var b=$("#"+a.data("action-form"));b.find("[name='start']").val(a.data("start"));b.find("[name='count']").val(a.data("count"));b.find("[name='sk']").val(c.sk.get());p.search(b)},ldapSync:function(a){d.info("appMgmt:ldapSync");var b='

    '+c.config().LANG[57]+"

    ";showDialog({text:b,negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43], onClick:function(b){b=c.appRequests().getRequestOpts();b.url=e.appMgmt.save;b.data={actionId:a.data("action-id"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(a){c.msg.out(a)})}}})}};return{doAction:g,appMgmt:p,account:m,file:{view:function(a){d.info("file:view");var b=c.appRequests().getRequestOpts();b.url=e.file;b.type="html";b.data={fileId:a.data("item-id"),sk:c.sk.get(),actionId:a.data("action-id")};c.appRequests().getActionCall(b,function(b){void 0!==b.status&&1===b.status? @@ -27,7 +27,7 @@ var b=$("#ldap-results");b.find(".list-wrap").html(c.appTheme().html.getList(a.d c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&(void 0!==a.data("nextaction-id")?g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")}):void 0!==a.data("reload")&&setTimeout(function(){c.redirect("index.php")},2E3))})},backup:function(a){d.info("config:backup");var b=c.appRequests().getRequestOpts();b.url=e.config["export"];b.data=a.serialize();c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&void 0!==a.data("nextaction-id")&&g({actionId:a.data("nextaction-id"), itemId:a.data("activetab")})})},"export":function(a){d.info("config:export");var b=c.appRequests().getRequestOpts();b.url=e.config["export"];b.data=a.serialize();c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&void 0!==a.data("nextaction-id")&&g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")})})},"import":function(a){d.info("config:import");var b=c.appRequests().getRequestOpts();b.url=e.config["import"];b.data=a.serialize();c.appRequests().getActionCall(b,function(b){c.msg.out(b); 0===b.status&&void 0!==a.data("nextaction-id")&&g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")})})}},main:q,user:{savePreferences:function(a){d.info("user:savePreferences");var b=c.appRequests().getRequestOpts();b.url=e.user.savePreferences;b.data=a.serialize();c.appRequests().getActionCall(b,function(a){c.msg.out(a);setTimeout(function(){c.redirect("index.php")},2E3)})},saveSecurity:function(a){d.info("user:saveSecurity");var b=c.appRequests().getRequestOpts();b.url=e.user.savePreferences; -b.data=a.serialize();c.appRequests().getActionCall(b,function(b){c.msg.out(b);g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")})})},password:function(a){d.info("user:password");var b=c.appRequests().getRequestOpts();b.type="html";b.method="get";b.url=e.user.password;b.data={actionId:a.data("action-id"),itemId:a.data("item-id"),sk:a.data("sk"),isAjax:1};c.appRequests().getActionCall(b,function(b){0===b.length?q.logout():l(a,b)})},passreset:function(a){d.info("user:passreset");var b=c.appRequests().getRequestOpts(); +b.data=a.serialize();c.appRequests().getActionCall(b,function(b){c.msg.out(b);g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")})})},password:function(a){d.info("user:password");var b=c.appRequests().getRequestOpts();b.type="html";b.method="get";b.url=e.user.password;b.data={actionId:a.data("action-id"),itemId:a.data("item-id"),sk:a.data("sk"),isAjax:1};c.appRequests().getActionCall(b,function(b){0===b.length?q.logout():k(a,b)})},passreset:function(a){d.info("user:passreset");var b=c.appRequests().getRequestOpts(); b.url=e.user.passreset;b.data=a.serialize();c.appRequests().getActionCall(b,function(a){c.msg.out(a)})}},link:{save:function(a){d.info("link:save");var b=c.appRequests().getRequestOpts();b.url=e.link;b.data={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),isAjax:1};a='

    '+c.config().LANG[48]+"

    ";showDialog({text:a,negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.appRequests().getActionCall(b,function(a){c.msg.out(a)})}}, positive:{title:c.config().LANG[43],onClick:function(a){a.preventDefault();b.data.notify=1;c.appRequests().getActionCall(b,function(a){c.msg.out(a)})}}})},refresh:function(a){d.info("link:refresh");var b={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),activeTab:a.data("activetab")},f=c.appRequests().getRequestOpts();f.url=e.link;f.data=b;c.appRequests().getActionCall(f,function(b){c.msg.out(b);0===b.status&&g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")})})}}, eventlog:{nav:function(a){if(void 0===a.data("start"))return!1;var b=c.appRequests().getRequestOpts();b.url=e.eventlog;b.type="html";b.data={start:a.data("start"),current:a.data("current")};c.appRequests().getActionCall(b,function(a){$("#content").html(a);c.scrollUp()})},clear:function(a){var b='

    '+c.config().LANG[20]+"

    ";showDialog({text:b,negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43], @@ -35,4 +35,4 @@ onClick:function(b){b.preventDefault();b=c.appRequests().getRequestOpts();b.url= function(a){c.msg.out(a);0===a.status&&setTimeout(function(){c.redirect("index.php")},2E3)})},reset:function(a){d.info("plugin:reset");var b='

    '+c.config().LANG[58]+"

    ";showDialog({text:b,negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43],onClick:function(b){b.preventDefault();b={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),activeTab:a.data("activetab")}; var d=c.appRequests().getRequestOpts();d.url=e.appMgmt.save;d.data=b;c.appRequests().getActionCall(d,function(a){c.msg.out(a)})}}})}},notice:{check:function(a){d.info("notice:check");var b={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get()},f=c.appRequests().getRequestOpts();f.url=e.appMgmt.save;f.data=b;c.appRequests().getActionCall(f,function(b){c.msg.out(b);0===b.status&&g({actionId:a.data("nextaction-id"),itemId:a.data("activetab")})})},search:function(a){d.info("notice:search"); var b=$(a.data("target")),f=c.appRequests().getRequestOpts();f.url=e.notice.search;f.data=a.serialize();c.appRequests().getActionCall(f,function(a){0===a.status?b.html(a.data.html):b.html(c.msg.html.error(a.description));c.sk.set(a.csrf)})},show:function(a){d.info("notice:show");var b=c.appRequests().getRequestOpts();b.url=e.notice.show;b.data={itemId:a.data("item-id"),actionId:a.data("action-id"),activeTab:a.data("activetab"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){0!== -b.status?c.msg.out(b):l(a,b.data.html)})}},wiki:{show:function(a){d.info("wiki:show");var b=c.appRequests().getRequestOpts();b.url=e.wiki.show;b.data={pageName:a.data("pagename"),actionId:a.data("action-id"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){0!==b.status?c.msg.out(b):l(a,b.data.html)})}}}}; +b.status?c.msg.out(b):k(a,b.data.html)})}},wiki:{show:function(a){d.info("wiki:show");var b=c.appRequests().getRequestOpts();b.url=e.wiki.show;b.data={pageName:a.data("pagename"),actionId:a.data("action-id"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){0!==b.status?c.msg.out(b):k(a,b.data.html)})}}}};