thorsten / phpMyFAQ

GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.

Completed

Push — 3.0 ( 49ab7a...0a9b70 )

by Thorsten

created 2019-02-23 07:58 UTC

Category

Toggle Patches

phpmyfaq/admin/stat.main.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -148,7 +148,7 @@
		block discarded – undo
148	148	</tr>
149	149	<tr>
150	150	<td><?= $PMF_LANG['ad_stat_vpd'] ?>:</td>
151		- <td><?= ($danz != 0) ? round(($vanz / $danz), 2) : 0 ?></td>
	151	+ <td><?= ($danz != 0) ? round(($vanz/$danz), 2) : 0 ?></td>
152	152	</tr>
153	153	<tr>
154	154	<td><?= $PMF_LANG['ad_stat_fien'] ?>:</td>

Please login to merge, or discard this patch.

phpmyfaq/admin/stat.adminlog.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -47,10 +47,10 @@
 block discarded – undo
     $page = Filter::filterInput(INPUT_GET, 'page', FILTER_VALIDATE_INT, 1);
 
     if (is_null($pages)) {
-        $pages = round(($logging->getNumberOfEntries() + ($perpage / 3)) / $perpage, 0);
+        $pages = round(($logging->getNumberOfEntries() + ($perpage/3))/$perpage, 0);
     }
 
-    $start = ($page - 1) * $perpage;
+    $start = ($page - 1)*$perpage;
     $ende = $start + $perpage;
 
     $baseUrl = sprintf(

Please login to merge, or discard this patch.

phpmyfaq/admin/stat.ratings.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

		@@ -115,18 +115,18 @@
		block discarded – undo
115	115	?></td>
116	116	<td>
117	117	<?php
118		- if (round($data['num'] * 20) > 75) {
	118	+ if (round($data['num']*20) > 75) {
119	119	$progressBar = 'success';
120		- } elseif (round($data['num'] * 20) < 25) {
	120	+ } elseif (round($data['num']*20) < 25) {
121	121	$progressBar = 'danger';
122	122	} else {
123	123	$progressBar = 'info';
124	124	}
125	125	?>
126		- <meter value="<?= round($data['num'] * 20);
	126	+ <meter value="<?= round($data['num']*20);
127	127	?>" max="100" min="0" low="25" optimum="75"></meter>
128	128	</td>
129		- <td><?= round($data['num'] * 20);
	129	+ <td><?= round($data['num']*20);
130	130	?>%</td>
131	131	</tr>
132	132	<?php

Please login to merge, or discard this patch.

phpmyfaq/admin/session.keepalive.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -55,7 +55,7 @@
 block discarded – undo
 if (!$user instanceof CurrentUser) {
     $user = CurrentUser::getFromSession($faqConfig);
 }
-$refreshTime = (PMF_AUTH_TIMEOUT - PMF_AUTH_TIMEOUT_WARNING) * 60;
+$refreshTime = (PMF_AUTH_TIMEOUT - PMF_AUTH_TIMEOUT_WARNING)*60;
 ?>
 <!DOCTYPE html>
 <html lang="<?= $PMF_LANG['metaLanguage']; ?>" class="no-js">

Please login to merge, or discard this patch.

phpmyfaq/admin/user.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -72,7 +72,7 @@  discard block
 block discarded – undo
     }
 
     // validate userAction
-    if (!in_array($userAction, $userActionList)){
+    if (!in_array($userAction, $userActionList)) {
         // @Todo: Implement Error message
     }
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
         if (!isset($_SESSION['phpmyfaq_csrf_token']) || $_SESSION['phpmyfaq_csrf_token'] !== $csrfToken) {
             $csrfOkay = false;
         }
-        if (0 === (int) $userId || !$csrfOkay) {
+        if (0 === (int)$userId || !$csrfOkay) {
             $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
         } else {
             $user = new User($faqConfig);
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
             $csrfOkay = false;
         }
         $userAction = $defaultUserAction;
-        if (0 === (int) $userId || !$csrfOkay) {
+        if (0 === (int)$userId || !$csrfOkay) {
             $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
         } else {
             if (!$user->getUserById($userId, true)) {
@@ -638,8 +638,8 @@  discard block
 block discarded – undo
         $numUsers = count($allUsers);
         $page = Filter::filterInput(INPUT_GET, 'page', FILTER_VALIDATE_INT, 0);
         $perPage = 10;
-        $numPages = ceil($numUsers / $perPage);
-        $lastPage = $page * $perPage;
+        $numPages = ceil($numUsers/$perPage);
+        $lastPage = $page*$perPage;
         $firstPage = $lastPage - $perPage;
 
         $baseUrl = sprintf(

Please login to merge, or discard this patch.

phpmyfaq/admin/record.comments.php 1 patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -82,9 +82,9 @@
 block discarded – undo
                     </a> |
                     <?= $date->format(date('Y-m-d H:i', $faqcomment['date'])) ?> |
                     <a href="<?php printf('../?action=faq&cat=%d&id=%d&artlang=%s',
-                       $faqcomment['category_id'],
-                       $faqcomment['record_id'],
-                       $LANGCODE) ?>">
+                        $faqcomment['category_id'],
+                        $faqcomment['record_id'],
+                        $LANGCODE) ?>">
                         <?= $faq->getRecordTitle($faqcomment['record_id']) ?>
                     </a>
                 </span><br/>

Please login to merge, or discard this patch.

phpmyfaq/admin/category.add.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -137,12 +137,12 @@  discard block
 block discarded – undo
                         <div class="col-lg-4">
                           <select name="group_id" id="group_id" class="form-control">
                               <?php
-                              if ($faqConfig->get('main.enableCategoryRestrictions')) {
-                                  echo $user->perm->getAllGroupsOptions([], $currentUserId);
-                              } else {
-                                  echo $user->perm->getAllGroupsOptions([]);
-                              }
-                              ?>
+                                if ($faqConfig->get('main.enableCategoryRestrictions')) {
+                                    echo $user->perm->getAllGroupsOptions([], $currentUserId);
+                                } else {
+                                    echo $user->perm->getAllGroupsOptions([]);
+                                }
+                                ?>
                           </select>
                         </div>
                       </div>
@@ -165,12 +165,12 @@  discard block
 block discarded – undo
                               </label>
                               <select name="restricted_groups[]" size="3" class="form-control" multiple>
                                   <?php
-                                  if ($faqConfig->get('main.enableCategoryRestrictions')) {
-                                      echo $user->perm->getAllGroupsOptions([], $currentUserId);
-                                  } else {
-                                      echo $user->perm->getAllGroupsOptions([]);
-                                  }
-                                  ?>
+                                    if ($faqConfig->get('main.enableCategoryRestrictions')) {
+                                        echo $user->perm->getAllGroupsOptions([], $currentUserId);
+                                    } else {
+                                        echo $user->perm->getAllGroupsOptions([]);
+                                    }
+                                    ?>
                               </select>
                             </div>
                           </div>

Please login to merge, or discard this patch.

phpmyfaq/admin/ajax.image.php 2 patches

Switch Indentation +34 added lines, -34 removed lines patch added patch discarded remove patch

@@ -40,46 +40,46 @@
 block discarded – undo
 }
 switch ($ajaxAction) {
 
-    case 'upload':
+        case 'upload':
 
-        $uploadDir = '../images/';
-        $validFileExtensions = ['gif', 'jpg', 'jpeg', 'png'];
-        if ($csrfOkay) {
-            reset($_FILES);
-            $temp = current($_FILES);
-            if (is_uploaded_file($temp['tmp_name'])) {
-                if (isset($_SERVER['HTTP_ORIGIN'])) {
-                    if ($_SERVER['HTTP_ORIGIN'] . '/' === $faqConfig->getDefaultUrl()) {
-                        $http->sendCorsHeader();
-                    } else {
-                        $http->sendStatus(403);
-                        return;
+            $uploadDir = '../images/';
+            $validFileExtensions = ['gif', 'jpg', 'jpeg', 'png'];
+            if ($csrfOkay) {
+                reset($_FILES);
+                $temp = current($_FILES);
+                if (is_uploaded_file($temp['tmp_name'])) {
+                    if (isset($_SERVER['HTTP_ORIGIN'])) {
+                        if ($_SERVER['HTTP_ORIGIN'] . '/' === $faqConfig->getDefaultUrl()) {
+                            $http->sendCorsHeader();
+                        } else {
+                            $http->sendStatus(403);
+                            return;
+                        }
                     }
-                }
 
-                // Sanitize input
-                if (preg_match("/([^\w\s\d\-_~,;:\[\]\(\).])|([\.]{2,})/", $temp['name'])) {
-                    $http->sendStatus(400);
-                    return;
-                }
+                    // Sanitize input
+                    if (preg_match("/([^\w\s\d\-_~,;:\[\]\(\).])|([\.]{2,})/", $temp['name'])) {
+                        $http->sendStatus(400);
+                        return;
+                    }
 
-                // Verify extension
-                if (!in_array(strtolower(pathinfo($temp['name'], PATHINFO_EXTENSION)), $validFileExtensions)) {
-                    $http->sendStatus(400);
-                    return;
-                }
+                    // Verify extension
+                    if (!in_array(strtolower(pathinfo($temp['name'], PATHINFO_EXTENSION)), $validFileExtensions)) {
+                        $http->sendStatus(400);
+                        return;
+                    }
 
-                // Accept upload if there was no origin, or if it is an accepted origin
-                $fileToWrite = $uploadDir . $temp['name'];
-                move_uploaded_file($temp['tmp_name'], $fileToWrite);
+                    // Accept upload if there was no origin, or if it is an accepted origin
+                    $fileToWrite = $uploadDir . $temp['name'];
+                    move_uploaded_file($temp['tmp_name'], $fileToWrite);
 
-                // Respond to the successful upload with JSON.
-                $http->sendJsonWithHeaders(['location' => $fileToWrite]);
+                    // Respond to the successful upload with JSON.
+                    $http->sendJsonWithHeaders(['location' => $fileToWrite]);
+                } else {
+                    $http->sendStatus(500);
+                }
             } else {
-                $http->sendStatus(500);
+                $http->sendStatus(401);
             }
-        } else {
-            $http->sendStatus(401);
-        }
-        break;
+            break;
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
     if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
             $temp = current($_FILES);
             if (is_uploaded_file($temp['tmp_name'])) {
                 if (isset($_SERVER['HTTP_ORIGIN'])) {
-                    if ($_SERVER['HTTP_ORIGIN'] . '/' === $faqConfig->getDefaultUrl()) {
+                    if ($_SERVER['HTTP_ORIGIN'].'/' === $faqConfig->getDefaultUrl()) {
                         $http->sendCorsHeader();
                     } else {
                         $http->sendStatus(403);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
                 }
 
                 // Accept upload if there was no origin, or if it is an accepted origin
-                $fileToWrite = $uploadDir . $temp['name'];
+                $fileToWrite = $uploadDir.$temp['name'];
                 move_uploaded_file($temp['tmp_name'], $fileToWrite);
 
                 // Respond to the successful upload with JSON.

Please login to merge, or discard this patch.

phpmyfaq/admin/ajax.records.php 2 patches

Switch Indentation +86 added lines, -86 removed lines patch added patch discarded remove patch

@@ -54,101 +54,101 @@
 block discarded – undo
 switch ($ajax_action) {
 
     // save active FAQs
-    case 'save_active_records':
-        if ($user->perm->checkRight($user->getUserId(), 'approverec')) {
-            if (!empty($items)) {
-                $faq = new Faq($faqConfig);
-
-                foreach ($items as $item) {
-                    if (is_array($item) && count($item) == 3 && Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'active');
+        case 'save_active_records':
+            if ($user->perm->checkRight($user->getUserId(), 'approverec')) {
+                if (!empty($items)) {
+                    $faq = new Faq($faqConfig);
+
+                    foreach ($items as $item) {
+                        if (is_array($item) && count($item) == 3 && Language::isASupportedLanguage($item[1])) {
+                            echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'active');
+                        }
                     }
                 }
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // save sticky FAQs
-    case 'save_sticky_records':
-        if ($user->perm->checkRight($user->getUserId(), 'edit_faq')) {
-            if (!empty($items)) {
+            break;
+
+        // save sticky FAQs
+        case 'save_sticky_records':
+            if ($user->perm->checkRight($user->getUserId(), 'edit_faq')) {
+                if (!empty($items)) {
+                    $faq = new Faq($faqConfig);
+
+                    foreach ($items as $item) {
+                        if (is_array($item) && count($item) == 3 && Language::isASupportedLanguage($item[1])) {
+                            echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'sticky');
+                        }
+                    }
+                }
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
+            }
+            break;
+
+        // search FAQs for suggestions
+        case 'search_records':
+            if ($user->perm->checkRight($user->getUserId(), 'edit_faq')) {
                 $faq = new Faq($faqConfig);
+                $faqSearch = new Search($faqConfig);
+                $faqSearch->setCategory(new Category($faqConfig));
+                $faqSearchResult = new Resultset($user, $faq, $faqConfig);
+                $searchResult = '';
+                $searchString = Filter::filterInput(INPUT_POST, 'search', FILTER_SANITIZE_STRIPPED);
+
+                if (!is_null($searchString)) {
+                    try {
+                        $searchResult = $faqSearch->search($searchString, false);
 
-                foreach ($items as $item) {
-                    if (is_array($item) && count($item) == 3 && Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'sticky');
+                        $faqSearchResult->reviewResultset($searchResult);
+
+                        $searchHelper = new SearchHelper($faqConfig);
+                        $searchHelper->setSearchterm($searchString);
+
+                        echo $searchHelper->renderAdminSuggestionResult($faqSearchResult);
+                    } catch (Search\Exception $e) {
+                        //
                     }
                 }
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // search FAQs for suggestions
-    case 'search_records':
-        if ($user->perm->checkRight($user->getUserId(), 'edit_faq')) {
-            $faq = new Faq($faqConfig);
-            $faqSearch = new Search($faqConfig);
-            $faqSearch->setCategory(new Category($faqConfig));
-            $faqSearchResult = new Resultset($user, $faq, $faqConfig);
-            $searchResult = '';
-            $searchString = Filter::filterInput(INPUT_POST, 'search', FILTER_SANITIZE_STRIPPED);
-
-            if (!is_null($searchString)) {
-                try {
-                    $searchResult = $faqSearch->search($searchString, false);
-
-                    $faqSearchResult->reviewResultset($searchResult);
-
-                    $searchHelper = new SearchHelper($faqConfig);
-                    $searchHelper->setSearchterm($searchString);
-
-                    echo $searchHelper->renderAdminSuggestionResult($faqSearchResult);
-                } catch (Search\Exception $e) {
-                    //
-                }
+            break;
+
+        // delete FAQs
+        case 'delete_record':
+            if ($user->perm->checkRight($user->getUserId(), 'delete_faq')) {
+                $recordId = Filter::filterInput(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
+                $recordLang = Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
+
+                $logging = new Logging($faqConfig);
+                $logging->logAdmin($user, 'Deleted FAQ ID '.$recordId);
+
+                $faq->deleteRecord($recordId, $recordLang);
+                echo $PMF_LANG['ad_entry_delsuc'];
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // delete FAQs
-    case 'delete_record':
-        if ($user->perm->checkRight($user->getUserId(), 'delete_faq')) {
-            $recordId = Filter::filterInput(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
-            $recordLang = Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
-
-            $logging = new Logging($faqConfig);
-            $logging->logAdmin($user, 'Deleted FAQ ID '.$recordId);
-
-            $faq->deleteRecord($recordId, $recordLang);
-            echo $PMF_LANG['ad_entry_delsuc'];
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // delete open questions
-    case 'delete_question':
-        if ($user->perm->checkRight($user->getUserId(), 'delquestion')) {
-            $checks = array(
-                'filter' => FILTER_VALIDATE_INT,
-                'flags' => FILTER_REQUIRE_ARRAY,
-            );
-            $questionIds = Filter::filterInputArray(INPUT_POST, array('questions' => $checks));
-
-            if (!is_null($questionIds['questions'])) {
-                foreach ($questionIds['questions'] as $questionId) {
-                    $faq->deleteQuestion((int) $questionId);
+            break;
+
+        // delete open questions
+        case 'delete_question':
+            if ($user->perm->checkRight($user->getUserId(), 'delquestion')) {
+                $checks = array(
+                    'filter' => FILTER_VALIDATE_INT,
+                    'flags' => FILTER_REQUIRE_ARRAY,
+                );
+                $questionIds = Filter::filterInputArray(INPUT_POST, array('questions' => $checks));
+
+                if (!is_null($questionIds['questions'])) {
+                    foreach ($questionIds['questions'] as $questionId) {
+                        $faq->deleteQuestion((int) $questionId);
+                    }
                 }
+                echo $PMF_LANG['ad_entry_delsuc'];
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-            echo $PMF_LANG['ad_entry_delsuc'];
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
+            break;
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 
                 foreach ($items as $item) {
                     if (is_array($item) && count($item) == 3 && Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'active');
+                        echo $faq->updateRecordFlag((int)$item[0], addslashes($item[1]), $item[2], 'active');
                     }
                 }
             }
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
 
                 foreach ($items as $item) {
                     if (is_array($item) && count($item) == 3 && Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'sticky');
+                        echo $faq->updateRecordFlag((int)$item[0], addslashes($item[1]), $item[2], 'sticky');
                     }
                 }
             }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
 
             if (!is_null($questionIds['questions'])) {
                 foreach ($questionIds['questions'] as $questionId) {
-                    $faq->deleteQuestion((int) $questionId);
+                    $faq->deleteQuestion((int)$questionId);
                 }
             }
             echo $PMF_LANG['ad_entry_delsuc'];

Please login to merge, or discard this patch.