| ... | ... |
@@ -46,7 +46,8 @@ function random_string ($charset_string, $length) |
| 46 | 46 |
$uid = isset($_REQUEST['uid']) ? $_REQUEST['uid'] : false; |
| 47 | 47 |
if(!$uid) $uid = USERUID; |
| 48 | 48 |
|
| 49 |
- if((!isADMIN || uLEVEL > 2) && $uid != USERUID && $action == "editbio") $output .= write_error(_NOTAUTHORIZED); |
|
| 49 |
+ if($uid && !isNumber($uid)) accessDenied( ); |
|
| 50 |
+ if((!isADMIN || uLEVEL > 2) && $uid != USERUID && $action == "editbio") accessDenied( ); |
|
| 50 | 51 |
if(isMEMBER) $output .= "<div id=\"pagetitle\">"._EDITPERSONAL."</div>"; |
| 51 | 52 |
else $output .= "<div id=\"pagetitle\">"._NEWACCOUNT."</div>"; |
| 52 | 53 |
if(!empty($_POST['submit'])) {
|
| ... | ... |
@@ -164,7 +165,7 @@ function random_string ($charset_string, $length) |
| 164 | 165 |
$output .= write_message(_PENNAMEINUSE." "._TRYAGAIN); |
| 165 | 166 |
} |
| 166 | 167 |
else {
|
| 167 |
- dbquery("UPDATE "._AUTHORTABLE." SET penname = '".escapestring($penname)."' WHERE uid = '$_POST[uid]'");
|
|
| 168 |
+ dbquery("UPDATE "._AUTHORTABLE." SET penname = '".escapestring($penname)."' WHERE uid = '$uid'");
|
|
| 168 | 169 |
if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_NEWPEN, USERPENNAME, USERUID, $_POST['oldpenname'], $uid, $penname))."', '".USERUID."', INET6_ATON('".$_SERVER['REMOTE_ADDR']."'), 'EB', " . time() . ")");
|
| 169 | 170 |
} |
| 170 | 171 |
} |
| ... | ... |
@@ -207,8 +208,8 @@ function random_string ($charset_string, $length) |
| 207 | 208 |
else if(isset($user)) $output .= " ".$user['penname']; |
| 208 | 209 |
|
| 209 | 210 |
$output .= "</div> |
| 210 |
- <div><label for='realname'>"._REALNAME.": </label><INPUT type=\"text\" class=\"textbox=\" name=\"realname\" maxlength=\"200\" value=\"".(isset($user) ? $user['realname'] : "")."\"></div> |
|
| 211 |
- <div><label for='email'>"._EMAIL.":</label><INPUT type=\"text\" class=\"textbox=\" name=\"email\" value=\"".(isset($user) ? $user['email'] : "")."\" maxlength=\"200\" size=\"35\"><font color=\"red\">*</font></div> |
|
| 211 |
+ <div><label for='realname'>"._REALNAME.": </label><INPUT type=\"text\" class=\"textbox=\" name=\"realname\" maxlength=\"200\" value=\"".(isset($user) ? htmlspecialchars($user['realname'], ENT_QUOTES) : "")."\"></div> |
|
| 212 |
+ <div><label for='email'>"._EMAIL.":</label><INPUT type=\"text\" class=\"textbox=\" name=\"email\" value=\"".(isset($user) ? htmlspecialchars($user['email'], ENT_QUOTES) : "")."\" maxlength=\"200\" size=\"35\"><font color=\"red\">*</font></div> |
|
| 212 | 213 |
<div><label for='bio'>"._BIO.":</label></div> |
| 213 | 214 |
<div style='width: 450px; margin: 0 auto;'> |
| 214 | 215 |
<textarea class=\"textbox\" name=\"bio\" cols=\"50\" rows=\"6\">".(isset($user['bio']) ? stripslashes($user['bio']) : "")."</TEXTAREA></div>"; |
| ... | ... |
@@ -25,7 +25,7 @@ |
| 25 | 25 |
if(!defined("_CHARSET")) exit( );
|
| 26 | 26 |
// Get session variables from cookie data if not logged in. |
| 27 | 27 |
// 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. |
| 28 |
-if (!empty($_COOKIE[$sitekey."_useruid"])) {
|
|
| 28 |
+if (!empty($_COOKIE[$sitekey."_useruid"]) && isNumber($_COOKIE[$sitekey."_useruid"])) {
|
|
| 29 | 29 |
$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"]."'"));
|
| 30 | 30 |
if($userdata && $userdata['level'] != -1 && $_COOKIE[$sitekey.'_salt'] == md5($userdata['email'] . $userdata['password'])) {
|
| 31 | 31 |
define("USERUID", $userdata['uid']);
|
| ... | ... |
@@ -66,4 +66,4 @@ if(!defined("isMEMBER")) define("isMEMBER", false);
|
| 66 | 66 |
if(!defined("isADMIN")) define("isADMIN", false);
|
| 67 | 67 |
if(empty($siteskin)) $siteskin = $defaultskin; |
| 68 | 68 |
|
| 69 |
-?> |
|
| 70 | 69 |
\ No newline at end of file |
| 70 |
+?> |
| ... | ... |
@@ -66,10 +66,15 @@ |
| 66 | 66 |
} |
| 67 | 67 |
if($passwd['password'] == $encryptedpassword) {
|
| 68 | 68 |
if(isset($_POST['cookiecheck'])) {
|
| 69 |
- setcookie($sitekey."_useruid",$passwd['uid'], time()+60*60*24*30, "/"); |
|
| 70 |
- setcookie($sitekey."_salt", md5($passwd['email'] . $encryptedpassword), time()+60*60*24*30, "/"); |
|
| 69 |
+ setcookie($sitekey."_useruid", $passwd['uid'], array('expires' => time()+60*60*24*30, 'path' => "/", 'httponly' => true, 'samesite' => 'Lax'));
|
|
| 70 |
+ setcookie($sitekey."_salt", md5($passwd['email'].$encryptedpassword), array('expires' => time()+60*60*24*30, 'path' => "/", 'httponly' => true, 'samesite' => 'Lax'));
|
|
| 71 | 71 |
} |
| 72 |
- if(!isset($_SESSION)) session_start( ); |
|
| 72 |
+ if(!isset($_SESSION)) {
|
|
| 73 |
+ ini_set('session.cookie_httponly', '1');
|
|
| 74 |
+ ini_set('session.cookie_samesite', 'Lax');
|
|
| 75 |
+ session_start( ); |
|
| 76 |
+ } |
|
| 77 |
+ session_regenerate_id(true); |
|
| 73 | 78 |
$_SESSION[$sitekey."_useruid"] = $passwd['uid']; |
| 74 | 79 |
$_SESSION[$sitekey."_salt"] = md5($passwd['email'] . $encryptedpassword); |
| 75 | 80 |
$logincode = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'login'");
|
| ... | ... |
@@ -29,24 +29,24 @@ $tpl->newBlock("profile");
|
| 29 | 29 |
$result2 = dbquery("SELECT *, date as date FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '$uid' LIMIT 1");
|
| 30 | 30 |
$userinfo = dbassoc($result2); |
| 31 | 31 |
$nameinfo = ""; |
| 32 |
-if($userinfo['email']) |
|
| 32 |
+if(isset($userinfo['email'])) |
|
| 33 | 33 |
$nameinfo .= " [<a href=\"viewuser.php?action=contact&uid=".$userinfo['uid']."\">"._CONTACT."</a>]"; |
| 34 |
-if(!empty($favorites) && isMEMBER && $userinfo['uid'] != USERUID) {
|
|
| 35 |
- $fav = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_favorites WHERE uid = '".USERUID."' AND type = 'AU' AND item = '".$userinfo['uid']."'");
|
|
| 36 |
- if(dbnumrows($fav) == 0) $nameinfo .= " [<a href=\"user.php?action=favau&uid=".USERUID."&add=".$userinfo['uid']."\">"._ADDAUTHOR2FAVES."</a>]"; |
|
| 34 |
+if(!empty($favorites) && isMEMBER && isset($userinfo['uid']) != USERUID) {
|
|
| 35 |
+ $fav = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_favorites WHERE uid = '".USERUID."' AND type = 'AU' AND item = '".(isset($userinfo['uid']))."'");
|
|
| 36 |
+ if(dbnumrows($fav) == 0) $nameinfo .= " [<a href=\"user.php?action=favau&uid=".USERUID."&add=".(isset($userinfo['uid']))."\">"._ADDAUTHOR2FAVES."</a>]"; |
|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 |
-$tpl->assign("userpenname", $userinfo['penname']." ".$nameinfo);
|
|
| 40 |
-$tpl->assign("membersince", date("$dateformat", $userinfo['date']));
|
|
| 39 |
+$tpl->assign("userpenname", ($userinfo['penname'] ?? null)." ".$nameinfo);
|
|
| 40 |
+$tpl->assign("membersince", date("$dateformat", ($userinfo['date'] ?? null)));
|
|
| 41 | 41 |
|
| 42 |
-if($userinfo['realname']) |
|
| 42 |
+if(isset($userinfo['realname'])) |
|
| 43 | 43 |
$tpl->assign("realname", $userinfo['realname']);
|
| 44 |
-if($userinfo['bio']) {
|
|
| 44 |
+if(isset($userinfo['bio'])) {
|
|
| 45 | 45 |
$bio = nl2br($userinfo['bio']); |
| 46 | 46 |
$tpl->assign("bio", stripslashes($bio));
|
| 47 | 47 |
} |
| 48 |
-if($userinfo['image']) |
|
| 49 |
- $tpl->assign("image", "<img src=\"".$userinfo['image']."\">");
|
|
| 48 |
+if(isset($userinfo['image'])) |
|
| 49 |
+ $tpl->assign("image", "<img src=\"".htmlspecialchars($userinfo['image'], ENT_QUOTES)."\">");
|
|
| 50 | 50 |
|
| 51 | 51 |
$tpl->assign("userlevel", isset($userinfo['level']) && $userinfo['level'] > 0 && $userinfo['level'] < 4 ? _ADMINISTRATOR.(isADMIN ? " - ".$userinfo['level'] : "") : _MEMBER);
|
| 52 | 52 |
|
| ... | ... |
@@ -86,7 +86,7 @@ $tpl->assign("reportthis", "[<a href=\""._BASEDIR."contact.php?action=report&
|
| 86 | 86 |
$adminopts = ""; |
| 87 | 87 |
if(isADMIN && uLEVEL < 3) {
|
| 88 | 88 |
$adminopts .= "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> ".(isset($userinfo['validated']) && $userinfo['validated'] ? "[<a href=\"admin.php?action=members&revoke=$uid\" class=\"vuadmin\">"._REVOKEVAL."</a>] " : "[<a href=\"admin.php?action=members&validate=$uid\" class=\"vuadmin\">"._VALIDATE."</a>] ")."[<a href=\"user.php?action=editbio&uid=$uid\" class=\"vuadmin\">"._EDIT."</a>] [<a href=\"admin.php?action=members&delete=$uid\" class=\"vuadmin\">"._DELETE."</a>]"; |
| 89 |
- $adminopts .= " [<a href=\"admin.php?action=members&".($userinfo['level'] < 0 ? "unlock=".$userinfo['uid']."\" class=\"vuadmin\">"._UNLOCKMEM : "lock=".$userinfo['uid']."\" class=\"vuadmin\">"._LOCKMEM)."</a>]"; |
|
| 89 |
+ $adminopts .= " [<a href=\"admin.php?action=members&".(isset($userinfo['level']) < 0 ? "unlock=".($userinfo['uid'] ?? null)."\" class=\"vuadmin\">"._UNLOCKMEM : "lock=".($userinfo['uid'] ?? null)."\" class=\"vuadmin\">"._LOCKMEM)."</a>]"; |
|
| 90 | 90 |
$adminopts .= " [<a href=\"admin.php?action=admins&".(isset($userinfo['level']) && $userinfo['level'] > 0 ? "revoke=$uid\" class=\"vuadmin\">"._REVOKEADMIN."</a>] [<a href=\"admin.php?action=admins&do=edit&uid=$uid\" class=\"vuadmin\">"._EDITADMIN : "do=new&uid=$uid\" class=\"vuadmin\">"._MAKEADMIN)."</a>]</div>"; |
| 91 | 91 |
$tpl->assign("adminoptions", $adminopts);
|
| 92 | 92 |
} |
| ... | ... |
@@ -45,7 +45,8 @@ function random_string ($charset_string, $length) |
| 45 | 45 |
$uid = isset($_REQUEST['uid']) ? $_REQUEST['uid'] : false; |
| 46 | 46 |
if(!$uid) $uid = USERUID; |
| 47 | 47 |
|
| 48 |
- if((!isADMIN || uLEVEL > 2) && $uid != USERUID && $action == "editbio") $output .= write_error(_NOTAUTHORIZED); |
|
| 48 |
+ if($uid && !isNumber($uid)) accessDenied( ); |
|
| 49 |
+ if((!isADMIN || uLEVEL > 2) && $uid != USERUID && $action == "editbio") accessDenied( ); |
|
| 49 | 50 |
if(isMEMBER) $output .= "<div id=\"pagetitle\">"._EDITPERSONAL."</div>"; |
| 50 | 51 |
else $output .= "<div id=\"pagetitle\">"._NEWACCOUNT."</div>"; |
| 51 | 52 |
if(!empty($_POST['submit'])) {
|
| ... | ... |
@@ -203,8 +204,8 @@ function random_string ($charset_string, $length) |
| 203 | 204 |
$output .= "<INPUT name=\"newpenname\" type=\"text\" class=\"textbox\" maxlength=\"200\" value=\"".(isset($user) ? $user['penname'] : "")."\"><INPUT name=\"oldpenname\" type=\"hidden\" value=\"".(isset($user) ? $user['penname'] : "")."\"><font color=\"red\">*</font> "; |
| 204 | 205 |
else if(isset($user)) $output .= " ".$user['penname']; |
| 205 | 206 |
$output .= "</div> |
| 206 |
- <div><label for='realname'>"._REALNAME.": </label><INPUT type=\"text\" class=\"textbox=\" name=\"realname\" maxlength=\"200\" value=\"".(isset($user) ? $user['realname'] : "")."\"></div> |
|
| 207 |
- <div><label for='email'>"._EMAIL.":</label><INPUT type=\"text\" class=\"textbox=\" name=\"email\" value=\"".(isset($user) ? $user['email'] : "")."\" maxlength=\"200\" size=\"35\"><font color=\"red\">*</font></div> |
|
| 207 |
+ <div><label for='realname'>"._REALNAME.": </label><INPUT type=\"text\" class=\"textbox=\" name=\"realname\" maxlength=\"200\" value=\"".(isset($user) ? htmlspecialchars($user['realname'], ENT_QUOTES) : "")."\"></div> |
|
| 208 |
+ <div><label for='email'>"._EMAIL.":</label><INPUT type=\"text\" class=\"textbox=\" name=\"email\" value=\"".(isset($user) ? htmlspecialchars($user['email'], ENT_QUOTES) : "")."\" maxlength=\"200\" size=\"35\"><font color=\"red\">*</font></div> |
|
| 208 | 209 |
<div><label for='bio'>"._BIO.":</label></div> |
| 209 | 210 |
<div style='width: 450px; margin: 0 auto;'><textarea class=\"textbox\" name=\"bio\" cols=\"50\" rows=\"6\">".(isset($user) ? stripslashes($user['bio']) : "")."</TEXTAREA></div>"; |
| 210 | 211 |
/* The section adds fields to the form from the authorfields table to the authorinfo table allowing dynamic additions to the bio/registration page */ |
| ... | ... |
@@ -236,7 +237,7 @@ function random_string ($charset_string, $length) |
| 236 | 237 |
<div><label for='password2'>"._PASSWORD2.":</label> <INPUT name=\"password2\" class=\"textbox=\" value=\"\" type=\"password\">".($action == "register" ? "<font color=\"red\">*</font>" : "")."</div>"; |
| 237 | 238 |
if(!empty($captcha) && $action == "register") $output .= "<div><label for='userdigit'>"._CAPTCHANOTE."</label><input MAXLENGTH=5 SIZE=5 name=\"userdigit\" type=\"text\" value=\"\"><div style='text-align: center;'><img width=120 height=30 src=\""._BASEDIR."includes/button.php\" style=\"border: 1px solid #111;\"></div></div>"; |
| 238 | 239 |
$output .= "<div style='text-align: center; margin: 1em;'><INPUT type=\"hidden\" name=\"uid\" value=\"".(isset($user) ? $user['uid'] : "")."\"><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\">"; |
| 239 |
- if(!isADMIN) |
|
| 240 |
+ if(!isADMIN && $action != "register") |
|
| 240 | 241 |
{
|
| 241 | 242 |
$output .= " [<a href=\"admin.php?action=members&delete=$uid\">"._DELETE."</a>]"; |
| 242 | 243 |
} |