forked from science-ation/science-ation
Use the unique id (uid) to attach reports to committee members, instead of the
id, since now the id will change every year.
This commit is contained in:
parent
9756705aad
commit
b803c00881
@ -40,7 +40,7 @@
|
|||||||
if($action == 'unlink') {
|
if($action == 'unlink') {
|
||||||
$id = intval($_GET['id']);
|
$id = intval($_GET['id']);
|
||||||
mysql_query("DELETE FROM reports_committee WHERE
|
mysql_query("DELETE FROM reports_committee WHERE
|
||||||
users_id='{$_SESSION['users_id']}' AND id='$id'");
|
users_id='{$_SESSION['users_uid']}' AND id='$id'");
|
||||||
$_SESSION['messages'][] = 'unlinked';
|
$_SESSION['messages'][] = 'unlinked';
|
||||||
header("Location: reports.php?edit=1");
|
header("Location: reports.php?edit=1");
|
||||||
exit;
|
exit;
|
||||||
@ -87,7 +87,7 @@
|
|||||||
mysql_query("INSERT INTO `reports_committee`
|
mysql_query("INSERT INTO `reports_committee`
|
||||||
(`id`, `users_id` , `reports_id` , `category` , `comment` , `format` , `stock`)
|
(`id`, `users_id` , `reports_id` , `category` , `comment` , `format` , `stock`)
|
||||||
VALUES (
|
VALUES (
|
||||||
NULL , '{$_SESSION['users_id']}',
|
NULL , '{$_SESSION['users_uid']}',
|
||||||
'$reports_id', '$category', '$comment',
|
'$reports_id', '$category', '$comment',
|
||||||
'$type', '$stock' );");
|
'$type', '$stock' );");
|
||||||
$_SESSION['messages'][] = 'added';
|
$_SESSION['messages'][] = 'added';
|
||||||
@ -139,7 +139,7 @@
|
|||||||
$q = mysql_query("SELECT reports_committee.*,reports.name
|
$q = mysql_query("SELECT reports_committee.*,reports.name
|
||||||
FROM reports_committee
|
FROM reports_committee
|
||||||
LEFT JOIN reports ON reports.id=reports_committee.reports_id
|
LEFT JOIN reports ON reports.id=reports_committee.reports_id
|
||||||
WHERE users_id='{$_SESSION['users_id']}'
|
WHERE users_id='{$_SESSION['users_uid']}'
|
||||||
ORDER BY category,id");
|
ORDER BY category,id");
|
||||||
echo mysql_error();
|
echo mysql_error();
|
||||||
if(mysql_num_rows($q) == 0) {
|
if(mysql_num_rows($q) == 0) {
|
||||||
@ -354,7 +354,7 @@
|
|||||||
|
|
||||||
echo "<tr><td>".i18n("Category").":</td><td>";
|
echo "<tr><td>".i18n("Category").":</td><td>";
|
||||||
$q = mysql_query("SELECT DISTINCT category FROM reports_committee
|
$q = mysql_query("SELECT DISTINCT category FROM reports_committee
|
||||||
WHERE users_id='{$_SESSION['users_id']}'
|
WHERE users_id='{$_SESSION['users_uid']}'
|
||||||
ORDER BY category");
|
ORDER BY category");
|
||||||
|
|
||||||
echo i18n("Existing Category").": <select name=\"category_exist\">";
|
echo i18n("Existing Category").": <select name=\"category_exist\">";
|
||||||
|
@ -73,7 +73,7 @@
|
|||||||
echo '<tr><td colspan="2"><hr /></td></tr>';
|
echo '<tr><td colspan="2"><hr /></td></tr>';
|
||||||
/* See if the report is in this committee member's list */
|
/* See if the report is in this committee member's list */
|
||||||
$q = mysql_query("SELECT * FROM reports_committee
|
$q = mysql_query("SELECT * FROM reports_committee
|
||||||
WHERE users_id='{$_SESSION['users_id']}'
|
WHERE users_id='{$_SESSION['users_uid']}'
|
||||||
AND reports_id='{$report['id']}'");
|
AND reports_id='{$report['id']}'");
|
||||||
echo "<tr><td colspan=\"2\"><h4>".i18n('My Reports Info')."</h4></td></tr>";
|
echo "<tr><td colspan=\"2\"><h4>".i18n('My Reports Info')."</h4></td></tr>";
|
||||||
if(mysql_num_rows($q) > 0) {
|
if(mysql_num_rows($q) > 0) {
|
||||||
|
@ -157,6 +157,7 @@
|
|||||||
$_SESSION['username']=$u['username'];
|
$_SESSION['username']=$u['username'];
|
||||||
$_SESSION['email']=$u['email'];
|
$_SESSION['email']=$u['email'];
|
||||||
$_SESSION['users_id']=$u['id'];
|
$_SESSION['users_id']=$u['id'];
|
||||||
|
$_SESSION['users_uid']=$u['uid'];
|
||||||
$_SESSION['users_type']=$type;
|
$_SESSION['users_type']=$type;
|
||||||
|
|
||||||
/* Load the password expiry for each user type, and
|
/* Load the password expiry for each user type, and
|
||||||
|
Loading…
Reference in New Issue
Block a user