From 5dfaf0ed80b30f53574a8866858d3e7cf05ce325 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 15 Feb 2008 21:29:05 +0000 Subject: [PATCH] stripslashes() removed from obsolete places --- inc/functions.php | 12 ++++++------ inc/modules/admin/what-chk_regs.php | 2 +- inc/modules/admin/what-config_email.php | 2 +- inc/modules/admin/what-edit_emails.php | 6 +++--- inc/modules/admin/what-extensions.php | 2 +- inc/modules/admin/what-list_norefs.php | 2 +- inc/modules/admin/what-list_user.php | 2 +- inc/modules/admin/what-lock_user.php | 12 ++++-------- inc/modules/admin/what-refbanner.php | 2 +- inc/modules/admin/what-send_newsletter.php | 2 +- inc/modules/admin/what-theme_check.php | 2 +- inc/mysql-manager.php | 2 +- 12 files changed, 22 insertions(+), 26 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 021edbe879..62c7b75a7f 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -101,7 +101,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) { // That's why you don't need any \n at the end of your HTML code... :-) if (_OB_CACHING == "on") { // Output into PHP's internal buffer - echo stripslashes($HTML); + echo $HTML; // That's why you don't need any \n at the end of your HTML code... :-) if ($NEW_LINE) echo "\n"; @@ -119,7 +119,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) { if ((!empty($OUTPUT)) && (_OB_CACHING != "on")) { echo $OUTPUT; $OUTPUT = ""; } // The same as above... ^ - echo stripslashes($HTML); + echo $HTML; if ($NEW_LINE) echo "\n"; break; @@ -146,7 +146,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) { } // Output code here, DO NOT REMOVE! ;-) - echo stripslashes($OUTPUT); + echo $OUTPUT; flush(); } elseif ((OUTPUT_MODE == "render") && (!empty($OUTPUT))) { // Rewrite links when rewrite extension is active @@ -161,7 +161,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) { } // Output code here, DO NOT REMOVE! ;-) - echo stripslashes($OUTPUT); + echo $OUTPUT; flush(); } } @@ -371,10 +371,10 @@ Message : ".$MSG." $TO = COMPILE_CODE($TO); // Send Mail away - SEND_RAW_EMAIL(stripslashes($TO), COMPILE_CODE($SUBJECT), stripslashes($MSG), $FROM); + SEND_RAW_EMAIL($TO, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM); } elseif ($HTML == 'N') { // Problem found! - SEND_RAW_EMAIL(WEBMASTER, COMPILE_CODE($SUBJECT), stripslashes($MSG), $FROM); + SEND_RAW_EMAIL(WEBMASTER, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM); } } diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php index 7f7df23637..bbdf02305a 100644 --- a/inc/modules/admin/what-chk_regs.php +++ b/inc/modules/admin/what-chk_regs.php @@ -58,7 +58,7 @@ if (SQL_NUMROWS($query) > 0) 'sex' => TRANSLATE_SEX($sex), 'sname' => $sname, 'fname' => $fname, - 'email' => "".stripslashes($email)."", + 'email' => "".$email."", 'ip' => $IP, 'ref' => $ref, 'hash' => $hash, diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php index e87d58d233..23ac9fe670 100644 --- a/inc/modules/admin/what-config_email.php +++ b/inc/modules/admin/what-config_email.php @@ -51,7 +51,7 @@ if (isset($_POST['add_max'])) { // Add this value (including comment) $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_max_receive (value, comment) VALUES ('%s', '%s')", - array(bigintval($_POST['max']), stripslashes($_POST['comment'])),__FILE__, __LINE__); + array(bigintval($_POST['max']), $_POST['comment']),__FILE__, __LINE__); $content = "".MAX_VALUE_SAVED.""; } else diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php index bf98dad7c0..431c518819 100644 --- a/inc/modules/admin/what-edit_emails.php +++ b/inc/modules/admin/what-edit_emails.php @@ -59,9 +59,9 @@ if (SQL_NUMROWS($result) > 0) list($subj, $text, $url) = SQL_FETCHROW($result); SQL_FREERESULT($result); define('__ID_VALUE' , $_POST['id']); - define('__URL_VALUE' , stripslashes($url)); - define('__SUBJ_VALUE', stripslashes($subj)); - define('__TEXT_VALUE', stripslashes($text)); + define('__URL_VALUE' , $url); + define('__SUBJ_VALUE', $subj); + define('__TEXT_VALUE', $text); // Load template LOAD_TEMPLATE("admin_edit_email"); diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index bfad063c37..bd283a93da 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -422,7 +422,7 @@ case "search": // Search for new extensions on our server 'link' => $LINK, 'last' => MAKE_DATETIME($EXT_SEARCH['fctime'][$id], "2"), 'size' => TRANSLATE_COMMA(round($EXT_SEARCH['fsize'][$id] / 1.024) / 1000), - 'info' => stripslashes($EXT_SEARCH['infos'][$id]), + 'info' => $EXT_SEARCH['infos'][$id], ); // Load row template add current size to total size and switch color diff --git a/inc/modules/admin/what-list_norefs.php b/inc/modules/admin/what-list_norefs.php index 313ccfc248..e034b3bf50 100644 --- a/inc/modules/admin/what-list_norefs.php +++ b/inc/modules/admin/what-list_norefs.php @@ -130,7 +130,7 @@ if (SQL_NUMROWS($result_master) > 0) 'sex' => TRANSLATE_SEX($sex), 'sname' => $sname, 'fname' => $fname, - 'email' => "".stripslashes($email)."", + 'email' => "".$email."", 'addr' => $IP, 'ref' => $ref, 'status' => TRANSLATE_STATUS($status), diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 0ab0267cdb..f964aef935 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -214,7 +214,7 @@ WHERE userid=%d LIMIT 1", 'sex' => TRANSLATE_SEX($sex), 'sname' => $sname, 'fname' => $fname, - 'email' => "".stripslashes($email)."", + 'email' => "".$email."", 'addr' => $IP, 'ref' => $ref, 'status' => TRANSLATE_STATUS($status), diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index c257d797f6..021adfaf4b 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -56,16 +56,14 @@ if (!empty($_GET['u_id'])) { // Output selection form with all confirmed user accounts listed ADD_MEMBER_SELECTION_BOX(); - } - elseif (!empty($_POST['lock'])) - { + } elseif (!empty($_POST['lock'])) { // Ok, lock the account! $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='LOCKED' WHERE userid=%d LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__); if (SQL_AFFECTEDROWS($link, __FILE__, __LINE__) == 1) { // Send an email to the user! In later version you can optionally switch this feature off - $msg = LOAD_EMAIL_TEMPLATE("lock-user", stripslashes($_POST['reason']), $_GET['u_id']); + $msg = LOAD_EMAIL_TEMPLATE("lock-user", $_POST['reason'], bigintval($_GET['u_id'])); // Send away... SEND_EMAIL($email, ADMIN_LOCKED_SUBJ, $msg); @@ -74,16 +72,14 @@ if (!empty($_GET['u_id'])) // Prepare message $MSG = USER_ACCOUNT_LOCKED_1.$_GET['u_id'].USER_ACCOUNT_LOCKED_2; $ACT = true; - } - elseif (!empty($_POST['unlock'])) - { + } elseif (!empty($_POST['unlock'])) { // Ok, unlock the account! $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='CONFIRMED' WHERE userid=%d LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__); if (SQL_AFFECTEDROWS($link, __FILE__, __LINE__) == 1) { // Send an email to the user! In later version you can optionally switch this feature off - $msg = LOAD_EMAIL_TEMPLATE("unlock-user", stripslashes($_POST['reason']), $_GET['u_id']); + $msg = LOAD_EMAIL_TEMPLATE("unlock-user", $_POST['reason'], bigintval($_GET['u_id'])); // Send away... SEND_EMAIL($email, ADMIN_UNLOCKED_SUBJ, $msg); diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php index 9b0b8fa371..c52ab321cd 100644 --- a/inc/modules/admin/what-refbanner.php +++ b/inc/modules/admin/what-refbanner.php @@ -83,7 +83,7 @@ VALUES ('%s', '%s', '%s')", // Update entry $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refbanner SET url='%s', alternate='%s', visible='%s' WHERE id=%d LIMIT 1", - array(stripslashes($_POST['url'][$id]), $_POST['alternate'][$id], $_POST['visible'], $id), __FILE__, __LINE__); + array($_POST['url'][$id], $_POST['alternate'][$id], $_POST['visible'], $id), __FILE__, __LINE__); } break; } diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php index 8f85d134b9..9a4377833f 100644 --- a/inc/modules/admin/what-send_newsletter.php +++ b/inc/modules/admin/what-send_newsletter.php @@ -65,7 +65,7 @@ if (isset($_POST['ok'])) } // Compile message - $_POST['text'] = stripslashes(COMPILE_CODE($_POST['text'])); + $_POST['text'] = COMPILE_CODE($_POST['text']); // Load template $msg = LOAD_EMAIL_TEMPLATE($template, $_POST['text'], $id); diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php index 83aac95704..04caa4616b 100644 --- a/inc/modules/admin/what-theme_check.php +++ b/inc/modules/admin/what-theme_check.php @@ -139,7 +139,7 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))   - ".stripslashes($THEMES['infos'][$idx])." + ".$THEMES['infos'][$idx]." \n"; $TSIZE += $THEMES['fsize'][$idx]; diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index ad4a3bdb69..ac4ee4c582 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1451,7 +1451,7 @@ WHERE p.userid=%d", array(bigintval($uid)), __FILE__, __LINE__); } // Now a mail to the user and that's all... - $msg = LOAD_EMAIL_TEMPLATE("del-user", stripslashes($reason), $uid); + $msg = LOAD_EMAIL_TEMPLATE("del-user", $reason, $uid); SEND_EMAIL($uid, ADMIN_DEL_ACCOUNT, $msg); // Ok, delete the account! -- 2.30.2