Changeset 192

Timestamp:

08/09/06 15:44:02 (2 years ago)

Author:

rollercow

Message:

More small sanity changes

Files:

• admin.lib.php (modified) (11 diffs)

admin.lib.php

@@ -725 +725 @@
-                echo "</select><br />\n";
-                echo "<input type=\"submit\" name=\"delete\" value=\"Delete selected\" />\n";
+                echo "</form>\n";
+                //close and start a new form, so pressing enter in the 2nd bit of the form submits with addnew rather than delete
+                echo "<form name=\"emailform\" id=\"emailform\" action=\"".$this->adminPath."updateauthusers\" method=\"post\">\n";
-                echo "<h3>"._("Add Address")."</h3>\n";
-                echo "<input type=\"text\" name=\"name\" id=\"name\" />\n";
@@ -734 +737 @@
-                echo "</div>\n";
-        }
-//got here, need to check for valid email address and such before hitting the db
-        //udates the list of authorised users.
-        function updateAuthorisedUsers($quiet=FALSE) {
+                //hack so we get error returned from validEmail
+                global $error;
+                //if we have a delete action
-                if(isset($_POST['delete'])) {
-                        if (count($_POST['emaillist'])==0) {
@@ -743 +748 @@
-                                $del = "(";
-                                foreach($_POST['emaillist'] as $addr) {
-
+
+
+
+
+
+
-                                }
-                                $del = substr($del, 0, -4).")";
@@ -754 +764 @@
-                                }
-                        }
-
-
-
+
+
+
+
+
-                        }
-                        if(!validEmail($_POST['email'])) {
-error = _("Check e-mail address"
-
-
+this->error = _("Invalid e-mail address : ".$error
+
+this->
-                                $name = addslashes(trim($_POST['name']));
-                                $email = addslashes(trim($_POST['email']));
@@ -770 +782 @@
-                                        echo "<div class=\"updateinfo\">"._("Address added")."</div>\n";
-                                }
+                        }
+                        else {
+                                error(3,$this->error);
-                        }
-                }
@@ -825 +840 @@
-                        error(4, _("No entries marked for deletion."));
-                } else {
-                        //Need to check the entries exist first
-                        if ($_REQUEST[submit]==_("Yes")) {
-                                $sql = "DELETE FROM entries WHERE (";
@@ -834 +848 @@
-                                $sql .= ") AND user_id = {$this->id};";
-                                db_query($sql);
-count($_POST['entry']
+db_affected_rows($sql
-                        } else {
-                                error(4, _("Entries not deleted."));
@@ -859 +873 @@
-                $description = '';
-                //sanitise username
-isset($_POST['username']) && trim($_POST['username']) != "" && (int)$_POST['username'] == 0
+trim($_POST['username']) != ""
-                        if (safeuname($_POST['username'])) {
-addslashes(trim(strip_tags($_POST['username'])))
+$_POST['username']
-                        } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        $title = addslashes(trim(strip_tags($_POST['title'])));
-                } else {
-inputE
-
-
- && (int)$_POST['description'] == 0
+e
+
+, same check as title gets
+
-                        $description = addslashes(trim(strip_tags($_POST['description'])));
-                } else {
-inputE
+e
-                }
-                //check the user doesn't already exist
@@ -890 +909 @@
-                $sqlNum = db_num_rows($sql);
-                if ($sqlNum != 0) {
-inputE
+e
-                }
-                //check there is a system user with this name (ie if they are a sucs member)
-                if(!posix_getpwnam($username)) {
-inputE
+e
-                } else {
-                        //check the user is a member of the users, staff or socieys groups
-                        $posixInfo = posix_getpwnam($username);
-                        if ($posixInfo[gid] != 100 && $posixInfo[gid] != 106 && $posixInfo[gid] != 113) {
-inputE
+e
-                        }
-                }
-                //if we dont have any errors
-inputE
+e
-                        //encrypt the password
-                        $cryptPassword = crypt($password);
@@ -933 +952 @@
-        function addUserForm() {
-                echo "<div class=\"entry\">\n";
-inputE
-inputE
+e
+e
-                }
-                echo "<h2>"._("Register for a Blog")."</h2>\n";
@@ -940 +959 @@
-                echo "<form action=\"".$this->adminPath."adduser\" method=\"post\" id=\"adduserform\">\n";
-                echo "<p>\n";
-inputE
+e
-                echo "<label for=\"username\">"._("Username")."</label>\n";
-                echo "</p>\n";
-                echo "<p>\n";
-inputE
+e
-                echo "<label for=\"name\">"._("Real name")."</label>\n";
-                echo "</p>\n";
-                echo "<p>\n";
-inputE
+e
-                echo "<label for=\"title\">"._("Title")."</label>\n";
-                echo "</p>\n";
-                echo "<p>\n";
-inputE
+e
-                echo "<label for=\"title\">"._("Description")."</label>\n";
-                echo "</p>\n";