thorsten / phpMyFAQ

phpmyfaq/admin/footer.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 <iframe id="keepPMFSessionAlive" src="session.keepalive.php?lang=<?= $LANGCODE ?>" width="0" height="0"
         style="display: none;"></iframe>
 <?php
-    if (isset($auth) && (('takequestion' == $action) || ('editentry' == $action) || ('editpreview'  == $action) ||
+    if (isset($auth) && (('takequestion' == $action) || ('editentry' == $action) || ('editpreview' == $action) ||
                          ('addnews' == $action) || ('editnews' == $action) || ('copyentry' == $action))) {
         if ($faqConfig->get('main.enableWysiwygEditor') == true) {
 ?>

Braces +5 added lines, -2 removed lines

@@ -224,12 +224,15 @@
       action: 'ajax',
       ajax: 'recordAdd'
     };
-      <?php else: ?>
+      <?php else {
+    : ?>
     var data = {
       action: 'ajax',
       ajax: 'recordSave'
     };
-      <?php endif; ?>
+      <?php endif;
+}
+?>
 
     $.each($('#faqEditor').serializeArray(), function (i, field) {
       data[field.name] = field.value;

phpmyfaq/admin/ajax.config_list.php

Indentation +3 added lines, -3 removed lines

@@ -104,8 +104,8 @@ 
                         echo Language::languageOptions(
                             str_replace(
                                 array(
-                                     'language_',
-                                     '.php',
+                                        'language_',
+                                        '.php',
                                 ),
                                 '',
                                 $faqConfig->get('main.language')
@@ -116,7 +116,7 @@ 
                     } else {
                         echo '<option value="language_en.php">English</option>';
                     }
-                   break;
+                    break;
 
                 case 'records.orderby':
                     echo Configuration::sortingOptions($faqConfig->get($key));

phpmyfaq/admin/group.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     $groupAction = $defaultGroupAction;
 }
 
-if (!in_array($groupAction, $groupActionList)){
+if (!in_array($groupAction, $groupActionList)) {
     // @Todo: implement Error message
 }
 
@@ -85,7 +85,7 @@ 
             $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_msg_mysqlerr']);
         }
         foreach ($groupMembers as $memberId) {
-            $perm->addToGroup((int) $memberId, $groupId);
+            $perm->addToGroup((int)$memberId, $groupId);
         }
         $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
             $PMF_LANG['ad_msg_savedsuc_1'],
@@ -109,7 +109,7 @@ 
             $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_msg_mysqlerr']);
         }
         foreach ($groupRights as $rightId) {
-            $perm->grantGroupRight($groupId, (int) $rightId);
+            $perm->grantGroupRight($groupId, (int)$rightId);
         }
         $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
             $PMF_LANG['ad_msg_savedsuc_1'],

phpmyfaq/admin/stat.search.php

Indentation +2 added lines, -2 removed lines

@@ -153,11 +153,11 @@
                   (response) => {
                     if (response === 1) {
                       $('#ajaxresponse').html('<?php printf('<p class="alert alert-success">%s</p>',
-                          $PMF_LANG['ad_search_delsuc']) ?>');
+                            $PMF_LANG['ad_search_delsuc']) ?>');
                       $('.row_search_id_' + searchId).fadeOut('slow');
                     } else {
                       $('#ajaxresponse').html('<?php printf('<p class="alert alert-danger">%s</p>',
-                          $PMF_LANG['ad_search_delfail']) ?>');
+                            $PMF_LANG['ad_search_delfail']) ?>');
                     }
                   });
               }

Spacing +3 added lines, -3 removed lines

@@ -66,10 +66,10 @@ 
     $searchesList = $search->getMostPopularSearches($searchesCount + 1, true);
 
     if (is_null($pages)) {
-        $pages = round((count($searchesList) + ($perPage / 3)) / $perPage, 0);
+        $pages = round((count($searchesList) + ($perPage/3))/$perPage, 0);
     }
 
-    $start = ($page - 1) * $perPage;
+    $start = ($page - 1)*$perPage;
     $end = $start + $perPage;
 
     $baseUrl = sprintf(
@@ -120,7 +120,7 @@ 
         }
         ++$displayedCounter;
 
-        $num = round(($searchItem['number'] * 100 / $searchesCount), 2);
+        $num = round(($searchItem['number']*100/$searchesCount), 2);
         ?>
               <tr class="row_search_id_<?= $searchItem['id'] ?>">
                   <td><?= Strings::htmlspecialchars($searchItem['searchterm']) ?></td>

phpmyfaq/admin/header.php

Indentation +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
             $secLevelEntries .= $adminHelper->addMenuEntry('addgroup+editgroup+delgroup', 'group', 'ad_menu_group_administration', $action);
         }
         if ($faqConfig->get('security.permLevel') == 'large') {
-           $secLevelEntries .= $adminHelper->addMenuEntry('add_section+edit_section+del_section', 'section', 'ad_menu_section_administration', $action);
+            $secLevelEntries .= $adminHelper->addMenuEntry('add_section+edit_section+del_section', 'section', 'ad_menu_section_administration', $action);
         }
         if (!$faqConfig->get('ldap.ldapSupport')) {
             $secLevelEntries .= $adminHelper->addMenuEntry('passwd', 'passwd', 'ad_menu_passwd', $action);
@@ -230,13 +230,13 @@ 
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="pmf-admin-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <?php
-              if ($faqConfig->get('main.enableGravatarSupport')) {
-                  $avatar = new Gravatar($faqConfig);
-                  echo $avatar->getImage($user->getUserData('email'), ['size' => 24, 'class' => 'rounded-circle']);
-              } else {
-                  echo '<i aria-hidden="true" class="fas fa-user"></i>';
-              }
-              ?>
+                if ($faqConfig->get('main.enableGravatarSupport')) {
+                    $avatar = new Gravatar($faqConfig);
+                    echo $avatar->getImage($user->getUserData('email'), ['size' => 24, 'class' => 'rounded-circle']);
+                } else {
+                    echo '<i aria-hidden="true" class="fas fa-user"></i>';
+                }
+                ?>
             <span title="<?= $PMF_LANG['ad_user_loggedin'].$user->getLogin(); ?>">
               <?= $user->getUserData('display_name'); ?>
             </span>

phpmyfaq/admin/category.translate.php

Indentation +4 added lines, -4 removed lines

@@ -107,10 +107,10 @@
                 <div class="col-lg-4">
                   <ul class="list-unstyled">
                       <?php
-                      foreach ($category->getCategoryLanguagesTranslated($id) as $language => $description) {
-                          echo '<input type="text" readonly class="form-control-plaintext" id="staticEmail" value="' . $language . ': ' . $description . '">';
-                      }
-                      ?>
+                        foreach ($category->getCategoryLanguagesTranslated($id) as $language => $description) {
+                            echo '<input type="text" readonly class="form-control-plaintext" id="staticEmail" value="' . $language . ': ' . $description . '">';
+                        }
+                        ?>
                   </ul>
                 </div>
               </div>

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
                   <ul class="list-unstyled">
                       <?php
                       foreach ($category->getCategoryLanguagesTranslated($id) as $language => $description) {
-                          echo '<input type="text" readonly class="form-control-plaintext" id="staticEmail" value="' . $language . ': ' . $description . '">';
+                          echo '<input type="text" readonly class="form-control-plaintext" id="staticEmail" value="'.$language.': '.$description.'">';
                       }
                       ?>
                   </ul>

Braces +5 added lines, -2 removed lines

@@ -64,9 +64,12 @@
               <input type="hidden" name="showcat" value="<?= $showcat ?>">
                 <?php if ($faqConfig->get('security.permLevel') !== 'basic'): ?>
                   <input type="hidden" name="restricted_groups[]" value="<?= $groupPermission[0] ?>">
-                <?php else: ?>
+                <?php else {
+    : ?>
                   <input type="hidden" name="restricted_groups[]" value="-1">
-                <?php endif; ?>
+                <?php endif;
+}
+?>
               <input type="hidden" name="restricted_users" value="<?= $userPermission[0] ?>">
               <input type="hidden" name="csrf" value="<?= $user->getCsrfTokenFromSession() ?>">
 

phpmyfaq/admin/section.php

Indentation +123 added lines, -123 removed lines

@@ -69,71 +69,71 @@ 
 
 // update section members
 if ($sectionAction == 'update_members' && $user->perm->checkRight($user->getUserId(), 'edit_section')) {
-  $message = '';
-  $sectionAction = $defaultSectionAction;
-  $sectionId = Filter::filterInput(INPUT_POST, 'section_id', FILTER_VALIDATE_INT, 0);
-  $sectionMembers = isset($_POST['section_members']) ? $_POST['section_members'] : [];
-
-  if ($sectionId == 0) {
-      $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
-  } else {
-      $user = new User($faqConfig);
-      $perm = $user->perm;
-      if (!$perm->removeAllGroupsFromSection($sectionId)) {
-          $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_msg_mysqlerr']);
-      }
-      foreach ($sectionMembers as $memberId) {
-          $perm->addGroupToSection((int) $memberId, $sectionId);
-      }
-      $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
-          $PMF_LANG['ad_msg_savedsuc_1'],
-          $perm->getSectionName($sectionId),
-          $PMF_LANG['ad_msg_savedsuc_2']);
-  }
+    $message = '';
+    $sectionAction = $defaultSectionAction;
+    $sectionId = Filter::filterInput(INPUT_POST, 'section_id', FILTER_VALIDATE_INT, 0);
+    $sectionMembers = isset($_POST['section_members']) ? $_POST['section_members'] : [];
+
+    if ($sectionId == 0) {
+        $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
+    } else {
+        $user = new User($faqConfig);
+        $perm = $user->perm;
+        if (!$perm->removeAllGroupsFromSection($sectionId)) {
+            $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_msg_mysqlerr']);
+        }
+        foreach ($sectionMembers as $memberId) {
+            $perm->addGroupToSection((int) $memberId, $sectionId);
+        }
+        $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
+            $PMF_LANG['ad_msg_savedsuc_1'],
+            $perm->getSectionName($sectionId),
+            $PMF_LANG['ad_msg_savedsuc_2']);
+    }
 }
 
 // update section data
 if ($sectionAction == 'update_data' && $user->perm->checkRight($user->getUserId(), 'edit_section')) {
-  $message = '';
-  $sectionAction = $defaultSectionAction;
-  $sectionId = Filter::filterInput(INPUT_POST, 'section_id', FILTER_VALIDATE_INT, 0);
-  if ($sectionId == 0) {
-      $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
-  } else {
-      $sectionData = [];
-      $dataFields = ['name', 'description'];
-      foreach ($dataFields as $field) {
-          $sectionData[$field] = Filter::filterInput(INPUT_POST, $field, FILTER_SANITIZE_STRING, '');
-      }
-      $user = new User($faqConfig);
-      $perm = $user->perm;
-      if (!$perm->changeSection($sectionId, $sectionData)) {
-          $message .= sprintf(
-          '<p class="alert alert-danger">%s<br>%s</p>',
-          $PMF_LANG['ad_msg_mysqlerr'],
-          $db->error()
-          );
-      } else {
-          $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
-              $PMF_LANG['ad_msg_savedsuc_1'],
-              $perm->getSectionName($sectionId),
-              $PMF_LANG['ad_msg_savedsuc_2']);
-      }
-  }
+    $message = '';
+    $sectionAction = $defaultSectionAction;
+    $sectionId = Filter::filterInput(INPUT_POST, 'section_id', FILTER_VALIDATE_INT, 0);
+    if ($sectionId == 0) {
+        $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
+    } else {
+        $sectionData = [];
+        $dataFields = ['name', 'description'];
+        foreach ($dataFields as $field) {
+            $sectionData[$field] = Filter::filterInput(INPUT_POST, $field, FILTER_SANITIZE_STRING, '');
+        }
+        $user = new User($faqConfig);
+        $perm = $user->perm;
+        if (!$perm->changeSection($sectionId, $sectionData)) {
+            $message .= sprintf(
+            '<p class="alert alert-danger">%s<br>%s</p>',
+            $PMF_LANG['ad_msg_mysqlerr'],
+            $db->error()
+            );
+        } else {
+            $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
+                $PMF_LANG['ad_msg_savedsuc_1'],
+                $perm->getSectionName($sectionId),
+                $PMF_LANG['ad_msg_savedsuc_2']);
+        }
+    }
 }
 
 // delete section confirmation
 if ($sectionAction == 'delete_confirm' && $user->perm->checkRight($user->getUserId(), 'delete_section')) {
-  $message = '';
-  $user = new CurrentUser($faqConfig);
-  $perm = $user->perm;
-  $sectionId = Filter::filterInput(INPUT_POST, 'section_list_select', FILTER_VALIDATE_INT, 0);
-  if ($sectionId <= 0) {
-      $message    .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
-      $sectionAction = $defaultSectionAction;
-  } else {
-      $sectionData = $perm->getSectionData($sectionId);
-      ?>
+    $message = '';
+    $user = new CurrentUser($faqConfig);
+    $perm = $user->perm;
+    $sectionId = Filter::filterInput(INPUT_POST, 'section_list_select', FILTER_VALIDATE_INT, 0);
+    if ($sectionId <= 0) {
+        $message    .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
+        $sectionAction = $defaultSectionAction;
+    } else {
+        $sectionData = $perm->getSectionData($sectionId);
+        ?>
       <header class="row">
           <div class="col-lg-12">
               <h2 class="page-header">
@@ -162,85 +162,85 @@ 
       </div>
 <?php
 
-  }
+    }
 }
 
 if ($sectionAction == 'delete' && $user->perm->checkRight($user->getUserId(), 'delete_section')) {
-  $message = '';
-  $user = new User($faqConfig);
-  $sectionId = Filter::filterInput(INPUT_POST, 'section_id', FILTER_VALIDATE_INT, 0);
-  $csrfOkay = true;
-  $csrfToken = Filter::filterInput(INPUT_POST, 'csrf', FILTER_SANITIZE_STRING);
-  if (!isset($_SESSION['phpmyfaq_csrf_token']) || $_SESSION['phpmyfaq_csrf_token'] !== $csrfToken) {
-      $csrfOkay = false;
-  }
-  $sectionAction = $defaultSectionAction;
-  if ($sectionId <= 0) {
-      $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
-  } else {
-      if (!$user->perm->deleteSection($sectionId) && !$csrfOkay) {
-          $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_section_error_delete']);
-      } else {
-          $message .= sprintf('<p class="alert alert-success">%s</p>', $PMF_LANG['ad_section_deleted']);
-      }
-      $userError = $user->error();
-      if ($userError != '') {
-          $message .= sprintf('<p class="alert alert-danger">%s</p>', $userError);
-      }
-  }
+    $message = '';
+    $user = new User($faqConfig);
+    $sectionId = Filter::filterInput(INPUT_POST, 'section_id', FILTER_VALIDATE_INT, 0);
+    $csrfOkay = true;
+    $csrfToken = Filter::filterInput(INPUT_POST, 'csrf', FILTER_SANITIZE_STRING);
+    if (!isset($_SESSION['phpmyfaq_csrf_token']) || $_SESSION['phpmyfaq_csrf_token'] !== $csrfToken) {
+        $csrfOkay = false;
+    }
+    $sectionAction = $defaultSectionAction;
+    if ($sectionId <= 0) {
+        $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
+    } else {
+        if (!$user->perm->deleteSection($sectionId) && !$csrfOkay) {
+            $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_section_error_delete']);
+        } else {
+            $message .= sprintf('<p class="alert alert-success">%s</p>', $PMF_LANG['ad_section_deleted']);
+        }
+        $userError = $user->error();
+        if ($userError != '') {
+            $message .= sprintf('<p class="alert alert-danger">%s</p>', $userError);
+        }
+    }
 }
 
 if ($sectionAction == 'addsave' && $user->perm->checkRight($user->getUserId(), 'add_section')) {
-  $user = new User($faqConfig);
-  $message = '';
-  $messages = [];
-  $sectionName = Filter::filterInput(INPUT_POST, 'section_name', FILTER_SANITIZE_STRING, '');
-  $sectionDescription = Filter::filterInput(INPUT_POST, 'section_description', FILTER_SANITIZE_STRING, '');
-  $csrfOkay = true;
-  $csrfToken = Filter::filterInput(INPUT_POST, 'csrf', FILTER_SANITIZE_STRING);
-
-  if (!isset($_SESSION['phpmyfaq_csrf_token']) || $_SESSION['phpmyfaq_csrf_token'] !== $csrfToken) {
-      $csrfOkay = false;
-  }
-  // check section name
-  if ($sectionName == '') {
-      $messages[] = $PMF_LANG['ad_section_error_noName'];
-  }
-  // ok, let's go
-  if (count($messages) == 0 && $csrfOkay) {
-      // create section
-      $sectionData = array(
-          'name' => $sectionName,
-          'description' => $sectionDescription
-      );
-
-      if ($user->perm->addSection($sectionData) <= 0) {
-          $messages[] = $PMF_LANG['ad_adus_dberr'];
-      }
-  }
-  // no errors, show list
-  if (count($messages) == 0) {
-      $sectionAction = $defaultSectionAction;
-      $message = sprintf('<p class="alert alert-success">%s</p>', $PMF_LANG['ad_section_suc']);
-  // display error messages and show form again
-  } else {
-      $sectionAction = 'add';
-      $message = '<p class="alert alert-danger">';
-      foreach ($messages as $err) {
-          $message .= $err.'<br>';
-      }
-      $message .= '</p>';
-  }
+    $user = new User($faqConfig);
+    $message = '';
+    $messages = [];
+    $sectionName = Filter::filterInput(INPUT_POST, 'section_name', FILTER_SANITIZE_STRING, '');
+    $sectionDescription = Filter::filterInput(INPUT_POST, 'section_description', FILTER_SANITIZE_STRING, '');
+    $csrfOkay = true;
+    $csrfToken = Filter::filterInput(INPUT_POST, 'csrf', FILTER_SANITIZE_STRING);
+
+    if (!isset($_SESSION['phpmyfaq_csrf_token']) || $_SESSION['phpmyfaq_csrf_token'] !== $csrfToken) {
+        $csrfOkay = false;
+    }
+    // check section name
+    if ($sectionName == '') {
+        $messages[] = $PMF_LANG['ad_section_error_noName'];
+    }
+    // ok, let's go
+    if (count($messages) == 0 && $csrfOkay) {
+        // create section
+        $sectionData = array(
+            'name' => $sectionName,
+            'description' => $sectionDescription
+        );
+
+        if ($user->perm->addSection($sectionData) <= 0) {
+            $messages[] = $PMF_LANG['ad_adus_dberr'];
+        }
+    }
+    // no errors, show list
+    if (count($messages) == 0) {
+        $sectionAction = $defaultSectionAction;
+        $message = sprintf('<p class="alert alert-success">%s</p>', $PMF_LANG['ad_section_suc']);
+    // display error messages and show form again
+    } else {
+        $sectionAction = 'add';
+        $message = '<p class="alert alert-danger">';
+        foreach ($messages as $err) {
+            $message .= $err.'<br>';
+        }
+        $message .= '</p>';
+    }
 }
 
 if (!isset($message)) {
-  $message = '';
+    $message = '';
 }
 
 // show new section form
 if ($sectionAction == 'add' && $user->perm->checkRight($user->getUserId(), 'add_section')) {
-  $user = new CurrentUser($faqConfig);
-  ?>
+    $user = new CurrentUser($faqConfig);
+    ?>
 
       <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
         <h1 class="h2">

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 }
 
 // validate sectionAction
-if (!in_array($sectionAction, $sectionActionList)){
+if (!in_array($sectionAction, $sectionActionList)) {
     // @Todo: implement Error message
 }
 
@@ -83,7 +83,7 @@ 
           $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_msg_mysqlerr']);
       }
       foreach ($sectionMembers as $memberId) {
-          $perm->addGroupToSection((int) $memberId, $sectionId);
+          $perm->addGroupToSection((int)$memberId, $sectionId);
       }
       $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
           $PMF_LANG['ad_msg_savedsuc_1'],