admin/backup.php, admin/backup_utf8.php, includes/get_session_vars.php: changes to database backup behavior - deprecations fix, revert encode in utf8 variant... also apparently get_session_vars fatals with the backup tools when using isNumber, so is_int is used instead
--- a/admin/backup.php
+++ b/admin/backup.php
@@ -28,8 +28,8 @@
$settingsresults = dbquery("SELECT * FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '$sitekey'");
$settings = dbassoc($settingsresults);
foreach($settings as $var => $val) {
- $$var = stripslashes($val);
- $settings[$var] = htmlspecialchars($val);
+ $$var = stripslashes(isset($val) ? $val : '');
+ $settings[$var] = htmlspecialchars(isset($val) ? $val : '');
}
if(!defined("SITEKEY")) define("SITEKEY", $settings['sitekey']);
unset($settings['sitekey']);
--- a/admin/backup_utf8.php
+++ b/admin/backup_utf8.php
@@ -30,8 +30,8 @@
$settingsresults = dbquery("SELECT * FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '$sitekey'");
$settings = dbassoc($settingsresults);
foreach($settings as $var => $val) {
- $$var = stripslashes($val);
- $settings[$var] = htmlspecialchars($val);
+ $$var = stripslashes(isset($val) ? $val : '');
+ $settings[$var] = htmlspecialchars(isset($val) ? $val : '');
}
if(!defined("SITEKEY")) define("SITEKEY", $settings['sitekey']);
unset($settings['sitekey']);
@@ -63,7 +63,8 @@
echo "INSERT INTO ".$table." ";
$row = array( );
foreach($t AS $field => $value) {
- $value = utf8_encode (escapestring($value) );
+ $value = escapestring($value);
+ $value = mb_convert_encoding($value, 'UTF-8');
$value = str_replace("\n","\\n",$value);
if (isset($value)) $row[$field] = "\"$value\"";
else $row[$field] = "\"\"";
--- a/includes/get_session_vars.php
+++ b/includes/get_session_vars.php
@@ -25,7 +25,7 @@
if(!defined("_CHARSET")) exit( );
// Get session variables from cookie data if not logged in.
// To bridge to another program replace (or add to) this information with the bridge to your other script. See examples in the includes/bridges/ folder.
-if (!empty($_COOKIE[$sitekey."_useruid"]) && isNumber($_COOKIE[$sitekey."_useruid"])) {
+if (!empty($_COOKIE[$sitekey."_useruid"]) && (is_int($_COOKIE[$sitekey."_useruid"]))) {
$userdata = dbassoc(dbquery("SELECT ap.*, "._UIDFIELD." as uid, "._PENNAMEFIELD." as penname, "._EMAILFIELD." as email, "._PASSWORDFIELD." as password FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '".$_COOKIE[$sitekey."_useruid"]."'"));
if($userdata && $userdata['level'] != -1 && $_COOKIE[$sitekey.'_salt'] == md5($userdata['email'] . $userdata['password'])) {
define("USERUID", $userdata['uid']);