diff --git a/admin/Masmak/admin_footer.html b/admin/Masmak/admin_footer.html index f79a45c..cdc4866 100755 --- a/admin/Masmak/admin_footer.html +++ b/admin/Masmak/admin_footer.html @@ -125,9 +125,8 @@ $(function () { }); function check_msg_and_reports(){ - $.ajax({ - url: './?check_msgs=1', - success: function (data) { + $.ajax({url: './?check_msgs=1', cache: false}) + .done(function (data) { if (data.indexOf("::") !== -1) { var nums = data.split("::"); if (nums[0] !== 0) { @@ -138,8 +137,15 @@ function check_msg_and_reports(){ $('.bubble_reports').html(nums[1]).css('display', 'inline'); } } - } - }); + }) + .fail(function(hxr, status, error) { + if(confirm('{lang.SESSION_ENDED}')) { + location.reload(); + } else { + location.href = '{config.siteurl}'; + } + }); + setTimeout(check_msg_and_reports, 240000); } @@ -223,5 +229,7 @@ function get_kleeja_link(link) { location.href = link; } + +{extra_admin_footer_code} diff --git a/admin/Masmak/admin_header.html b/admin/Masmak/admin_header.html index 9e1d04f..f7e928c 100755 --- a/admin/Masmak/admin_header.html +++ b/admin/Masmak/admin_header.html @@ -40,12 +40,10 @@ - +{extra_admin_header_code} diff --git a/admin/Masmak/admin_start.html b/admin/Masmak/admin_start.html index b81a359..f9fc799 100755 --- a/admin/Masmak/admin_start.html +++ b/admin/Masmak/admin_start.html @@ -416,8 +416,8 @@ setTimeout(function() { $.ajax({ url: "https://api.github.com/repos/awssat/kleeja/contributors", - dataType: 'json', - success: function (data) { + dataType: 'json'}) + .done(function (data) { var template = $('#ghTemplate')[0].outerHTML; $.each(data, function (i, item) { $("#gtresults").append(template.replace('%id%', item['id']).replace('%login%', item['login']).replace( @@ -426,8 +426,7 @@ 'contributions']).replace('%htmlUrl%', item['html_url'])); $('#gt' + item['id']).removeAttr('style'); }); - } - }); + }); }, 400); diff --git a/admin/index.php b/admin/index.php index b51a2bc..65f1d06 100755 --- a/admin/index.php +++ b/admin/index.php @@ -130,8 +130,16 @@ if( //prevent indexing this page by bots - header('HTTP/1.1 503 Service Temporarily Unavailable'); - echo $tpl->display("admin_login"); + header('HTTP/1.0 401 Unauthorized'); + if (ig('_ajax_') || ig('check_msgs')) + { + echo_ajax(401, 'Unauthorized'); + } + else + { + echo $tpl->display('admin_login'); + } + $SQL->close(); exit; }#end login @@ -419,6 +427,8 @@ if(isset($go_menu)) } } +//add extra html to header or footer +$extra_admin_header_code = $extra_admin_footer_code = ''; is_array($plugin_run_result = Plugins::getInstance()->run('end_admin_page', get_defined_vars())) ? extract($plugin_run_result) : null; //run hook diff --git a/lang/ar/acp.php b/lang/ar/acp.php index 4b80623..1e7d7c6 100755 --- a/lang/ar/acp.php +++ b/lang/ar/acp.php @@ -261,5 +261,6 @@ return array( 'UPLOAD_LOCAL_PC' => 'رفع من جهازك', 'NO_ZIP_ARCHIVE' => 'يبدو أن ZipArchive ليس متوفراً علي خادمك، قم بتثبيته فهو من المتطلبات.', 'EXTRACT_ZIP_FAILED' => 'صادفتنا مشكلة أثناء فك الأرشيف! تأكد من أنه ملف zip صالح، وأن مجلد "%s" قابل للكتابة.', - 'NO_PROBLEM_AFTER_ZIP' => 'لقد تم فك الملف بنجاح وهو جاهز للتفعيل.', + 'NO_PROBLEM_AFTER_ZIP' => 'لقد تم فك الملف بنجاح وهو جاهز للتفعيل.', + 'SESSION_ENDED' => 'انتهت الجلسة، هل تريد تسجل الدخول من جديد؟', ); diff --git a/lang/en/acp.php b/lang/en/acp.php index deaa370..71fa244 100755 --- a/lang/en/acp.php +++ b/lang/en/acp.php @@ -260,4 +260,5 @@ return array( 'NO_ZIP_ARCHIVE' => 'ZipArchive is not installed on your server, it\'s required.', 'EXTRACT_ZIP_FAILED' => 'We encounter a problem while extracting this archive file, make sure it\'s a valid zip file, and that "%s" folder is writable', 'NO_PROBLEM_AFTER_ZIP' => 'The file has been extracted successfully and it\'s ready to be enabled', + 'SESSION_ENDED' => 'Session has ended, do you want to login again?', );