claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This patch make email address the user's username as requested in the TODO.

Browse Source 
query_users.php is modified even if we will drop it in the future to be sure it works everywhere.
This commit is contained in:
Jonathan Ernst
2005-01-10 22:54:04 +00:00
committed by WineHQ
parent 6b039f82ce
commit d9826427da
25 changed files with 85 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -37,7 +37,7 @@ To install locally for testing/hacking:
# An AppDB admin user has been automatically created while running # An AppDB admin user has been automatically created while running
the create_tables script the create_tables script
username: admin email: admin@localhost
password: testing password: testing
You should change the password as soon as possible! You should change the password as soon as possible!

2
TODO
View File

@@ -3,8 +3,6 @@ WineHQ Application Database TODO List
# incorporate templates into appdb to simplify code, Jeremy says we can # incorporate templates into appdb to simplify code, Jeremy says we can
borrow from lostwages(winehq.org/cvsweb/lostwages) for this borrow from lostwages(winehq.org/cvsweb/lostwages) for this
# make email address the users username
# check for existing email when user is creating a new account # check for existing email when user is creating a new account
# setup a cron job in a new /bin directory, put a deny all .htaccess # setup a cron job in a new /bin directory, put a deny all .htaccess

38
account.php
View File

@@ -76,16 +76,10 @@ function retry($cmd, $msg)
function cmd_do_new() function cmd_do_new()
{ {
if(ereg("^.+@.+\\..+$", $_POST['ext_username'])) if(!ereg("^.+@.+\\..+$", $_POST['ext_email']))
{ {
$_POST['ext_username'] = ""; $_POST['ext_email'] = "";
retry("new", "Invalid Username, must not contain special characters"); retry("new", "Invalid email address");
return;
}
if(strlen($_POST['ext_username']) < 3)
{
$_POST['ext_username'] = "";
retry("new", "Username must be at least 3 characters");
return; return;
} }
if(strlen($_POST['ext_password']) < 5) if(strlen($_POST['ext_password']) < 5)
@@ -103,28 +97,22 @@ function cmd_do_new()
retry("new", "You don't have a Real name?"); retry("new", "You don't have a Real name?");
return; return;
} }
if(!ereg("^.+@.+\\..+$", $_POST['ext_email']))
{
$_POST['ext_email'] = "";
retry("new", "Invalid email address");
return;
}
$user = new User(); $user = new User();
if($user->exists($_POST['ext_username'])) if($user->exists($_POST['ext_email']))
{ {
$_POST['ext_username'] = ""; $_POST['ext_email'] = "";
retry("new", "That username is already in use"); retry("new", "An account with this e-mail is already in use");
return; return;
} }
$result = $user->create($_POST['ext_username'], $_POST['ext_password'], $_POST['ext_realname'], $_POST['ext_email'], $_POST['CVSrelease'] ); $result = $user->create($_POST['ext_email'], $_POST['ext_password'], $_POST['ext_realname'], $_POST['CVSrelease'] );
if($result == null) if($result == null)
{ {
$user->login($_POST['ext_username'], $_POST['ext_password']); $user->login($_POST['ext_email'], $_POST['ext_password']);
addmsg("Account created! (".$_POST['ext_username'].")", "green"); addmsg("Account created! (".$_POST['ext_email'].")", "green");
redirect(apidb_fullurl()); redirect(apidb_fullurl());
} }
else else
@@ -139,7 +127,7 @@ function cmd_send_passwd()
{ {
$user = new User(); $user = new User();
$userid = $user->lookup_userid($_POST['ext_username']); $userid = $user->lookup_userid($_POST['ext_email']);
$passwd = generate_passwd(); $passwd = generate_passwd();
if ($userid) if ($userid)
@@ -169,7 +157,7 @@ function cmd_send_passwd()
} }
else else
{ {
addmsg("Sorry, that username (". urlencode($_POST['ext_username']) .") does not exist.", "red"); addmsg("Sorry, that user (". urlencode($_POST['ext_email']) .") does not exist.", "red");
} }
redirect(apidb_fullurl("account.php?cmd=login")); redirect(apidb_fullurl("account.php?cmd=login"));
@@ -182,12 +170,12 @@ function cmd_send_passwd()
function cmd_do_login() function cmd_do_login()
{ {
$user = new User(); $user = new User();
$result = $user->login($_POST['ext_username'], $_POST['ext_password']); $result = $user->login($_POST['ext_email'], $_POST['ext_password']);
if($result == null) if($result == null)
{ {
$_SESSION['current'] = $user; $_SESSION['current'] = $user;
addmsg("You are successfully logged in as '$user->username'.", "green"); addmsg("You are successfully logged in as '$user->realname'.", "green");
redirect(apidb_fullurl("index.php")); redirect(apidb_fullurl("index.php"));
} else } else
{ {

6
addcomment.php
View File

@@ -59,7 +59,7 @@ if(isset($_REQUEST['body']))
$fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); $fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms .= APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'].".\n"; $ms .= APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'].".\n";
$ms .= "\n"; $ms .= "\n";
$ms .= ($_SESSION['current']->username ? $_SESSION['current']->username : "Anonymous")." added comment to ".$fullAppName."\n"; $ms .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "Anonymous")." added comment to ".$fullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= "Subject: ".$subject."\n"; $ms .= "Subject: ".$subject."\n";
$ms .= "\n"; $ms .= "\n";
@@ -80,7 +80,7 @@ if(isset($_REQUEST['body']))
$fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); $fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'].".\n"; $ms = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'].".\n";
$ms .= "\n"; $ms .= "\n";
$ms .= $_SESSION['current']->username." added comment to ".$fullAppName."\n"; $ms .= $_SESSION['current']->realname." added comment to ".$fullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= "Subject: ".$subject."\n"; $ms .= "Subject: ".$subject."\n";
$ms .= "\n"; $ms .= "\n";
@@ -129,7 +129,7 @@ else if(loggedin())
echo '<table width="100%" border=0 cellpadding=0 cellspacing=1>',"\n"; echo '<table width="100%" border=0 cellpadding=0 cellspacing=1>',"\n";
echo "<tr class=\"color0\"><td align=right><b>From:</b>&nbsp;</td>\n"; echo "<tr class=\"color0\"><td align=right><b>From:</b>&nbsp;</td>\n";
echo " <td>&nbsp;".$_SESSION['current']->username."</td></tr>\n"; echo " <td>&nbsp;".$_SESSION['current']->realname."</td></tr>\n";
echo "<tr class=\"color0\"><td align=right><b>Subject:</b>&nbsp;</td>\n"; echo "<tr class=\"color0\"><td align=right><b>Subject:</b>&nbsp;</td>\n";
echo " <td>&nbsp;<input type=\"text\" size=\"35\" name=\"subject\" value=\"".$_REQUEST['subject']."\" /> </td></tr>\n"; echo " <td>&nbsp;<input type=\"text\" size=\"35\" name=\"subject\" value=\"".$_REQUEST['subject']."\" /> </td></tr>\n";
echo "<tr class=\"color1\"><td colspan=2><textarea name=\"body\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$_REQUEST['body']."</textarea></td></tr>\n"; echo "<tr class=\"color1\"><td colspan=2><textarea name=\"body\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$_REQUEST['body']."</textarea></td></tr>\n";

2
admin/addAppNote.php
View File

@@ -45,7 +45,7 @@ if($_REQUEST['sub'] == "Submit")
$fullAppName .= " Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); $fullAppName .= " Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n"; $ms = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= ($_SESSION['current']->username ? $_SESSION['current']->username : "Anonymous")." added note to ".$fullAppName."\n"; $ms .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "Anonymous")." added note to ".$fullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= "title: ".$_REQUEST['noteTitle']."\n"; $ms .= "title: ".$_REQUEST['noteTitle']."\n";
$ms .= "\n"; $ms .= "\n";

4
admin/adminAppDataQueue.php
View File

@@ -48,7 +48,7 @@ if (!$_REQUEST['queueId'])
echo "<tr class=color4>\n"; echo "<tr class=color4>\n";
echo " <td><font color=white>Submission Date</font></td>\n"; echo " <td><font color=white>Submission Date</font></td>\n";
echo " <td><font color=white>Queue Id</font></td>\n"; echo " <td><font color=white>Queue Id</font></td>\n";
echo " <td><font color=white>Username (e-mail)</font></td>\n"; echo " <td><font color=white>Name (e-mail)</font></td>\n";
echo " <td><font color=white>Application Name</font></td>\n"; echo " <td><font color=white>Application Name</font></td>\n";
echo " <td><font color=white>Version</font></td>\n"; echo " <td><font color=white>Version</font></td>\n";
echo " <td><font color=white>Type</font></td>\n"; echo " <td><font color=white>Type</font></td>\n";
@@ -66,7 +66,7 @@ if (!$_REQUEST['queueId'])
echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." &nbsp;</td>\n"; echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." &nbsp;</td>\n";
echo " <td><a href='adminAppDataQueue.php?queueId=$ob->queueId'>".$ob->queueId."</a></td>\n"; echo " <td><a href='adminAppDataQueue.php?queueId=$ob->queueId'>".$ob->queueId."</a></td>\n";
if($ob->userId) if($ob->userId)
echo " <td>".lookupUsername($ob->userId)." (".lookupEmail($ob->userId).")</td>\n"; echo " <td>".lookupRealname($ob->userId)." (".lookupEmail($ob->userId).")</td>\n";
else else
echo " <td>Anonymous</td>\n"; echo " <td>Anonymous</td>\n";
echo "<td>".appIdToName($ob->appId)."</td>\n"; echo "<td>".appIdToName($ob->appId)."</td>\n";

12
admin/adminMaintainerQueue.php
View File

@@ -67,11 +67,11 @@ if ($_REQUEST['sub'])
{ {
if($firstDisplay) if($firstDisplay)
{ {
echo "<td>".lookupUsername($userIdValue)."</td></tr>\n"; echo "<td>".lookupRealname($userIdValue)."</td></tr>\n";
$firstDisplay = false; $firstDisplay = false;
} else } else
{ {
echo "<tr><td class=color0></td><td>".lookupUsername($userIdValue)."</td></tr>\n"; echo "<tr><td class=color0></td><td>".lookupRealname($userIdValue)."</td></tr>\n";
} }
} }
} }
@@ -84,11 +84,11 @@ if ($_REQUEST['sub'])
{ {
if($firstDisplay) if($firstDisplay)
{ {
echo "<td>".lookupUsername($userIdValue)."*</td></tr>\n"; echo "<td>".lookupRealname($userIdValue)."*</td></tr>\n";
$firstDisplay = false; $firstDisplay = false;
} else } else
{ {
echo "<tr><td class=color0></td><td>".lookupUsername($userIdValue)."*</td></tr>\n"; echo "<tr><td class=color0></td><td>".lookupRealname($userIdValue)."*</td></tr>\n";
} }
} }
} }
@@ -283,7 +283,7 @@ if ($_REQUEST['sub'])
echo "<tr class=color4>\n"; echo "<tr class=color4>\n";
echo " <td><font color=white>Submission Date</font></td>\n"; echo " <td><font color=white>Submission Date</font></td>\n";
echo " <td><font color=white>Queue Id</font></td>\n"; echo " <td><font color=white>Queue Id</font></td>\n";
echo " <td><font color=white>Username</font></td>\n"; echo " <td><font color=white>Name</font></td>\n";
echo " <td><font color=white>Application Name</font></td>\n"; echo " <td><font color=white>Application Name</font></td>\n";
echo " <td><font color=white>Version</font></td>\n"; echo " <td><font color=white>Version</font></td>\n";
echo " <td><font color=white>Super maintainer?</font></td>\n"; echo " <td><font color=white>Super maintainer?</font></td>\n";
@@ -298,7 +298,7 @@ if ($_REQUEST['sub'])
echo "<tr class=$bgcolor>\n"; echo "<tr class=$bgcolor>\n";
echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." &nbsp;</td>\n"; echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." &nbsp;</td>\n";
echo " <td><a href='adminMaintainerQueue.php?sub=view&queueId=$ob->queueId'>$ob->queueId</a></td>\n"; echo " <td><a href='adminMaintainerQueue.php?sub=view&queueId=$ob->queueId'>$ob->queueId</a></td>\n";
echo " <td>".lookupUsername($ob->userId)."</td>\n"; echo " <td>".lookupRealname($ob->userId)."</td>\n";
echo " <td>".appIdToName($ob->appId)."</td>\n"; echo " <td>".appIdToName($ob->appId)."</td>\n";
if($ob->superMaintainer) if($ob->superMaintainer)

4
admin/adminMaintainers.php
View File

@@ -56,7 +56,7 @@ if ($_REQUEST['sub'])
echo "<tr class=color4>\n"; echo "<tr class=color4>\n";
echo " <td><font color=white>Submission Date</font></td>\n"; echo " <td><font color=white>Submission Date</font></td>\n";
echo " <td><font color=white>Username</font></td>\n"; echo " <td><font color=white>Name</font></td>\n";
echo " <td><font color=white>Application Name</font></td>\n"; echo " <td><font color=white>Application Name</font></td>\n";
echo " <td><font color=white>Version</font></td>\n"; echo " <td><font color=white>Version</font></td>\n";
echo " <td><font color=white>Super maintainer?</font></td>\n"; echo " <td><font color=white>Super maintainer?</font></td>\n";
@@ -71,7 +71,7 @@ if ($_REQUEST['sub'])
if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
echo "<tr class=$bgcolor>\n"; echo "<tr class=$bgcolor>\n";
echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." &nbsp;</td>\n"; echo " <td>".date("Y-n-t h:i:sa", $ob->submitTime)." &nbsp;</td>\n";
echo " <td>".lookupUsername($ob->userId)."</td>\n"; echo " <td>".lookupRealname($ob->userId)."</td>\n";
if($ob->superMaintainer) if($ob->superMaintainer)
{ {

4
admin/editAppNote.php
View File

@@ -45,7 +45,7 @@ if(isset($_REQUEST['sub']))
if($sEmail) if($sEmail)
{ {
$ms .= ($_SESSION['current']->username ? $_SESSION['current']->username : "Anonymous")." deleted note from ".$sFullAppName."\n"; $ms .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "Anonymous")." deleted note from ".$sFullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= "title: ".$sOldNoteTitle."\n"; $ms .= "title: ".$sOldNoteTitle."\n";
$ms .= "\n"; $ms .= "\n";
@@ -72,7 +72,7 @@ if(isset($_REQUEST['sub']))
if($sEmail) if($sEmail)
{ {
$ms .= ($_SESSION['current']->username ? $_SESSION['current']->username : "Anonymous")." changed note for ".$sFullAppName."\n"; $ms .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "Anonymous")." changed note for ".$sFullAppName."\n";
$ms .= "From --------------------------\n"; $ms .= "From --------------------------\n";
$ms .= "title: ".$sOldNoteTitle."\n"; $ms .= "title: ".$sOldNoteTitle."\n";
$ms .= "\n"; $ms .= "\n";

2
admin/editAppVersion.php
View File

@@ -110,7 +110,7 @@ if(isset($_REQUEST['submit1']))
$fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); $fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms .= APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n"; $ms .= APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= ($_SESSION['current']->username ? $_SESSION['current']->username : "Anonymous")." changed ".$fullAppName."\n"; $ms .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "Anonymous")." changed ".$fullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= $WhatChanged."\n"; $ms .= $WhatChanged."\n";
$ms .= "\n"; $ms .= "\n";

4
appview.php
View File

@@ -314,7 +314,7 @@ if($appId && !$versionId)
while(list($index, list($userIdValue)) = each($other_maintainers)) while(list($index, list($userIdValue)) = each($other_maintainers))
{ {
echo " <tr><td align=left>\n"; echo " <tr><td align=left>\n";
echo " <li>".lookupUsername($userIdValue)."</td></tr>\n"; echo " <li>".lookupRealname($userIdValue)."</td></tr>\n";
} }
} else } else
{ {
@@ -449,7 +449,7 @@ else if($appId && $versionId)
while(list($index, list($userIdValue)) = each($other_maintainers)) while(list($index, list($userIdValue)) = each($other_maintainers))
{ {
echo "<tr class=color0><td align=left colspan=2>"; echo "<tr class=color0><td align=left colspan=2>";
echo "<li>".lookupUsername($userIdValue)."</td></tr>\n"; echo "<li>".lookupRealname($userIdValue)."</td></tr>\n";
} }
} else } else
{ {

6
deletecomment.php
View File

@@ -99,16 +99,16 @@ if($_SESSION['current']->getpref("confirm_comment_deletion") != "no" &&
{ {
$email = getNotifyEmailAddressList($_REQUEST['appId'], $_REQUEST['versionId']); $email = getNotifyEmailAddressList($_REQUEST['appId'], $_REQUEST['versionId']);
$notify_user_email=lookupEmail($ob->userId); $notify_user_email=lookupEmail($ob->userId);
$notify_user_username=lookupUsername($ob->userId); $notify_user_realname=lookupRealname($ob->userId);
$email .= $notify_user_email; $email .= $notify_user_email;
if($email) if($email)
{ {
$fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); $fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n"; $ms = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= $_SESSION['current']->username." deleted comment from ".$fullAppName."\n"; $ms .= $_SESSION['current']->realname." deleted comment from ".$fullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= "This comment was made on ".substr($ob->time,0,10)." by $notify_user_username \n"; $ms .= "This comment was made on ".substr($ob->time,0,10)." by $notify_user_realname \n";
$ms .= "\n"; $ms .= "\n";
$ms .= "Subject: ".$subject."\n"; $ms .= "Subject: ".$subject."\n";
$ms .= "\n"; $ms .= "\n";

17
edituser.php
View File

@@ -20,7 +20,7 @@ if(!havepriv("admin"))
exit; exit;
} }
$user = new User(); $user = new User();
$result = query_appdb("SELECT stamp, userid, username, realname, ". $result = query_appdb("SELECT stamp, userid, realname, ".
"created, status, perm FROM user_list WHERE ". "created, status, perm FROM user_list WHERE ".
"userid = '$userid'", $user->link); "userid = '$userid'", $user->link);
if(!$result) if(!$result)
@@ -30,11 +30,9 @@ if(!havepriv("admin"))
} }
list($user->stamp, $user->userid, $user->username, $user->realname, list($user->stamp, $user->userid, $user->realname,
$user->created, $status, $perm) = mysql_fetch_row($result); $user->created, $status, $perm) = mysql_fetch_row($result);
global $ext_username, $ext_password1, $ext_password2, $ext_realname, $ext_email, $ext_hasadmin;
if($_POST) if($_POST)
{ {
if ($ext_password == $ext_password2) if ($ext_password == $ext_password2)
@@ -70,9 +68,6 @@ if($_POST)
echo html_frame_start("Data for user ID $userid", "80%"); echo html_frame_start("Data for user ID $userid", "80%");
echo html_table_begin("width='100%' border=0 align=left cellspacing=0 class='box-body'"); echo html_table_begin("width='100%' border=0 align=left cellspacing=0 class='box-body'");
$ext_username = $user->lookup_username($userid);
$ext_realname = $user->lookup_realname($userid); $ext_realname = $user->lookup_realname($userid);
$ext_email = $user->lookup_email($userid); $ext_email = $user->lookup_email($userid);
if($user->checkpriv("admin")) if($user->checkpriv("admin"))
@@ -84,8 +79,8 @@ if($_POST)
?> ?>
<input type="hidden" name="userid" value="<?php echo $userid; ?>"> <input type="hidden" name="userid" value="<?php echo $userid; ?>">
<tr> <tr>
<td> &nbsp; User Name </td> <td> &nbsp; Email Address </td>
<td> <b> <?php echo $ext_username; ?> </b> </td> <td> <input type="text" name="ext_email" value="<?php echo $ext_email; ?>"> </td>
</tr> </tr>
<tr> <tr>
<td> &nbsp; Password </td> <td> &nbsp; Password </td>
@@ -99,10 +94,6 @@ if($_POST)
<td> &nbsp; Real Name </td> <td> &nbsp; Real Name </td>
<td> <input type="text" name="ext_realname" value="<?php echo $ext_realname; ?>"> </td> <td> <input type="text" name="ext_realname" value="<?php echo $ext_realname; ?>"> </td>
</tr> </tr>
<tr>
<td> &nbsp; Email Address </td>
<td> <input type="text" name="ext_email" value="<?php echo $ext_email; ?>"> </td>
</tr>
<tr> <tr>
<td> &nbsp; Administrator </td> <td> &nbsp; Administrator </td>
<td> <input type="checkbox" name="ext_hasadmin" "<?php echo $ext_hasadmin; ?>"> </td> <td> <input type="checkbox" name="ext_hasadmin" "<?php echo $ext_hasadmin; ?>"> </td>

11
include/comments.php
View File

@@ -8,17 +8,10 @@ function forum_lookup_user ($userid)
$mailto = ''; $mailto = '';
if ($userid > 0) if ($userid > 0)
{ {
$qstring = "SELECT email,username FROM user_list WHERE userid = '".$userid."' LIMIT 1"; $qstring = "SELECT email FROM user_list WHERE userid = '".$userid."' LIMIT 1";
$result = mysql_query($qstring); $result = mysql_query($qstring);
$usr = mysql_fetch_object($result); $usr = mysql_fetch_object($result);
if ($usr->email) $mailto = '<a href="mailto:' . $usr->email . '">' . $usr->realname . '</a>';
{
$mailto = '<a href="mailto:' . $usr->email . '">' . $usr->username . '</a>';
}
else
{
$mailto = $usr->username;
}
unset($qstring, $result, $usr); unset($qstring, $result, $usr);
} }
else else

8
include/form_edit.php
View File

@@ -6,8 +6,8 @@
<!-- start of edit account form --> <!-- start of edit account form -->
<tr> <tr>
<td> &nbsp; User Name </td> <td> &nbsp; Email Address </td>
<td> <b> <?php echo $ext_username; ?> </b> </td> <td> <input type="text" name="ext_email" value="<?php echo $ext_email; ?>"> </td>
</tr> </tr>
<tr> <tr>
<td> &nbsp; Password </td> <td> &nbsp; Password </td>
@@ -21,10 +21,6 @@
<td> &nbsp; Real Name </td> <td> &nbsp; Real Name </td>
<td> <input type="text" name="ext_realname" value="<?php echo $ext_realname; ?>"> </td> <td> <input type="text" name="ext_realname" value="<?php echo $ext_realname; ?>"> </td>
</tr> </tr>
<tr>
<td> &nbsp; Email Address </td>
<td> <input type="text" name="ext_email" value="<?php echo $ext_email; ?>"> </td>
</tr>
<tr> <tr>
<td colspan=2>&nbsp;</td> <td colspan=2>&nbsp;</td>
</tr> </tr>

4
include/form_login.php
View File

@@ -18,8 +18,8 @@ function cmd_send_passwd() {
<table border="0" width="100%" cellspacing=0 cellpadding="10"> <table border="0" width="100%" cellspacing=0 cellpadding="10">
<tr> <tr>
<td class=color1> User Name </td> <td class=color1> E-mail </td>
<td class=color0> <input type="text" name="ext_username" value='<?php if(isset($_POST['ext_username'])) echo $_POST['ext_username']?>'> </td> <td class=color0> <input type="text" name="ext_email" value='<?php if(isset($_POST['ext_email'])) echo $_POST['ext_email']?>'> </td>
</tr> </tr>
<tr> <tr>
<td class=color1> Password </td> <td class=color1> Password </td>

9
include/form_new.php
View File

@@ -10,8 +10,8 @@ echo html_frame_start("Create New Application DB Account","400","",0)
<!-- start of new account form --> <!-- start of new account form -->
<table border=0 width="100%" cellspacing=0 cellpadding=20> <table border=0 width="100%" cellspacing=0 cellpadding=20>
<tr> <tr>
<td class=color1> User Name </td> <td class=color1> E-mail </td>
<td class=color0> <input type="text" name="ext_username" value='<?php if(isset($_POST['ext_username'])) echo $_POST['ext_username']?>'> </td> <td class=color0> <input type="text" name="ext_email" value='<?php if(isset($_POST['ext_email'])) echo $_POST['ext_email']?>'> </td>
</tr> </tr>
<tr> <tr>
<td class=color1> Password </td> <td class=color1> Password </td>
@@ -25,11 +25,6 @@ echo html_frame_start("Create New Application DB Account","400","",0)
<td class=color1> Real Name </td> <td class=color1> Real Name </td>
<td class=color0> <input type="text" name="ext_realname" value='<?php if(isset($_POST['ext_realname'])) echo $_POST['ext_realname']?>'> </td> <td class=color0> <input type="text" name="ext_realname" value='<?php if(isset($_POST['ext_realname'])) echo $_POST['ext_realname']?>'> </td>
</tr> </tr>
<tr>
<td class=color1> Email Address </td>
<td class=color0> <input type="text" name="ext_email" value='<?php if(isset($_POST['ext_email'])) echo $_POST['ext_email']?>'> </td>
</tr>
<?php <?php
echo "<tr><td class=color1>&nbsp; Wine version </td><td class=color0>"; echo "<tr><td class=color1>&nbsp; Wine version </td><td class=color0>";

2
include/incl.php
View File

@@ -46,7 +46,7 @@ function apidb_fullpath($path)
*/ */
function apidb_header($title = 0) function apidb_header($title = 0)
{ {
$username = isset($_SESSION['current'])?$_SESSION['current']->username:""; $realname = isset($_SESSION['current'])?$_SESSION['current']->realname:"";
// Set Page Title // Set Page Title
$page_title = $title; $page_title = $title;

3
include/query_users.php
View File

@@ -36,9 +36,8 @@ echo html_frame_start("List Users","400","",0)
</table> </table>
<input TYPE="HIDDEN" NAME="orderby" VALUE="userid"> <input TYPE="HIDDEN" NAME="orderby" VALUE="userid">
<input TYPE="HIDDEN" NAME="searchwhat" VALUE="user_list.username"> <input TYPE="HIDDEN" NAME="searchwhat" VALUE="user_list.email">
<input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.userid"> <input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.userid">
<input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.username">
<input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.email"> <input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.email">
<input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.realname"> <input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.realname">
<input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.created"> <input TYPE="HIDDEN" NAME="fields[]" VALUE="user_list.created">

2
include/tableve.php
View File

@@ -302,7 +302,7 @@ class TableVE {
if($field->name == "lastmodby") if($field->name == "lastmodby")
{ {
$user = new user(); $user = new user();
$name = $user->lookup_username($value); $name = $user->lookup_realname($value);
if(!$name) if(!$name)
$name = "system"; $name = "system";
echo "$name ($value)"; echo "$name ($value)";

59
include/user.php
View File

@@ -7,7 +7,6 @@ class User {
var $stamp; var $stamp;
var $userid; var $userid;
var $username;
var $realname; var $realname;
var $created; var $created;
var $status; var $status;
@@ -27,23 +26,17 @@ class User {
* check if a user exists * check if a user exists
* returns TRUE if the user exists * returns TRUE if the user exists
*/ */
function exists($username) function exists($sEmail)
{ {
$result = mysql_query("SELECT * FROM user_list WHERE username = '$username'"); $result = mysql_query("SELECT * FROM user_list WHERE email = '$sEmail'");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return 0; return 0;
return 1; return 1;
} }
function lookup_userid($sEmail)
function lookup_username($userid)
{ {
return lookupUsername($userId); $result = mysql_query("SELECT userid FROM user_list WHERE email = '$sEmail'");
}
function lookup_userid($username)
{
$result = mysql_query("SELECT userid FROM user_list WHERE username = '$username'");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return null; return null;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -79,28 +72,28 @@ class User {
* restore a user from the database * restore a user from the database
* returns 0 on success and an error msg on failure * returns 0 on success and an error msg on failure
*/ */
function restore($username, $password) function restore($sEmail, $sPassword)
{ {
$result = mysql_query("SELECT stamp, userid, username, realname, ". $result = mysql_query("SELECT stamp, userid, realname, ".
"created, status, perm FROM user_list WHERE ". "created, status, perm FROM user_list WHERE ".
"username = '$username' AND ". "email = '$sEmail' AND ".
"password = password('$password')"); "password = password('$sPassword')");
if(!$result) if(!$result)
return "Error: ".mysql_error(); return "Error: ".mysql_error();
if(mysql_num_rows($result) == 0) if(mysql_num_rows($result) == 0)
return "Invalid username or password"; return "Invalid e-mail or password";
list($this->stamp, $this->userid, $this->username, $this->realname, list($this->stamp, $this->userid, $this->realname,
$this->created, $status, $perm) = mysql_fetch_row($result); $this->created, $status, $perm) = mysql_fetch_row($result);
return 0; return 0;
} }
function login($username, $password) function login($sEmail, $sPassword)
{ {
$result = $this->restore($username, $password); $result = $this->restore($sEmail, $sPassword);
/* if our result is non-null then we must have had an error */ /* if our result is non-null then we must have had an error */
if($result != null) if($result != null)
@@ -108,7 +101,7 @@ class User {
/* update the 'stamp' field in the users account to reflect the last time */ /* update the 'stamp' field in the users account to reflect the last time */
/* they logged in */ /* they logged in */
$myUserId = $this->lookup_userid($username); $myUserId = $this->lookup_userid($sEmail);
$result = mysql_query("UPDATE user_list SET stamp=null WHERE userid=$myUserId;"); $result = mysql_query("UPDATE user_list SET stamp=null WHERE userid=$myUserId;");
return 0; return 0;
} }
@@ -176,12 +169,12 @@ class User {
* remove the current, or specified user from the database * remove the current, or specified user from the database
* returns 0 on success and an error msg on failure * returns 0 on success and an error msg on failure
*/ */
function remove($username = 0) function remove($sEmail = 0)
{ {
if($username == 0) if($sEmail == 0)
$username = $this->username; $sEmail = $this->email;
$result = mysql_query("DELETE FROM user_list WHERE username = '$username'"); $result = mysql_query("DELETE FROM user_list WHERE email = '$sEmail'");
if(!$result) if(!$result)
return mysql_error(); return mysql_error();
@@ -348,16 +341,6 @@ function generate_passwd($pass_len = 10)
} }
function lookupUsername($userid)
{
$result = mysql_query("SELECT username FROM user_list WHERE userid = $userid");
if(!$result || mysql_num_rows($result) != 1)
return null;
$ob = mysql_fetch_object($result);
return $ob->username;
}
function lookupEmail($userid) function lookupEmail($userid)
{ {
$result = mysql_query("SELECT email FROM user_list WHERE userid = $userid"); $result = mysql_query("SELECT email FROM user_list WHERE userid = $userid");
@@ -367,6 +350,14 @@ function lookupEmail($userid)
return $ob->email; return $ob->email;
} }
function lookupRealname($userid)
{
$result = mysql_query("SELECT realname FROM user_list WHERE userid = $userid");
if(!$result || mysql_num_rows($result) != 1)
return null;
$ob = mysql_fetch_object($result);
return $ob->realname;
}
function UserWantsEmail($userid) function UserWantsEmail($userid)
{ {

3
preferences.php
View File

@@ -51,7 +51,6 @@ function show_user_fields()
$user = new User(); $user = new User();
$ext_username = $_SESSION['current']->username;
$ext_realname = $user->lookup_realname($_SESSION['current']->userid); $ext_realname = $user->lookup_realname($_SESSION['current']->userid);
$ext_email = $user->lookup_email($_SESSION['current']->userid); $ext_email = $user->lookup_email($_SESSION['current']->userid);
$CVSrelease = $user->lookup_CVSrelease($_SESSION['current']->userid); $CVSrelease = $user->lookup_CVSrelease($_SESSION['current']->userid);
@@ -97,7 +96,7 @@ if($_POST)
apidb_header("User Preferences"); apidb_header("User Preferences");
echo "<form method=post action='preferences.php'>\n"; echo "<form method=post action='preferences.php'>\n";
echo html_frame_start("Preferences for ".$_SESSION['current']->username, "80%"); echo html_frame_start("Preferences for ".$_SESSION['current']->realname, "80%");
echo html_table_begin("width='100%' border=0 align=left cellspacing=0 class='box-body'"); echo html_table_begin("width='100%' border=0 align=left cellspacing=0 class='box-body'");
show_user_fields(); show_user_fields();

6
screenshots.php
View File

@@ -50,7 +50,7 @@ if($_REQUEST['cmd'])
$fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); $fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms .= APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n"; $ms .= APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= $_SESSION['current']->username." added screenshot ".$_REQUEST['screenshot_desc']." to ".$fullAppName."\n"; $ms .= $_SESSION['current']->realname." added screenshot ".$_REQUEST['screenshot_desc']." to ".$fullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= STANDARD_NOTIFY_FOOTER; $ms .= STANDARD_NOTIFY_FOOTER;
@@ -104,7 +104,7 @@ if($_REQUEST['cmd'])
$fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); $fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms .= APPDB_ROOT."admin/adminAppDataQueue.php?queueId=".mysql_insert_id()."\n"; $ms .= APPDB_ROOT."admin/adminAppDataQueue.php?queueId=".mysql_insert_id()."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= ($_SESSION['current']->username ? $_SESSION['current']->username : "an anonymous user")." submitted a screenshot ".$_REQUEST['screenshot_desc']." for ".$fullAppName."\n"; $ms .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "an anonymous user")." submitted a screenshot ".$_REQUEST['screenshot_desc']." for ".$fullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= STANDARD_NOTIFY_FOOTER; $ms .= STANDARD_NOTIFY_FOOTER;
@@ -142,7 +142,7 @@ if($_REQUEST['cmd'])
$fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); $fullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms .= APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n"; $ms .= APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= ($_SESSION['current']->username ? $_SESSION['current']->username : "Anonymous")." deleted screenshot from ".$fullAppName."\n"; $ms .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "Anonymous")." deleted screenshot from ".$fullAppName."\n";
$ms .= "\n"; $ms .= "\n";
$ms .= STANDARD_NOTIFY_FOOTER; $ms .= STANDARD_NOTIFY_FOOTER;

2
tables/appdb_tables.sql
View File

@@ -86,7 +86,7 @@ create table userExperience (
testPlatform varchar(100), testPlatform varchar(100),
wineVintage varchar(100), wineVintage varchar(100),
entryDate timestamp not null, entryDate timestamp not null,
userName text not null, userId int not null,
wineCfgFile text, wineCfgFile text,
key(uExpId) key(uExpId)
); );

7
tables/user_list.sql
View File

@@ -5,7 +5,6 @@ drop table if exists user_list;
create table user_list ( create table user_list (
stamp timestamp not null, stamp timestamp not null,
userid int not null auto_increment, userid int not null auto_increment,
username text not null,
password text not null, password text not null,
realname text not null, realname text not null,
email text not null, email text not null,
@@ -14,10 +13,10 @@ create table user_list (
perm int(4), perm int(4),
CVSrelease text, CVSrelease text,
unique key(userid), unique key(userid),
unique(username(12)) unique(email)
); );
insert into user_list values (NOW(), 0, 'admin', password('testing'), 'Administrator', insert into user_list values (NOW(), 0, password('testing'), 'Administrator',
'Admin@localhost', NOW(), 0, 0xffffffff); 'Admin@localhost', NOW(), 0, 0xffffffff);
update user_list set userid = 1000 where username = 'admin'; update user_list set userid = 1000 where email = 'Admin@localhost';