Skip to content

Commit

Permalink
Modified Login Interface
Browse files Browse the repository at this point in the history 
Field "user" in table _users is unique
Added possibility to set user rights after adding
Several fixed in user management

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2060 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
Dennis committed Sep 5, 2006
1 parent 3629896 commit ddf98ae
Show file tree
Hide file tree
Showing 6 changed files with 159 additions and 153 deletions.
5 changes: 4 additions & 1 deletion admin/admin.php
View file
Expand Up @@ -217,7 +217,10 @@
."\t\t<td valign='top' align='center' bgcolor='#BBBBBB'>\n";
//."\t\t\t<font size='2'>\n";

echo showadminmenu();
if(isset($_SESSION['loginID']))
{
echo showadminmenu();
}

if (isset($accesssummary)) {echo $accesssummary;} // added by Dennis

Expand Down
225 changes: 117 additions & 108 deletions admin/html.php
View file
Expand Up @@ -95,9 +95,7 @@
else $listsurveys="<br /><strong> No Surveys in this Installation </strong><br /><br />" ;
}



if ($action == "checksettings" || $action == "changelang")
if ($action == "checksettings" || ($action == "changelang" && isset($_SESSION['loginID'])))
{
//GET NUMBER OF SURVEYS
$query = "SELECT sid FROM ".db_table_name('surveys');
Expand Down Expand Up @@ -428,6 +426,13 @@
. "onmouseout=\"hideTooltip()\""
. "onmouseover=\"showTooltip(event,'". _("Export this Survey")."');return false\">" .
"<img src='$imagefiles/exportsql.png' title='' alt='". _("Export this Survey")."' align='left' name='ExportSurvey'></a>" ;

// ***********************
$actsurquery = "SELECT edit_survey_property FROM {$dbprefix}surveys_rights WHERE sid=$surveyid AND uid = ".$_SESSION['loginID']; //Getting rights for this survey
//$actsurresult = $connect->Execute($actsurquery) or die($connect->ErrorMsg());
$actsurresult = &db_execute_assoc($actsurquery);
$actsurrows = $actsurresult->FetchRow();

if($actsurrows['edit_survey_property'])
{
$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' align='left' border='0' hspace='0'>\n"
Expand Down Expand Up @@ -1071,9 +1076,7 @@
<td>&nbsp;</td>
<td><input type='hidden' name='action' value='forgotpass'>
<input class='action' type='submit' value='Check data'></td>
</tr>
</table>
</form>";
</tr>";
}
else
{
Expand All @@ -1094,10 +1097,27 @@
<tr>
<td>&nbsp;</td>
<td><a href='$scriptname?action=forgotpassword'>"._("Forgot Your Password?")."</a><br />&nbsp;\n</td>
</tr>
</table>
</form>";
</tr>";

}
// Current language
$loginsummary .= "\t<tr>\n"
. "\t\t<td align='center' >$setfont\n"
. "\t\t\t<strong>"._("Current Language").":</strong>\n"
. "\t\t</font></td><td>$setfont\n"
. "\t\t\t<select name='lang' onChange='form.submit()'>\n";
foreach (getlanguagedata() as $langkey=>$languagekind)
{
$loginsummary .= "\t\t\t\t<option value='$langkey'";
if ($langkey == $_SESSION['adminlang']) {$loginsummary .= " selected";}
$loginsummary .= ">".$languagekind['description']." - ".$languagekind['nativedescription']."</option>\n";
}
$loginsummary .= "\t\t\t</select>\n"
. "\t\t\t<input type='hidden' name='action' value='changelang'>\n"
. "\t\t</font></td>\n"
. "\t</tr>\n"
. "</table>"
. "</form>";
}

// logout user
Expand Down Expand Up @@ -1182,11 +1202,10 @@

foreach ($_SESSION['userlist'] as $usr)
{
if ($usr['uid'] == $_POST['uid'])
if ($usr['uid'] == $_POST['uid']) // ist nicht der fall bei neuen *******
{

$usersummary .="\t\t<th></th>\n\t</tr>\n"
."\t<tr><form method='post' action='$scriptname'></tr>" // added by Dennis
."\t<tr><form method='post' action='$scriptname'></tr>"
."<form action='$scriptname' method='post'>\n";
//content
if($_SESSION['USER_RIGHT_CREATE_SURVEY']) {
Expand Down Expand Up @@ -1279,99 +1298,86 @@
$_SESSION['userlist'] = getuserlistforuser($_SESSION['loginID'], 0, NULL);
$ui = count($_SESSION['userlist']);

/*
Tritt im Moment nicht mehr auf, da die Datenbank automatisch initialisiert wird
$usrhimself = $_SESSION['userlist'][0];
unset($_SESSION['userlist'][0]);

if ($ui < 1)
{
$usersummary .= "\t<tr>\n"
. "\t\t<td>\n"
. "\t\t\t<center>"._("Warning").": "._UC_NOUSERS."</center>"
. "\t\t</td>\n"
. "\t</tr>\n";
}
else*/
{
// sort
$sortArray = array();

foreach($_SESSION['userlist'] as $key => $array) {
$sortArray[$key] = $array[0];
}
array_multisort($sortArray, $_SESSION['userlist']); // by user name

// sort
$sortArray = array();
// output users
$usersummary .= "\t<tr>\n"
. "\t<td style=\"border-left:1px solid #000000; border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'><strong>$setfont{$usrhimself['user']}</font></strong></td>\n"
. "\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'><strong>$setfont{$usrhimself['email']}</font></strong></td>\n";

foreach($_SESSION['userlist'] as $key => $array) {
$sortArray[$key] = $array;
$usersummary .= "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'><strong>$setfont{$usrhimself['password']}</font></strong></td>\n";

$usersummary .= "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'><strong>$setfont{$usrhimself['level']}</strong></td>\n"
. "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'><strong>$setfont{$usrhimself['parent_id']}</strong></td>\n"
. "\t\t<td style=\"padding-top:5px; border-right:1px solid #000000; border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>\n";

$usersummary .= "\t\t\t<form method='post' action='$scriptname'>"
."<input type='submit' value='"._("Edit")."'>"
."<input type='hidden' name='action' value='modifyuser'>"
."<input type='hidden' name='uid' value='{$usrhimself['uid']}'>"
."</form>";

// users are allowed to delete all successor users (but the admin not himself)
if ($usrhimself['parent_id'] != 0 && ($_SESSION['USER_RIGHT_DELETE_USER'] || ($usrhimself['uid'] == $_SESSION['loginID'])))
{
$usersummary .= "\t\t\t<form method='post' action='$scriptname?action=deluser'>"
."<input type='submit' value='"._("Delete")."' onClick='return confirm(\""._("Are you sure you want to delete this entry.")."\")'>"
."<input type='hidden' name='action' value='deluser'>"
."<input type='hidden' name='user' value='{$usrhimself['user']}'>"
."<input type='hidden' name='uid' value='{$usrhimself['uid']}'>"
."</form>";
}
array_multisort($sortArray, $_SESSION['userlist']); // by user name

$usersummary .= "\t\t</td>\n"
. "\t</tr>\n";

// empty row
if(!empty($_SESSION['userlist']))
$usersummary .= "\t<tr>\n\t<td height=\"20\" colspan=\"6\" style=\"border-left:1px solid #000000; border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'></td>\n\t</tr>";

// other users
foreach ($_SESSION['userlist'] as $usr)
{
$usersummary .= "\t<tr>\n"
. "\t<td style=\"border-left:1px solid #000000; border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['user']}</font></td>\n"
. "\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['email']}</font></td>\n";

// output users
foreach ($_SESSION['userlist'] as $usr)
{
$usersummary .= "\t<tr>\n"
. "\t<td style=\"border-left:1px solid #000000; border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['user']}</font></td>\n"
. "\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['email']}</font></td>\n";
// passwords of other users will not be displayed
if ($usr['uid'] == $_SESSION['loginID'])
{
$usersummary .= "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['password']}</font></td>\n";
}
else
{
$usersummary .= "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>******</td>\n";
}
$usersummary .= "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['level']}</td>\n"
. "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['parent_id']}</td>\n"
. "\t\t<td style=\"padding-top:5px; border-right:1px solid #000000; border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>\n";




/* . "\t<td align='center'>$setfont{$usr['user']}</font></td>\n"
. "\t<td align='center'>$setfont{$usr['email']}</font></td>\n";
// passwords of other users will not be displayed
if ($usr['uid'] == $_SESSION['loginID'])
{
$usersummary .= "\t\t<td align='center'>$setfont{$usr['password']}</font></td>\n";
}
else
{
$usersummary .= "\t\t<td align='center'>******</td>\n";
}
$usersummary .= "\t\t<td align='center'>$setfont{$usr['level']}</td>\n"
. "\t\t<td align='center'>$setfont{$usr['parent_id']}</td>\n"
. "\t\t<td align='center'>\n";*/

// users are only allowed to change his own data
if ($usr['uid'] == $_SESSION['loginID'])
{
$usersummary .= "\t\t\t<form method='post' action='$scriptname'>"//?action=modifyuser'>" // added by Dennis
."<input type='submit' value='"._("Edit")."'>"
."<input type='hidden' name='action' value='modifyuser'>"
."<input type='hidden' name='uid' value='{$usr['uid']}'>"
."</form>";
}

// users are allowed to delete all successor users (but the admin not himself)
if ($usr['parent_id'] != 0 && ($_SESSION['USER_RIGHT_DELETE_USER'] || ($usr['uid'] == $_SESSION['loginID'])))
{
$usersummary .= "\t\t\t<form method='post' action='$scriptname?action=deluser'>" // added by Dennis
."<input type='submit' value='"._("Delete")."' onClick='return confirm(\""._("Are you sure you want to delete this entry.")."\")'>"
."<input type='hidden' name='action' value='deluser'>"
."<input type='hidden' name='user' value='{$usr['user']}'>"
."<input type='hidden' name='uid' value='{$usr['uid']}'>"
."</form>";
}

if ($usr['uid'] != $_SESSION['loginID'])
{
$usersummary .= "\t\t\t<form method='post' action='$scriptname'>" // added by Dennis
."<input type='submit' value='"._("Set User Rights")."'>"
."<input type='hidden' name='action' value='setuserrights'>"
."<input type='hidden' name='user' value='{$usr['user']}'>"
."<input type='hidden' name='uid' value='{$usr['uid']}'>"
."</form>";
}
// passwords of other users will not be displayed
$usersummary .= "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>******</td>\n";

$usersummary .= "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['level']}</td>\n"
. "\t\t<td style=\"border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>$setfont{$usr['parent_id']}</td>\n"
. "\t\t<td style=\"padding-top:5px; border-right:1px solid #000000; border-top:1px solid #000000; border-bottom:1px solid #000000;\" align='center'>\n";

$usersummary .= "\t\t</td>\n"
. "\t</tr>\n";
}
// users are allowed to delete all successor users (but the admin not himself)
if ($usr['parent_id'] != 0 && ($_SESSION['USER_RIGHT_DELETE_USER'] || ($usr['uid'] == $_SESSION['loginID'])))
{
$usersummary .= "\t\t\t<form method='post' action='$scriptname?action=deluser'>"
."<input type='submit' value='"._("Delete")."' onClick='return confirm(\""._("Are you sure you want to delete this entry.")."\")'>"
."<input type='hidden' name='action' value='deluser'>"
."<input type='hidden' name='user' value='{$usr['user']}'>"
."<input type='hidden' name='uid' value='{$usr['uid']}'>"
."</form>";
}

$usersummary .= "\t\t\t<form method='post' action='$scriptname'>"
."<input type='submit' value='"._("Set User Rights")."'>"
."<input type='hidden' name='action' value='setuserrights'>"
."<input type='hidden' name='user' value='{$usr['user']}'>"
."<input type='hidden' name='uid' value='{$usr['uid']}'>"
."</form>";

$usersummary .= "\t\t</td>\n"
. "\t</tr>\n";
}
if($_SESSION['USER_RIGHT_CREATE_USER'])
{
Expand Down Expand Up @@ -1930,24 +1936,26 @@
$result = db_execute_assoc($query);
if($result->RecordCount() > 0)
{
if($_POST['uid'] != _("Please Choose...")){
if($_POST['uid'] > 0){

$isrquery = "INSERT INTO {$dbprefix}surveys_rights VALUES($surveyid,". $_POST['uid'].",0,0,0,0,0,0)";
$isrresult = $connect->Execute($isrquery);

if(mysql_affected_rows() < 0)
if($isrresult)
{
// Username already exists.
$addsummary .= "<br /><strong>"._("Failed to add User.")."</strong><br />\n" . " " . _("Username already exists.")."<br />\n";
$addsummary .= "<br />"._("User added.")."<br />\n";
}
else
{
$addsummary .= "<br />"._("User added.")."<br />\n";
}
// Username already exists.
$addsummary .= "<br /><strong>"._("Failed to add User.")."</strong><br />\n" . " " . _("Username already exists.")."<br />\n";
}


$addsummary .= "<br /><form method='post' action='$scriptname?sid={$surveyid}'>"
."<input type='submit' value='"._("Set Survey Rights")."'>"
."<input type='hidden' name='action' value='setsurveysecurity'>"
."<input type='hidden' name='user' value='{$_POST['user']}'>"
//."<input type='hidden' name='user' value='{$_POST['user']}'>"
."<input type='hidden' name='uid' value='{$_POST['uid']}'>"
."</form>\n";
$addsummary .= "<br /><a href='$scriptname?action=surveysecurity&sid={$surveyid}'>"._("Continue")."</a><br />&nbsp;\n";
Expand Down Expand Up @@ -2006,7 +2014,8 @@
$resul2row = $result2->FetchRow();

$usersummary = "<table width='100%' border='0'>\n\t<tr><td colspan='6' bgcolor='black' align='center'>\n"
. "\t\t<strong>$setfont<font color='white'>"._("Set Survey Rights").": ".$_POST['user']."</td></tr>\n";
//. "\t\t<strong>$setfont<font color='white'>"._("Set Survey Rights").": ".$_POST['user']."</td></tr>\n";
. "\t\t<strong>$setfont<font color='white'>"._("Set Survey Rights")."</td></tr>\n";

$usersummary .= "\t\t<th align='center'>edit_survey_property</th>\n"
. "\t\t<th align='center'>define_questions</th>\n"
Expand Down Expand Up @@ -2115,7 +2124,7 @@
. "\t\t\t\t\t</select>\n"
. "\t\t\t\t</td>\n"

. "\t\t<td align='center'><input type='submit' $btstyle value='"._("Add User")."'>"
. "\t\t<td align='center'><input type='submit' value='"._("Add User")."'>"
. "<input type='hidden' name='action' value='addsurveysecurity'></td></form>\n"
. "\t</tr>\n"
. "\t</table>\n";
Expand Down
2 changes: 1 addition & 1 deletion admin/install/create-mysql.sql
View file
Expand Up @@ -218,7 +218,7 @@ CREATE TABLE `prefix_surveys` (

CREATE TABLE `prefix_users` (
`uid` int(11) NOT NULL auto_increment PRIMARY KEY,
`user` varchar(20) NOT NULL default '',
`user` varchar(20) NOT NULL UNIQUE default '',
`password` BLOB NOT NULL default '',
`parent_id` int(10) unsigned NOT NULL,
`lang` varchar(20),
Expand Down
16 changes: 2 additions & 14 deletions admin/sessioncontrol.php
View file
Expand Up @@ -42,7 +42,7 @@

//LANGUAGE ISSUES

if (returnglobal('action') == "changelang")
if (returnglobal('action') == "changelang" && !$login) // no update when login (just read from db)
{
$_SESSION['adminlang']=returnglobal('lang');
// if user is logged in update language in database
Expand Down Expand Up @@ -75,18 +75,6 @@
$_SESSION['USER_RIGHT_PULL_UP_USER'] = $fields['pull_up_user'];
$_SESSION['USER_RIGHT_PUSH_DOWN_USER'] = $fields['push_down_user'];
$_SESSION['USER_RIGHT_CREATE_TEMPLATE'] = $fields['create_template'];
}
/*
else
{
// nicht mehr nötig
$accesssummary = ("<strong>Keine Benutzerrechte gefunden! Bitte kontaktieren Sie den Admin.</strong>");
killSession();
checkfortables();
}
*/
}
}

//CHANGE LANGUAGE IF SESSION LANG DOESN'T MATCH DEFAULT LANG
//if (isset($_SESSION['adminlang'])) {$defaultlang=$_SESSION['adminlang'];}
?>

0 comments on commit ddf98ae

Please sign in to comment.