thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Auth/Ldap.php

Spacing +3 added lines, -3 removed lines

@@ -215,7 +215,7 @@ 
                 }
 
                 if (false !== $this->ldap->getDn($login)) {
-                    $this->activeServer = (int) $key;
+                    $this->activeServer = (int)$key;
                     break;
                 }
             }
@@ -251,7 +251,7 @@ 
             htmlspecialchars_decode($password)
         );
 
-        if (! $this->ldap->bind($bindLogin, htmlspecialchars_decode($password))) {
+        if (!$this->ldap->bind($bindLogin, htmlspecialchars_decode($password))) {
             $this->errors[] = $this->ldap->error;
 
             return false;
@@ -288,7 +288,7 @@ 
                 }
 
                 if (false !== $this->ldap->getDn($login)) {
-                    $this->activeServer = (int) $key;
+                    $this->activeServer = (int)$key;
                     break;
                 }
             }

phpmyfaq/setup/update.php

Spacing +4 added lines, -4 removed lines

@@ -231,7 +231,7 @@ 
     // Backup of config/elasticsearch.php if exists
     if (file_exists(PMF_ROOT_DIR.'/config/elasticsearch.php')) {
         if (!copy(PMF_ROOT_DIR.'/config/elasticsearch.php', PMF_ROOT_DIR.'/config/elasticsearch.bak.php')) {
-            echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ' .
+            echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file '.
                 '../config/elasticsearch.bak.php could not be written. Please correct this!</p>';
         } else {
             $checkElasticsearchSetupFile = true;
@@ -599,7 +599,7 @@ 
         foreach ($query as $key => $executeQuery) {
             $result = $faqConfig->getDb()->query($executeQuery);
             echo '.';
-            if (!($key % 100)) {
+            if (!($key%100)) {
                 echo '<br />';
             }
             if (!$result) {
@@ -619,7 +619,7 @@ 
             }
             usleep(10000);
             ++$count;
-            if (!($count % 10)) {
+            if (!($count%10)) {
                 ob_flush();
             }
         }
@@ -713,7 +713,7 @@ 
         $faqConfig->add('main.enableGzipCompression', 'true');
 
         if ('sqlite3' === $DB['type']) {
-            $query[] = 'ALTER TABLE ' . $prefix . 'faquser ADD COLUMN success INT(1) NULL DEFAULT 1';
+            $query[] = 'ALTER TABLE '.$prefix.'faquser ADD COLUMN success INT(1) NULL DEFAULT 1';
         } elseif ('pgsql' === $DB['type']) {
             $query[] = 'ALTER TABLE '.$prefix.'faquser ADD success SMALLINT NULL DEFAULT 1';
         } else {

Indentation +5 added lines, -5 removed lines

@@ -160,7 +160,7 @@ 
                 // 2.5 versions only
                 if (version_compare($version, '2.6.0-alpha', '<') && !is_writeable('../template')) {
                     echo '<p class="alert alert-danger text-center"><strong>Please change the directory ../template '.
-                         'and its contents writable (777 on Linux/UNIX).</strong></p>';
+                            'and its contents writable (777 on Linux/UNIX).</strong></p>';
                 }
 
                 // We only support updates from 2.6+
@@ -206,7 +206,7 @@ 
     if (file_exists(PMF_ROOT_DIR.'/config/database.php')) {
         if (!copy(PMF_ROOT_DIR.'/config/database.php', PMF_ROOT_DIR.'/config/database.bak.php')) {
             echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ../config/database.bak.php '.
-                  'could not be written. Please correct this!</p>';
+                    'could not be written. Please correct this!</p>';
         } else {
             $checkDatabaseSetupFile = true;
             $updateMessages[] = 'A backup of your database configuration file has been made.';
@@ -603,8 +603,8 @@ 
             if (!$result) {
                 echo '</div>';
                 echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ '.
-                      'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'.
-                      '</p>';
+                        'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'.
+                        '</p>';
                 printf(
                     '<p class="alert alert-danger"><strong>DB error:</strong> %s</p>',
                     $faqConfig->getDb()->error()
@@ -906,7 +906,7 @@ 
             printf('<span title="%s"><i aria-hidden="true" class="fa fa-circle"></i></span>', $executeQuery);
             if (!$result) {
                 echo '<p class="alert alert-danger"><strong>Error:</strong> Please install your version of phpMyFAQ once again '.
-                      'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
+                        'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
                 printf('<p class="error"><strong>DB error:</strong> %s</p>', $faqConfig->getDb()->error());
                 printf('<code>%s</code>', htmlentities($executeQuery));
                 PMF_System::renderFooter();

phpmyfaq/admin/record.comments.php

Indentation +3 added lines, -3 removed lines

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

phpmyfaq/admin/image.browser.php

Spacing +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
 if (!is_dir(PMF_ROOT_DIR.'/images')) {
     echo '<p class="alert alert-danger">'.sprintf($PMF_LANG['ad_dir_missing'], '/images').'</p>';
 } else {
-    $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(PMF_ROOT_DIR . '/images/'));
+    $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(PMF_ROOT_DIR.'/images/'));
     foreach ($files as $file) {
         if ($file->isDir() || !in_array($file->getExtension(), $allowedExtensions)) {
             continue;
@@ -74,9 +74,9 @@ 
         $path = str_replace(dirname(__DIR__).'/', '', $file->getPath());
         printf(
             '<div class="mce-file" data-src="%s"><img src="%s" class="mce-file-preview">%s</div>',
-            $faqConfig->getDefaultUrl() . $path . '/' . $file->getFilename(),
-            $faqConfig->getDefaultUrl() . $path . '/' . $file->getFilename(),
-            $path . '/' . $file->getFilename()
+            $faqConfig->getDefaultUrl().$path.'/'.$file->getFilename(),
+            $faqConfig->getDefaultUrl().$path.'/'.$file->getFilename(),
+            $path.'/'.$file->getFilename()
         );
     }
 }

phpmyfaq/inc/PMF/Relation.php

Indentation +10 added lines, -10 removed lines

@@ -73,21 +73,21 @@
         $search
             ->setTable(PMF_Db::getTablePrefix().'faqdata AS fd')
             ->setResultColumns(
-               [
-                   'fd.id AS id',
-                   'fd.lang AS lang',
-                   'fcr.category_id AS category_id',
-                   'fd.thema AS question',
-                   'fd.content AS answer',
-                   'fd.keywords AS keywords'
-               ]
+                [
+                    'fd.id AS id',
+                    'fd.lang AS lang',
+                    'fcr.category_id AS category_id',
+                    'fd.thema AS question',
+                    'fd.content AS answer',
+                    'fd.keywords AS keywords'
+                ]
             )
             ->setJoinedTable(PMF_Db::getTablePrefix().'faqcategoryrelations AS fcr')
             ->setJoinedColumns(
-               [
+                [
                 'fd.id = fcr.record_id',
                 'fd.lang = fcr.record_lang',
-               ]
+                ]
             )
             ->setConditions(
                 [

phpmyfaq/admin/trans.list.php

Braces +20 added lines, -8 removed lines

@@ -105,9 +105,12 @@ 
                         <?php echo $PMF_LANG['msgEdit'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgEdit'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <?php if ($user->perm->checkRight($user->getUserId(), 'deltranslation') && $showActions): ?>
                 <td>
                     <a class="btn btn-danger" href="javascript: del('<?php echo $lang ?>');" >
@@ -115,9 +118,12 @@ 
                         <?php echo $PMF_LANG['msgDelete'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgDelete'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <?php if ($user->perm->checkRight($user->getUserId(), 'edittranslation') && $showActions): ?>
                 <td>
                     <a class="btn btn-success" href="javascript: sendToTeam('<?php echo $lang ?>');" >
@@ -125,14 +131,20 @@ 
                         <?php echo $PMF_LANG['msgTransToolSendToTeam'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgTransToolSendToTeam'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <?php if ($isLangFileWritable): ?>
                 <td><i aria-hidden="true" class="fa fa-ok-circle"></i> <?php echo $PMF_LANG['msgYes'] ?></td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><i aria-hidden="true" class="fa fa-ban-circle"></i> <?php echo $PMF_LANG['msgNo'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <td>
                     <?php echo $percents ?>%
                     <meter value="<?php echo $percents ?>" max="100" min="0" title="<?php echo $percents ?>%">

phpmyfaq/inc/PMF/Mail/SwiftSMTP.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * @param array $headers
      * @param string $body
      *
-     * @return bool True if successful, false otherwise.
+     * @return integer True if successful, false otherwise.
      */
     public function send($recipients, Array $headers, $body)
     {

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     exit();
 }
 
-require __DIR__ . '/../../libs/swiftmailer/swift_required.php';
+require __DIR__.'/../../libs/swiftmailer/swift_required.php';
 
 /**
  * Class PMF_Mail_SwiftSMTP

phpmyfaq/admin/ajax.image.php

Switch Indentation +35 added lines, -35 removed lines

@@ -36,41 +36,41 @@ 
 }
 switch ($ajaxAction) {
 
-    case 'upload':
+        case 'upload':
 
-        $uploadDir = PMF_ROOT_DIR . '/images/';
-        $uploadFile = basename($_FILES['upload']['name']);
-        $isUploaded = false;
-        $height = $width = 0;
+            $uploadDir = PMF_ROOT_DIR . '/images/';
+            $uploadFile = basename($_FILES['upload']['name']);
+            $isUploaded = false;
+            $height = $width = 0;
 
-        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')
+                ) {
 
-                $info = getimagesize($uploadedFile['tmp_name']);
+                    $info = getimagesize($uploadedFile['tmp_name']);
 
-                if (false === $info) {
-                    $isUploaded = false;
-                }
-
-                if (($info[2] !== IMAGETYPE_GIF) &&
-                    ($info[2] !== IMAGETYPE_JPEG) &&
-                    ($info[2] !== IMAGETYPE_PNG)) {
-                    $isUploaded = false;
-                } else {
-                    $isUploaded = true;
-                }
+                    if (false === $info) {
+                        $isUploaded = false;
+                    }
 
-                if ($info) {
-                    list($width, $height) = $info;
-                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
-                        $isUploaded = true;
-                    } else {
+                    if (($info[2] !== IMAGETYPE_GIF) &&
+                        ($info[2] !== IMAGETYPE_JPEG) &&
+                        ($info[2] !== IMAGETYPE_PNG)) {
                         $isUploaded = false;
+                    } else {
+                        $isUploaded = true;
                     }
-                }
-                ?>
+
+                    if ($info) {
+                        list($width, $height) = $info;
+                        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 ?>',
@@ -81,8 +81,8 @@ 
                     });
                 </script>
                 <?php
-            } else {
-                ?>
+                } else {
+                    ?>
                 <script>
                     window.parent.window.pmfImageUpload.uploadFinished({
                         filename: '',
@@ -93,9 +93,9 @@ 
                     });
                 </script>
                 <?php
-            }
-        } else {
-            ?>
+                }
+            } else {
+                ?>
             <script>
                 window.parent.window.pmfImageUpload.uploadFinished({
                     filename: '',
@@ -106,7 +106,7 @@ 
                 });
             </script>
             <?php
-        }
+            }
 
-        break;
+            break;
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 
     case 'upload':
 
-        $uploadDir = PMF_ROOT_DIR . '/images/';
+        $uploadDir = PMF_ROOT_DIR.'/images/';
         $uploadFile = basename($_FILES['upload']['name']);
         $isUploaded = false;
         $height = $width = 0;
@@ -64,7 +64,7 @@ 
 
                 if ($info) {
                     list($width, $height) = $info;
-                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
+                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir.$uploadFile)) {
                         $isUploaded = true;
                     } else {
                         $isUploaded = false;
@@ -73,7 +73,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/lang/language_bs.php

Spacing +8 added lines, -8 removed lines

@@ -661,14 +661,14 @@
 $PMF_LANG['ad_entry_visibility'] = 'Objavi?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Molimo unesite lozinku. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Lozinke se ne poklapaju. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "Unešeno korisničko ime nije nađeno.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Unesite važeću email adresu. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Unesite Vaše pravo ime. ";
-$PMF_LANG['ad_user_error_delete'] =  "Korisnički nalog ne može biti izbrisan. ";
-$PMF_LANG['ad_user_error_noId'] =  "Nije priložen ID. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "Korisnički nalog je zaštićen. ";
+$PMF_LANG['ad_user_error_password'] = "Molimo unesite lozinku. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Lozinke se ne poklapaju. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "Unešeno korisničko ime nije nađeno.";
+$PMF_LANG['ad_user_error_noEmail'] = "Unesite važeću email adresu. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Unesite Vaše pravo ime. ";
+$PMF_LANG['ad_user_error_delete'] = "Korisnički nalog ne može biti izbrisan. ";
+$PMF_LANG['ad_user_error_noId'] = "Nije priložen ID. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "Korisnički nalog je zaštićen. ";
 $PMF_LANG['ad_user_deleteUser'] = "Obriši korisnika";
 $PMF_LANG['ad_user_status'] = "Status:";
 $PMF_LANG['ad_user_lastModified'] = "zadnji put menjano:";