From 9b27fd714bd5db5ca84ec1bd019c7614441f504b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 25 Aug 2008 15:58:14 +0000 Subject: [PATCH] - Long variables $HTTP_x_VARS rewritten to short $_x - Tabs removed in .htaccess files - Typo fixed (thx 2 monakoianar) - Checking for updates fixed --- DOCS/de/rewrite/.htaccess | 10 ++--- inc/functions.php | 14 ++++++- inc/modules/admin/what-updates.php | 63 ++++++++++------------------ sponsor_confirm.php | 19 ++++----- sponsor_ref.php | 20 ++++----- templates/de/html/ext/ext_rallye.tpl | 2 +- 6 files changed, 56 insertions(+), 72 deletions(-) diff --git a/DOCS/de/rewrite/.htaccess b/DOCS/de/rewrite/.htaccess index 114ce6623f..b5b7925479 100644 --- a/DOCS/de/rewrite/.htaccess +++ b/DOCS/de/rewrite/.htaccess @@ -1,5 +1,5 @@ -RewriteEngine On - -RewriteRule ^cms/(.*)/wht/(.*)$ modules.php?module=$1&what=$2 [L] -RewriteRule ^cms/(.*)/act/(.*)$ modules.php?module=$1&action=$2 [L] -RewriteRule ^cms/(.*)$ modules.php?module=$1 [L] +RewriteEngine On + +RewriteRule ^cms/(.*)/wht/(.*)$ modules.php?module=$1&what=$2 [L] +RewriteRule ^cms/(.*)/act/(.*)$ modules.php?module=$1&action=$2 [L] +RewriteRule ^cms/(.*)$ modules.php?module=$1 [L] diff --git a/inc/functions.php b/inc/functions.php index d1dffd29b9..c59093bd50 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1646,8 +1646,10 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) { // function MXCHANGE_OPEN ($script) { + //* DEBUG */ print("SCRIPT=".$script."
\n"); // Compile the script name $script = COMPILE_CODE($script); + //* DEBUG */ print("SCRIPT=".$script."
\n"); // Use default SERVER_URL by default... ;) So? $url = SERVER_URL; @@ -1664,10 +1666,20 @@ function MXCHANGE_OPEN ($script) { if (ereg("/", $host)) $host = substr($host, 0, strpos($host, "/")); // Generate relative URL - $script = substr($script, (strlen($url) + 7)); + //* DEBUG */ print("SCRIPT=".$script."
\n"); + if (substr(strtolower($script), 0, 7) == "http://") { + // But only if http:// is in front! + $script = substr($script, (strlen($url) + 7)); + } elseif (substr(strtolower($script), 0, 8) == "https://") { + // Does this work?! + $script = substr($script, (strlen($url) + 8)); + } + + //* DEBUG */ print("SCRIPT=".$script."
\n"); if (substr($script, 0, 1) == "/") $script = substr($script, 1); // Open connection + //* DEBUG */ die("SCRIPT=".$script."
\n"); $fp = @fsockopen($host, 80, $errno, $errdesc, 30); if (!$fp) { // Failed! diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index c2c31ac2eb..a2d5dbc462 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -32,11 +32,11 @@ ************************************************************************/ // Some security stuff... -if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) -{ +if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } + // Add description as navigation point ADD_DESCR("admin", basename(__FILE__)); @@ -45,30 +45,25 @@ $ONLINE['code'] = "???"; // Get response from our server in an array $response = MXCHANGE_OPEN("check-updates2.php"); -if (empty($response[0]) && empty($response[1]) && empty($response[2])) -{ + +if (empty($response[0]) && empty($response[1]) && empty($response[2])) { // Error! $response = array("", "", ""); -} - else -{ +} else { // Analyse header for response code - if (ereg("200 OK", $response[0])) - { + if (ereg("200 OK", $response[0])) { // Found, kill header $pos = 0; - foreach($response as $k=>$v) - { + foreach($response as $k => $v) { $v = trim($v); - if (empty($v)) - { + if (empty($v)) { // Header ends here (+1) $pos = $k + 1; break; } } + $response2 = array(); - for($i = $pos; $i < count($response); $i++) - { + for($i = $pos; $i < count($response); $i++) { $response2[] = trim($response[$i]); } $response = $response2; unset($response2); @@ -87,27 +82,23 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2])) 'ctime' => array() ); - if (($response[2] != "[EOF]") && ($ONLINE['version'] == FULL_VERSION)) - { + if (($response[2] != "[EOF]") && ($ONLINE['version'] == FULL_VERSION)) { // We have found new patches (newer than FULL_VERSION) $max = str_replace("\n", "", $response[sizeof($response) - 2]); $TOTAL_SIZE = "0"; // Maximum of available pacthes extracted (above). Now we can get all informations - for ($idx = 0; $idx < $max; $idx++) - { + for ($idx = 0; $idx < $max; $idx++) { // List only newer patches $TEST = substr(str_replace("\n", "", $response[$idx * 5 + 2]), 0, strlen($_CONFIG['patch_level'])); // I have removed the addional test for the stored timemark in database or you cannot find // new updates on my server when you haven't installed it before I upload a patch... :-( - if (bigintval($TEST) > bigintval($_CONFIG['patch_level'])) - { + if (bigintval($TEST) > bigintval($_CONFIG['patch_level'])) { // Copy every data from the response array $PATCHES['fname'][] = str_replace("\n", "", $response[$idx * 5 + 2]); $PATCHES['fsize'][] = str_replace("\n", "", $response[$idx * 5 + 3]); $PATCHES['ctime'][] = str_replace("\n", "", $response[$idx * 5 + 4]); - switch (GET_LANGUAGE()) - { + switch (GET_LANGUAGE()) { case "de": $PATCHES['descr'][] = str_replace("\n", "", $response[$idx * 5 + 5]); break; // Load german description default : $PATCHES['descr'][] = str_replace("\n", "", $response[$idx * 5 + 6]); break; // Load english description as default } @@ -116,41 +107,33 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2])) $TOTAL_SIZE += $PATCHES['fsize'][$idx]; } } + array_pk_sort($PATCHES, array("ctime", "fname")); // All done here! $ONLINE['code'] = "200 OK"; } - } - else - { + } else { // 404 / 403 error from server $ONLINE['code'] = $response[0]; } } -OPEN_TABLE("100%", "admin_content", "center"); // Is a newer version available? -if (empty($ONLINE['version'])) -{ +if (empty($ONLINE['version'])) { // Disconnected? LOAD_TEMPLATE("admin_settings_saved", false, "".ADMIN_CANNOT_CHECK_VERSION." (".$ONLINE['code'].")"); -} - elseif ($ONLINE['version'] != FULL_VERSION) -{ +} elseif ($ONLINE['version'] != FULL_VERSION) { // New full-version available (all previous released patches are included in this version!) define('__ONLINE_VERSION', $ONLINE['version']); define('__ONLINE_CHANGE' , MAKE_DATETIME($ONLINE['changed'], "2")); // Load template LOAD_TEMPLATE("admin_update_download"); -} - elseif (sizeof($PATCHES['fname']) > 0) -{ +} elseif (sizeof($PATCHES['fname']) > 0) { // Some patches are available $OUT = ""; $SW = "2"; - foreach ($PATCHES['fname'] as $idx=>$file) - { + foreach ($PATCHES['fname'] as $idx => $file) { $SIZE = TRANSLATE_COMMA(round($PATCHES['fsize'][$idx]/102.4)/10); $content = array( 'sw' => $SW, @@ -175,12 +158,10 @@ if (empty($ONLINE['version'])) // Load main template LOAD_TEMPLATE("admin_patches"); -} - else -{ +} else { // You have the latest version! LOAD_TEMPLATE("admin_settings_saved", false, NO_UPDATES_AVAILABLE); } -CLOSE_TABLE(); + // ?> diff --git a/sponsor_confirm.php b/sponsor_confirm.php index 85cdfdde0b..85cbbf61c9 100644 --- a/sponsor_confirm.php +++ b/sponsor_confirm.php @@ -37,28 +37,25 @@ require_once("inc/libs/security_functions.php"); require ("inc/config.php"); // Is the script installed? -if (defined('mxchange_installed') && (mxchange_installed)) -{ +if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_installed'))) { // Base URL for redirection $URL = URL."/modules.php?module=index&what=sponsor_login&hash="; - if (empty($HTTP_GET_VARS['hash'])) - { + if (empty($_GET['hash'])) { // No refid and we add our refid (don't forget to set $def_refid!) $URL = URL."/modules.php?module=index"; - } - else - { + } else { // We have an refid here. So we simply add it - $URL .= $HTTP_GET_VARS['hash']; + $URL .= SQL_ESCAPE($_GET['hash']); } + // Load the URL LOAD_URL($URL); // Redirection should be done here -} - else -{ + +} else { // You have to configure first! LOAD_URL(URL."/install.php"); } + // Really all done here... ;-) ?> diff --git a/sponsor_ref.php b/sponsor_ref.php index 101bbb1f5e..6f68a9ed59 100644 --- a/sponsor_ref.php +++ b/sponsor_ref.php @@ -37,23 +37,19 @@ require_once("inc/libs/security_functions.php"); require ("inc/config.php"); // Redirect only to registration page when this script is installed -if (defined('mxchange_installed') && (mxchange_installed)) -{ +if (defined('mxchange_installed') && (isBooleanConstantAndTrue(mxchange_installed))) { // Base URL for redirection $URL = URL."/modules.php?module=index&what=sponsor_reg&refid="; // Get referral ID from ref or refid variable $ref = 0; - if (!empty($HTTP_GET_VARS['ref'])) $ref = $HTTP_GET_VARS['ref']; - elseif (!empty($HTTP_GET_VARS['refid'])) $ref = $HTTP_GET_VARS['refid']; + if (!empty($_GET['ref'])) $ref = bigintval($_GET['ref']); + elseif (!empty($_GET['refid'])) $ref = bigintval($_GET['refid']); - if (!empty($ref)) - { + if (!empty($ref)) { // We have an refid here. So we simply add it $URL .= $ref; - } - else - { + } else { // No refid so we redirect to the index page $URL = URL."/index.php"; } @@ -62,12 +58,10 @@ if (defined('mxchange_installed') && (mxchange_installed)) LOAD_URL($URL); // Redirection should be done here -} - else -{ +} else { // You have to configure first! LOAD_URL(URL."/install.php"); } -// Really all done here... ;-) +// Really all done here... ;-) ?> diff --git a/templates/de/html/ext/ext_rallye.tpl b/templates/de/html/ext/ext_rallye.tpl index dc11b032d2..f98dfafa05 100644 --- a/templates/de/html/ext/ext_rallye.tpl +++ b/templates/de/html/ext/ext_rallye.tpl @@ -1,6 +1,6 @@ Starten Sie mit dieser Erweiterung vollautomatisierte Rallyes! Nun können Sie auch eine mindestens zu erreichende Mitgliederanzahl und -Minimum zu belegender Pläze angeben. Nur noch Einrichten und +Minimum zu belegender Plätze angeben. Nur noch Einrichten und Freigeben müssen Sie die Rallye. Den Rest erledigt das Script für Sie. Vorsicht! -- 2.39.5