thorsten / phpMyFAQ

phpmyfaq/admin/stat.browser.php

Spacing +5 added lines, -5 removed lines

@@ -19,10 +19,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    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();
 }
 
@@ -30,15 +30,15 @@ 
 
     $perpage   = 50;
     $day       = PMF_Filter::filterInput(INPUT_POST, 'day', FILTER_VALIDATE_INT);
-    $firstHour = mktime (0, 0, 0, date('m', $day), date('d', $day), date('Y', $day));
-    $lastHour  = mktime (23, 59, 59, date('m', $day), date('d', $day), date('Y', $day));
+    $firstHour = mktime(0, 0, 0, date('m', $day), date('d', $day), date('Y', $day));
+    $lastHour  = mktime(23, 59, 59, date('m', $day), date('d', $day), date('Y', $day));
     
     $session     = new PMF_Session($faqConfig);
     $sessiondata = $session->getSessionsbyDate($firstHour, $lastHour);
     $date        = new PMF_Date($faqConfig);
 ?>
         <header>
-            <h2><i class="icon-tasks"></i> <?php echo $PMF_LANG['ad_sess_session'] . ' ' . date("Y-m-d", $day); ?></h2>
+            <h2><i class="icon-tasks"></i> <?php echo $PMF_LANG['ad_sess_session'].' '.date("Y-m-d", $day); ?></h2>
         </header>
 
         <table class="table table-striped">

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Sessionbrowser
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2003-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2003-02-24
- */
+     * Sessionbrowser
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2003-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2003-02-24
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

phpmyfaq/admin/ajax.category.php

Spacing +3 added lines, -3 removed lines

@@ -19,16 +19,16 @@
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    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();
 }
 
 $ajaxAction = PMF_Filter::filterInput(INPUT_GET, 'ajaxaction', FILTER_SANITIZE_STRING);
 
-switch($ajaxAction) {
+switch ($ajaxAction) {
 
     case 'getpermissions':
 

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * AJAX: handling of Ajax category calls
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2012-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2012-12-26
- */
+     * AJAX: handling of Ajax category calls
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2012-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2012-12-26
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

phpmyfaq/admin/ajax.trans.php

Spacing +22 added lines, -22 removed lines

@@ -20,10 +20,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    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();
 }
 
@@ -41,7 +41,7 @@ 
             if (is_string($val)) {
                 $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
                 $val = str_replace("'", "\\'", $val);
-                $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key]"]  = $val;
+                $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key]"] = $val;
             } elseif (is_array($val)) {
                 /**
                  * Here we deal with a two dimensional array
@@ -56,13 +56,13 @@ 
         
         foreach ((array)@$_POST['LANG_CONF'] as $key => $val) {
             // if string like array(blah-blah-blah), extract the contents inside the brackets
-            if (preg_match('/^\s*array\s*\(\s*(\d+.+)\s*\).*$/',$val,$matches1)) {
+            if (preg_match('/^\s*array\s*\(\s*(\d+.+)\s*\).*$/', $val, $matches1)) {
                 // split the resulting string of delimiters such as "number =>"
                 $valArr = preg_split(
                     '/\s*(\d+)\s*\=\>\s*/',
                     $matches1[1],
                     null,
-                    PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
+                    PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
                 );
                 // in an array $valArr contents like  "number substring", "substring", "number substring", "substring", ...
                 $numVal = count($valArr);
@@ -81,12 +81,12 @@ 
                             }
                         }
                     }
-                    $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = 'array('.implode(", ",$newValArr).')';
+                    $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = 'array('.implode(", ", $newValArr).')';
                 }
             } else {  // compatibility for old behavior
                 $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
                 $val = str_replace("'", "\\'", $val);
-                $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"]  = $val;
+                $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = $val;
             }
         }
         
@@ -101,14 +101,14 @@ 
         }
         
         $lang     = strtolower($_SESSION['trans']['rightVarsOnly']["PMF_LANG[metaLanguage]"]);
-        $filename = PMF_ROOT_DIR . "/lang/language_" . $lang . ".php";
+        $filename = PMF_ROOT_DIR."/lang/language_".$lang.".php";
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        if (!is_writable(PMF_ROOT_DIR."/lang")) {
             print 0;
             exit;
         }     
         
-        if (!copy($filename, PMF_ROOT_DIR . "/lang/language_" . $lang . ".bak.php")) {
+        if (!copy($filename, PMF_ROOT_DIR."/lang/language_".$lang.".bak.php")) {
             print 0;
             exit;
         }
@@ -130,7 +130,7 @@ 
             if (0 === strpos($key, 'PMF_LANG')) {
                 $val = "'$val'";
             }
-            array_push($tmpLines, '$' . str_replace(array('[', ']'), array("['", "']"), $key) . " = $val;");
+            array_push($tmpLines, '$'.str_replace(array('[', ']'), array("['", "']"), $key)." = $val;");
         }
         
         $newFileContents .= implode("\n", $tmpLines);
@@ -150,17 +150,17 @@ 
          
         $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        if (!is_writable(PMF_ROOT_DIR."/lang")) {
             print 0;
             exit;
         }     
         
-        if (!copy(PMF_ROOT_DIR . "/lang/language_$lang.php", PMF_ROOT_DIR . "/lang/language_$lang.bak.php")) {
+        if (!copy(PMF_ROOT_DIR."/lang/language_$lang.php", PMF_ROOT_DIR."/lang/language_$lang.bak.php")) {
             print 0;
             exit;
         }
         
-        if (!unlink(PMF_ROOT_DIR . "/lang/language_$lang.php")) {
+        if (!unlink(PMF_ROOT_DIR."/lang/language_$lang.php")) {
             print 0;
             exit;
         }
@@ -175,7 +175,7 @@ 
             exit;
         }        
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        if (!is_writable(PMF_ROOT_DIR."/lang")) {
             print 0;
             exit;
         }
@@ -184,17 +184,17 @@ 
         $langName    = @$languageCodes[$langCode];
         $langCharset = "UTF-8";
         $langDir     = PMF_Filter::filterInput(INPUT_POST, 'langdir', FILTER_SANITIZE_STRING);
-        $langNPlurals= strval(PMF_Filter::filterVar(@$_POST['langnplurals'], FILTER_VALIDATE_INT, -1));
+        $langNPlurals = strval(PMF_Filter::filterVar(@$_POST['langnplurals'], FILTER_VALIDATE_INT, -1));
         $langDesc    = PMF_Filter::filterInput(INPUT_POST, 'langdesc', FILTER_SANITIZE_STRING);
-        $author      = (array) @$_POST['author'];
+        $author      = (array)@$_POST['author'];
         
-        if(empty($langCode) || empty($langName) || empty($langCharset) ||
+        if (empty($langCode) || empty($langName) || empty($langCharset) ||
            empty($langDir) || empty($langDesc) || empty($author)) {
             print 0;
             exit;
         }
         
-        $fileTpl     = <<<FILE
+        $fileTpl = <<<FILE
 <?php
 /**
  * %s
@@ -228,7 +228,7 @@ 
         $fileTpl = sprintf($fileTpl, $langDesc, $authorTpl, date('Y-m-d'), $langCode, date('Y'),
                                      $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
 
-        $retval = @file_put_contents(PMF_ROOT_DIR . '/lang/language_' . strtolower($langCode) . '.php', $fileTpl);
+        $retval = @file_put_contents(PMF_ROOT_DIR.'/lang/language_'.strtolower($langCode).'.php', $fileTpl);
         print intval($retval);
     break;
     
@@ -236,7 +236,7 @@ 
     case 'send_translated_file':
         
         $lang     = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
-        $filename = PMF_ROOT_DIR . "/lang/language_" . $lang . ".php";
+        $filename = PMF_ROOT_DIR."/lang/language_".$lang.".php";
         
         if (!file_exists($filename)) {
             print 0;
@@ -255,6 +255,6 @@ 
         $mail->addTo('thorsten@phpmyfaq.de');
         $mail->addAttachment($filename, null, 'text/plain');
         
-        print (int) $mail->send();
+        print (int)$mail->send();
     break;
 }

Indentation +18 added lines, -18 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Handle ajax requests for the interface translation tool
- *
- * PHP 5.2
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Anatoliy Belsky <ab@php.net>
- * @author    Alexander Melnik <old@km.ua>
- * @copyright 2009-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-05-12
- */
+     * Handle ajax requests for the interface translation tool
+     *
+     * PHP 5.2
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @author    Alexander Melnik <old@km.ua>
+     * @copyright 2009-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-05-12
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
@@ -226,7 +226,7 @@ 
         }
         
         $fileTpl = sprintf($fileTpl, $langDesc, $authorTpl, date('Y-m-d'), $langCode, date('Y'),
-                                     $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
+                                        $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
 
         $retval = @file_put_contents(PMF_ROOT_DIR . '/lang/language_' . strtolower($langCode) . '.php', $fileTpl);
         print intval($retval);

phpmyfaq/admin/news.php

Spacing +9 added lines, -9 removed lines

@@ -20,10 +20,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    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();
 }
 
@@ -180,7 +180,7 @@ 
         $newsHeader = $news->getNewsHeader();
         $date       = new PMF_Date($faqConfig);
         if (count($newsHeader)) {
-            foreach($newsHeader as $newsItem) {
+            foreach ($newsHeader as $newsItem) {
 ?>
         <tr>
             <td><?php echo $newsItem['header']; ?></td>
@@ -366,8 +366,8 @@ 
             <?php print($item['user']); ?>
         </a>:<br>
         <?php print($item['content']); ?><br>
-        <?php print($PMF_LANG['newsCommentDate'] . PMF_Date::createIsoDate($item['date'], 'Y-m-d H:i', false)); ?>
-        <a href="?action=delcomment&amp;artid=<?php print($newsId); ?>&amp;cmtid=<?php print($item['id']); ?>&amp;type=<?php print(PMF_Comment::COMMENT_TYPE_NEWS);?>">
+        <?php print($PMF_LANG['newsCommentDate'].PMF_Date::createIsoDate($item['date'], 'Y-m-d H:i', false)); ?>
+        <a href="?action=delcomment&amp;artid=<?php print($newsId); ?>&amp;cmtid=<?php print($item['id']); ?>&amp;type=<?php print(PMF_Comment::COMMENT_TYPE_NEWS); ?>">
             <img src="images/delete.gif" alt="<?php echo $PMF_LANG["ad_entry_delete"] ?>" title="<?php echo $PMF_LANG["ad_entry_delete"] ?>" border="0" width="17" height="18" align="right">
         </a>
     </div>
@@ -400,8 +400,8 @@ 
         'authorEmail'   => $email,
         'active'        => (is_null($active)) ? 'n' : 'y',
         'comment'       => (is_null($comment)) ? 'n' : 'y',
-        'dateStart'     => (empty($dateStart)) ? '00000000000000' : str_replace('-', '', $dateStart) . '000000',
-        'dateEnd'       => (empty($dateEnd))  ? '99991231235959' : str_replace('-', '', $dateEnd) . '235959',
+        'dateStart'     => (empty($dateStart)) ? '00000000000000' : str_replace('-', '', $dateStart).'000000',
+        'dateEnd'       => (empty($dateEnd)) ? '99991231235959' : str_replace('-', '', $dateEnd).'235959',
         'link'          => $link,
         'linkTitle'     => $linktitle,
         'date'          => date('YmdHis'),
@@ -441,8 +441,8 @@ 
         'authorEmail' => $email,
         'active'      => (is_null($active)) ? 'n' : 'y',
         'comment'     => (is_null($comment)) ? 'n' : 'y',
-        'dateStart'   => (empty($dateStart)) ? '00000000000000' : str_replace('-', '', $dateStart) . '000000',
-        'dateEnd'     => (empty($dateEnd))   ? '99991231235959' : str_replace('-', '', $dateEnd) . '235959',
+        'dateStart'   => (empty($dateStart)) ? '00000000000000' : str_replace('-', '', $dateStart).'000000',
+        'dateEnd'     => (empty($dateEnd)) ? '99991231235959' : str_replace('-', '', $dateEnd).'235959',
         'link'        => $link,
         'linkTitle'   => $linktitle,
         'date'        => date('YmdHis'),

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * The main administration file for the news.
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
- * @copyright 2003-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2003-02-23
- */
+             * The main administration file for the news.
+             *
+             * PHP Version 5.3
+             *
+             * This Source Code Form is subject to the terms of the Mozilla Public License,
+             * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+             * obtain one at http://mozilla.org/MPL/2.0/.
+             *
+             * @category  phpMyFAQ
+             * @package   Administration
+             * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+             * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
+             * @copyright 2003-2016 phpMyFAQ Team
+             * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+             * @link      http://www.phpmyfaq.de
+             * @since     2003-02-23
+             */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

phpmyfaq/glossary.php

Spacing +4 added lines, -4 removed lines

@@ -19,14 +19,14 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    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();
 }
 
-$page = PMF_Filter::filterInput(INPUT_GET, 'page' , FILTER_VALIDATE_INT, 1);
+$page = PMF_Filter::filterInput(INPUT_GET, 'page', FILTER_VALIDATE_INT, 1);
 
 $glossary      = new PMF_Glossary($faqConfig);
 $glossaryItems = $glossary->getAllGlossaryItems();
@@ -51,7 +51,7 @@ 
 if (0 < $numItems) {
         
     $output       = array();
-    $visibleItems = array_slice($glossaryItems, ($page - 1) * $itemsPerPage, $itemsPerPage);
+    $visibleItems = array_slice($glossaryItems, ($page - 1)*$itemsPerPage, $itemsPerPage);
 
     foreach ($visibleItems as $item) {
         $output['item'][]       = $item['item'];

phpmyfaq/login.php

Spacing +6 added lines, -6 removed lines

@@ -19,24 +19,24 @@
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    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();
 }
 
 if (is_null($error)) {
-    $loginMessage = '<p>' . $PMF_LANG['ad_auth_insert'] . '</p>';
+    $loginMessage = '<p>'.$PMF_LANG['ad_auth_insert'].'</p>';
 } else {
-    $loginMessage = '<p class="alert alert-error">' . $error . '</p>';
+    $loginMessage = '<p class="alert alert-error">'.$error.'</p>';
 }
 
 $tpl->parse(
     'writeContent',
     array(
-        'registerUser'   => '<a href="?action=register">' . $PMF_LANG['msgRegistration'] . '</a>',
-        'sendPassword'   => '<a href="?action=password">' . $PMF_LANG['lostPassword'] . '</a>',
+        'registerUser'   => '<a href="?action=register">'.$PMF_LANG['msgRegistration'].'</a>',
+        'sendPassword'   => '<a href="?action=password">'.$PMF_LANG['lostPassword'].'</a>',
         'loginHeader'    => $PMF_LANG['msgLoginUser'],
         'loginMessage'   => $loginMessage,
         'writeLoginPath' => $faqSystem->getSystemUri($faqConfig),

phpmyfaq/services/twitter/redirect.php

Spacing +4 added lines, -4 removed lines

@@ -27,8 +27,8 @@ 
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
-require PMF_ROOT_DIR . '/inc/libs/twitteroauth/twitteroauth.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/libs/twitteroauth/twitteroauth.php';
 
 $connection = new TwitterOAuth(
     $faqConfig->get('socialnetworks.twitterConsumerKey'),
@@ -36,7 +36,7 @@ 
 );
 
 $requestToken = $connection->getRequestToken(
-    $faqConfig->get('main.referenceURL') . '/services/twitter/callback.php'
+    $faqConfig->get('main.referenceURL').'/services/twitter/callback.php'
 );
 
 $_SESSION['oauth_token']        = $requestToken['oauth_token'];
@@ -45,7 +45,7 @@ 
 switch ($connection->http_code) {
     case 200:
         $url = $connection->getAuthorizeURL($requestToken['oauth_token']);
-        header('Location: ' . $url);
+        header('Location: '.$url);
         break;
     default:
         print 'Could not connect to Twitter. Refresh the page or try again later.';

phpmyfaq/services/twitter/callback.php

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
-require PMF_ROOT_DIR . '/inc/libs/twitteroauth/twitteroauth.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/libs/twitteroauth/twitteroauth.php';
 
 $oAuthToken    = PMF_Filter::filterInput(INPUT_GET, 'oauth_token', FILTER_SANITIZE_STRING);
 $oAuthVerifier = PMF_Filter::filterInput(INPUT_GET, 'oauth_verifier', FILTER_SANITIZE_STRING);

Indentation +22 added lines, -22 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Take the user when they return from Twitter. Get access tokens.
- * Verify credentials and redirect to based on response from Twitter.
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Services
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2010-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2010-09-18
- */
+     * Take the user when they return from Twitter. Get access tokens.
+     * Verify credentials and redirect to based on response from Twitter.
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Services
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2010-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2010-09-18
+     */
 
 //
 // Prepend and start the PHP session
@@ -34,8 +34,8 @@ 
 $oAuthVerifier = PMF_Filter::filterInput(INPUT_GET, 'oauth_verifier', FILTER_SANITIZE_STRING);
 
 if (!is_null($oAuthToken) && $_SESSION['oauth_token'] !== $oAuthToken) {
-  $_SESSION['oauth_status'] = 'oldtoken';
-  header('Location: ./clearsessions.php');
+    $_SESSION['oauth_status'] = 'oldtoken';
+    header('Location: ./clearsessions.php');
 }
 
 $connection = new TwitterOAuth(
@@ -52,8 +52,8 @@ 
 unset($_SESSION['oauth_token_secret']);
 
 if (200 === $connection->http_code) {
-  $_SESSION['status'] = 'verified';
-  header('Location: ./index.php');
+    $_SESSION['status'] = 'verified';
+    header('Location: ./index.php');
 } else {
-  header('Location: ./clearsessions.php');
+    header('Location: ./clearsessions.php');
 }
\ No newline at end of file

phpmyfaq/services/twitter/connect.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 if ($faqConfig->get('socialnetworks.twitterConsumerKey') === '' ||
     $faqConfig->get('socialnetworks.twitterConsumerSecret') === '') {

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * Clears PHP sessions and redirects to the connect page.
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Services
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Thomas Zeithaml <tom@annatom.de>
- * @copyright 2010-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2010-09-18
- */
+         * Clears PHP sessions and redirects to the connect page.
+         *
+         * PHP Version 5.3
+         *
+         * This Source Code Form is subject to the terms of the Mozilla Public License,
+         * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+         * obtain one at http://mozilla.org/MPL/2.0/.
+         *
+         * @category  phpMyFAQ
+         * @package   Services
+         * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+         * @author    Thomas Zeithaml <tom@annatom.de>
+         * @copyright 2010-2016 phpMyFAQ Team
+         * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+         * @link      http://www.phpmyfaq.de
+         * @since     2010-09-18
+         */
 
 //
 // Prepend and start the PHP session