Fixed counter of inactive FAQs, closes thorsten#1489

Author: thorsten

phpmyfaq/admin/header.php

@@ -257,23 +257,23 @@
 <div id="wrapper">
 
   <!-- Sidebar -->
-    <?php if (isset($auth) && (count($user->perm->getAllUserRights($user->getUserId())) > 0 || $user->isSuperAdmin(
-            ))): ?>
-      <ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
-
-        <li>
-          <a class="sidebar-brand d-flex align-items-center justify-content-center" href="../">
-            <div class="sidebar-brand-icon rotate-n-15">
-              <i class="fas fa-laugh-wink"></i>
-            </div>
-            <div class="sidebar-brand-text mx-4">phpMyFAQ <?= System::getVersion() ?></div>
-          </a>
-        </li>
-
-        <li>
-          <hr class="sidebar-divider my-0">
-        </li>
-
+  <ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
+
+    <li>
+      <a class="sidebar-brand d-flex align-items-center justify-content-center" href="../">
+        <div class="sidebar-brand-icon rotate-n-15">
+          <i class="fas fa-laugh-wink"></i>
+        </div>
+        <div class="sidebar-brand-text mx-4">phpMyFAQ <?= System::getVersion() ?></div>
+      </a>
+    </li>
+
+    <li>
+      <hr class="sidebar-divider my-0">
+    </li>
+
+      <?php if (isset($auth) && (count($user->perm->getAllUserRights($user->getUserId())) > 0 || $user->isSuperAdmin(
+              ))): ?>
         <li class="nav-item active">
           <a class="nav-link" href="index.php">
             <i class="fa fa-tachometer"></i>
@@ -377,9 +377,13 @@
           <hr class="sidebar-divider d-none d-md-block">
         </li>
 
-      </ul>
-      <!-- End of Sidebar -->
-    <?php endif; ?>
+        <li>
+          <div class="text-center small" id="saving_data_indicator"></div>
+        </li>
+
+      <?php endif; ?>
+  </ul>
+  <!-- End of Sidebar -->
 
   <!-- Content Wrapper -->
   <div id="content-wrapper" class="d-flex flex-column">

phpmyfaq/admin/record.show.php

@@ -220,10 +220,11 @@ function verifyEntryURL_failure(XmlRequest)
     } else {
         $fdTable = Database::getTablePrefix().'faqdata';
         $fcrTable = Database::getTablePrefix().'faqcategoryrelations';
-        $search = SearchFactory::create($faqConfig, array('database' => Database::getType()));
+        $search = SearchFactory::create($faqConfig, ['database' => Database::getType()]);
 
         $search->setTable($fdTable)
-            ->setResultColumns(array(
+            ->setResultColumns(
+                [
                     $fdTable.'.id AS id',
                     $fdTable.'.lang AS lang',
                     $fdTable.'.solution_id AS solution_id',
@@ -232,24 +233,29 @@ function verifyEntryURL_failure(XmlRequest)
                     $fdTable.'.active AS active',
                     $fdTable.'.thema AS thema',
                     $fdTable.'.content AS content',
-                    $fdTable.'.updated AS updated',))
+                    $fdTable.'.updated AS updated',
+                ]
+            )
             ->setJoinedTable($fcrTable)
-            ->setJoinedColumns(array(
+            ->setJoinedColumns(
+                [
                     $fdTable.'.id = '.$fcrTable.'.record_id',
-                    $fdTable.'.lang = '.$fcrTable.'.record_lang',));
+                    $fdTable.'.lang = '.$fcrTable.'.record_lang',
+                ]
+            );
 
         if (is_numeric($searchTerm)) {
-            $search->setMatchingColumns(array($fdTable.'.solution_id'));
+            $search->setMatchingColumns([$fdTable.'.solution_id']);
         } else {
-            $search->setMatchingColumns(array($fdTable.'.thema', $fdTable.'.content', $fdTable.'.keywords'));
+            $search->setMatchingColumns([$fdTable.'.thema', $fdTable.'.content', $fdTable.'.keywords']);
         }
 
         $result = $search->search($searchTerm);
         $laction = 'view';
         $internalSearch = '&search='.$searchTerm;
         $wasSearch = true;
-        $idsFound = array();
-        $faqsFound = array();
+        $idsFound = [];
+        $faqsFound = [];
 
         while ($row = $faqConfig->getDb()->fetchObject($result)) {
             if ($searchCat != 0 && $searchCat != (int)$row->category_id) {
@@ -472,7 +478,7 @@ function verifyEntryURL_failure(XmlRequest)
                           <?php if ($user->perm->checkRight($user->getUserId(),
                                     'approverec') && isset($numVisits[$record['id']])) { ?>
                             <label>
-                              <input type="checkbox" lang="<?= $record['lang'] ?>"
+                              <input type="checkbox" lang="<?= $record['lang'] ?>" class="active-records-category-<?= $cid ?>"
                                      onclick="saveStatus(<?= $cid.', ['.$record['id'].']' ?>, 'active', '<?= $user->getCsrfTokenFromSession() ?>');"
                                      id="active_record_<?= $cid.'_'.$record['id'] ?>"
                                   <?= 'yes' == $record['active'] ? 'checked' : '    ' ?>>
@@ -580,27 +586,19 @@ function saveStatus(cid, ids, type, csrf) {
         if ('active' === type) {
           for (let j = 0; j < sameRecords.length; j++) {
             $('#' + sameRecords[j].id).attr('checked', status);
-
             const catid = sameRecords[j].id.match(/active_record_(\d+)_\d+/)[1];
-            const current_item_count = $('#js-active-records-' + catid).html();
-            const delta = 'checked' === status ? -1 : 1;
-
-            $('#js-active-records-' + catid).html(current_item_count * 1 + delta);
+            $('#js-active-records-' + catid).html($('.active-records-category-' + cid + ':not(:checked)').length);
           }
         } else {
           for (let j = 0; j < sameRecords.length; j++) {
             $('#' + sameRecords[j].id).attr('checked', status);
-
             const catid = sameRecords[j].id.match(/active_record_(\d+)_\d+/)[1];
-            const current_item_count = $('#js-active-records-' + catid).html();
-            const delta = 'checked' === status ? -1 : 1;
-
-            $('#js-active-records-' + catid).html(current_item_count * 1 + delta);
+            $('#js-active-records-' + catid).html($('.active-records-category-' + cid + ':not(:checked)').length);
           }
         }
       }
 
-      $.get("index.php", data, null);
+      $.get('index.php', data, null);
       indicator.html('<?= $PMF_LANG['ad_entry_savedsuc'] ?>');
     }