From 94105795f6c6195c2630c09303c0aeb4ffbe15de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 14 Feb 2008 22:06:37 +0000 Subject: [PATCH] Obsolete function is_SQLwriteable() removed (never used) and code-cosmetics. --- inc/functions.php | 200 ++++++++++++++---------------------------- inc/header.php | 2 +- inc/language/de.php | 2 +- inc/mysql-connect.php | 61 +++++-------- 4 files changed, 88 insertions(+), 177 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index eb09c9b119..6594d72fb6 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -32,47 +32,34 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) -{ +if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Check if our config file is writeable or not -function is_INCWritable($inc) -{ +function is_INCWritable($inc) { $fp = @fopen(PATH."inc/".$inc.".php", 'a'); - if ($inc == "dummy") - { + if ($inc == "dummy") { // Remove dummy file @fclose($fp); return @unlink(PATH."inc/dummy.php"); - } - else - { + } else { // Close all other files return @fclose($fp); } } -// Check if we can write to an sql file -function is_SQLWriteable($sql) -{ - $fp = @fopen(PATH.$sql.".sql", 'a'); - return @fclose($fp); -} - // Open a table (you may want to add some header stuff here) -function OPEN_TABLE($PERCENT = "", $CLASS = "", $ALIGN="left", $VALIGN="", $td_only=false) -{ +function OPEN_TABLE($PERCENT = "", $CLASS = "", $ALIGN="left", $VALIGN="", $td_only=false) { global $table_cnt; // Count tables so we can generate CSS classes for every table... :-) - if (empty($CLASS)) - { + if (empty($CLASS)) { // Class is empty so count one up and create a class $table_cnt++; $CLASS = "class".$table_cnt; } $OUT = ""; OUTPUT_HTML($OUT); } + // Close a table (you may want to add some footer stuff here) -function CLOSE_TABLE($ADD="") -{ +function CLOSE_TABLE($ADD="") { OUTPUT_HTML(" "); if (!empty($ADD)) OUTPUT_HTML($ADD); @@ -112,16 +99,13 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) { { case "render": // That's why you don't need any \n at the end of your HTML code... :-) - if (_OB_CACHING == "on") - { + if (_OB_CACHING == "on") { // Output into PHP's internal buffer echo stripslashes($HTML); // That's why you don't need any \n at the end of your HTML code... :-) if ($NEW_LINE) echo "\n"; - } - else - { + } else { // Render mode for old or lame servers... $OUTPUT .= $HTML; @@ -196,8 +180,7 @@ function ADD_FATAL ($message, $extra="") } // Load a template file and return it's content (only it's name; do not use ' or ") -function LOAD_TEMPLATE($template, $return=false, $content="") -{ +function LOAD_TEMPLATE($template, $return=false, $content="") { // Add more variables which you want to use in your template files global $DATA, $username; $ACTION = SQL_ESCAPE($GLOBALS['action']); @@ -206,8 +189,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="") if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0; $REFID = $GLOBALS['refid']; - if ($template == "member_support_form") - { + if ($template == "member_support_form") { // Support request of a member $result = SQL_QUERY_ESC("SELECT sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__); @@ -224,42 +206,28 @@ function LOAD_TEMPLATE($template, $return=false, $content="") $MODE = ""; // Check for admin/guest/member templates - if (strpos($template, "admin_") > -1) - { + if (strpos($template, "admin_") > -1) { // Admin template found $MODE = "admin/"; - } - elseif (strpos($template, "guest_") > -1) - { + } elseif (strpos($template, "guest_") > -1) { // Guest template found $MODE = "guest/"; - } - elseif (strpos($template, "member_") > -1) - { + } elseif (strpos($template, "member_") > -1) { // Member template found $MODE = "member/"; - } - elseif (strpos($template, "install_") > -1) - { + } elseif (strpos($template, "install_") > -1) { // Installation template found $MODE = "install/"; - } - elseif (strpos($template, "ext_") > -1) - { + } elseif (strpos($template, "ext_") > -1) { // Extension template found $MODE = "ext/"; - } - elseif (strpos($template, "la_") > -1) - { + } elseif (strpos($template, "la_") > -1) { // "Logical-area" template found $MODE = "la/"; - } - else - { + } else { // Test for extension $test = substr($template, 0, strpos($template, "_")); - if (EXT_IS_ACTIVE($test)) - { + if (EXT_IS_ACTIVE($test)) { // Set extra path to extension's name $MODE = $test."/"; } @@ -270,8 +238,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="") //////////////////////// $file = $BASE.$MODE.$template.".tpl"; - if ((!empty($GLOBALS['what'])) && ((strpos($template, "_header") > 0) || (strpos($template, "_footer") > 0)) && (($MODE == "guest/") || ($MODE == "member/") || ($MODE == "admin/"))) - { + if ((!empty($GLOBALS['what'])) && ((strpos($template, "_header") > 0) || (strpos($template, "_footer") > 0)) && (($MODE == "guest/") || ($MODE == "member/") || ($MODE == "admin/"))) { // Select what depended header/footer template file for admin/guest/member area $file2 = sprintf("%s%s%s_%s.tpl", $BASE, @@ -288,15 +255,13 @@ function LOAD_TEMPLATE($template, $return=false, $content="") } // Does the special template exists? - if (!file_exists($file)) - { + if (!file_exists($file)) { // Reset to default template $file = $BASE.$template.".tpl"; } // Now does the final template exists? - if (file_exists($file)) - { + if (file_exists($file)) { // The local file does exists so we load it. :) $tmpl_file = implode("", file($file)); @@ -304,23 +269,18 @@ function LOAD_TEMPLATE($template, $return=false, $content="") while (strpos($tmpl_file, "\'") !== false) { $tmpl_file = str_replace("\'", "{QUOT}", $tmpl_file); } // Do we have to compile the code? - if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) - { + if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) { // Okay, compile it! $tmpl_file = "\$ret=\"".COMPILE_CODE(addslashes($tmpl_file))."\";"; eval($tmpl_file); - } - else - { + } else { // Simply return loaded code $ret = $tmpl_file; } // Add surrounding HTML comments to help finding bugs faster $ret = "\n".$ret."\n"; - } - elseif ((IS_ADMIN()) || ((mxchange_installing) && (!mxchange_installed))) - { + } elseif ((IS_ADMIN()) || ((mxchange_installing) && (!mxchange_installed))) { // Only admins shall see this warning or when installation mode is active $ret = "
".TEMPLATE_404."
(".basename($file).")
@@ -331,46 +291,37 @@ function LOAD_TEMPLATE($template, $return=false, $content="") 
".print_r($DATA, true)."


"; } - if (!empty($ret)) - { + + // Do we have some content to output or return? + if (!empty($ret)) { // Not empty so let's put it out! ;) - if ($return) - { + if ($return) { // Return the HTML code return $ret; - } - else - { + } else { // Output direct OUTPUT_HTML($ret); } - } - elseif (DEBUG_MODE) - { + } elseif (DEBUG_MODE) { // Warning, empty output! return "E:".$template."
\n"; } } // Send mail out to an email address -function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") -{ +function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") { // Compile subject line (for POINTS constant etc.) $eval = "\$SUBJECT = \"".COMPILE_CODE(addslashes($SUBJECT))."\";"; eval($eval); $SUBJECT = html_entity_decode($SUBJECT); // Set from header - if (!eregi("@", $TO)) - { + if (!eregi("@", $TO)) { // Value detected, load email from database - if (EXT_IS_ACTIVE("msg")) - { + if (EXT_IS_ACTIVE("msg")) { ADD_MESSAGE_TO_BOX($TO, $SUBJECT, $MSG, $HTML); return; - } - else - { + } else { $result_email = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__); list($TO) = SQL_FETCHROW($result_email); SQL_FREERESULT($result_email); @@ -398,8 +349,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") // Fix HTML parameter (default is no!) if (empty($HTML)) $HTML = 'N'; - if (DEBUG_MODE) - { + if (DEBUG_MODE) { // In debug mode we want to display the mail instead of sending it away so we can debug this part echo "
 ".htmlentities(trim($FROM))."
@@ -407,26 +357,21 @@ To      : ".$TO."
 Subject : ".$SUBJECT."
 Message : ".$MSG."
\n"; - } - elseif (($HTML == 'Y') && (EXT_IS_ACTIVE("html_mail", true))) - { + } elseif (($HTML == 'Y') && (EXT_IS_ACTIVE("html_mail", true))) { // Send mail as HTML away SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM); - } - elseif (!empty($TO)) - { + } elseif (!empty($TO)) { // Compile email $TO = COMPILE_CODE($TO); // Send Mail away SEND_RAW_EMAIL(stripslashes($TO), COMPILE_CODE($SUBJECT), stripslashes($MSG), $FROM); - } - elseif ($HTML == 'N') - { + } elseif ($HTML == 'N') { // Problem found! SEND_RAW_EMAIL(WEBMASTER, COMPILE_CODE($SUBJECT), stripslashes($MSG), $FROM); } } + // Check if legacy or PHPMailer command // @private function CHECK_PHPMAILER_USAGE() { @@ -536,71 +481,56 @@ function MAKE_DATETIME($time, $mode="0") } return $ret; } -// + +// Translates the american decimal dot into a german comma function TRANSLATE_COMMA($dotted, $cut=true) { global $CONFIG; // Default is 3 you can change this in admin area "Misc -> Misc Options" if (empty($CONFIG['max_comma'])) $CONFIG['max_comma'] = "3"; if (!ereg("\.", $dotted)) $dotted .= ".".str_repeat("0", $CONFIG['max_comma']); - if ($cut) - { + if ($cut) { // Remove trailing zeros $dot = str_replace(".", "x", $dotted); - while(substr($dot, -1, 1) == "0") - { + while(substr($dot, -1, 1) == "0") { $dot = substr($dot, 0, -1); } - if (substr($dot, -1, 1) == "x") - { + + if (substr($dot, -1, 1) == "x") { // Last char is the 'x' $dotted = substr($dot, 0, -1); - } - else - { + } else { // Last char is a number $dotted = str_replace("x", ".", $dot); } } - switch (GET_LANGUAGE()) - { + + // Translate it now + switch (GET_LANGUAGE()) { case "de": $pos = strpos($dotted, "."); - if ($pos > 0) - { - if ($cut) - { + if ($pos > 0) { + if ($cut) { // Cut x numbers behind comma $dotted = str_replace(".", ",", substr($dotted, 0, ($pos + $CONFIG['max_comma'] + 1))); - } - else - { + } else { // Replace comma with dot $dotted = str_replace(".", ",", $dotted); } - } - elseif (!$cut) - { - if (empty($pos)) - { + } elseif (!$cut) { + if (empty($pos)) { $dotted = "0,".str_repeat("0", $CONFIG['max_comma']); - } - else - { + } else { $dotted .= ",".str_repeat("0", $CONFIG['max_comma']); } } break; default: - if (!$cut) - { - if ($pos > 0) - { + if (!$cut) { + if ($pos > 0) { $dotted = substr($dotted, 0, ($pos + $CONFIG['max_comma'] + 1)); - } - else - { + } else { $dotted .= ".".str_repeat("0", $CONFIG['max_comma']); } } @@ -608,15 +538,15 @@ function TRANSLATE_COMMA($dotted, $cut=true) } return $dotted; } + // -function DEREFERER($URL) -{ +function DEREFERER($URL) { $URL = URL."/modules.php?module=loader&url=".urlencode(base64_encode(COMPILE_CODE($URL))); return $URL; } + // -function TRANSLATE_SEX($sex) -{ +function TRANSLATE_SEX($sex) { switch ($sex) { case "M": $ret = SEX_M; break; diff --git a/inc/header.php b/inc/header.php index 4f3f2a4e75..59a2f5b24d 100644 --- a/inc/header.php +++ b/inc/header.php @@ -49,7 +49,7 @@ if (($header != "1") && ($header != "2")) { $TITLE = ""; // Add title decorations? (left) - if ((!empty($CONFIG)) && (isset($link)) && (isset($db))) { + if ((count($CONFIG) > 1) && (is_resource($link)) && ($db) !== false) { if (($CONFIG['title_decoration'] == 'Y') && (trim(!empty($CONFIG['title_left'])))) $TITLE .= trim($CONFIG['title_left'])." "; $TITLE .= MAIN_TITLE; diff --git a/inc/language/de.php b/inc/language/de.php index 6201cc02c8..6bda938d21 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -178,7 +178,7 @@ define('MENU_IS_ACTIVE', "Menüpunkt ist aktiviert"); define('CREATE_ACTION_FIRST', "Bitte erstellen Sie zuerst die action-xxxxx.php Datei. Dann können Sie sie hier auswählen."); define('IS_FIRST_MENU', "Ist das erste Hauptmenü"); define('NO_DB_LINK', "Keine Verbindung zur Datenbank!"); -define('MYSQL_DATA_MISSING', "Etwas stimmt mit der MySQL-Konfiguration nicht!"); +define('MYSQL_DATA_MISSING', "Die Konfiguration Ihrer Datenbankverbindung ist unnvollständig. Bitte in inc/config.php mindestens den Hostnamen, Datenbanknamen und Login zur Datenbank eingeben."); define('REGISTER_PERSONAL_DATA', "Persönliche Daten"); define('REGISTER_CATEGORIES', "Interessengebiete"); define('REGISTER_MISC', "Passwort, maximale Mails pro Tag etc."); diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index ee79d2ebb9..d75d6dacc8 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -88,15 +88,17 @@ if ((!mxchange_installing) && (mxchange_installed)) require_once(PATH."inc/functions.php"); // Non-database functions require_once(PATH."inc/databases.php"); // Several hard-coded databases (arrays, constants) - if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) - { + if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) { // Connect to DB $link = SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__); - if ($link !== false) - { + + // Is the link valid? + if (is_resource($link)) { + // Choose the database $db = SQL_SELECT_DB($MySQL['dbase'], $link, __FILE__, __LINE__); - if ($db !== false) - { + + // Is it a valid resource? + if ($db === true) { // Load configuration stuff $result = SQL_QUERY("SELECT pass_len, points_register, points_ref, least_cats, check_double_email, check_double_pass, admin_notify, url_tlock, test_text, max_tlength, test_subj, autosend_active, max_send, url_blacklist, auto_purge, auto_purge_active, last_update, unconfirmed, profile_lock, online_timeout, mad_timestamp, mad_count, profile_update, send_prof_update, resend_profile_update, code_length, patch_level, patch_ctime, guest_stats, ref_payout, activate_xchange, order_multi_page, display_refid, ip_timeout, allow_direct_pay, config FROM "._MYSQL_PREFIX."_config WHERE config='0' LIMIT 1", __FILE__, __LINE__); @@ -118,8 +120,7 @@ if ((!mxchange_installing) && (mxchange_installed)) require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database // Run daily reset - if ((date("d", $CONFIG['last_update']) != date("d", time()) || (DEBUG_MODE == true)) && (!mxchange_installing) && (mxchange_installed) && (admin_registered) && (!isset($_GET['register'])) && ($CSS != 1)) - { + if ((date("d", $CONFIG['last_update']) != date("d", time()) || (DEBUG_MODE == true)) && (!mxchange_installing) && (mxchange_installed) && (admin_registered) && (!isset($_GET['register'])) && ($CSS != 1)) { // Do daily things in external PHP file but only when script is completely setup $INC_POOL[] = PATH."inc/reset/reset_daily.php"; @@ -140,21 +141,17 @@ if ((!mxchange_installing) && (mxchange_installed)) require_once(PATH."inc/session.php"); // Load admin include file if he is admin - if (IS_ADMIN()) - { + if (IS_ADMIN()) { // Administrative functions require_once(PATH."inc/modules/admin/admin-inc.php"); } // Get all values - if (($CSS != 1) && ($CSS != -1)) - { + if (($CSS != 1) && ($CSS != -1)) { if (empty($GLOBALS['module'])) $GLOBALS['module'] = "empty"; if (empty($GLOBALS['what'])) $GLOBALS['what'] = GET_WHAT($GLOBALS['module']); if (empty($GLOBALS['action'])) $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']); - } - else - { + } else { // Set action/what to empty $GLOBALS['action'] = ""; $GLOBALS['what'] = ""; @@ -174,21 +171,15 @@ if ((!mxchange_installing) && (mxchange_installed)) // Set default 'what' value //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n"; - if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) - { - if ($GLOBALS['module'] == "admin") - { + if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) { + if ($GLOBALS['module'] == "admin") { // Set 'action' value to 'login' in admin menu $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']); - } - elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) - { + } elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) { // Set 'what' value to 'welcome' in guest and member menu $GLOBALS['what'] = "welcome"; if (!empty($CONFIG['index_home'])) $GLOBALS['what'] = $CONFIG['index_home']; - } - else - { + } else { // Anything else like begging link $GLOBALS['what'] = ""; } @@ -203,9 +194,7 @@ if ((!mxchange_installing) && (mxchange_installed)) if ($dummy == "done") COUNT_MODULE($GLOBALS['module']); unset($dummy); if ($CONFIG['activate_xchange'] > 0) activateExchange(); - } - else - { + } else { // If you will read following error message you probably need to contact me (webmaster@mxchange.org) // and download the sql-upgrades extension from my server. Please ask me which SQL file(s) you need to // import *BEFORE* you import them! @@ -214,28 +203,20 @@ if ((!mxchange_installing) && (mxchange_installed)) // Free memory SQL_FREERESULT($result); - } - else - { + } else { // Wrong database? ADD_FATAL(WRONG_DB_SELECTED); } - } - else - { + } else { // No link to database! ADD_FATAL(NO_DB_LINK); $db = false; } - } - else - { + } else { // Maybe you forgot to enter your MySQL data? ADD_FATAL(MYSQL_DATA_MISSING); } -} - else -{ +} else { /////////////////////////////////////////////////// // Include neccessary functions for installation // /////////////////////////////////////////////////// -- 2.30.2