OpencachingDeutschland / oc-server3

htdocs/lib2/search/search.kml.inc.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
     $kmlLine =
         '
 <Placemark>
-  <description><![CDATA[' . $t_by . ' {username}<br><br><a href="' . $opt['page']['default_absolute_url'] . 'viewcache.php?cacheid={cacheid}">' . $t_showdesc . '</a><br>&nbsp;<br><table cellspacing="0" cellpadding="0" border="0"><tr><td>{typeimgurl} </td><td>' . $t_type . ' {type}<br>' . $t_size . ' {size}</td></tr><tr><td colspan="2">' . $t_difficulty . '<br>' . $t_terrain . '</td></tr></table>]]></description>
+  <description><![CDATA[' . $t_by.' {username}<br><br><a href="'.$opt['page']['default_absolute_url'].'viewcache.php?cacheid={cacheid}">'.$t_showdesc.'</a><br>&nbsp;<br><table cellspacing="0" cellpadding="0" border="0"><tr><td>{typeimgurl} </td><td>'.$t_type.' {type}<br>'.$t_size.' {size}</td></tr><tr><td colspan="2">'.$t_difficulty.'<br>'.$t_terrain.'</td></tr></table>]]></description>
   <name>{name}{archivedflag}</name>
   <LookAt>
     <longitude>{lon}</longitude>
@@ -34,7 +34,7 @@ 
   <Point>
     <coordinates>{lon},{lat},0</coordinates>
   </Point>
-  <Snippet>D: {difficulty}/T: {terrain} {size}  ' . $t_by . ' {username}</Snippet>
+  <Snippet>D: {difficulty}/T: {terrain} {size}  ' . $t_by.' {username}</Snippet>
 </Placemark>
 ';
 
@@ -93,7 +93,7 @@ 
 
     while ($r = sql_fetch_array($rs)) {
         $thisline = $kmlLine;
-        $typeimgurl = '<img src="{urlbase}resource2/' . $style . '/images/cacheicon/' . $r['icon_large'] . '" alt="' . $r['typedesc'] . '" title="' . $r['typedesc'] . '" />';
+        $typeimgurl = '<img src="{urlbase}resource2/'.$style.'/images/cacheicon/'.$r['icon_large'].'" alt="'.$r['typedesc'].'" title="'.$r['typedesc'].'" />';
 
         $thisline = mb_ereg_replace('{icon}', $r['kml_name'], $thisline);
         $thisline = mb_ereg_replace('{typeimgurl}', $typeimgurl, $thisline);
@@ -111,11 +111,11 @@ 
 
         if (($r['status'] == 2) || ($r['status'] == 3) || ($r['status'] == 6)) {
             if ($r['status'] == 2) {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_temporarily_na . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_temporarily_na.')', $thisline);
             } elseif ($r['status'] == 3) {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_archived . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_archived.')', $thisline);
             } else {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_locked . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_locked.')', $thisline);
             }
         } else {
             $thisline = mb_ereg_replace('{archivedflag}', '', $thisline);

htdocs/lib2/search/search.loc.inc.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
     $server_domain = $opt['page']['domain'];
     $server_address = $opt['page']['default_absolute_url'];
 
-    $locHead = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><loc version="1.0" src="' . $server_domain . '">' . "\n";
+    $locHead = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><loc version="1.0" src="'.$server_domain.'">'."\n";
 
     $locLine =
         '
@@ -27,7 +27,7 @@ 
     <name id="{waypoint}"><![CDATA[{archivedflag}{name} by {username}]]></name>
     <coord lat="{lat}" lon="{lon}"/>
     <type>Geocache</type>
-    <link text="Beschreibung">' . $server_address . 'viewcache.php?cacheid={cacheid}</link>
+    <link text="Beschreibung">' . $server_address.'viewcache.php?cacheid={cacheid}</link>
 </waypoint>
 ';
 
@@ -78,11 +78,11 @@ 
 
         if (($r['status'] == 2) || ($r['status'] == 3) || ($r['status'] == 6)) {
             if ($r['status'] == 2) {
-                $thisline = mb_ereg_replace('{archivedflag}', $state_temporarily_na . '!, ', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', $state_temporarily_na.'!, ', $thisline);
             } elseif ($r['status'] == 3) {
-                $thisline = mb_ereg_replace('{archivedflag}', $state_archived . '!, ', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', $state_archived.'!, ', $thisline);
             } else {
-                $thisline = mb_ereg_replace('{archivedflag}', $state_locked . '!, ', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', $state_locked.'!, ', $thisline);
             }
         } else {
             $thisline = mb_ereg_replace('{archivedflag}', '', $thisline);

htdocs/lib2/search/search.inc.php

Spacing +6 added lines, -6 removed lines

@@ -156,8 +156,8 @@ 
     }
 
     // doppelte chars ersetzen
-    for ($c = ord('a'); $c <= ord('z'); $c ++) {
-        $str = mb_ereg_replace(chr($c) . chr($c), chr($c), $str);
+    for ($c = ord('a'); $c <= ord('z'); $c++) {
+        $str = mb_ereg_replace(chr($c).chr($c), chr($c), $str);
     }
 
     return $str;
@@ -257,14 +257,14 @@ 
 {
     global $opt;
 
-    $desclangs = ',' . $rCache['desc_languages'] . ',';
+    $desclangs = ','.$rCache['desc_languages'].',';
     $desclang = $rCache['desc_language'];
 
-    if (strpos($desclangs, ',' . $opt['template']['locale'] . ',') !== false) {
+    if (strpos($desclangs, ','.$opt['template']['locale'].',') !== false) {
         $desclang = $opt['template']['locale'];
-    } elseif (strpos($desclangs, ',' . $opt['template']['default']['locale'] . ',') !== false) {
+    } elseif (strpos($desclangs, ','.$opt['template']['default']['locale'].',') !== false) {
         $desclang = $opt['template']['default']['locale'];
-    } elseif (strpos($desclangs, ',' . $opt['template']['default']['fallback_locale'] . ',') !== false) {
+    } elseif (strpos($desclangs, ','.$opt['template']['default']['fallback_locale'].',') !== false) {
         $desclang = $opt['template']['default']['fallback_locale'];
     } elseif (strpos($desclangs, ',EN,') !== false) {
         $desclang = 'EN';

htdocs/lib2/search/search.map2.inc.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
     $tpl->error(ERROR_INVALID_OPERATION);
 }
 
-$sqlchecksum = sprintf('%u', crc32($cachesFilter . "\n" . $sqlFilter));
+$sqlchecksum = sprintf('%u', crc32($cachesFilter."\n".$sqlFilter));
 
 // check if query was already executed within the cache period
 $rsMapCache = sql(
@@ -28,12 +28,12 @@ 
 );
 if ($rMapCache = sql_fetch_assoc($rsMapCache)) {
     $resultId = $rMapCache['result_id'];
-    sql("UPDATE `map2_result` SET `shared_counter`=`shared_counter`+1 WHERE `result_id`='" . ($resultId + 0) . "'");
+    sql("UPDATE `map2_result` SET `shared_counter`=`shared_counter`+1 WHERE `result_id`='".($resultId + 0)."'");
 } else {
     // ensure that query is performed without errors before reserving the result_id
     sql_temp_table_slave('tmpmapresult');
     sql_slave("CREATE TEMPORARY TABLE &tmpmapresult (`cache_id` INT UNSIGNED NOT NULL, PRIMARY KEY (`cache_id`)) ENGINE=MEMORY");
-    sql_slave("INSERT INTO &tmpmapresult (`cache_id`) " . $sqlFilter);
+    sql_slave("INSERT INTO &tmpmapresult (`cache_id`) ".$sqlFilter);
 
     sql(
         "
@@ -41,7 +41,7 @@ 
         VALUES ('&1', '&2', '&3', NOW(), NOW())",
         $db['slave_id'],
         $sqlchecksum,
-        $cachesFilter . "\n" . $sqlFilter
+        $cachesFilter."\n".$sqlFilter
     );
     $resultId = sql_insert_id();
 
@@ -74,11 +74,11 @@ 
             $rBounds['lon_min'] -= $halfwin;
             $rBounds['lon_max'] += $halfwin;
         }
-        $bounds_param = "&lat_min=" . round($rBounds['lat_min'], 5) . "&lat_max=" . round($rBounds['lat_max'], 5) . '&lon_min=' . round($rBounds['lon_min'], 5) . '&lon_max=' . round($rBounds['lon_max'], 5);
+        $bounds_param = "&lat_min=".round($rBounds['lat_min'], 5)."&lat_max=".round($rBounds['lat_max'], 5).'&lon_min='.round($rBounds['lon_min'], 5).'&lon_max='.round($rBounds['lon_max'], 5);
     }
     sql_free_result($rs);
 
-    $tpl->redirect('map2.php?queryid=' . $options['queryid'] . '&resultid=' . $resultId . $bounds_param);
+    $tpl->redirect('map2.php?queryid='.$options['queryid'].'&resultid='.$resultId.$bounds_param);
 } else {
     echo $resultId;
 }

Braces +2 added lines, -1 removed lines

@@ -67,7 +67,8 @@
     if (($rBounds = sql_fetch_assoc($rs)) && $rBounds['lat_min'] !== null /* >0 caches */) {
         if ($rBounds['lat_min'] == $rBounds['lat_max'] &&
             $rBounds['lon_min'] == $rBounds['lon_max']
-        ) { // 1 Cache
+        ) {
+// 1 Cache
             $halfwin = 0.02;
             $rBounds['lat_min'] -= $halfwin;
             $rBounds['lat_max'] += $halfwin;

htdocs/lib2/search/search.ovl.inc.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * OVL search output for TOP25, TOP50 etc.
  ****************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/charset.inc.php';
+require_once $opt['rootpath'].'lib2/charset.inc.php';
 
 $search_output_file_download = true;
 $content_type_plain = 'application/ovl';

htdocs/lib2/cli.class.php

Spacing +5 added lines, -5 removed lines

@@ -11,30 +11,30 @@
 {
     public function out($str)
     {
-        echo $str . "\n";
+        echo $str."\n";
     }
 
     public function debug($str)
     {
         global $opt;
         if (($opt['debug'] & DEBUG_CLI) == DEBUG_CLI) {
-            echo 'DEBUG: ' . $str . "\n";
+            echo 'DEBUG: '.$str."\n";
         }
     }
 
     public function warn($str)
     {
-        echo 'WARN: ' . $str . "\n";
+        echo 'WARN: '.$str."\n";
     }
 
     public function error($str)
     {
-        echo 'ERROR: ' . $str . "\n";
+        echo 'ERROR: '.$str."\n";
     }
 
     public function fatal($str)
     {
-        echo 'FATAL: ' . $str . "\n";
+        echo 'FATAL: '.$str."\n";
         exit;
     }
 }

htdocs/lib2/html2text.class.php

Spacing +10 added lines, -10 removed lines

@@ -451,9 +451,9 @@ 
         if (empty($url)) {
             if (!empty($_SERVER['HTTP_HOST'])) {
                 if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') {
-                    $this->url = 'https://' . $_SERVER['HTTP_HOST'];
+                    $this->url = 'https://'.$_SERVER['HTTP_HOST'];
                 } else {
-                    $this->url = 'http://' . $_SERVER['HTTP_HOST'];
+                    $this->url = 'http://'.$_SERVER['HTTP_HOST'];
                 }
             } else {
                 $this->url = '';
@@ -499,7 +499,7 @@ 
 
         // Add link list
         if (!empty($this->_link_list)) {
-            $text .= "\n\nLinks:\n------\n" . $this->_link_list;
+            $text .= "\n\nLinks:\n------\n".$this->_link_list;
         }
 
         // Wrap the text to a readable format
@@ -534,24 +534,24 @@ 
         if (substr($link, 0, 7) == 'http://' || substr($link, 0, 8) == 'https://' ||
             substr($link, 0, 7) == 'mailto:'
         ) {
-            $this->_link_count ++;
-            $this->_link_list .= "[" . $this->_link_count . "] $link\n";
-            $additional = ' [' . $this->_link_count . ']';
+            $this->_link_count++;
+            $this->_link_list .= "[".$this->_link_count."] $link\n";
+            $additional = ' ['.$this->_link_count.']';
         } elseif (substr($link, 0, 11) == 'javascript:') {
             // Don't count the link; ignore it
             $additional = '';
             // what about href="#anchor" ?
         } else {
-            $this->_link_count ++;
-            $this->_link_list .= "[" . $this->_link_count . "] " . $this->url;
+            $this->_link_count++;
+            $this->_link_list .= "[".$this->_link_count."] ".$this->url;
             if (substr($link, 0, 1) != '/') {
                 $this->_link_list .= '/';
             }
             $this->_link_list .= "$link\n";
-            $additional = ' [' . $this->_link_count . ']';
+            $additional = ' ['.$this->_link_count.']';
         }
 
-        return $display . $additional;
+        return $display.$additional;
     }
 
 }

htdocs/lib2/logic/cachelist.class.php

Spacing +20 added lines, -20 removed lines

@@ -8,7 +8,7 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/../translate.class.php';
+require_once __DIR__.'/../translate.class.php';
 
 define('ERROR_BAD_LISTNAME', 1);
 define('ERROR_DUPLICATE_LISTNAME', 2);
@@ -164,7 +164,7 @@ 
         return sql_value(
             "
             SELECT `entries` FROM `stat_cache_lists`
-            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId()) . "'",
+            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId())."'",
             0
         );
     }
@@ -174,7 +174,7 @@ 
         return sql_value(
             "
             SELECT `watchers` FROM `stat_cache_lists`
-            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId()) . "'",
+            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId())."'",
             0
         );
     }
@@ -402,7 +402,7 @@ 
     {
         global $login;
 
-        return cachelist::getLists("`cache_lists`.`user_id`='" . sql_escape($login->userid) . "'");
+        return cachelist::getLists("`cache_lists`.`user_id`='".sql_escape($login->userid)."'");
     }
 
     public static function getListsWatchedByMe()
@@ -410,9 +410,9 @@ 
         global $login;
 
         return cachelist::getLists(
-            "`id` IN (SELECT `cache_list_id` FROM `cache_list_watches` WHERE `user_id`='" . sql_escape(
+            "`id` IN (SELECT `cache_list_id` FROM `cache_list_watches` WHERE `user_id`='".sql_escape(
                 $login->userid
-            ) . "')"
+            )."')"
         );
     }
 
@@ -421,9 +421,9 @@ 
         global $login;
 
         return cachelist::getLists(
-            "`id` IN (SELECT `cache_list_id` FROM `cache_list_bookmarks` WHERE `user_id`='" . sql_escape(
+            "`id` IN (SELECT `cache_list_id` FROM `cache_list_bookmarks` WHERE `user_id`='".sql_escape(
                 $login->userid
-            ) . "')"
+            )."')"
         );
     }
 
@@ -436,8 +436,8 @@ 
             LEFT JOIN `stat_cache_lists` ON  `stat_cache_lists`.`cache_list_id`=`cache_lists`.`id`
             LEFT JOIN `user` ON `user`.`user_id`=`cache_lists`.`user_id`
             WHERE `is_public`>=2 AND `entries`>0"
-            . ($namelike ? " AND `name` LIKE '%" . sql_escape($namelike) . "%'" : '')
-            . ($userlike ? " AND `username` LIKE '%" . sql_escape($userlike) . "%'" : ''),
+            . ($namelike ? " AND `name` LIKE '%".sql_escape($namelike)."%'" : '')
+            . ($userlike ? " AND `username` LIKE '%".sql_escape($userlike)."%'" : ''),
             0
         );
     }
@@ -446,8 +446,8 @@ 
     {
         return cachelist::getLists(
             "`is_public`>=2 AND `entries`>0"
-            . ($namelike ? " AND `name` LIKE '%" . sql_escape($namelike) . "%'" : '')
-            . ($userlike ? " AND `username` LIKE '%" . sql_escape($userlike) . "%'" : ''),
+            . ($namelike ? " AND `name` LIKE '%".sql_escape($namelike)."%'" : '')
+            . ($userlike ? " AND `username` LIKE '%".sql_escape($userlike)."%'" : ''),
             0,
             $startat,
             $maxitems,
@@ -458,7 +458,7 @@ 
     public static function getPublicListsOf($userid)
     {
         return cachelist::getLists(
-            "`is_public`>=2 AND `entries`>0 AND `cache_lists`.`user_id`='" . sql_escape($userid) . "'"
+            "`is_public`>=2 AND `entries`>0 AND `cache_lists`.`user_id`='".sql_escape($userid)."'"
         );
     }
 
@@ -471,7 +471,7 @@ 
             "
             SELECT `user_id`
             FROM `caches`
-            WHERE `cache_id`='" . sql_escape($cacheid) . "'",
+            WHERE `cache_id`='" . sql_escape($cacheid)."'",
             0
         );
         $my_watches = sql_fetch_column(
@@ -483,15 +483,15 @@ 
             `id` IN
                 (SELECT `cache_list_id`
                  FROM `cache_list_items`
-                 WHERE `cache_id`='" . sql_escape($cacheid) . "')
+                 WHERE `cache_id`='" . sql_escape($cacheid)."')
             AND
             (
-                `cache_lists`.`user_id`='" . sql_escape($login->userid) . "' " .
-            ($all ? "OR `is_public`= 3 " : "") .
+                `cache_lists`.`user_id`='" . sql_escape($login->userid)."' ".
+            ($all ? "OR `is_public`= 3 " : "").
             "OR (`is_public`> 0 AND
-                   `cache_lists`.`id` IN ('" . implode("','", array_map('sql_escape', $my_watches)) . "'))
+                   `cache_lists`.`id` IN ('" . implode("','", array_map('sql_escape', $my_watches))."'))
             )",
-            "`cache_lists`.`user_id`<>'" . sql_escape($cache_owner_id) . "'",
+            "`cache_lists`.`user_id`<>'".sql_escape($cache_owner_id)."'",
             0,
             20,
             true
@@ -500,7 +500,7 @@ 
 
     public static function getListById($listid)
     {
-        $lists = cachelist::getLists("`id`='" . sql_escape($listid) . "'");
+        $lists = cachelist::getLists("`id`='".sql_escape($listid)."'");
         if (count($lists)) {
             $lists[0]['description_for_display'] = use_current_protocol_in_html($lists[0]['description']);
 

Braces +2 added lines, -1 removed lines

@@ -109,7 +109,8 @@
                 $this->getUserId(),
                 $this->getId(),
                 $name
-            )) {// $this->getId() is 0 when creating a new list -> condition has no effect
+            )) {
+// $this->getId() is 0 when creating a new list -> condition has no effect
                 return ERROR_DUPLICATE_LISTNAME;
             } elseif ($visibility >= 2 && strlen($name) < 10) {
                 return ERROR_BAD_LISTNAME;

htdocs/lib2/logic/const.inc.php

Spacing +21 added lines, -21 removed lines

@@ -16,28 +16,28 @@ 
 define('RE_TYPE_FLOAT', 5);
 define('RE_TYPE_DOUBLE', 6);
 
-define('RE_INSERT_NOTHING', 0);       //
-define('RE_INSERT_OVERWRITE', 1);     // ignore given values and use function
-define('RE_INSERT_IGNORE', 2);        // dont use this column on insert
+define('RE_INSERT_NOTHING', 0); //
+define('RE_INSERT_OVERWRITE', 1); // ignore given values and use function
+define('RE_INSERT_IGNORE', 2); // dont use this column on insert
 define('RE_INSERT_AUTOINCREMENT', 4); // column is an auto increment column
-define('RE_INSERT_AUTOUUID', 8);      // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
-define('RE_INSERT_NOW', 16);          // NOW()
+define('RE_INSERT_AUTOUUID', 8); // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
+define('RE_INSERT_NOW', 16); // NOW()
 
 define('EUROPEAN_LETTERS', 'A-Za-zÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ');
 // ASCII + ISO-8859-1 0xC0..0xFF
-define('REGEX_USERNAME', '^[' . EUROPEAN_LETTERS . '0-9\.\-_@=)(\/\\\&*+~#][' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*+~#]{1,58}[' . EUROPEAN_LETTERS . '0-9\.\-_@=)(\/\\\&*+~#]$');
-define('REGEX_PASSWORD', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*+~#]{3,60}$');
-define('REGEX_LAST_NAME', '^[' . EUROPEAN_LETTERS . '][' . EUROPEAN_LETTERS . '0-9\.\- ]{0,58}[' . EUROPEAN_LETTERS . '0-9\.]$');
+define('REGEX_USERNAME', '^['.EUROPEAN_LETTERS.'0-9\.\-_@=)(\/\\\&*+~#]['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*+~#]{1,58}['.EUROPEAN_LETTERS.'0-9\.\-_@=)(\/\\\&*+~#]$');
+define('REGEX_PASSWORD', '^['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*+~#]{3,60}$');
+define('REGEX_LAST_NAME', '^['.EUROPEAN_LETTERS.']['.EUROPEAN_LETTERS.'0-9\.\- ]{0,58}['.EUROPEAN_LETTERS.'0-9\.]$');
 define('REGEX_FIRST_NAME', REGEX_LAST_NAME);
-define('REGEX_STATPIC_TEXT', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
+define('REGEX_STATPIC_TEXT', '^['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
 
-define('ADMIN_TRANSLATE', 1);     // edit translation
-define('ADMIN_MAINTAINANCE', 2);  // check table etc.
-define('ADMIN_USER', 4);          // drop users, caches etc.
-define('ADMIN_NEWS', 8);          // obsolete / reserved
-define('ADMIN_RESTORE', 16);      // restore vandalized listings
-define('ADMIN_ROOT', 128 | 127);  // root + all previous rights
-define('ADMIN_LISTING', 1024);    // can edit any cache listings
+define('ADMIN_TRANSLATE', 1); // edit translation
+define('ADMIN_MAINTAINANCE', 2); // check table etc.
+define('ADMIN_USER', 4); // drop users, caches etc.
+define('ADMIN_NEWS', 8); // obsolete / reserved
+define('ADMIN_RESTORE', 16); // restore vandalized listings
+define('ADMIN_ROOT', 128 | 127); // root + all previous rights
+define('ADMIN_LISTING', 1024); // can edit any cache listings
 
 define('ATTRIB_SELECTED', 1);
 define('ATTRIB_UNSELECTED', 2);
@@ -79,11 +79,11 @@ 
 // ID 15 was temporarily used and is reserved, see commit dda7ef0. Continue with 16.
 
 // user.data_license values
-define('OLD_DATA_LICSENSE', 0);                       // before deadline
-define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1);      // declined license
-define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2);      // accepted new license on registration
-define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3);     // did not decline license until deadline
-define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4);     // could not accept/decline because disabled
+define('OLD_DATA_LICSENSE', 0); // before deadline
+define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1); // declined license
+define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2); // accepted new license on registration
+define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3); // did not decline license until deadline
+define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4); // could not accept/decline because disabled
 
 //picture upload/resize parameters
 define('PICTURE_QUALITY', 85);