@@ -28,7 +28,7 @@ |
||
| 28 | 28 | } |
| 29 | 29 | sql_free_result($rs); |
| 30 | 30 | |
| 31 | - $this->cleanup_slave(- 1); |
|
| 31 | + $this->cleanup_slave(-1); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function cleanup_slave($slaveId) |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | $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>'; |
| 142 | 142 | $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/'; |
| 143 | 143 | $opt['locale']['DE']['mostly_translated'] = true; |
| 144 | -$opt['locale']['DE']['what3words'] = true; // "beta" |
|
| 144 | +$opt['locale']['DE']['what3words'] = true; // "beta" |
|
| 145 | 145 | |
| 146 | 146 | $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y'; |
| 147 | 147 | $opt['locale']['IT']['format']['dm'] = '%d/%m'; |
@@ -7,10 +7,10 @@ |
||
| 7 | 7 | * common constant definitions of lib1 and lib2 |
| 8 | 8 | ***************************************************************************/ |
| 9 | 9 | |
| 10 | -define('GUI_HTML', 0); // also defined in lib/consts.inc.php |
|
| 10 | +define('GUI_HTML', 0); // also defined in lib/consts.inc.php |
|
| 11 | 11 | define('GUI_TEXT', 1); |
| 12 | 12 | |
| 13 | -define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php |
|
| 13 | +define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php |
|
| 14 | 14 | define('HTTPS_ENABLED', 1); |
| 15 | 15 | define('HTTPS_ENFORCED', 2); |
| 16 | 16 | |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | // database names |
| 20 | 20 | $dbname = 'opencaching'; |
| 21 | -$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges |
|
| 21 | +$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges |
|
| 22 | 22 | |
| 23 | 23 | // common developer system settings |
| 24 | 24 | require 'settings-dev.inc.php'; |
@@ -16,14 +16,14 @@ |
||
| 16 | 16 | |
| 17 | 17 | public function push_pos(&$pos) |
| 18 | 18 | { |
| 19 | - $this->stack[count($this->stack)] =& $pos; |
|
| 20 | - $this->stack_ref =& $pos; |
|
| 19 | + $this->stack[count($this->stack)] = & $pos; |
|
| 20 | + $this->stack_ref = & $pos; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | public function pop_pos() |
| 24 | 24 | { |
| 25 | 25 | unset($this->stack[count($this->stack) - 1]); |
| 26 | - $this->stack_ref =& $this->stack[count($this->stack) - 1]; |
|
| 26 | + $this->stack_ref = & $this->stack[count($this->stack) - 1]; |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | public function parse($strInputXML) |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | * Unicode Reminder メモ |
| 6 | 6 | ***************************************************************************/ |
| 7 | 7 | |
| 8 | -require __DIR__ . '/lib2/web.inc.php'; |
|
| 8 | +require __DIR__.'/lib2/web.inc.php'; |
|
| 9 | 9 | |
| 10 | 10 | $tpl->name = 'adminuser'; |
| 11 | 11 | $tpl->menuitem = MNU_ADMIN_USER; |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | // send a new confirmation |
| 52 | 52 | $user->sendRegistrationCode(); |
| 53 | 53 | |
| 54 | - $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username=' . urlencode($user->getUsername())); |
|
| 54 | + $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username='.urlencode($user->getUsername())); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | function formAction() |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | $user->addEmailProblem($datalicense); |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - $tpl->redirect('adminuser.php?action=searchuser&username=' . urlencode($username) . |
|
| 101 | - '&success=' . ($disduelicense + $disable)); |
|
| 100 | + $tpl->redirect('adminuser.php?action=searchuser&username='.urlencode($username). |
|
| 101 | + '&success='.($disduelicense + $disable)); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | function searchUser() |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | ***************************************************************************/ |
| 7 | 7 | |
| 8 | 8 | $disable_verifyemail = true; |
| 9 | -require __DIR__ . '/lib2/web.inc.php'; |
|
| 9 | +require __DIR__.'/lib2/web.inc.php'; |
|
| 10 | 10 | |
| 11 | 11 | $tpl->name = 'login'; |
| 12 | 12 | $tpl->menuitem = MNU_LOGIN; |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $target = 'myhome.php'; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | -$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; // Ocprop |
|
| 31 | +$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; // Ocprop |
|
| 32 | 32 | |
| 33 | 33 | if ($action == 'cookieverify') { |
| 34 | 34 | // we should be logged in ... check if cookie is set ... |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $tpl->redirect($target); |
| 40 | 40 | } |
| 41 | 41 | } else { |
| 42 | - if (!isset($_COOKIE[$opt['session']['cookiename'] . 'data'])) { |
|
| 42 | + if (!isset($_COOKIE[$opt['session']['cookiename'].'data'])) { |
|
| 43 | 43 | $tpl->error(ERROR_NO_COOKIES); |
| 44 | 44 | } else { |
| 45 | 45 | $tpl->redirect($target); |
@@ -58,13 +58,13 @@ discard block |
||
| 58 | 58 | $tpl->error(ERROR_ALREADY_LOGGEDIN); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - $username = isset($_POST['email']) ? $_POST['email'] : ''; // Ocprop |
|
| 62 | - $password = isset($_POST['password']) ? $_POST['password'] : ''; // Ocprop |
|
| 61 | + $username = isset($_POST['email']) ? $_POST['email'] : ''; // Ocprop |
|
| 62 | + $password = isset($_POST['password']) ? $_POST['password'] : ''; // Ocprop |
|
| 63 | 63 | |
| 64 | 64 | $retval = $login->try_login($username, $password, null); |
| 65 | 65 | $password = ''; |
| 66 | 66 | if ($retval == LOGIN_OK) { |
| 67 | - $tpl->redirect('login.php?action=cookieverify&target=' . urlencode($target)); |
|
| 67 | + $tpl->redirect('login.php?action=cookieverify&target='.urlencode($target)); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $tpl->assign('username', $username); |
@@ -6,4 +6,4 @@ |
||
| 6 | 6 | ***************************************************************************/ |
| 7 | 7 | |
| 8 | 8 | $newlogs_rest = true; |
| 9 | -require __DIR__ . '/newlogs.php'; |
|
| 9 | +require __DIR__.'/newlogs.php'; |
|
@@ -5,9 +5,9 @@ discard block |
||
| 5 | 5 | * Unicode Reminder メモ |
| 6 | 6 | ****************************************************************************/ |
| 7 | 7 | |
| 8 | -require __DIR__ . '/lib2/web.inc.php'; |
|
| 9 | -require_once __DIR__ . '/lib2/logic/labels.inc.php'; |
|
| 10 | -require_once __DIR__ . '/lib2/logic/cache.class.php'; |
|
| 8 | +require __DIR__.'/lib2/web.inc.php'; |
|
| 9 | +require_once __DIR__.'/lib2/logic/labels.inc.php'; |
|
| 10 | +require_once __DIR__.'/lib2/logic/cache.class.php'; |
|
| 11 | 11 | |
| 12 | 12 | $tpl->name = 'garmin'; |
| 13 | 13 | $tpl->popup = 1; |
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | // be needed. |
| 31 | 31 | |
| 32 | 32 | if (($opt['lib']['garmin']['domain'] != $_SERVER['HTTP_HOST']) && !isset($_REQUEST['redirect'])) { |
| 33 | - $redirect = $opt['lib']['garmin']['page_url'] . 'garmin.php?redirect=1&cacheid=' . $cacheid; |
|
| 33 | + $redirect = $opt['lib']['garmin']['page_url'].'garmin.php?redirect=1&cacheid='.$cacheid; |
|
| 34 | 34 | if (isset($_REQUEST['templocale'])) { |
| 35 | - $redirect .= '&templocale=' . $_REQUEST['templocale']; |
|
| 35 | + $redirect .= '&templocale='.$_REQUEST['templocale']; |
|
| 36 | 36 | } |
| 37 | 37 | $tpl->redirect($redirect); |
| 38 | 38 | exit; |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | $tpl->assign('crypt', $bCrypt); |
| 53 | 53 | |
| 54 | 54 | if (isset($_REQUEST['desclang'])) { |
| 55 | - $sPreferedDescLang = $_REQUEST['desclang'] . ',' . $opt['template']['locale'] . ',EN'; |
|
| 55 | + $sPreferedDescLang = $_REQUEST['desclang'].','.$opt['template']['locale'].',EN'; |
|
| 56 | 56 | } else { |
| 57 | - $sPreferedDescLang = $opt['template']['locale'] . ',EN'; |
|
| 57 | + $sPreferedDescLang = $opt['template']['locale'].',EN'; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | //get cache record |