thorsten / phpMyFAQ

phpmyfaq/admin/ajax.config.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
         $password = PMF_Filter::filterInput(INPUT_GET, 'password', FILTER_SANITIZE_STRING);
 
         $data = array(
-            'url'      => 'http://' . $url . '.' . $_SERVER['SERVER_NAME'],
+            'url'      => 'http://'.$url.'.'.$_SERVER['SERVER_NAME'],
             'instance' => $instance,
             'comment'  => $comment
         );
@@ -61,12 +61,12 @@ 
 
         if ($faqInstanceClient->createClientFolder($hostname)) {
 
-            $clientDir   = PMF_ROOT_DIR . '/multisite/' . $hostname;
+            $clientDir   = PMF_ROOT_DIR.'/multisite/'.$hostname;
             $clientSetup = new PMF_Instance_Setup();
             $clientSetup->setRootDir($clientDir);
 
-            $faqInstanceClient->copyConstantsFile($clientDir . '/constants.php');
-            $faqInstanceClient->copyLdapConstantsFile($clientDir . '/constants_ldap.php');
+            $faqInstanceClient->copyConstantsFile($clientDir.'/constants.php');
+            $faqInstanceClient->copyLdapConstantsFile($clientDir.'/constants_ldap.php');
 
             $dbSetup = array(
                 'dbServer'       => $DB['server'],
@@ -78,7 +78,7 @@ 
             );
             $clientSetup->createDatabaseFile($dbSetup, '');
 
-            $faqInstanceClient->setClientUrl('http://' . $hostname);
+            $faqInstanceClient->setClientUrl('http://'.$hostname);
             $faqInstanceClient->createClientTables($dbSetup['dbPrefix']);
 
             PMF_Db::setTablePrefix($dbSetup['dbPrefix']);
@@ -168,7 +168,7 @@ 
             $stopwords->setLanguage($stopwordsLang);
             if (null !== $stopwordId && -1 < $stopwordId) {
                 echo $stopwords->update($stopwordId, $stopword);
-            } elseif (!$stopwords->match($stopword)){
+            } elseif (!$stopwords->match($stopword)) {
                 echo $stopwords->add($stopword);
             } else {
 

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">

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':
 

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'),

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 +5 added lines, -5 removed lines

@@ -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') === '') {