diff --git a/admin/Masmak/admin_login.html b/admin/Masmak/admin_login.html index 93a6ea4..8c92db9 100755 --- a/admin/Masmak/admin_login.html +++ b/admin/Masmak/admin_login.html @@ -27,7 +27,7 @@ body { padding-top: 40px; padding-bottom: 40px; - background:#fcedef; + background:#ffffff; } .form-signin { diff --git a/includes/adm/start.php b/includes/adm/start.php index e97da4d..c00993d 100755 --- a/includes/adm/start.php +++ b/includes/adm/start.php @@ -306,6 +306,8 @@ if($cf_num > 3) $prv_files = get_actual_stats('files'); $prev_imgs = get_actual_stats('imgs'); $prev_date = date('d-n-Y'); + $todayIsGone = false; + while($row=$SQL->fetch_array($cf_result)) { #jump today @@ -320,7 +322,17 @@ if($cf_num > 3) $t_files = $prv_files - $s_files; $t_imgs = $prev_imgs - $s_imgs; - $day = date('d-n-Y') == $prev_date ? $lang['TODAY'] . ' ~ ' . $lang['NOW'] : $prev_date; + if(date('d-n-Y') == $prev_date) { + $day = $lang['TODAY'] . ' ~ ' . $lang['NOW']; + + if($todayIsGone) { + continue; + } + + $todayIsGone = true; + } else { + $day = $prev_date; + } $stats_chart .= ($comma ? ',': '') . "[[$t_files,$t_imgs],'" . ($cf_num > 6 ? str_replace(date('-Y'), '', $day) : $day) . "']"; diff --git a/includes/common.php b/includes/common.php index 31d04f4..6727e98 100755 --- a/includes/common.php +++ b/includes/common.php @@ -299,7 +299,12 @@ if(isset($_GET['go']) && $_GET['go'] == 'login') } #install.php exists -if (file_exists(PATH . 'install') && !defined('IN_ADMIN') && !defined('IN_LOGIN') && !defined('DEV_STAGE')) +if (file_exists(PATH . 'install') + && !defined('IN_ADMIN') + && !defined('IN_LOGIN') + && !defined('DEV_STAGE') + && !(defined('IN_UCP') && in_array(g('go'), array('captcha', 'login'))) + ) { #Different message for admins! delete install folder kleeja_info((user_can('enter_acp') ? $lang['DELETE_INSTALL_FOLDER'] : $lang['WE_UPDATING_KLEEJA_NOW']), $lang['SITE_CLOSED']);