diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set user_enabled to true when adding a user and add enabled to the user account list.

Browse Source
This commit is contained in:
Mark Crane
2012-08-10 17:29:25 +00:00
parent 13d8e86b7d
commit 97a5aba2a6
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/users/signup.php
+4 -2
View File
@@ -110,7 +110,8 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
$sql .= "password, "; $sql .= "password, ";
$sql .= "salt, "; $sql .= "salt, ";
$sql .= "user_add_date, "; $sql .= "user_add_date, ";
$sql .= "user_add_user "; $sql .= "user_add_user, ";
$sql .= "user_enabled ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
$sql .= "("; $sql .= "(";
@@ -121,7 +122,8 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
$sql .= "'".md5($salt.$password)."', "; $sql .= "'".md5($salt.$password)."', ";
$sql .= "'".$salt."', "; $sql .= "'".$salt."', ";
$sql .= "now(), "; $sql .= "now(), ";
$sql .= "'".$_SESSION["username"]."' "; $sql .= "'".$_SESSION["username"]."', ";
$sql .= "'true' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
core/users/userlist.php
+5 -3
View File
@@ -85,9 +85,9 @@ echo " <td align=\"center\">\n";
echo "</tr>\n"; echo "</tr>\n";
//get the user list from the database //get the user list from the database
$sql = " select * from v_users "; $sql = "select * from v_users ";
$sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and user_enabled = 'true' "; $sql .= "and (user_enabled = 'true' or user_enabled is null) ";
if (strlen($field_name) > 0 && strlen($field_value) > 0) { if (strlen($field_name) > 0 && strlen($field_value) > 0) {
$sql .= "and $field_name = '$field_value' "; $sql .= "and $field_name = '$field_value' ";
} }
@@ -106,7 +106,7 @@ echo " <td align=\"center\">\n";
$sql = "select * from v_users "; $sql = "select * from v_users ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and user_enabled = 'true' "; $sql .= "and (user_enabled = 'true' or user_enabled is null) ";
if (strlen($field_name) > 0 && strlen($field_value) > 0) { if (strlen($field_name) > 0 && strlen($field_value) > 0) {
$sql .= "and $field_name like '%$field_value%' "; $sql .= "and $field_name like '%$field_value%' ";
} }
@@ -136,6 +136,7 @@ echo " <td align=\"center\">\n";
echo th_order_by('username', 'Username', $order_by, $order); echo th_order_by('username', 'Username', $order_by, $order);
//echo th_order_by('user_email', 'Email', $order_by, $order); //echo th_order_by('user_email', 'Email', $order_by, $order);
//echo th_order_by('user_template_name', 'Template', $order_by, $order); //echo th_order_by('user_template_name', 'Template', $order_by, $order);
echo "<th>Enabled</th>\n";
echo "<td align='right' width='42'>\n"; echo "<td align='right' width='42'>\n";
if (permission_exists('user_add')) { if (permission_exists('user_add')) {
echo " <a href='signup.php' alt='add'>$v_link_label_add</a>\n"; echo " <a href='signup.php' alt='add'>$v_link_label_add</a>\n";
@@ -148,6 +149,7 @@ echo " <td align=\"center\">\n";
echo "<tr >\n"; echo "<tr >\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['username']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['username']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['user_email']."&nbsp;</td>\n"; //echo " <td valign='top' class='".$row_style[$c]."'>".$row['user_email']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['user_enabled']."&nbsp;</td>\n";
echo " <td valign='top' align='right'>\n"; echo " <td valign='top' align='right'>\n";
if (permission_exists('user_edit')) { if (permission_exists('user_edit')) {
echo " <a href='usersupdate.php?id=".$row['user_uuid']."' alt='edit'>$v_link_label_edit</a>\n"; echo " <a href='usersupdate.php?id=".$row['user_uuid']."' alt='edit'>$v_link_label_edit</a>\n";