OpencachingDeutschland / oc-server3

local/devel/strip_private_data.php

Spacing +2 added lines, -2 removed lines

@@ -63,11 +63,11 @@
 echo "clearing user data\n";
 sql('TRUNCATE `cache_adoption`');
 sql('TRUNCATE `cache_ignore`');
-sql('DELETE FROM `cache_lists` WHERE `is_public`<2');  // trigger deletes dependent data
+sql('DELETE FROM `cache_lists` WHERE `is_public`<2'); // trigger deletes dependent data
 sql('TRUNCATE `cache_list_bookmarks`');
 sql('TRUNCATE `cache_list_watches`');
 sql('TRUNCATE `cache_watches`');
-sql('DELETE FROM `coordinates` WHERE `type`=2');   // personal cache notes and coords
+sql('DELETE FROM `coordinates` WHERE `type`=2'); // personal cache notes and coords
 sql('TRUNCATE `queries`');
 sql('TRUNCATE `user_options`');
 sql(

htdocs/addtolist.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 }
 $newlist_public = isset($_REQUEST['newlist_public']);
 $newlist_watch = isset($_REQUEST['newlist_watch']);
-$default_list = isset($_REQUEST['listid']) ? (int) $_REQUEST['listid'] : cachelist::getMyLastAddedToListId();
+$default_list = isset($_REQUEST['listid']) ? (int)$_REQUEST['listid'] : cachelist::getMyLastAddedToListId();
 
 if (isset($_REQUEST['save']) && isset($_REQUEST['listid'])) {
     $listid = $_REQUEST['listid'] + 0;

htdocs/lib2/logic/const.inc.php

Spacing +18 added lines, -18 removed lines

@@ -16,12 +16,12 @@ 
 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
@@ -31,13 +31,13 @@ 
 define('REGEX_FIRST_NAME', REGEX_LAST_NAME);
 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);
@@ -68,7 +68,7 @@ 
 define('USR_OPT_GMZOOM', 1);
 define('USR_OPT_SHOWSTATS', 5);
 define('USR_OPT_MAP_MENU', 6);
-define('USR_OPT_MAP_OVERVIEW', 7);   // obsolete, no longer supported since Google Maps 3.22
+define('USR_OPT_MAP_OVERVIEW', 7); // obsolete, no longer supported since Google Maps 3.22
 define('USR_OPT_MAP_MAXCACHES', 8);
 define('USR_OPT_MAP_ICONSET', 9);
 define('USR_OPT_MAP_PREVIEW', 10);
@@ -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);

htdocs/config2/locale.inc.php

Spacing +6 added lines, -6 removed lines

@@ -17,9 +17,9 @@ 
  *                 $opt['locale']
  ***************************************************************************/
 
-define('OC_LOCALE_ACTIVE', 2);    // enable language and show language button in header line
-define('OC_LOCALE_HIDDEN', 1);    // enable language but hide language button in header line
-define('OC_LOCALE_DISABLED', 0);  // disable language
+define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line
+define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line
+define('OC_LOCALE_DISABLED', 0); // disable language
 
 $opt['template']['locales']['DE']['status'] = OC_LOCALE_ACTIVE;
 $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png';
@@ -131,7 +131,7 @@ 
 $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
 $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/';
 $opt['locale']['DE']['mostly_translated'] = true;
-$opt['locale']['DE']['what3words'] = true;  // "beta"
+$opt['locale']['DE']['what3words'] = true; // "beta"
 
 $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';
 $opt['locale']['IT']['format']['dm'] = '%d/%m';
@@ -233,7 +233,7 @@ 
 $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
 $opt['locale']['SV']['page']['subtitle2'] = '';
 $opt['locale']['SV']['mostly_translated'] = false;
-$opt['locale']['SV']['what3words'] = true;  // "beta"
+$opt['locale']['SV']['what3words'] = true; // "beta"
 
 $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y';
 $opt['locale']['NO']['format']['dm'] = '%d.%m.';
@@ -283,7 +283,7 @@ 
 $opt['locale']['RU']['country'] = 'RU';
 $opt['locale']['RU']['primary_lang_of'] = ['RU'];
 $opt['locale']['RU']['mostly_translated'] = false;
-$opt['locale']['RU']['what3words'] = true;   // "beta"
+$opt['locale']['RU']['what3words'] = true; // "beta"
 
 $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y';
 $opt['locale']['DA']['format']['dm'] = '%d.%m.';