OpencachingDeutschland / oc-server3

htdocs/picture.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
  *
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'picture';
 $tpl->menuitem = MNU_CACHES_PICTURE;
@@ -75,11 +75,11 @@ 
     if (isset($_REQUEST['ok'])) { // Ocprop
         $bError = false;
 
-        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
-        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false);  // Ocprop
+        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1'); // Ocprop
+        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false); // Ocprop
         $picture->setMapPreview(isset($_REQUEST['mappreview']) && $_REQUEST['mappreview'] == '1');
 
-        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';  // Ocprop
+        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : ''; // Ocprop
         if ($title == '' || ($picture->getObjectType() == OBJECT_CACHELOG && trim($title) == '')) {
             $tpl->assign('errortitle', true);
             $bError = true;
@@ -135,7 +135,7 @@ 
                 }
             } // try saving as jpg and shrinking if > PICTURE_MAX_LONG_SIDE file
             else {
-                $picture->setFilenames(mb_strtolower($fname) . '.jpg');
+                $picture->setFilenames(mb_strtolower($fname).'.jpg');
                 if (!$picture->rotate_and_shrink($_FILES['file']['tmp_name'], PICTURE_MAX_LONG_SIDE)) {
                     $bError = true;
                 }

Braces +10 added lines, -5 removed lines

@@ -34,10 +34,12 @@ 
 
 $uuid = isset($_REQUEST['uuid']) ? $_REQUEST['uuid'] : 0;
 
-if ($action == 'add') { // Ocprop
+if ($action == 'add') {
+// Ocprop
     $picture = new picture();
 
-    if (isset($_REQUEST['cacheuuid'])) {  // Ocprop
+    if (isset($_REQUEST['cacheuuid'])) {
+// Ocprop
         $cache = cache::fromUUID($_REQUEST['cacheuuid']);
         if ($cache === null) {
             $tpl->error(ERROR_CACHE_NOT_EXISTS);
@@ -51,7 +53,8 @@ 
         $picture->setObjectType(OBJECT_CACHE);
 
         $cache = null;
-    } elseif (isset($_REQUEST['loguuid'])) {// Ocprop
+    } elseif (isset($_REQUEST['loguuid'])) {
+// Ocprop
         $cachelog = cachelog::fromUUID($_REQUEST['loguuid']);
         if ($cachelog === null) {
             $tpl->error(ERROR_CACHELOG_NOT_EXISTS);
@@ -72,7 +75,8 @@ 
     }
 
     // uploaded file ok?
-    if (isset($_REQUEST['ok'])) { // Ocprop
+    if (isset($_REQUEST['ok'])) {
+// Ocprop
         $bError = false;
 
         $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
@@ -92,7 +96,8 @@ 
             $tpl->redirect($picture->getPageLink());
         }
 
-        if (!isset($_FILES['file'])) { // Ocprop
+        if (!isset($_FILES['file'])) {
+// Ocprop
             $tpl->assign('errorfile', ERROR_UPLOAD_ERR_NO_FILE);
             $bError = true;
         } elseif ($_FILES['file']['error'] == UPLOAD_ERR_NO_FILE) {

htdocs/404.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $sUserCountry = $login->getUserCountry();
 
@@ -27,10 +27,10 @@ 
 if ($isRedirect404) {
     // check length
     $uril = 70;
-    $uri = 'http://' . strtolower($_SERVER['SERVER_NAME']) . $_SERVER['REQUEST_URI'];
+    $uri = 'http://'.strtolower($_SERVER['SERVER_NAME']).$_SERVER['REQUEST_URI'];
     // limit to $uril
     if (strlen($uri) > $uril) {
-        $uri = substr($uri, 0, $uril - 3) . '...';
+        $uri = substr($uri, 0, $uril - 3).'...';
     }
 
     // assign uri

htdocs/api/email_problems.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 header('Content-type: text/plain; charset=utf-8');
 
@@ -16,7 +16,7 @@ 
 ) {
     $rs = sql('SELECT `user_id`, `email_problems` FROM `user` WHERE `email_problems`');
     while ($r = sql_fetch_assoc($rs)) {
-        echo $r['user_id'] . ' ' . $r['email_problems'] . "\n";
+        echo $r['user_id'].' '.$r['email_problems']."\n";
     }
     sql_free_result($rs);
 }

htdocs/api/hidden_caches.php

Spacing +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@ 
  *  replicated system than the XML interface.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 header('Content-type: text/plain; charset=utf-8');
 
@@ -24,5 +24,5 @@ 
 );
 $wp_ocs = sql_fetch_column($rs);
 foreach ($wp_ocs as $wp_oc) {
-    echo $wp_oc . "\n";
+    echo $wp_oc."\n";
 }

htdocs/api/gc2oc.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
  *
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 if (isset($_REQUEST['report']) && $_REQUEST['report']) {
     header('Content-type: text/plain');

htdocs/api/coord.ch/newest.php

Spacing +3 added lines, -3 removed lines

@@ -7,8 +7,8 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 $bFirstRow = true;
 
@@ -52,5 +52,5 @@ 
 // renamed function from "str_getcsv" to avoid collision with PHP 5.3 str_getcsv()
 function strGetCsv($str)
 {
-    return '"' . mb_ereg_replace('"', '\"', $str) . '"';
+    return '"'.mb_ereg_replace('"', '\"', $str).'"';
 }

htdocs/removedesc.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/lib/common.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -32,7 +32,7 @@ 
         tpl_set_var(
             'target',
             htmlspecialchars(
-                'removedesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode($desclang),
+                'removedesc.php?cacheid='.urlencode($cache_id).'&desclang='.urlencode($desclang),
                 ENT_COMPAT,
                 'UTF-8'
             )
@@ -56,7 +56,7 @@ 
                 if (mysql_num_rows($desc_rs) == 1) {
                     $desc_record = sql_fetch_array($desc_rs);
                     mysql_free_result($desc_rs);
-                    require $stylepath . '/removedesc.inc.php';
+                    require $stylepath.'/removedesc.inc.php';
 
                     if ($desc_record['node'] != $oc_nodeid) {
                         tpl_errorMsg('removedesc', $error_wrong_node);
@@ -70,7 +70,7 @@ 
                         // do not use slave server for the next time ...
                         db_slave_exclude();
 
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
                         exit;
                     } else {
                         //commit the removement

htdocs/util2/stats/rank.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 header('Content-type: text/html; charset=utf-8');
 
 $opt['rootpath'] = '../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 $n = 1;
 $rs = sql('SELECT `user`.`username`, `stat_user`.`found`
@@ -18,7 +18,7 @@ 
            ORDER BY `stat_user`.`found` DESC
               LIMIT 100');
 while ($r = sql_fetch_assoc($rs)) {
-    echo $n . ' ' . $r['username'] . ': ' . $r['found'] . "\n";
-    $n ++;
+    echo $n.' '.$r['username'].': '.$r['found']."\n";
+    $n++;
 }
 sql_free_result($rs);

htdocs/util2/stats/owner.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 header('Content-type: text/html; charset=utf-8');
 
 $opt['rootpath'] = '../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 echo "<h2>Top-Owner</h2>\n";
 
@@ -28,7 +28,7 @@ 
         FROM `caches`
         LEFT JOIN `user` ON `user`.`user_id`=`caches`.`user_id`
         LEFT JOIN `caches_attributes` `ca` ON `ca`.`cache_id`=`caches`.`cache_id` AND `ca`.`attrib_id`=6
-        WHERE status=1 AND " . $condition . "
+        WHERE status=1 AND " . $condition."
         GROUP BY `caches`.`user_id`
         HAVING COUNT(*) >= $limit
         ORDER BY COUNT(*) DESC"
@@ -36,7 +36,7 @@ 
 
     $n = 1;
     while ($r = sql_fetch_assoc($rs)) {
-        echo "  <tr><td style='text-align:right'>&nbsp;&nbsp;" . ($n ++) . ".&nbsp;&nbsp;&nbsp;</td><td style='text-align:right'>" . $r['count'] . "</td><td>&nbsp;&nbsp;" . $r['name'] . "</td></tr>\n";
+        echo "  <tr><td style='text-align:right'>&nbsp;&nbsp;".($n++).".&nbsp;&nbsp;&nbsp;</td><td style='text-align:right'>".$r['count']."</td><td>&nbsp;&nbsp;".$r['name']."</td></tr>\n";
     }
     sql_free_result($rs);