OpencachingDeutschland / oc-server3

htdocs/lang/de/ocstyle/newdesc.inc.php

Spacing +3 added lines, -3 removed lines

@@ -18,6 +18,6 @@
 $submit = t('Add');
 $default_lang = t('EN');
  
-$lang_message = '<br/><span class="errormsg">' . t('There already exists a description in this language') . '</span>';
-$error_no_lang_selected = '&nbsp;<span class="errormsg">' . t('Please select a language.') . "</span>";
-$show_all_langs_submit = '&nbsp;<input type="submit" name="show_all_langs_submit" value="' . t('Show all') . '" class="formbutton" onclick="submitbutton(\'show_all_langs_submit\')" />';
+$lang_message = '<br/><span class="errormsg">'.t('There already exists a description in this language').'</span>';
+$error_no_lang_selected = '&nbsp;<span class="errormsg">'.t('Please select a language.')."</span>";
+$show_all_langs_submit = '&nbsp;<input type="submit" name="show_all_langs_submit" value="'.t('Show all').'" class="formbutton" onclick="submitbutton(\'show_all_langs_submit\')" />';

htdocs/lang/de/ocstyle/lib/menu.php

Spacing +19 added lines, -19 removed lines

@@ -285,7 +285,7 @@ 
     /* selmenuitem contains the selected (bold) menu item */
     global $mnu_selmenuitem;
 
-    for ($i = 0, $ret = - 1; ($i < count($menustructure)) && ($ret == - 1); $i ++) {
+    for ($i = 0, $ret = - 1; ($i < count($menustructure)) && ($ret == - 1); $i++) {
         if ($menustructure[$i]['siteid'] == $pageid) {
             $mnu_selmenuitem = $menustructure[$i];
 
@@ -313,22 +313,22 @@ 
     global $menu;
     $c = 0;
     $max = count($menu);
-    for ($i = 0; $i < $max; $i ++) {
+    for ($i = 0; $i < $max; $i++) {
         if ($menu[$i]['visible'] == true) {
             $sTarget = isset($menu[$i]['target']) ? $menu[$i]['target'] : '';
-            $sItem = '<a href="' . $menu[$i]['filename'] . '" ' . $sTarget . '>' . htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a>';
-            $sItemSel = '<a href="' . $menu[$i]['filename'] . '" ' . $sTarget . ' class=\'selected bg-green06\'>' . htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a>';
+            $sItem = '<a href="'.$menu[$i]['filename'].'" '.$sTarget.'>'.htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a>';
+            $sItemSel = '<a href="'.$menu[$i]['filename'].'" '.$sTarget.' class=\'selected bg-green06\'>'.htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a>';
 
             if ($menu[$i]['siteid'] == $selmenuid) {
                 /* $sItem = '<li>TODO:selected' . $sItem . '</li>'; */
-                $sItem = '<li>' . $sItemSel . '</li>';
+                $sItem = '<li>'.$sItemSel.'</li>';
             } else {
-                $sItem = '<li>' . $sItem . '</li>';
+                $sItem = '<li>'.$sItem.'</li>';
             }
 
-            echo $sItem . "\n";
+            echo $sItem."\n";
 
-            $c ++;
+            $c++;
         }
     }
 }
@@ -348,7 +348,7 @@ 
 
     if (!$bHasSubmenu) {
         /* prüfen, ob ein Submenü vorhanden ist */
-        for ($i = 0, $bSubmenu = false; ($i < count($menustructure)) && ($bSubmenu == false); $i ++) {
+        for ($i = 0, $bSubmenu = false; ($i < count($menustructure)) && ($bSubmenu == false); $i++) {
             if (isset($menustructure[$i]['submenu'])) {
                 $bSubmenu = true;
             }
@@ -365,19 +365,19 @@ 
         }
     }
     $maxMenuStructure = count($menustructure);
-    for ($i = 0; $i < $maxMenuStructure; $i ++) {
+    for ($i = 0; $i < $maxMenuStructure; $i++) {
         if ($menustructure[$i]['visible'] == true) {
             if ($menustructure[$i]['siteid'] == $pageid) {
-                echo '<li class="' . $cssclass . ' group_active"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
+                echo '<li class="'.$cssclass.' group_active"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
             } else {
                 if (isset($menustructure[$i]['submenu'])) {
                     if (mnu_IsMenuParentOf($menustructure[$i]['submenu'], $pageid)) {
-                        echo '<li class="' . $cssclass . ' group_active"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
+                        echo '<li class="'.$cssclass.' group_active"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
                     } else {
-                        echo '<li class="' . $cssclass . '"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
+                        echo '<li class="'.$cssclass.'"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
                     }
                 } else {
-                    echo '<li class="' . $cssclass . '"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
+                    echo '<li class="'.$cssclass.'"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
                 }
             }
 
@@ -397,7 +397,7 @@ 
  */
 function mnu_IsMenuParentOf($parentmenuitems, $menuitemid)
 {
-    for ($i = 0; $i < count($parentmenuitems); $i ++) {
+    for ($i = 0; $i < count($parentmenuitems); $i++) {
         if ($parentmenuitems[$i]['siteid'] == $menuitemid) {
             return true;
         }
@@ -439,15 +439,15 @@ 
 function mnu_prv_EchoBreadCrumbSubItem($pageid, $menustructure)
 {
     $maxMenuStructure = count($menustructure);
-    for ($i = 0; $i < $maxMenuStructure; $i ++) {
+    for ($i = 0; $i < $maxMenuStructure; $i++) {
         if ($menustructure[$i]['siteid'] == $pageid) {
-            echo '&nbsp;&gt;&nbsp;' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
+            echo '&nbsp;&gt;&nbsp;'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
 
             return;
         } else {
             if (isset($menustructure[$i]['submenu'])) {
                 if (mnu_IsMenuParentOf($menustructure[$i]['submenu'], $pageid)) {
-                    echo '&nbsp;&gt;&nbsp;' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
+                    echo '&nbsp;&gt;&nbsp;'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
                     mnu_prv_EchoBreadCrumbSubItem($pageid, $menustructure[$i]['submenu']);
 
                     return;
@@ -465,6 +465,6 @@ 
 {
     $helplink = helppagelink($tplname);
     if ($helplink != "") {
-        echo $helplink . '<img src="resource2/ocstyle/images/misc/32x32-help.png" /></a>';
+        echo $helplink.'<img src="resource2/ocstyle/images/misc/32x32-help.png" /></a>';
     }
 }

htdocs/verifyemail.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  ***************************************************************************/
 
 $disable_verifyemail = true;
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'verifyemail';
 $tpl->menuitem = MNU_VERIFY_EMAIL;
@@ -28,7 +28,7 @@ 
     } else {
         $tpl->assign('emailadr', $user->getEMail());
         if ($user->missedDataLicenseMail()) {
-            $tpl->assign('datalicensemail', "<br /><br />" . file_get_contents("resource2/misc/datalicensemail.html"));
+            $tpl->assign('datalicensemail', "<br /><br />".file_get_contents("resource2/misc/datalicensemail.html"));
         }
         $tpl->assign('orgpage', $orgpage);
     }

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;
                 }

htdocs/ocstats.php

Spacing +6 added lines, -6 removed lines

@@ -7,11 +7,11 @@ 
  *  Create / redirect to statpic
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 // Parameter
 $jpeg_qualitaet = 80;
-$fontfile = $opt['rootpath'] . 'resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
+$fontfile = $opt['rootpath'].'resource2/'.$opt['template']['style'].'/fonts/dejavu/ttf/DejaVuSans.ttf';
 
 // get userid and style from URL
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
@@ -66,10 +66,10 @@ 
 
     if (sql_num_rows($rs) == 1) {
         $record = sql_fetch_array($rs);
-        $tplpath = $opt['rootpath'] . $record['tplpath'];
+        $tplpath = $opt['rootpath'].$record['tplpath'];
         $maxtextwidth = $record['maxtextwidth'];
     } else {
-        $tplpath = $opt['rootpath'] . 'images/ocstats1.gif';
+        $tplpath = $opt['rootpath'].'images/ocstats1.gif';
         $maxtextwidth = 60;
         $logo = 1;
     }
@@ -170,11 +170,11 @@ 
 }
 
 // Redirect auf das gespeicherte Bild
-$tpl->redirect('images/statpics/statpic' . $userid . $lang . '.jpg');
+$tpl->redirect('images/statpics/statpic'.$userid.$lang.'.jpg');
 
 function GetFilename($userid, $lang)
 {
     global $opt;
 
-    return $opt['rootpath'] . 'images/statpics/statpic' . $userid . $lang . '.jpg';
+    return $opt['rootpath'].'images/statpics/statpic'.$userid.$lang.'.jpg';
 }

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/restorecaches.php

Spacing +42 added lines, -42 removed lines

@@ -132,8 +132,8 @@ 
 
 */
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/labels.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/labels.inc.php';
 
 $tpl->name = 'restorecaches';
 $tpl->menuitem = MNU_ADMIN_RESTORE;
@@ -308,12 +308,12 @@ 
 
 function get_archive_data($caches)
 {
-    $cachelist = "(" . implode(",", $caches) . ")";
+    $cachelist = "(".implode(",", $caches).")";
     $data = array();
     $admins = array();
 
     // make waypoint index
-    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $wp_oc[$r['cache_id']] = $r['wp_oc'];
     }
@@ -328,7 +328,7 @@ 
             `latitude`,
             `restored_by`
         FROM `cache_coordinates`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_created` ASC"
     );
     // order is relevant, because multiple changes per day possible
@@ -336,7 +336,7 @@ 
     while ($r = sql_fetch_assoc($rs)) {
         $coord = new coordinate($r['latitude'], $r['longitude']);
         $coord = $coord->getDecimalMinutes();
-        $coord = $coord['lat'] . " " . $coord['lon'];
+        $coord = $coord['lat']." ".$coord['lon'];
         if (isset($lastcoord[$r['cache_id']]) && $coord != $lastcoord[$r['cache_id']]) {
             // the database contains lots of old coord records with unchanged coords, wtf?
             append_data($data, $admins, $wp_oc, $r, "coord", $lastcoord[$r['cache_id']], $coord);
@@ -348,7 +348,7 @@ 
     // cache country
     $rs = sql("SELECT `cache_id`, LEFT(`date_created`,10) AS `date_modified`, `country`, `restored_by`
                FROM `cache_countries`
-                         WHERE `cache_id` IN " . $cachelist . "
+                         WHERE `cache_id` IN " . $cachelist."
                          ORDER BY `date_created` ASC");
     // order is relevant, because multiple changes per day possible
     $lastcountry = array();
@@ -364,17 +364,17 @@ 
     // all other cache data
     // first the current data ...
     $nextcd = array();
-    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $nextcd[$r['wp_oc']] = $r;
-        $user_id = $r['user_id'];     // is used later for logs
+        $user_id = $r['user_id']; // is used later for logs
     }
     sql_free_result($rs);
 
     // .. and then the changes
     $rs = sql(
         "SELECT * FROM `caches_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     while ($r = sql_fetch_assoc($rs)) {
@@ -417,8 +417,8 @@ 
                 $wp_oc,
                 $r,
                 "time",
-                $r['search_time'] . ' h',
-                $nextcd[$wp]['search_time'] . ' h'
+                $r['search_time'].' h',
+                $nextcd[$wp]['search_time'].' h'
             );
         }
         if ($r['way_length'] != $nextcd[$wp]['way_length']) {
@@ -428,8 +428,8 @@ 
                 $wp_oc,
                 $r,
                 "way",
-                $r['way_length'] . ' km',
-                $nextcd[$wp]['way_length'] . ' km'
+                $r['way_length'].' km',
+                $nextcd[$wp]['way_length'].' km'
             );
         }
         if ($r['wp_gc'] != $nextcd[$wp]['wp_gc']) {
@@ -465,8 +465,8 @@ 
     // attributes
     $rs = sql(
         "SELECT * FROM `caches_attributes_modified`
-        WHERE `cache_id` IN " . $cachelist . "  /* OConly attrib is shown, but not restorable */
-        ORDER BY `date_modified` ASC");   // order doesn't matter as long it is date only
+        WHERE `cache_id` IN " . $cachelist."  /* OConly attrib is shown, but not restorable */
+        ORDER BY `date_modified` ASC"); // order doesn't matter as long it is date only
     while ($r = sql_fetch_assoc($rs)) {
         append_data(
             $data,
@@ -474,7 +474,7 @@ 
             $wp_oc,
             $r,
             "attrib",
-            ($r['was_set'] ? "-" : "+") . labels::getLabelValue('cache_attrib', $r['attrib_id']),
+            ($r['was_set'] ? "-" : "+").labels::getLabelValue('cache_attrib', $r['attrib_id']),
             ''
         );
     }
@@ -512,7 +512,7 @@ 
             LENGTH(`short_desc`) AS `sdl`,
             `restored_by`
         FROM `cache_desc_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     // order doesn't matter as long only one change per day is recorded
@@ -534,8 +534,8 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "desc(" . $r['language'] . ")",
-                $r['dl'] + 0, $next['dl'] + 0 . " bytes"
+                "desc(".$r['language'].")",
+                $r['dl'] + 0, $next['dl'] + 0." bytes"
             );
         }
         if ($r['hl'] + 0 != $next['hl'] + 0) {
@@ -544,9 +544,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "hint(" . $r['language'] . ")",
+                "hint(".$r['language'].")",
                 $r['hl'] + 0,
-                $next['hl'] + 0 . " bytes"
+                $next['hl'] + 0." bytes"
             );
         }
         if ($r['sdl'] + 0 != $next['sdl'] + 0) {
@@ -555,9 +555,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "shortdesc(" . $r['language'] . ")",
+                "shortdesc(".$r['language'].")",
                 $r['sdl'] + 0,
-                $next['sdl'] + 0 . " bytes"
+                $next['sdl'] + 0." bytes"
             );
         }
 
@@ -580,7 +580,7 @@ 
               (SELECT 1 AS `op`, `deletion_date` AS `date_modified`, `cache_id`,
                     `user_id`, `type`, `date`, `restored_by`
                    FROM `cache_logs_archived`
-                  WHERE `cache_id` IN " . $cachelist . "AND `deleted_by`='&1' AND `user_id`<>'&1'
+                  WHERE `cache_id` IN " . $cachelist."AND `deleted_by`='&1' AND `user_id`<>'&1'
                   UNION
                   SELECT 2 AS `op`, `date_modified`, `cache_id`,
                        (SELECT `user_id` FROM `cache_logs_archived` WHERE `id`=`original_id`),
@@ -588,7 +588,7 @@ 
                        (SELECT `date` FROM `cache_logs_archived` WHERE `id`=`original_id`),
                        `restored_by`
                  FROM `cache_logs_restored`
-                  WHERE `cache_id` IN " . $cachelist . ") `logs`
+                  WHERE `cache_id` IN " . $cachelist.") `logs`
                 INNER JOIN `user` ON `user`.`user_id`=`logs`.`user_id`
               ORDER BY `logs`.`date_modified` ASC",
         // order may not be exact when redoing reverts, because delete and insert
@@ -602,7 +602,7 @@ 
             $wp_oc,
             $r,
             $r["op"] == 1 ? "dellog" : "restorelog",
-            "<a href='viewprofile.php?userid=" . $r['user_id'] . "' target='_blank'>" . $r['username'] . "</a>/" . $r['date'],
+            "<a href='viewprofile.php?userid=".$r['user_id']."' target='_blank'>".$r['username']."</a>/".$r['date'],
             ''
         );
     }
@@ -618,9 +618,9 @@ 
 
     $piccacheid = "IF(`object_type`=2, `object_id`, IF(`object_type`=1, IFNULL((SELECT `cache_id` FROM `cache_logs` WHERE `id`=`object_id`),(SELECT `cache_id` FROM `cache_logs_archived` WHERE `id`=`object_id`)), 0))";
     $rs = sql(
-        "SELECT *, " . $piccacheid . "AS `cache_id` FROM `pictures_modified`
-        WHERE " . $piccacheid . " IN " . $cachelist . "
-        ORDER BY `date_modified` ASC");  // order is relevant for the case of restore-reverts
+        "SELECT *, ".$piccacheid."AS `cache_id` FROM `pictures_modified`
+        WHERE " . $piccacheid." IN ".$cachelist."
+        ORDER BY `date_modified` ASC"); // order is relevant for the case of restore-reverts
     while ($r = sql_fetch_assoc($rs)) {
         $r['date_modified'] = substr($r['date_modified'], 0, 10);
         switch ($r['operation']) {
@@ -642,14 +642,14 @@ 
                 $picchange .= "-cache";
                 break;
         }
-        append_data($data, $admins, $wp_oc, $r, $picchange . "pic", $r['title'], '');
+        append_data($data, $admins, $wp_oc, $r, $picchange."pic", $r['title'], '');
     }
     sql_free_result($rs);
 
     // admins
     foreach ($admins as $adate => $adata) {
         foreach ($adata as $awp => $alist) {
-            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> " . implode(',', $alist);
+            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> ".implode(',', $alist);
         }
     }
 
@@ -698,9 +698,9 @@ 
     } else {
         $text .= " class='userchange'";
     }
-    $text .= ">$field</strong>: $oldvalue" . ($newvalue != "" ? " &rarr; $newvalue" : "");
+    $text .= ">$field</strong>: $oldvalue".($newvalue != "" ? " &rarr; $newvalue" : "");
     if (isset($data[$mdate][$wp])) {
-        $data[$mdate][$wp] .= ", " . $text;
+        $data[$mdate][$wp] .= ", ".$text;
     } else {
         $data[$mdate][$wp] = $text;
     }
@@ -713,8 +713,8 @@ 
             $admins[$mdate][$wp] = [];
         }
         $admins[$mdate][$wp][$r['restored_by'] + 0]
-            = "<a href='viewprofile.php?userid=" . $r['restored_by'] . "' target='_blank'>" .
-            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']) .
+            = "<a href='viewprofile.php?userid=".$r['restored_by']."' target='_blank'>".
+            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']).
             "</a>";
     }
 }
@@ -724,7 +724,7 @@ 
 {
     global $opt, $login;
 
-    sql("SET @restoredby='&1'", $login->userid);         // is evaluated by trigger functions
+    sql("SET @restoredby='&1'", $login->userid); // is evaluated by trigger functions
     sql_slave("SET @restoredby='&1'", $login->userid);
 
     $restored = array();
@@ -834,12 +834,12 @@ 
                     if ($setfields != "") {
                         $setfields .= ",";
                     }
-                    $setfields .= "`$field`='" . sql_escape($r[$field]) . "'";
+                    $setfields .= "`$field`='".sql_escape($r[$field])."'";
                     $restored[$wp][$field] = true;
                 }
             }
             if ($setfields != "" && !$simulate) {
-                sql("UPDATE `caches` SET " . $setfields . " WHERE `cache_id`='&1'", $cacheid);
+                sql("UPDATE `caches` SET ".$setfields." WHERE `cache_id`='&1'", $cacheid);
             }
         }
         sql_free_result($rs);
@@ -1016,7 +1016,7 @@ 
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore
                         $log = new cachelog();
-                        $log->setNode($r['node']);  // cachelog class currently does not initialize node field
+                        $log->setNode($r['node']); // cachelog class currently does not initialize node field
                         $log->setCacheId($r['cache_id']);
                         $log->setUserId($r['user_id']);
                         $log->setType($r['type'], true);
@@ -1068,7 +1068,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error log ' + $r['id'] + "/" + $logid];
+                    $restored[$wp]['internal error - could not $error log ' +$r['id'] + "/" +$logid];
                 }
                 if ($logs_restored) {
                     $restored[$wp]['logs'] = true;
@@ -1202,7 +1202,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + "/" + $picid] = true;
+                    $restored[$wp]['internal error - could not $error picture '.$r['id'] + "/" +$picid] = true;
                 }
                 if ($pics_restored) {
                     $restored[$wp]['pictures'] = true;

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