Pronoun field and display (closes #44)

editprofile.php

@@ -30,9 +30,9 @@
     $checked5[$loguser['pagestyle']]='checked=1';
     $checked6[$loguser['pollstyle']]='checked=1';
     $sexlist="
-	$radio=sex value=0 $checked1[0]> Male   
+	$radio=sex value=0 $checked1[0]> <strong style='color: #". getnamecolor(0, $loguser['powerlevel'], false) ."'>Male</strong> &nbsp;&nbsp;
-	$radio=sex value=1 $checked1[1]> Female &nbsp;&nbsp;
+	$radio=sex value=1 $checked1[1]> <strong style='color: #". getnamecolor(1, $loguser['powerlevel'], false) ."'>Female</strong> &nbsp;&nbsp;
-	$radio=sex value=2 $checked1[2]> N/A";
+	$radio=sex value=2 $checked1[2]> <strong style='color: #". getnamecolor(2, $loguser['powerlevel'], false) ."'>Other / N/A</strong>";
 	if ($loguser['sex'] > 2)
 		$sexlist .= "$radio=sex value=$loguser[sex] checked style=\"display:none;\">";
 
@@ -128,8 +128,10 @@
 	 $tccell2l>$txta=signature ROWS=8 COLS=60 style='width: 100%;'>". htmlspecialchars($loguser['signature']) ."</TEXTAREA><tr>
 
 	 $tccellh colspan='2'>Personal information</td><tr>
-	 $tccell1><b>Gender:$descbr This determines your name color (for now).</td>
+     $tccell1><b>Gender/Name color:$descbr This mostly determines your name color.</td>
 	 $tccell2l>$sexlist<tr>
+     $tccell1><b>Pronouns:$descbr You can put your pronouns here (e.g. they/them, he/his, she/hers, etc).</td>
+	 $tccell2l>$inpt=pronouns VALUE=\"". htmlspecialchars($loguser['pronouns']) ."\" SIZE=40 MAXLENGTH=50><tr>
 <!--	 $tccell1><b>Also known as:$descbr If you go by an alternate alias (or are constantly subjected to name changes), enter it here.  It will be displayed in your profile if it doesn't match your current username.</td>
 	 $tccell2l>$inpt=aka VALUE=\"$loguser[aka]\" SIZE=25 MAXLENGTH=25><tr> -->
 	 $tccell1><b>Real name:$descbr Your real name (you can leave this blank).</td>
@@ -272,9 +274,9 @@
       `threadsperpage` = '$threadsperpage',
       `viewsig` = '$viewsig',
       `layout` = '$tlayout',
-      `moodurl` = '". $_POST['moodurl'] ."',".
+      `moodurl` = '". $_POST['moodurl'] ."',
-//      `posttool` = '$posttool',
+      `imood` = '$imood',
-     "`imood` = '$imood',
+      `pronouns` = '{$_POST['pronouns']}',
       `signsep` = '$signsep',
       `pagestyle` = '$pagestyle',
       `pollstyle` = '$pollstyle'

edituser.php

@@ -135,6 +135,7 @@
 
 				$hlft Personal information $hrgt
 				$lft Sex			$rgt$sexlist
+				$lft Pronouns		$rgt$inpt=pronouns VALUE=\"$user[pronouns]\" SIZE=40 MAXLENGTH=50>
 				$lft Real name		$rgt$inpt=realname VALUE=\"$user[realname]\" SIZE=40 MAXLENGTH=60>
 				$lft Location		$rgt$inpt=location VALUE=\"$user[location]\" SIZE=40 MAXLENGTH=60>
 				$lft Birthday		$rgt Month: $inpt=bmonth SIZE=2 MAXLENGTH=2 VALUE=$month> Day: $inpt=bday SIZE=2 MAXLENGTH=2 VALUE=$day> Year: $inpt=byear SIZE=4 MAXLENGTH=4 VALUE=$year>

lib/threadpost.php

@@ -15,7 +15,8 @@
 		$set['userlink'] = "<a name={$p}></a>{$userlink}";
 		$set['date']  = date($dateformat,$post['date']+$tzoff);
 
-		if($post['location']) { $set['location']="<br>From: {$post['location']}"; }
+		if($post['location']) { $set['location']="From: ". htmlspecialchars($post['location']); }
+		if($post['pronouns']) { $set['pronouns']="Pronouns: ". htmlspecialchars($post['pronouns']); }
 
 		if($post['picture'] || ($post['moodid'] && $post['moodurl'])){
 			$post['picture']  = str_replace('>','%3E',$post['picture']);

profile.php

@@ -211,6 +211,7 @@ $tblend
 <br>$tblstart
 	$tccellh colspan=2><center>Personal information<tr>
 	$tccell1l width=150><b>Real name</td>			$tccell2l>$user[realname]&nbsp;<tr>
+	$tccell1l width=150><b>Pronouns</td>			$tccell2l>". htmlspecialchars($user['pronouns']) ."&nbsp;<tr>
 	$tccell1l width=150><b>Location</td>			$tccell2l>$user[location]&nbsp;<tr>
 	$tccell1l width=150><b>Birthday</td>			$tccell2l>$birthday $age&nbsp;<tr>
 	$tccell1l width=150><b>User bio</td>			$tccell2l>". dofilters(doreplace2(doreplace($user['bio'], $user['posts'], (ctime()-$user['regdate'])/86400, $user['name']))) ."&nbsp;<tr>

tlayouts/regular.php

@@ -1,7 +1,7 @@
 <?php
 
 	function userfields(){
-		return 'posts,sex,powerlevel,birthday,aka,picture,moodurl,title,useranks,location,lastposttime,lastactivity,imood';
+		return 'posts,sex,powerlevel,birthday,aka,picture,moodurl,title,useranks,location,lastposttime,lastactivity,imood,pronouns';
 	}
 
 
@@ -75,12 +75,12 @@
 
 		$sidebars	= array(1, 3, 19, 89, 387, 45, 92, 47);
 
-		$sidebars	= array(1, 19, 89, 387, 45, 92, 47, 1420, 1090, 2100, 2069);
+		$sidebars	= array(19, 89, 387, 45, 92, 47, 1420, 1090, 2100, 2069);
 
 		// Large block of user-specific hacks follows //
 
 
-	if ($post['uid'] == 1 && !$x_hacks['host'] && true) {
+	if (false && $post['uid'] == 1 && !$x_hacks['host'] && true) {
 
 		global $numdir;
 		$numdir_	= $numdir;
@@ -246,7 +246,11 @@
 	  $set[userpic]<br>
 	  ". (filter_bool($hacks['noposts']) ? "" : "$poststext$postnum$posttotal<br>") ."
 	  $experience<br><br>
-	  $since<br>".str_ireplace("&lt;br&gt;", "<br>", substr(htmlspecialchars($set['location']),10))."<br><br>
+	  $since<br>
+	  ". (isset($set['pronouns']) ? "<br>".$set['pronouns'] : "")."
+	  ". (isset($set['location']) ? "<br>".$set['location'] : "")."
+	  <br>
+	  <br>
 	  $sincelastpost<br>$lastactivity<br>
 	  </font>
 	  <br><img src=images/_.gif width=200 height=1>