From 412be337a77bde56c3c78e182a97ed0d8a43daba Mon Sep 17 00:00:00 2001
From: Abdulrahman <saanina@gmail.com>
Date: Sun, 26 May 2019 00:43:03 +0300
Subject: [PATCH] fixes

---
 admin/Masmak/admin_ban.html     | 2 +-
 admin/Masmak/admin_reports.html | 4 ++--
 admin/Masmak/admin_users.html   | 4 ++++
 admin/index.php                 | 2 +-
 includes/functions_display.php  | 5 ++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/admin/Masmak/admin_ban.html b/admin/Masmak/admin_ban.html
index f512290..d049066 100755
--- a/admin/Masmak/admin_ban.html
+++ b/admin/Masmak/admin_ban.html
@@ -75,7 +75,7 @@
                 </div>
                 <div class="modal-body">
                     <label class="form-control">
-                        <input type="text" class="form-control" id="k" name="k" placeholder="{lang.IP} {lang.OR} {lang.USERNAME}" value="{filled_username}">
+                        <input type="text" class="form-control" id="k" name="k" placeholder="{lang.IP} {lang.OR} {lang.USERNAME}" value="">
                     </label>
                     <small>
                         {lang.BAN_EXP2}
diff --git a/admin/Masmak/admin_reports.html b/admin/Masmak/admin_reports.html
index fd1edf5..e3c86d4 100755
--- a/admin/Masmak/admin_reports.html
+++ b/admin/Masmak/admin_reports.html
@@ -4,7 +4,7 @@
 <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="./">{lang.R_CPINDEX}</a></li>
     <li class="breadcrumb-item active">{lang.R_REPORTS}</li>
-    <IF NAME="current_smt == show_h24"><li class="breadcrumb-item active"> {lang.SHOW_FROM_24H}</li></IF>
+    <IF NAME="current_smt == 'show_h24'"><li class="breadcrumb-item active"> {lang.SHOW_FROM_24H}</li></IF>
 </ol>
 
 
@@ -116,4 +116,4 @@
 <IF NAME="there_queue">
     <br><hr>
     <div class="alert alert-info">{lang.DELETE_PROCESS_IN_WORK}</div>
-</IF>
\ No newline at end of file
+</IF>
diff --git a/admin/Masmak/admin_users.html b/admin/Masmak/admin_users.html
index 1df3cc7..88c9653 100755
--- a/admin/Masmak/admin_users.html
+++ b/admin/Masmak/admin_users.html
@@ -160,7 +160,9 @@
                     <select class="form-control" id="cfrom" name="cfrom">
                         <option value="-1">{lang.DEFAULT_GROUP}</option>
                         <LOOP NAME="e_groups"><IF LOOP="id == 2"><ELSE><option value="{{id}}">{{name}}</option></IF></LOOP>
+                        <IF NAME="c_groups">
                         <LOOP NAME="c_groups"><option value="{{id}}">{{name}}</option></LOOP>
+                        </IF>
                     </select>
                 </div>
 
@@ -178,6 +180,7 @@
 
 
 <!-- end delete group modal -->
+<IF NAME="c_groups">
 <LOOP NAME="c_groups">
 
     <div id="delete_group_{{id}}"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="delAGroup" aria-hidden="true">
@@ -218,6 +221,7 @@
         </form>
     </div>
 </LOOP>
+</IF>
 <!-- end delete group modal -->
 
 <!-- ********** -->
diff --git a/admin/index.php b/admin/index.php
index 69c2e50..e884ede 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -427,7 +427,7 @@ if (isset($go_menu))
     foreach ($go_menu as $m=>$d)
     {
         $go_menu_html .= '<li class="' . ($d['current'] ? 'active' : '') . '" id="c_' . $d['goto'] . '">' .
-            '<a' . ($m == 'site' ? ' target="_blank" ' : ' ') . 'href="' . $d['link'] . '" ' . ($d['confirm'] ? ' onclick="javascript:return confirm_form();"' : '') . '>' .
+            '<a' . ($m == 'site' ? ' target="_blank" ' : ' ') . 'href="' . $d['link'] . '" ' . (! empty($d['confirm']) ? ' onclick="javascript:return confirm_form();"' : '') . '>' .
             $d['name'] . '</a></li>';
     }
 }
diff --git a/includes/functions_display.php b/includes/functions_display.php
index 422c3a4..843ddf9 100755
--- a/includes/functions_display.php
+++ b/includes/functions_display.php
@@ -680,7 +680,10 @@ function kleeja_style_info($style_name)
         }
         else
         {
-            $inf_r[$t[0]] = $t[1];
+            if (! empty($t[0]))
+            {
+                $inf_r[$t[0]] = empty($t[1]) ? '' : $t[1];
+            }
         }
     }