OpencachingDeutschland / oc-server3

htdocs/lib/eventhandler.inc.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
     $userid = $userid + 0;
 
     // data changed - delete statpic of user, if exists - will be recreated on next request
-    if (file_exists('./images/statpics/statpic' . $userid . '.jpg')) {
-        unlink('./images/statpics/statpic' . $userid . '.jpg');
+    if (file_exists('./images/statpics/statpic'.$userid.'.jpg')) {
+        unlink('./images/statpics/statpic'.$userid.'.jpg');
     }
 }
 

htdocs/lib/settings-dist.inc.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 $style = 'ocstyle';
 
 // include common settings of lib1 and lib2
-require_once $rootpath . 'config2/settings-dist-common.inc.php';
+require_once $rootpath.'config2/settings-dist-common.inc.php';
 
 //id of the node; see list in config2/settings-dist.inc.php
 $oc_nodeid = 0;
@@ -126,7 +126,7 @@ 
 
 // sql debugging
 $sql_allow_debug = 0;
-$sql_debug_cryptkey = 'this is my very, very secret \'secret key\'';  // min. 24 chars
+$sql_debug_cryptkey = 'this is my very, very secret \'secret key\''; // min. 24 chars
 
 // replacements for sql()
 $sql_replacements['db'] = $dbname;
@@ -148,10 +148,10 @@ 
 
 /* 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']
 
 // include all locale settings
-require_once $rootpath . 'config2/locale.inc.php';
+require_once $rootpath.'config2/locale.inc.php';
 
 /* replicated slave databases
  * use same config as in config2/settings.inc.php (!)
@@ -198,7 +198,7 @@ 
         'menustring' => t('Geokrety'),
         'siteid' => 'geokrety',
         'visible' => true,
-        'filename' => 'http://geokrety.org/index.php?lang=' . (isset($locale) ? strtolower($locale) : 'de')
+        'filename' => 'http://geokrety.org/index.php?lang='.(isset($locale) ? strtolower($locale) : 'de')
     ];
 
     $menu[] = [

htdocs/lib/auth.inc.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
  * Dont include this file by hand - it will be included from common.inc.php
  ****************************************************************************/
 
-require $opt['rootpath'] . 'lib/login.class.php';
+require $opt['rootpath'].'lib/login.class.php';
 
 $autherr = 0;
 define('AUTHERR_NOERROR', 0);
@@ -36,7 +36,7 @@ 
     if ($login->userid != 0) {
         //set up $usr array
         $usr['userid'] = $login->userid;
-        $usr['email'] = sqlValue("SELECT `email` FROM `user` WHERE `user_id`='" . sql_escape($login->userid) . "'", '');
+        $usr['email'] = sqlValue("SELECT `email` FROM `user` WHERE `user_id`='".sql_escape($login->userid)."'", '');
         $usr['username'] = $login->username;
         $usr['admin'] = $login->admin;
     } else {

htdocs/lib/settings-dev.inc.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 //relative path to the root directory
 if (!isset($rootpath)) {
-    $rootpath = dirname(__FILE__) . '/../';
+    $rootpath = dirname(__FILE__).'/../';
 }
 
 //default used language
@@ -36,7 +36,7 @@ 
 $style = 'ocstyle';
 
 // include common settings of lib1 and lib2
-require_once $rootpath . 'config2/settings-dist-common.inc.php';
+require_once $rootpath.'config2/settings-dist-common.inc.php';
 
 //id of the node; see config2/settings-dist.inc.php
 $oc_nodeid = 4;
@@ -74,10 +74,10 @@ 
     $maildomain = 'local.opencaching.de';
 }
 if (!isset($emailaddr)) {
-    $emailaddr = 'root@' . $maildomain;
+    $emailaddr = 'root@'.$maildomain;
 }
 if (!isset($opt['mail']['contact'])) {
-    $opt['mail']['contact'] = 'contact@' . $maildomain;
+    $opt['mail']['contact'] = 'contact@'.$maildomain;
 }
 
 // news settings
@@ -106,7 +106,7 @@ 
 
 // safemode_zip-binary
 $safemode_zip = '/var/www/bin/phpzip.php';
-$zip_basedir = $dev_basepath . ($dev_codepath == '*' ? '' : $dev_codepath . 'htdocs/') . 'download/zip/';
+$zip_basedir = $dev_basepath.($dev_codepath == '*' ? '' : $dev_codepath.'htdocs/').'download/zip/';
 $zip_wwwdir = 'download/zip/';
 
 $googlemap_key = "<key>";
@@ -117,17 +117,17 @@ 
 /* maximum number of failed logins per hour before that IP address is blocked
  * (used to prevent brute-force-attacks)
  */
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
 
 // data license
-$opt['logic']['license']['disclaimer'] = true;   // also in lib2/settings-dist.inc.php
-$opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense';
+$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php
+$opt['logic']['license']['terms'] = $absolute_server_URI.'articles.php?page=impressum#datalicense';
 
 $opt['logic']['admin']['listingadmin_notification'] = 'root';
 
 // include all locale settings
-require_once $rootpath . 'config2/locale.inc.php';
+require_once $rootpath.'config2/locale.inc.php';
 
 /* replicated slave databases
  * use same config as in config2/settings.inc.php (!)

htdocs/lib/settings-sample-vagrant.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 // database names
 $dbname = 'opencaching';
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
 
 // common developer system settings
 require 'settings-dev.inc.php';

htdocs/lib/logic.inc.php

Spacing +6 added lines, -6 removed lines

@@ -15,8 +15,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `cache_type`.`en`)
          FROM `cache_type`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `cache_type`.`id`='" . sql_escape($cachetype) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `cache_type`.`id`='" . sql_escape($cachetype)."'",
         ''
     );
 }
@@ -26,8 +26,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `cache_size`.`en`)
          FROM `cache_size`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_size`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `cache_size`.`id`='" . sql_escape($cachesize) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_size`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `cache_size`.`id`='" . sql_escape($cachesize)."'",
         ''
     );
 }
@@ -37,8 +37,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `log_types`.`en`)
          FROM `log_types`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `log_types`.`id`='" . sql_escape($logtype) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `log_types`.`id`='" . sql_escape($logtype)."'",
         ''
     );
 }

htdocs/adoptcache.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adoptcache';
 $tpl->menuitem = MNU_CACHES_ADOPT;
@@ -173,7 +173,7 @@ 
 
     $adopt_result = $cache->addAdoption($userid);
     if ($adopt_result === true) {
-        $tpl->redirect('adoptcache.php?action=listbycache&cacheid=' . $cacheid);
+        $tpl->redirect('adoptcache.php?action=listbycache&cacheid='.$cacheid);
     } else {
         $tpl->assign('error', $adopt_result);
         listRequestsByCacheId($cacheid);
@@ -194,7 +194,7 @@ 
         $tpl->error(ERROR_UNKNOWN);
     }
 
-    $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+    $tpl->redirect('viewcache.php?cacheid='.$cacheid);
 }
 
 function cancelRequest($cacheid, $userid)
@@ -218,6 +218,6 @@ 
     if ($userid == $login->userid) {
         $tpl->redirect('adoptcache.php');
     } else {
-        $tpl->redirect('adoptcache.php?action=listbycache&cacheid=' . $cacheid);
+        $tpl->redirect('adoptcache.php?action=listbycache&cacheid='.$cacheid);
     }
 }

htdocs/viewprofile.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'viewprofile';
 $tpl->menuitem = MNU_CACHES_USERPROFILE;
@@ -291,14 +291,14 @@ 
 }
 
 if ($show_oconly81) {
-    require __DIR__ . '/lib2/logic/oconly81.inc.php';
+    require __DIR__.'/lib2/logic/oconly81.inc.php';
     set_oconly81_tpldata($userid);
 }
 
 //Titel
 $menu->SetSelectItem($tpl->menuitem);
 
-$tpl->title = $menu->GetMenuTitle() . " " . $record['username'];
+$tpl->title = $menu->GetMenuTitle()." ".$record['username'];
 
 
 $tpl->assign('username', $record['username']);
@@ -329,7 +329,7 @@ 
     if (!$allpics) {
         $tpl->assign('logpics', LogPics::get(LogPics::FOR_USER_STAT, $userid));
     } else {
-        LogPics::setPaging(LogPics::FOR_USER_GALLERY, $userid, 0, "viewprofile.php?userid=" . $userid . "&allpics=1");
+        LogPics::setPaging(LogPics::FOR_USER_GALLERY, $userid, 0, "viewprofile.php?userid=".$userid."&allpics=1");
         $tpl->name = 'viewprofile_pics';
         // actually we dont need all the other stuff here ..
     }

htdocs/editdesc.php

Spacing +18 added lines, -18 removed lines

@@ -9,20 +9,20 @@ 
  *  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 __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 // Preprocessing
 if ($error == false) {
-    require $stylepath . '/editdesc.inc.php';
+    require $stylepath.'/editdesc.inc.php';
 
     // check for old-style parameters
     if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
         if (mysql_num_rows($rs) == 1) {
@@ -43,7 +43,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('editdesc.php?descid=' . urlencode($descid), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('editdesc.php?descid='.urlencode($descid), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message_start', "");
         tpl_set_var('message_end', "");
         tpl_set_var('message', $login_required);
@@ -90,7 +90,7 @@ 
                 if (isset($_POST['post']))  // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -123,7 +123,7 @@ 
                         $oldDescMode = $descMode;
                     }
 
-                    $short_desc = $_POST['short_desc'];  // Ocprop
+                    $short_desc = $_POST['short_desc']; // Ocprop
                     $hint = htmlspecialchars($_POST['hints'], ENT_COMPAT, 'UTF-8');
                     $desclang = $_POST['desclang'];
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -138,7 +138,7 @@ 
                     }
 
                     // Text from textarea
-                    $desc = $_POST['desc'];  // Ocprop
+                    $desc = $_POST['desc']; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -207,7 +207,7 @@ 
                         db_slave_exclude();
 
                         // redirect to cachepage
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($desc_record['cache_id']));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($desc_record['cache_id']));
                         exit;
                     } elseif (isset($_POST['show_all_langs'])) {
                         $show_all_langs = true;
@@ -277,7 +277,7 @@ 
                     ($show_all_langs == true) ? 1 : 0);
                 while ($rLanguage = sql_fetch_assoc($rsLanguages)) {
                     $sSelected = ($rLanguage['short'] == $desc_lang) ? ' selected="selected"' : '';
-                    $languages .= '<option value="' . $rLanguage['short'] . '"' . $sSelected . '>' . htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                    $languages .= '<option value="'.$rLanguage['short'].'"'.$sSelected.'>'.htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
                 }
                 sql_free_result($rsLanguages);
 
@@ -297,20 +297,20 @@ 
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
 
                 // Text / normal HTML / HTML editor
                 tpl_set_var('use_tinymce', ($desc_htmledit == 1) ? 1 : 0);
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if (($desc_html == 1) && ($desc_htmledit == 1)) {
                     // TinyMCE
-                    $headers = tpl_get_var('htmlheaders') . "\n";
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>' . "\n";
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=' . ($desc_record['cache_id'] + 0) . '&lang=' . strtolower($locale) . '"></script>' . "\n";
+                    $headers = tpl_get_var('htmlheaders')."\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>'."\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid='.($desc_record['cache_id'] + 0).'&lang='.strtolower($locale).'"></script>'."\n";
                 }
-                $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
+                $headers .= '<script language="javascript" type="text/javascript" src="'.editorJsPath().'"></script>'."\n";
                 tpl_set_var('htmlheaders', $headers);
             } else {
                 // @todo: not the owner