Merge pull request #21 from STJrInuyasha/master

fixes for random shit
This commit is contained in:
Alex (Xkeeper) 2016-01-29 17:58:39 -08:00
commit 88b1e13996
4 changed files with 33 additions and 6 deletions

View File

@ -101,11 +101,19 @@
print " print "
<br> <br>
$tblstart $tblstart
<FORM ACTION=edituser.php NAME=REPLIER METHOD=POST autocomplete=off> <FORM ACTION=edituser.php NAME=REPLIER METHOD=POST autocomplete=\"off\">
$hlft Login information $hrgt $hlft Login information $hrgt
$lft User name $rgt$inpt=username VALUE=\"$user[name]\" SIZE=25 MAXLENGTH=25 autocomplete=off> $lft User name $rgt$inpt=username VALUE=\"$user[name]\" SIZE=25 MAXLENGTH=25 autocomplete=\"off\">
$lft Also known as $rgt$inpt=aka VALUE=\"$user[aka]\" SIZE=25 MAXLENGTH=25 autocomplete=off> $lft Also known as $rgt$inpt=aka VALUE=\"$user[aka]\" SIZE=25 MAXLENGTH=25 autocomplete=\"off\">
$lft Password $rgt$inpp=password VALUE=\"\" SIZE=13 MAXLENGTH=64 autocomplete=off>
<!-- Hack around autocomplete, fake inputs (don't use these in the file)
Web browsers think they're smarter than the web designer, so they ignore demands to not use autocomplete.
This is STUPID AS FUCK when you're working on another user, and not YOURSELF. -->
<input style=\"display:none;\" type=\"text\" name=\"__f__usernm__\">
<input style=\"display:none;\" type=\"password\" name=\"__f__passwd__\">
$lft Password $rgt$inpp=password VALUE=\"\" SIZE=13 MAXLENGTH=64 autocomplete=\"new-password\">
$hlft Administrative bells and whistles $hrgt $hlft Administrative bells and whistles $hrgt
$lft Power level $rgt$levellist $lft Power level $rgt$levellist

View File

@ -7,8 +7,11 @@
// Awful old legacy thing. Too much code relies on register globals, // Awful old legacy thing. Too much code relies on register globals,
// and doesn't distinguish between _GET and _POST, so we have to do it here. fun // and doesn't distinguish between _GET and _POST, so we have to do it here. fun
$id = filter_int($_POST['id']) ? $_POST['id'] : filter_int($_GET['id']); $id = filter_int($_POST['id']);
if ($id === null)
$id = filter_int($_GET['id']);
if ($id === null)
$id = 0;
// Wait for the midnight backup to finish... // Wait for the midnight backup to finish...
if ((int)date("Gi") < 5) { if ((int)date("Gi") < 5) {
@ -402,6 +405,12 @@ function dotags($msg, $user, &$tags = array()) {
$tags = json_decode($tags, true); $tags = json_decode($tags, true);
} }
if (empty($tags) && empty($user)) {
// settags sent us here and we have nothing to go off of.
// Shrug our shoulders, and move on.
return $msg;
}
if (empty($tags)) { if (empty($tags)) {
$tags = array( $tags = array(
'/me ' => "*<b>". $user['username'] ."</b> ", '/me ' => "*<b>". $user['username'] ."</b> ",

View File

@ -111,6 +111,11 @@
$tccell1><b>{$passhint}</td> $tccell2l colspan=2> $tccell1><b>{$passhint}</td> $tccell2l colspan=2>
{$altloginjs} {$altloginjs}
<b>Username:</b> $inpt=username VALUE=\"".htmlspecialchars($username)."\" SIZE=25 MAXLENGTH=25 autocomplete=\"off\"> <b>Username:</b> $inpt=username VALUE=\"".htmlspecialchars($username)."\" SIZE=25 MAXLENGTH=25 autocomplete=\"off\">
<!-- Hack around autocomplete, fake inputs (don't use these in the file) -->
<input style=\"display:none;\" type=\"text\" name=\"__f__usernm__\">
<input style=\"display:none;\" type=\"password\" name=\"__f__passwd__\">
<b>Password:</b> $inpp=password SIZE=13 MAXLENGTH=64 autocomplete=\"off\"> <b>Password:</b> $inpp=password SIZE=13 MAXLENGTH=64 autocomplete=\"off\">
</span><tr> </span><tr>
$tccell1><b>Reply:</td> $tccell1><b>Reply:</td>

View File

@ -147,6 +147,11 @@
$tccell1><b>{$passhint}</td> $tccell2l colspan=2> $tccell1><b>{$passhint}</td> $tccell2l colspan=2>
{$altloginjs} {$altloginjs}
<b>Username:</b> $inpt=username VALUE=\"".htmlspecialchars($username)."\" SIZE=25 MAXLENGTH=25 autocomplete=\"off\"> <b>Username:</b> $inpt=username VALUE=\"".htmlspecialchars($username)."\" SIZE=25 MAXLENGTH=25 autocomplete=\"off\">
<!-- Hack around autocomplete, fake inputs (don't use these in the file) -->
<input style=\"display:none;\" type=\"text\" name=\"__f__usernm__\">
<input style=\"display:none;\" type=\"password\" name=\"__f__passwd__\">
<b>Password:</b> $inpp=password SIZE=13 MAXLENGTH=64 autocomplete=\"off\"> <b>Password:</b> $inpp=password SIZE=13 MAXLENGTH=64 autocomplete=\"off\">
</span><tr>"; </span><tr>";
print $form; print $form;