OpencachingDeutschland / oc-server3

htdocs/newdesc.php

Spacing +6 added lines, -7 removed lines

@@ -43,11 +43,11 @@ 
 
                 //get the posted data
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
 
-                $hints = isset($_POST['hints']) ? trim($_POST['hints']) : '';  // Ocprop
-                $sel_lang = isset($_POST['desc_lang']) ? trim($_POST['desc_lang']) : $default_lang;  // Ocprop
-                $desc = isset($_POST['desc']) ? trim($_POST['desc']) : '';  // Ocprop
+                $hints = isset($_POST['hints']) ? trim($_POST['hints']) : ''; // Ocprop
+                $sel_lang = isset($_POST['desc_lang']) ? trim($_POST['desc_lang']) : $default_lang; // Ocprop
+                $desc = isset($_POST['desc']) ? trim($_POST['desc']) : ''; // Ocprop
 
                 // read descMode; if not set, initialize from user profile
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -212,8 +212,7 @@ 
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
 
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
 
                 tpl_set_var('show_all_langs', $show_all_langs);
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -235,7 +234,7 @@ 
                 $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
                 tpl_set_var('htmlheaders', $headers);
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             }
         } else {

htdocs/lib2/util.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
 /**
  * @param $filename
  * @param $maxLength
- * @return bool|string
+ * @return false|string
  */
 function read_file($filename, $maxLength = 4096)
 {
@@ -265,7 +265,7 @@ 
  * format number with 1000s dots
  *
  * @param $n
- * @return mixed|string
+ * @return string
  */
 function number1000($n)
 {

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
  */
 function is_valid_email_address($eMail)
 {
-    return (int) ($eMail === filter_var($eMail, FILTER_VALIDATE_EMAIL));
+    return (int)($eMail === filter_var($eMail, FILTER_VALIDATE_EMAIL));
 }
 
 /**
@@ -205,7 +205,7 @@ 
 function escape_javascript($text)
 {
     return str_replace(
-        ['\'', '"',],
+        ['\'', '"', ],
         ['\\\'', '"'],
         $text
     );

htdocs/viewcache.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 // get cacheid
 $cacheid = 0;
 if (isset($_REQUEST['cacheid'])) {
-    $cacheid = (int) $_REQUEST['cacheid'];
+    $cacheid = (int)$_REQUEST['cacheid'];
 } else {
     if (isset($_REQUEST['uuid'])) {
         $cacheid = cache::cacheIdFromUUID($_REQUEST['uuid']);

htdocs/lang/de/ocstyle/main.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -155,7 +155,7 @@ 
 <?php
 foreach ($opt['template']['locales'] as $k => $lang) {
     if ($lang['status'] == OC_LOCALE_ACTIVE) {
-        echo '<a style="text-decoration: none;" href="'.$langUrl . $k . '"><img src="' . $lang['flag'] .
+        echo '<a style="text-decoration: none;" href="' . $langUrl . $k . '"><img src="' . $lang['flag'] .
             '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
     }
 }
@@ -184,7 +184,7 @@ 
                                         }
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
 
-                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
+                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry == $tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
                                     }
 ?>
                                 </select>&nbsp;
@@ -345,7 +345,7 @@ 
             </div> <!-- page-container-1 -->
 
         </div> <!-- overall -->
-        <?php if($opt['tracking']['googleAnalytics']) { ?>
+        <?php if ($opt['tracking']['googleAnalytics']) { ?>
             <script type="text/javascript">
                 // Set to the same value as the web property used on the site
                 var gaProperty = '<?= $opt['tracking']['googleAnalytics']; ?>';

htdocs/adminreports.php

Indentation +5 added lines, -5 removed lines

@@ -190,14 +190,14 @@
     $tpl->assign(
         'other_report_in_progress',
         sql_value(
-          "SELECT `id`
+            "SELECT `id`
            FROM `cache_reports`
            WHERE `cacheid`='&1' AND `id`<>'&2' AND `status`='&3'
            LIMIT 1",
-          null,
-          $record['cacheid'],
-          $record['id'],
-          CACHE_REPORT_INPROGRESS
+            null,
+            $record['cacheid'],
+            $record['id'],
+            CACHE_REPORT_INPROGRESS
         ) !== null
     );
 

htdocs/lib2/error.inc.php

Indentation +28 added lines, -28 removed lines

@@ -6,36 +6,36 @@
  *  Common error messages
  ***************************************************************************/
 
- define('ERROR_UNKNOWN', 1000);
- define('ERROR_TEMPLATE_NOT_FOUND', 1001);
- define('ERROR_COMPILATION_FAILED', 1002);
- define('ERROR_NO_ACCESS', 1003);
- define('ERROR_INVALID_OPERATION', 1004);
- define('ERROR_LOGIN_REQUIRED', 1005);
- define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
- define('ERROR_NO_COOKIES', 1007);
- define('ERROR_ALREADY_LOGGEDIN', 1008);
- define('ERROR_USER_NOT_ACTIVE', 1009);
- define('ERROR_USER_NO_EMAIL', 1010);
- define('ERROR_CACHE_NOT_PUBLISHED', 1011);
- define('ERROR_CACHE_LOCKED', 1012);
+    define('ERROR_UNKNOWN', 1000);
+    define('ERROR_TEMPLATE_NOT_FOUND', 1001);
+    define('ERROR_COMPILATION_FAILED', 1002);
+    define('ERROR_NO_ACCESS', 1003);
+    define('ERROR_INVALID_OPERATION', 1004);
+    define('ERROR_LOGIN_REQUIRED', 1005);
+    define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
+    define('ERROR_NO_COOKIES', 1007);
+    define('ERROR_ALREADY_LOGGEDIN', 1008);
+    define('ERROR_USER_NOT_ACTIVE', 1009);
+    define('ERROR_USER_NO_EMAIL', 1010);
+    define('ERROR_CACHE_NOT_PUBLISHED', 1011);
+    define('ERROR_CACHE_LOCKED', 1012);
 
- define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
  
- define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
- define('ERROR_DB_NO_ROOT', 1017);
+    define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
+    define('ERROR_DB_NO_ROOT', 1017);
 
- define('ERROR_USER_NOT_EXISTS', 1018);
- define('ERROR_CACHE_NOT_EXISTS', 1019);
- define('ERROR_CACHELOG_NOT_EXISTS', 1020);
- define('ERROR_PICTURE_NOT_EXISTS', 1021);
+    define('ERROR_USER_NOT_EXISTS', 1018);
+    define('ERROR_CACHE_NOT_EXISTS', 1019);
+    define('ERROR_CACHELOG_NOT_EXISTS', 1020);
+    define('ERROR_PICTURE_NOT_EXISTS', 1021);
 
- define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
- define('ERROR_UPLOAD_ERR_SIZE', 1023);
- define('ERROR_UPLOAD_ERR_TYPE', 1024);
- define('ERROR_UPLOAD_UNKNOWN', 1025);
- define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
+    define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
+    define('ERROR_UPLOAD_ERR_SIZE', 1023);
+    define('ERROR_UPLOAD_ERR_TYPE', 1024);
+    define('ERROR_UPLOAD_UNKNOWN', 1025);
+    define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
 
- define('ERROR_WRONG_NODE', 1027);
+    define('ERROR_WRONG_NODE', 1027);

htdocs/picture.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     } else {
         $position = PHP_INT_MAX;
     }
-    $position = min($position, $allpics ? $allpics[count($allpics)-1]['seq'] + 1 : 1);
+    $position = min($position, $allpics ? $allpics[count($allpics) - 1]['seq'] + 1 : 1);
 
     // uploaded file ok?
     if (isset($_REQUEST['ok'])) { // Ocprop
@@ -233,7 +233,7 @@ 
     }
     $tpl->assign('allpics', $allpics);
     $tpl->assign('position', $position);
-    $tpl->assign('appendseq', $allpics ? $allpics[count($allpics)-1]['seq']+1 : 1);
+    $tpl->assign('appendseq', $allpics ? $allpics[count($allpics) - 1]['seq'] + 1 : 1);
 }
 
 $rsCache = sql("SELECT `wp_oc`, `name` FROM `caches` WHERE `cache_id`='&1'", $picture->getCacheId());

htdocs/src/OcLegacy/Cache/WebCache.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
                 \set_php_locale();
 
                 if ($this->translate->t('INTERNAL_LANG', 'all', 'OcSmarty.class.php', '') !== $sLanguage) {
-                    echo 'setlocale() failed to set language to ' . $sLanguage ."\n";
+                    echo 'setlocale() failed to set language to ' . $sLanguage . "\n";
                     die("Is the translation of INTERNAL_LANG correct?\n");
                 }
 

htdocs/src/OcLegacy/SmartyPlugins/modifier.smiley.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @subpackage plugins
  */
 
-require_once __DIR__.'/../../../lib2/smiley.inc.php';
+require_once __DIR__ . '/../../../lib2/smiley.inc.php';
 
 /**
  * @param $string