thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Search.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function setCategoryId($categoryId)
     {
-        $this->categoryId = (int) $categoryId;
+        $this->categoryId = (int)$categoryId;
     }
 
     /**
@@ -159,8 +159,8 @@ 
      */
     public function searchDatabase($searchTerm, $allLanguages = true)
     {
-        $fdTable = PMF_Db::getTablePrefix() . 'faqdata AS fd';
-        $fcrTable = PMF_Db::getTablePrefix() . 'faqcategoryrelations';
+        $fdTable = PMF_Db::getTablePrefix().'faqdata AS fd';
+        $fcrTable = PMF_Db::getTablePrefix().'faqcategoryrelations';
         $condition = ['fd.active' => "'yes'"];
         $search = PMF_Search_Factory::create($this->_config, ['database' => PMF_Db::getType()]);
 
@@ -168,7 +168,7 @@ 
             if ($this->getCategory() instanceof PMF_Category) {
                 $children = $this->getCategory()->getChildNodes($this->getCategoryId());
                 $selectedCategory = array(
-                    $fcrTable.'.category_id' => array_merge((array) $this->getCategoryId(), $children),
+                    $fcrTable.'.category_id' => array_merge((array)$this->getCategoryId(), $children),
                 );
             } else {
                 $selectedCategory = array(
@@ -179,7 +179,7 @@ 
         }
 
         if ((!$allLanguages) && (!is_numeric($searchTerm))) {
-            $selectedLanguage = array('fd.lang' => "'" . $this->_config->getLanguage()->getLanguage() . "'");
+            $selectedLanguage = array('fd.lang' => "'".$this->_config->getLanguage()->getLanguage()."'");
             $condition        = array_merge($selectedLanguage, $condition);
         }
 
@@ -188,13 +188,13 @@ 
                 'fd.id AS id',
                 'fd.lang AS lang',
                 'fd.solution_id AS solution_id',
-                $fcrTable . '.category_id AS category_id',
+                $fcrTable.'.category_id AS category_id',
                 'fd.thema AS question',
                 'fd.content AS answer'))
             ->setJoinedTable($fcrTable)
             ->setJoinedColumns(array(
-                'fd.id = ' . $fcrTable . '.record_id',
-                'fd.lang = ' . $fcrTable . '.record_lang'
+                'fd.id = '.$fcrTable.'.record_id',
+                'fd.lang = '.$fcrTable.'.record_lang'
             ))
             ->setConditions($condition);
 
@@ -339,7 +339,7 @@ 
             $i = 0;
             while ($row = $this->_config->getDb()->fetchObject($result)) {
                 if ($i < $numResults) {
-                    $searchResult[] = (array) $row;
+                    $searchResult[] = (array)$row;
                 }
                 ++$i;
             }
@@ -362,7 +362,7 @@ 
 
         $result = $this->_config->getDb()->query($sql);
 
-        return (int) $this->_config->getDb()->fetchObject($result)->count;
+        return (int)$this->_config->getDb()->fetchObject($result)->count;
     }
 
     /**

phpmyfaq/inc/PMF/Instance/Elasticsearch.php

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
     public function createIndex()
     {
         $this->client->indices()->create($this->getParams());
-        return $this->putMapping();;
+        return $this->putMapping(); ;
     }
 
     /**
@@ -211,7 +211,7 @@ 
                 'category_id' => $faq['category_id']
             ];
 
-            if ($i % 1000 == 0) {
+            if ($i%1000 == 0) {
                 $responses = $this->client->bulk($params);
                 $params = ['body' => []];
                 unset($responses);

phpmyfaq/admin/attachment.php

Spacing +4 added lines, -4 removed lines

@@ -95,14 +95,14 @@ 
 
 }
 if (is_null($currentAction) && $auth && $user->perm->checkRight($user->getUserId(), 'addattachment')) {
-    $recordId = filter_input(INPUT_GET, 'record_id',   FILTER_VALIDATE_INT);
+    $recordId = filter_input(INPUT_GET, 'record_id', FILTER_VALIDATE_INT);
     $recordLang = filter_input(INPUT_GET, 'record_lang', FILTER_SANITIZE_STRING);
     ?>
         <form action="attachment.php?action=save" enctype="multipart/form-data" method="post" accept-charset="utf-8">
             <fieldset>
             <legend>
                 <?php echo $PMF_LANG['ad_att_addto'].' '.$PMF_LANG['ad_att_addto_2'] ?>
-                (max <?php echo round($faqConfig->get('records.maxAttachmentSize') / pow(1024, 2), 2) ?> MB)
+                (max <?php echo round($faqConfig->get('records.maxAttachmentSize')/pow(1024, 2), 2) ?> MB)
             </legend>
                 <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $faqConfig->get('records.maxAttachmentSize') ?>">
                 <input type="hidden" name="record_id" value="<?php echo $recordId ?>">
@@ -132,7 +132,7 @@ 
 
 if (!is_null($currentSave) && $currentSave == true && $auth &&
     $user->perm->checkRight($user->getUserId(), 'addattachment')) {
-    $recordId = filter_input(INPUT_POST, 'record_id',   FILTER_VALIDATE_INT);
+    $recordId = filter_input(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
     $recordLang = filter_input(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
     ?>
 <p>
@@ -174,7 +174,7 @@ 
             '<p>%s</p>',
             sprintf(
                 $PMF_LANG['ad_attach_4'],
-                round($faqConfig->get('records.maxAttachmentSize') / pow(1024, 2), 2)
+                round($faqConfig->get('records.maxAttachmentSize')/pow(1024, 2), 2)
             )
         );
 

phpmyfaq/lang/language_de.php

Spacing +10 added lines, -10 removed lines

@@ -638,14 +638,14 @@ 
 $PMF_LANG["ad_entry_visibility"] = "sichtbar";
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG["ad_user_error_password"] =  "Bitte geben Sie ein Passwort ein. ";
-$PMF_LANG["ad_user_error_passwordsDontMatch"] =  "Die Passwörter stimmen nicht überein. ";
-$PMF_LANG["ad_user_error_loginInvalid"] =  "Der ausgewählte Benutzer ist ungültig.";
-$PMF_LANG["ad_user_error_noEmail"] =  "Bitte geben Sie eine korrekte E-Mailadresse ein. ";
-$PMF_LANG["ad_user_error_noRealName"] =  "Bitte geben Sie ihren Namen ein. ";
-$PMF_LANG["ad_user_error_delete"] =  "Der Benutzeraccount kann nicht gelöscht werden. ";
-$PMF_LANG["ad_user_error_noId"] =  "Keine ID ausgewählt. ";
-$PMF_LANG["ad_user_error_protectedAccount"] =  "Der Benutzeraccount ist geschützt. ";
+$PMF_LANG["ad_user_error_password"] = "Bitte geben Sie ein Passwort ein. ";
+$PMF_LANG["ad_user_error_passwordsDontMatch"] = "Die Passwörter stimmen nicht überein. ";
+$PMF_LANG["ad_user_error_loginInvalid"] = "Der ausgewählte Benutzer ist ungültig.";
+$PMF_LANG["ad_user_error_noEmail"] = "Bitte geben Sie eine korrekte E-Mailadresse ein. ";
+$PMF_LANG["ad_user_error_noRealName"] = "Bitte geben Sie ihren Namen ein. ";
+$PMF_LANG["ad_user_error_delete"] = "Der Benutzeraccount kann nicht gelöscht werden. ";
+$PMF_LANG["ad_user_error_noId"] = "Keine ID ausgewählt. ";
+$PMF_LANG["ad_user_error_protectedAccount"] = "Der Benutzeraccount ist geschützt. ";
 $PMF_LANG["ad_user_deleteUser"] = "Lösche Benutzer";
 $PMF_LANG["ad_user_status"] = "Status";
 $PMF_LANG["ad_user_lastModified"] = "Letzte Änderung:";
@@ -975,9 +975,9 @@ 
 $PMF_LANG["ad_record_active"] = "aktiviert";
 
 // added 2.6.0-alpha - 2009-11-02 by max
-$LANG_CONF["search.numberSearchTerms"]   = array(0 => "input", 1 => "Anzahl der beliebtesten Suchbegriffe");
+$LANG_CONF["search.numberSearchTerms"] = array(0 => "input", 1 => "Anzahl der beliebtesten Suchbegriffe");
 $LANG_CONF["records.orderingPopularFaqs"] = array(0 => "select", 1 => "Sortierung der TOP-FAQ");
-$PMF_LANG["list_all_users"]            = "Alle Benutzer anzeigen";
+$PMF_LANG["list_all_users"] = "Alle Benutzer anzeigen";
 
 $PMF_LANG["records.orderingPopularFaqs.visits"] = "nach Anzahl der Besucher";
 $PMF_LANG["records.orderingPopularFaqs.voting"] = "nach Bewertung der Besucher";

phpmyfaq/admin/ajax.image.php

Switch Indentation +40 added lines, -40 removed lines

@@ -36,47 +36,47 @@ 
 }
 switch ($ajaxAction) {
 
-    case 'upload':
+        case 'upload':
 
-        $uploadDir = PMF_ROOT_DIR . '/images/';
-        $uploadFile = basename($_FILES['upload']['name']);
-        $isUploaded = false;
-        $height = $width = 0;
-        $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ];
+            $uploadDir = PMF_ROOT_DIR . '/images/';
+            $uploadFile = basename($_FILES['upload']['name']);
+            $isUploaded = false;
+            $height = $width = 0;
+            $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ];
 
-        if ($csrfOkay) {
-            if (is_uploaded_file($uploadedFile['tmp_name']) &&
-                $uploadedFile['size'] < $faqConfig->get('records.maxAttachmentSize')
-            ) {
+            if ($csrfOkay) {
+                if (is_uploaded_file($uploadedFile['tmp_name']) &&
+                    $uploadedFile['size'] < $faqConfig->get('records.maxAttachmentSize')
+                ) {
 
-                $fileInfo = getimagesize($uploadedFile['tmp_name']);
-                $fileExtension = pathinfo($uploadFile, PATHINFO_EXTENSION);;
+                    $fileInfo = getimagesize($uploadedFile['tmp_name']);
+                    $fileExtension = pathinfo($uploadFile, PATHINFO_EXTENSION);;
 
-                if (false === $fileInfo) {
-                    $isUploaded = false;
-                }
-
-                if (($fileInfo[2] !== IMAGETYPE_GIF) &&
-                    ($fileInfo[2] !== IMAGETYPE_JPEG) &&
-                    ($fileInfo[2] !== IMAGETYPE_PNG)) {
-                    $isUploaded = false;
-                } else {
-                    $isUploaded = true;
-                }
-
-                if (!in_array($fileExtension, $validFileExtensions)) {
-                    $isUploaded = false;
-                }
+                    if (false === $fileInfo) {
+                        $isUploaded = false;
+                    }
 
-                if ($fileInfo && $isUploaded) {
-                    list($width, $height) = $fileInfo;
-                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
-                        $isUploaded = true;
+                    if (($fileInfo[2] !== IMAGETYPE_GIF) &&
+                        ($fileInfo[2] !== IMAGETYPE_JPEG) &&
+                        ($fileInfo[2] !== IMAGETYPE_PNG)) {
+                        $isUploaded = false;
                     } else {
+                        $isUploaded = true;
+                    }
+
+                    if (!in_array($fileExtension, $validFileExtensions)) {
                         $isUploaded = false;
                     }
-                }
-                ?>
+
+                    if ($fileInfo && $isUploaded) {
+                        list($width, $height) = $fileInfo;
+                        if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
+                            $isUploaded = true;
+                        } else {
+                            $isUploaded = false;
+                        }
+                    }
+                    ?>
                 <script>
                     window.parent.window.pmfImageUpload.uploadFinished({
                         filename: '<?php echo $faqConfig->getDefaultUrl() . 'images/' . $uploadFile ?>',
@@ -87,8 +87,8 @@ 
                     });
                 </script>
                 <?php
-            } else {
-                ?>
+                } else {
+                    ?>
                 <script>
                     window.parent.window.pmfImageUpload.uploadFinished({
                         filename: '',
@@ -99,9 +99,9 @@ 
                     });
                 </script>
                 <?php
-            }
-        } else {
-            ?>
+                }
+            } else {
+                ?>
             <script>
                 window.parent.window.pmfImageUpload.uploadFinished({
                     filename: '',
@@ -112,7 +112,7 @@ 
                 });
             </script>
             <?php
-        }
+            }
 
-        break;
+            break;
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -38,11 +38,11 @@ 
 
     case 'upload':
 
-        $uploadDir = PMF_ROOT_DIR . '/images/';
+        $uploadDir = PMF_ROOT_DIR.'/images/';
         $uploadFile = basename($_FILES['upload']['name']);
         $isUploaded = false;
         $height = $width = 0;
-        $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ];
+        $validFileExtensions = ['gif', 'jpg', 'jpeg', 'png'];
 
         if ($csrfOkay) {
             if (is_uploaded_file($uploadedFile['tmp_name']) &&
@@ -50,7 +50,7 @@ 
             ) {
 
                 $fileInfo = getimagesize($uploadedFile['tmp_name']);
-                $fileExtension = pathinfo($uploadFile, PATHINFO_EXTENSION);;
+                $fileExtension = pathinfo($uploadFile, PATHINFO_EXTENSION); ;
 
                 if (false === $fileInfo) {
                     $isUploaded = false;
@@ -70,7 +70,7 @@ 
 
                 if ($fileInfo && $isUploaded) {
                     list($width, $height) = $fileInfo;
-                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
+                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir.$uploadFile)) {
                         $isUploaded = true;
                     } else {
                         $isUploaded = false;
@@ -79,7 +79,7 @@ 
                 ?>
                 <script>
                     window.parent.window.pmfImageUpload.uploadFinished({
-                        filename: '<?php echo $faqConfig->getDefaultUrl() . 'images/' . $uploadFile ?>',
+                        filename: '<?php echo $faqConfig->getDefaultUrl().'images/'.$uploadFile ?>',
                         result: '<?php echo $isUploaded ? 'file_uploaded' : 'error' ?>',
                         resultCode: '<?php echo $isUploaded ? 'success' : 'failed' ?>',
                         height: <?php echo $height ?>,

phpmyfaq/inc/PMF/Filter.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
         foreach ($attributes[0] as $attribute) {
             $attributeName = stristr($attribute, '=', true);
             if (!in_array($attributeName, $keep)) {
-                $html = str_replace(' ' . $attribute, '', $html);
+                $html = str_replace(' '.$attribute, '', $html);
             }
         }
 

phpmyfaq/admin/category.translate.php

Braces +5 added lines, -2 removed lines

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