OpencachingDeutschland / oc-server3

htdocs/config2/settings-dist.inc.php

Spacing +23 added lines, -23 removed lines

@@ -108,7 +108,7 @@ 
 // database placeholder
 
 // productive database with opencaching-tables
-$opt['db']['placeholder']['db'] = '';    // selected by default
+$opt['db']['placeholder']['db'] = ''; // selected by default
 
 // empty database for temporary table creation
 $opt['db']['placeholder']['tmpdb'] = '';
@@ -122,14 +122,14 @@ 
 $opt['system']['maillog']['syslog_db_user'] = '';
 $opt['system']['maillog']['syslog_db_password'] = '';
 $opt['system']['maillog']['syslog_db_table'] = '';
-$opt['system']['maillog']['syslog_oc_host'] = '';  // 'host_name' column in syslog DB
-$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%';  // 'program' column in syslog DB
-$opt['system']['maillog']['column']['id'] = 'id';               // 'ID'
-$opt['system']['maillog']['column']['created'] = 'created';     // 'ReceivedAt'
+$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB
+$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB
+$opt['system']['maillog']['column']['id'] = 'id'; // 'ID'
+$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt'
 $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost'
-$opt['system']['maillog']['column']['message'] = 'message';     // 'Message'
-$opt['system']['maillog']['column']['program'] = 'program';     // 'SysLogTag'
-$opt['system']['maillog']['inactivity_warning'] = 30;   // warn after N days without new entries
+$opt['system']['maillog']['column']['message'] = 'message'; // 'Message'
+$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag'
+$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries
 
 /* cookie or session
  *
@@ -151,15 +151,15 @@ 
  * 
  * other parameters may be customized
  */
-$opt['session']['mode'] = SAVE_COOKIE;     // don't change - other option "SAVE_SESSION" is not implemented properly
+$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly
 $opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE
 $opt['session']['path'] = '/';
-$opt['session']['domain'] = '';    // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* maximum session lifetime
  */
 $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year)
-$opt['session']['expire']['url'] = 1800;        // when no cookies used (default 30 min since last call), attention to session.js
+$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -185,7 +185,7 @@ 
 /* other template options
  *
  */
-$opt['page']['origin_url'] = 'http://www.opencaching.de/';  // production installation for this OC site
+$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site
 $opt['page']['develsystem'] = false;
 $opt['page']['teampic_url'] = 'http://www.opencaching.de/images/team/';
 $opt['page']['teammember_url'] = 'http://www.opencaching.de/';
@@ -219,7 +219,7 @@ 
     'newcaches' => [
         'show' => true,
         'url' => 'http://www.opencaching.de',
-        'urlname' => '',  // optional: show other name than the url-domain
+        'urlname' => '', // optional: show other name than the url-domain
     ],
 ];
 
@@ -277,7 +277,7 @@ 
 $opt['logic']['pictures']['dummy']['bgcolor'] = [255, 255, 255];
 $opt['logic']['pictures']['dummy']['text'] = '';
 $opt['logic']['pictures']['dummy']['textcolor'] = [0, 0, 0];
-$opt['logic']['pictures']['dummy']['replacepic'] = $opt['rootpath'] . 'images/';
+$opt['logic']['pictures']['dummy']['replacepic'] = $opt['rootpath'].'images/';
 
 /* cachemaps (obsolete)
  */
@@ -379,7 +379,7 @@ 
 
 /* license-related functions
  */
-$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
+$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
 $opt['logic']['license']['admin'] = true;
 $opt['logic']['license']['disclaimer'] = false;
 $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
@@ -387,18 +387,18 @@ 
 
 /* optional APIs
  */
-$opt['logic']['api']['email_problems']['key'] = '';   // must be set to enable
-$opt['logic']['api']['user_inactivity']['key'] = '';  // must be set to enable
+$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable
+$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable
 
 /* cache report info settings
  */
 $opt['logic']['cache_reports']['delaydays'] = 2;
-$opt['logic']['cache_reports']['min_processperday'] = 5;   // set to 0 to disable
-$opt['logic']['cache_reports']['max_processperday'] = 20;  // set to 0 to disable
+$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable
+$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable
 
 /* cronjob
  */
-$opt['cron']['username'] = 'apache';   // system username for cronjobs
+$opt['cron']['username'] = 'apache'; // system username for cronjobs
 
 /* phpbb news integration (index.php, outdated)
  *
@@ -496,7 +496,7 @@ 
 // a redirect to redirect-setting will be done
 // (use exact same url with slashes etc. as registered by garmin)
 $opt['lib']['garmin']['domain'] = 'www.site.org';
-$opt['lib']['garmin']['url'] = 'http://' . $opt['lib']['garmin']['domain'] . '/';
+$opt['lib']['garmin']['url'] = 'http://'.$opt['lib']['garmin']['domain'].'/';
 
 // if the plugin is not called from the correct domain, redirect to this site
 // (e.g. domain called without www. prefix) - must match domain of $opt['lib']['garmin']['url']
@@ -524,7 +524,7 @@ 
 
 // max number of caches displayed in google maps
 if (isset($_SERVER['HTTP_USER_AGENT'])) {
-    $user_agent = " " . $_SERVER['HTTP_USER_AGENT'];
+    $user_agent = " ".$_SERVER['HTTP_USER_AGENT'];
     if (strpos($user_agent, "MSIE") && !strpos($user_agent, "Opera")) {
         $opt['map']['maxrecords'] = 200;
     } else {
@@ -540,7 +540,7 @@ 
 /*
  * OKAPI
  */
-$opt['okapi']['var_dir'] = $opt['rootpath'] . 'var/okapi';
+$opt['okapi']['var_dir'] = $opt['rootpath'].'var/okapi';
 $opt['okapi']['github_access_token'] = null;
 
 /* Opencaching Node Daemon

htdocs/config2/settings-dist-common.inc.php

Spacing +19 added lines, -19 removed lines

@@ -15,11 +15,11 @@ 
  *   bin/dbsv-update.php will then migrate the tables' charset.
  */
 $opt['charset']['iconv'] = 'UTF-8'; // 'ISO-8859-1'; // use iconv compatible charset-name
-$opt['charset']['mysql'] = 'utf8';     // use mysql compatible charset-name
+$opt['charset']['mysql'] = 'utf8'; // use mysql compatible charset-name
 
 // handling of SQL and PHP errors
 $opt['db']['error']['display'] = false;
-$opt['db']['error']['mail'] = 'root';  // set '' to disable
+$opt['db']['error']['mail'] = 'root'; // set '' to disable
 
 // page title
 $opt['page']['title'] = 'OPENCACHING';
@@ -57,7 +57,7 @@ 
  * Additionally, the cookie domain (different vor lib1 and lib2) can be overwritten.
  * See examples for overriding in settings-sample.inc.php.
  */
-$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur';  // 5-10 keywords are recommended
+$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur'; // 5-10 keywords are recommended
 // see http://forum.opencaching.de/index.php?topic=3065.0
 // and http://forum.opencaching.de/index.php?topic=3065.0 regarding description
 $opt['page']['meta']['description'] = 'Opencaching.de ist das freie Portal für Geocaching, ein Schatzsuche-Spiel. Mittels GPS-Koordinaten sind Behälter oder Objekte zu finden.';
@@ -94,12 +94,12 @@ 
 // see also setting in lib/settings.inc.php!
 $opt['logic']['admin']['team_comments_only_for_reports'] = true;
 $opt['logic']['admin']['enable_listing_admins'] = false;
-$opt['logic']['admin']['listingadmin_notification'] = '';  // Email address(es), comma separated
+$opt['logic']['admin']['listingadmin_notification'] = ''; // Email address(es), comma separated
 
 /*
  * html purifier
  */
-$opt['html_purifier']['cache_path'] = dirname(__FILE__) . '/../cache2/html_purifier/';
+$opt['html_purifier']['cache_path'] = dirname(__FILE__).'/../cache2/html_purifier/';
 
 /*
  * CMS links for external pages
@@ -174,9 +174,9 @@ 
         $primary_httpsdefault = $opt['page']['https']['is_default'];
     }
     if ($primary_httpsdefault) {
-        $opt['page']['default_primary_url'] = 'https' . strstr($primary_site_url, '://');
+        $opt['page']['default_primary_url'] = 'https'.strstr($primary_site_url, '://');
     } else {
-        $opt['page']['default_primary_url'] = 'http' . strstr($primary_site_url, '://');
+        $opt['page']['default_primary_url'] = 'http'.strstr($primary_site_url, '://');
     }
 
     // 2. create settings for the current domain
@@ -187,7 +187,7 @@ 
     if (isset($opt['domain'][$current_domain]['url'])) {
         $current_site_url = $opt['domain'][$current_domain]['url'];
     } else {
-        $current_site_url = 'x://' . $current_domain . parse_url($primary_site_url, PHP_URL_PATH);
+        $current_site_url = 'x://'.$current_domain.parse_url($primary_site_url, PHP_URL_PATH);
     }
     if (substr($current_site_url, - 1, 1) != '/') {
         $current_site_url .= '/';
@@ -199,8 +199,8 @@ 
     }
 
     $adr = strstr($current_site_url, '://');
-    $opt['page']['absolute_http_url'] = 'http' . $adr;
-    $opt['page']['absolute_https_url'] = 'https' . $adr;
+    $opt['page']['absolute_http_url'] = 'http'.$adr;
+    $opt['page']['absolute_https_url'] = 'https'.$adr;
     $opt['page']['https']['active'] = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off');
 
     if ($opt['page']['https']['active']) {
@@ -231,18 +231,18 @@ 
         $opt['page']['default_primary_shortlink_url'] = false;
     } else {
         if ($primary_httpsdefault) {
-            $opt['page']['default_primary_shortlink_url'] = 'https://' . $primary_shortlink_domain . '/';
+            $opt['page']['default_primary_shortlink_url'] = 'https://'.$primary_shortlink_domain.'/';
         } else {
-            $opt['page']['default_primary_shortlink_url'] = 'http://' . $primary_shortlink_domain . '/';
+            $opt['page']['default_primary_shortlink_url'] = 'http://'.$primary_shortlink_domain.'/';
         }
 
         if (isset($opt['domain'][$current_domain]['shortlink_domain']) && $opt['domain'][$current_domain]['shortlink_domain']) {
-            $opt['page']['shortlink_url'] = $opt['page']['protocol'] . '://' . $opt['domain'][$current_domain]['shortlink_domain'] . '/';
-            $opt['page']['default_shortlink_url'] = $opt['page']['default_protocol'] . '://' . $opt['domain'][$current_domain]['shortlink_domain'] . '/';
+            $opt['page']['shortlink_url'] = $opt['page']['protocol'].'://'.$opt['domain'][$current_domain]['shortlink_domain'].'/';
+            $opt['page']['default_shortlink_url'] = $opt['page']['default_protocol'].'://'.$opt['domain'][$current_domain]['shortlink_domain'].'/';
         } else {
             if ($current_domain == $primary_domain) {
                 $opt['page']['default_shortlink_url'] = $opt['page']['default_primary_shortlink_url'];
-                $opt['page']['shortlink_url'] = $opt['page']['protocol'] . strstr(
+                $opt['page']['shortlink_url'] = $opt['page']['protocol'].strstr(
                         $opt['page']['default_shortlink_url'],
                         '://'
                     );
@@ -256,16 +256,16 @@ 
     // 4. set location of uploaded images
 
     if (!isset($opt['logic']['pictures']['dir'])) {
-        $opt['logic']['pictures']['dir'] = dirname(__FILE__) . '/../images/uploads';
+        $opt['logic']['pictures']['dir'] = dirname(__FILE__).'/../images/uploads';
     }  // Ocprop, OKAPI !
     if (!isset($opt['logic']['pictures']['url'])) {
-        $opt['logic']['pictures']['url'] = $opt['page']['default_primary_url'] . 'images/uploads';
+        $opt['logic']['pictures']['url'] = $opt['page']['default_primary_url'].'images/uploads';
     }
     if (!isset($opt['logic']['pictures']['thumb_dir'])) {
-        $opt['logic']['pictures']['thumb_dir'] = $opt['logic']['pictures']['dir'] . '/thumbs';
+        $opt['logic']['pictures']['thumb_dir'] = $opt['logic']['pictures']['dir'].'/thumbs';
     }
     if (!isset($opt['logic']['pictures']['thumb_url'])) {
-        $opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
+        $opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'].'/thumbs';
     }
 }
 

htdocs/config2/settings-sample.inc.php

Spacing +4 added lines, -4 removed lines

@@ -66,8 +66,8 @@ 
  * other parameters may be customized
  */
 $opt['session']['mode'] = SAVE_COOKIE;
-$opt['session']['cookiename'] = '<cookiename>';   // e.g. 'ocde'
-$opt['session']['domain'] = '<.do.main>';  // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde'
+$opt['session']['domain'] = '<.do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -100,7 +100,7 @@ 
 
 /* default locale
  */
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
 
 /* multi-domain settings
  *
@@ -191,7 +191,7 @@ 
  */
 $opt['lib']['garmin']['domain'] = '<domain>';
 $opt['lib']['garmin']['key'] = '00112233445566778899AABBCCDDEEFF00';
-$opt['lib']['garmin']['url'] = 'http://' . $opt['lib']['garmin']['domain'] . '/';
+$opt['lib']['garmin']['url'] = 'http://'.$opt['lib']['garmin']['domain'].'/';
 $opt['lib']['garmin']['page_url'] = 'http://<domain>/';
 
 // developer.what3words.com API Key

htdocs/config2/settings-dev.inc.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
 );
 
 $opt['page']['develsystem'] = true;
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 
 $opt['mail']['from'] = 'root';
 $opt['mail']['subject'] = '[local.opencaching.de] ';
@@ -102,7 +102,7 @@ 
 $opt['lib']['garmin']['key'] = '00112233445566778899AABBCCDDEEFF00';
 $opt['lib']['garmin']['domain'] = 'local.opencaching.de';
 $opt['lib']['garmin']['url'] = 'http://local.opencaching.de/';
-$opt['lib']['garmin']['page_url'] = $opt['lib']['garmin']['url'] . ($dev_codepath == '*' ? '' : $dev_codepath . 'htdocs/');
+$opt['lib']['garmin']['page_url'] = $opt['lib']['garmin']['url'].($dev_codepath == '*' ? '' : $dev_codepath.'htdocs/');
 
 // developer.what3words.com API Key
 $opt['lib']['w3w']['apikey'] = 'YOURAPIKEY';
@@ -112,7 +112,7 @@ 
 $opt['page']['showsocialmedia'] = true;
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
 
-$opt['logic']['pictures']['dummy']['replacepic'] = $dev_basepath . $dev_codepath . 'htdocs/images/no_image_license.png';
+$opt['logic']['pictures']['dummy']['replacepic'] = $dev_basepath.$dev_codepath.'htdocs/images/no_image_license.png';
 $opt['logic']['license']['disclaimer'] = true;
 $opt['logic']['admin']['listingadmin_notification'] = 'root';
 

htdocs/ownerlogs.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'ownerlogs';
 $tpl->menuitem = MNU_MYPROFILE_OWNERLOGS;
@@ -83,4 +83,4 @@ 
     )
 );
 
-require __DIR__ . '/newlogs.php';
+require __DIR__.'/newlogs.php';

htdocs/searchplugin.php

Spacing +11 added lines, -11 removed lines

@@ -9,7 +9,7 @@ 
  *  also used for waypoint search field.
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'searchplugin';
 
@@ -30,7 +30,7 @@ 
 
 if (($sourceid == 'waypoint-search') && ($userinput != '')) {
     $sourceid = 'mozilla-search';
-    $userinput = 'wp:' . $userinput;
+    $userinput = 'wp:'.$userinput;
 }
 
 if (($sourceid == 'mozilla-search') && ($userinput != '')) {
@@ -56,22 +56,22 @@ 
         $targeturl = 'search.php?showresult=1&expert=0&output=HTML&f_userowner=0&f_userfound=0';
         switch ($searchto) {
             case $keyword_name:
-                $targeturl .= '&utf8=1&sort=byname&searchbyname=1&f_inactive=1&cachename=' . $searchfor;
+                $targeturl .= '&utf8=1&sort=byname&searchbyname=1&f_inactive=1&cachename='.$searchfor;
                 break;
             case $keyword_finder:
-                $targeturl .= '&utf8=1&sort=byname&searchbyfinder=1&f_inactive=0&finder=' . $searchfor;
+                $targeturl .= '&utf8=1&sort=byname&searchbyfinder=1&f_inactive=0&finder='.$searchfor;
                 break;
             case $keyword_owner:
-                $targeturl .= '&utf8=1&sort=byname&searchbyowner=1&f_inactive=0&owner=' . $searchfor;
+                $targeturl .= '&utf8=1&sort=byname&searchbyowner=1&f_inactive=0&owner='.$searchfor;
                 break;
             case $keyword_town:
-                $targeturl .= '&utf8=1&searchbyort=1&f_inactive=1&ort=' . $searchfor . '&sort=' . $order;
+                $targeturl .= '&utf8=1&searchbyort=1&f_inactive=1&ort='.$searchfor.'&sort='.$order;
                 break;
             case $keyword_zipcode:
-                $targeturl .= '&utf8=1&sort=bydistance&searchbyplz=1&f_inactive=1&plz=' . $searchfor . '&sort=' . $order;
+                $targeturl .= '&utf8=1&sort=bydistance&searchbyplz=1&f_inactive=1&plz='.$searchfor.'&sort='.$order;
                 break;
             case $keyword_cacheid:
-                $targeturl .= '&utf8=1&sort=byname&searchbycacheid=1&f_inactive=1&cacheid=' . $searchfor;
+                $targeturl .= '&utf8=1&sort=byname&searchbycacheid=1&f_inactive=1&cacheid='.$searchfor;
                 break;
             case $keyword_wp:
                 $targeturl = 'index.php';
@@ -85,7 +85,7 @@ 
                 }
 
                 if ((($target == 'oc') || ($target == 'gc')) && mb_ereg_match(
-                        '((' . $opt['logic']['ocprefixes'] . '|gc)([a-z0-9]){4,5}|n([a-f0-9]){5,5})$',
+                        '(('.$opt['logic']['ocprefixes'].'|gc)([a-z0-9]){4,5}|n([a-f0-9]){5,5})$',
                         mb_strtolower($searchfor)
                     )
                 ) {
@@ -97,13 +97,13 @@ 
                     // get cache_id from DB
                     // GC/NC waypoints can be duplicates -> return first match with least status number
                     $rs = sql(
-                        "SELECT `cache_id` FROM `caches` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` WHERE (`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='&1') AND " . $wpfield . "='&2' ORDER BY `caches`.`status`,`caches`.`cache_id` LIMIT 0,1",
+                        "SELECT `cache_id` FROM `caches` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` WHERE (`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='&1') AND ".$wpfield."='&2' ORDER BY `caches`.`status`,`caches`.`cache_id` LIMIT 0,1",
                         $login->userid,
                         $searchfor
                     );
                     if (sql_num_rows($rs)) {
                         $record = sql_fetch_array($rs);
-                        $targeturl = 'viewcache.php?cacheid=' . $record['cache_id'];
+                        $targeturl = 'viewcache.php?cacheid='.$record['cache_id'];
                         unset($record);
                     } else {
                         $tpl->error(ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND, $searchfor);

htdocs/removelog.php

Spacing +20 added lines, -20 removed lines

@@ -9,13 +9,13 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
-require_once $stylepath . '/lib/icons.inc.php';
-require_once __DIR__ . '/lib/recommendation.inc.php';
-require_once __DIR__ . '/lib/logic.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once $stylepath.'/lib/icons.inc.php';
+require_once __DIR__.'/lib/recommendation.inc.php';
+require_once __DIR__.'/lib/logic.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -29,7 +29,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('removelog.php?logid=' . urlencode($log_id), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('removelog.php?logid='.urlencode($log_id), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message', $login_required);
         tpl_set_var('message_start', '');
         tpl_set_var('message_end', '');
@@ -69,7 +69,7 @@ 
             $log_record = sql_fetch_array($log_rs);
             mysql_free_result($log_rs);
 
-            require $stylepath . '/removelog.inc.php';
+            require $stylepath.'/removelog.inc.php';
 
             if ($log_record['node'] != $oc_nodeid) {
                 tpl_errorMsg('removelog', $error_wrong_node);
@@ -108,7 +108,7 @@ 
                         $message = isset($_POST['logowner_message']) ? $_POST['logowner_message'] : '';
                         if ($message != '') {
                             //message to logger
-                            $message = $removed_message_title . "\n" . $message . "\n" . $removed_message_end;
+                            $message = $removed_message_title."\n".$message."\n".$removed_message_end;
                         }
 
                         $logtext = html2plaintext(
@@ -166,7 +166,7 @@ 
                         }
 
                         sql("DELETE FROM `pictures` WHERE `id`='&1'", $r['id']);
-                        $archived = (sqlValue("SELECT `id` FROM `pictures_modified` WHERE `id`=" . $r['id'], 0) > 0);
+                        $archived = (sqlValue("SELECT `id` FROM `pictures_modified` WHERE `id`=".$r['id'], 0) > 0);
                         $fna = mb_split('\\/', $r['url']);
                         $filename = end($fna);
                         $path = $opt['logic']['pictures']['dir'];
@@ -175,18 +175,18 @@ 
                         }
 
                         if ($archived) {
-                            @rename($path . $filename, $path . "deleted/" . $filename);
+                            @rename($path.$filename, $path."deleted/".$filename);
                         } else {
-                            @unlink($path . $filename);
+                            @unlink($path.$filename);
                         }
 
                         $path = $opt['logic']['pictures']['thumb_dir'];
                         if (mb_substr($path, - 1, 1) != '/') {
                             $path .= '/';
                         }
-                        $path .= mb_strtoupper(mb_substr($filename, 0, 1)) . '/' .
-                            mb_strtoupper(mb_substr($filename, 1, 1)) . '/';
-                        @unlink($path . $filename);  // Thumb
+                        $path .= mb_strtoupper(mb_substr($filename, 0, 1)).'/'.
+                            mb_strtoupper(mb_substr($filename, 1, 1)).'/';
+                        @unlink($path.$filename); // Thumb
 
                         /* lib2 code would be ...
                         $rs = sql("SELECT `id` FROM `pictures` WHERE `object_type`=1 AND `object_id`='&1'", $log_id);
@@ -224,11 +224,11 @@ 
                     db_slave_exclude();
 
                     //call eventhandler
-                    require_once $opt['rootpath'] . 'lib/eventhandler.inc.php';
+                    require_once $opt['rootpath'].'lib/eventhandler.inc.php';
                     event_remove_log($log_record['cache_id'], $log_record['log_user_id']);
 
                     //cache anzeigen
-                    tpl_redirect('viewcache.php?cacheid=' . urlencode($log_record['cache_id']));
+                    tpl_redirect('viewcache.php?cacheid='.urlencode($log_record['cache_id']));
                     exit;
                 }
 
@@ -260,17 +260,17 @@ 
                 tpl_set_var('logid', htmlspecialchars($log_id, ENT_COMPAT, 'UTF-8'));
 
                 if ($log_record['oc_team_comment']) {
-                    $teamimg = '<img src="resource2/ocstyle/images/oclogo/oc-team-comment.png" title="' . t('OC team comment') . '" /> ';
+                    $teamimg = '<img src="resource2/ocstyle/images/oclogo/oc-team-comment.png" title="'.t('OC team comment').'" /> ';
                 } else {
                     $teamimg = "";
                 }
-                tpl_set_var('logimage', $teamimg . icon_log_type($log_record['icon_small'], ""));
+                tpl_set_var('logimage', $teamimg.icon_log_type($log_record['icon_small'], ""));
 
                 tpl_set_var(
                     'date',
                     htmlspecialchars(strftime($dateformat, strtotime($log_record['log_date'])), ENT_COMPAT, 'UTF-8')
                 );
-                tpl_set_var('time', substr($log_record['log_date'], 11) == "00:00:00" ? "" : ", " . substr($log_record['log_date'], 11, 5));
+                tpl_set_var('time', substr($log_record['log_date'], 11) == "00:00:00" ? "" : ", ".substr($log_record['log_date'], 11, 5));
                 tpl_set_var('userid', htmlspecialchars($log_record['log_user_id'] + 0, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('username', htmlspecialchars($log_record['log_username'], ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('typetext', htmlspecialchars($sLogTypeText, ENT_COMPAT, 'UTF-8'));

htdocs/lib/cookie.class.php

Spacing +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
     {
         global $opt;
 
-        if (isset($_COOKIE[$opt['cookie']['name'] . 'data'])) {
+        if (isset($_COOKIE[$opt['cookie']['name'].'data'])) {
             //get the cookievars-array
-            $decoded = base64_decode($_COOKIE[$opt['cookie']['name'] . 'data']);
+            $decoded = base64_decode($_COOKIE[$opt['cookie']['name'].'data']);
 
             if ($decoded !== false) {
                 $this->values = @unserialize($decoded);
@@ -66,7 +66,7 @@ 
         if ($this->changed == true) {
             if (count($this->values) == 0) {
                 setcookie(
-                    $opt['cookie']['name'] . 'data',
+                    $opt['cookie']['name'].'data',
                     false,
                     time() + 31536000,
                     $opt['cookie']['path'],
@@ -75,7 +75,7 @@ 
                 );
             } else {
                 setcookie(
-                    $opt['cookie']['name'] . 'data',
+                    $opt['cookie']['name'].'data',
                     base64_encode(serialize($this->values)),
                     time() + 31536000,
                     $opt['cookie']['path'],

htdocs/lib/consts.inc.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  * named consts
  ****************************************************************************/
 
-require_once __DIR__ . '/consts-common.inc.php';
+require_once __DIR__.'/consts-common.inc.php';
 
 // for cachelists
 define('cachelist_type_ignore', 1);