Changeset 149

Timestamp:

20/07/05 18:31:22 (3 years ago)

Author:

rollercow

Message:

--SQL--
Added uniqueness checks to database to inforce here what we already should check in the code
New keys for..

• users -> username
  
• entries -> shortsubject+user_id
  
• authorised_emails -> email+user_id
  
  

--Sign Up--
New users can now sign up, provided they have a system account (thus are SUCS members)
Various Sign up links now exist, as ever everything i've writen needs checking and double checking for spelling.. preferably before we announce!

Files:

• admin.lib.php (modified) (5 diffs)
• admin.php (modified) (1 diff)
• blog.lib.php (modified) (2 diffs)
• blog.sql (modified) (3 diffs)

admin.lib.php

@@ -189 +189 @@
-                echo "</div>\n";
-                echo "</div>\n";
+                echo "<div>\n"._("Not got an account?")."<br /><a href=\"{$this->adminPath}signup\">"._("Sign Up Here!")."</a></div>";
-        }
-
@@ -765 +766 @@
-                //sanitise username
-                if (isset($_POST['username']) && trim($_POST['username']) != "" && (int)$_POST['username'] == 0) {
-username
+_POST['username']
-                                $username = addslashes(trim(strip_tags($_POST['username'])));
-                        }
@@ -774 +775 @@
-                        $this->inputError = _("No Username Provided");
-                }
-                
-                //sanitise name
-                if (isset($_POST['name']) && trim($_POST['name']) != "" && (int)$_POST['name'] == 0) {
@@ -793 +793 @@
-                        $this->inputError = _("No Description Provided");
-                }
+                //check the user doesn't already exist
+                $sql = db_query("SELECT username from users where username = '".$username."';");
+                $sqlNum = db_num_rows($sql);
+                if ($sqlNum != 0) {
+                        $this->inputError = _("Username already in use!");
+                }
+                //check there is a system user with this name (ie if they are a sucs member)
+                if(!posix_getpwnam($username)) {
+                        $this->inputError = _("You need to be a SUCS member to sign up for a blog here!");                      
+                }
+                //if we dont have any errors
-                if (!$this->inputError) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                        } 
+                        //else mail the password to the user and report sucsess
-                        else {
-                                mail(
-                                        "{$username}@sucs.org",
-                                        _("Blog Password"),
-You Blog Password is : ").$password."\n"._("Please login and change it at")
+Welcome to SUCS Blogs")."\n\n"._("The multi-user web log system created by SUCS members for SUCS members.")."\n\n"._("You Blog Password is : ").$password."\n"._("Please login and change it at ")."http://"
-                                        "From: \"Blog Admin\" <blogadmin@sucs.org>"
-                                );
-                                echo _("Account Added!<br />Your password has been sent to your SUCS email account");
-                        }
-
+
+
-                else {
-error(4,$this->inputError
+$this->addUserForm(
-                }
-        }
@@ -831 +837 @@
-                        echo "<div class=\"errorinfo\">"._("Error")." : " . $this->inputError . "</div>\n";
-                }
-
-
-
-
+
-                echo "<form action=\"".$this->adminPath."adduser\" method=\"post\" id=\"adduserform\">\n";
-                echo "<p>\n";
-22\" maxlength=\"5
+30\" maxlength=\"6
-                echo "<label for=\"username\">"._("Username")."</label>\n";
+                echo "</p>\n";
+                echo "<input type=\"text\" name=\"name\" id=\"name\" value=\"" . (($this->inputError != "") ? strip_tags(trim($_POST['name'])) : "") . "\" size=\"30\" maxlength=\"60\" tabindex=\"2\" />\n";
+                echo "<label for=\"name\">"._("Real name")."</label>\n";
+                echo "</p>\n";
+                echo "<p>\n";
+                echo "<input type=\"text\" name=\"title\" id=\"title\" value=\"" . (($this->inputError != "") ? strip_tags(trim($_POST['title'])) : "") . "\" size=\"30\" maxlength=\"60\" tabindex=\"3\" />\n";
+                echo "<label for=\"title\">"._("Title")."</label>\n";
+                echo "</p>\n";
+                echo "<p>\n";
+                echo "<input type=\"text\" name=\"description\" id=\"description\" value=\"" . (($this->inputError != "") ? strip_tags(trim($_POST['description'])) : "") . "\" size=\"30\" maxlength=\"60\" tabindex=\"4\" />\n";
+                echo "<label for=\"title\">"._("Description")."</label>\n";
+                echo "</p>\n";
+                echo "<p>\n";
+                echo "<input name=\"submit\" type=\"submit\" id=\"submit\" tabindex=\"4\" value=\""._("Sign Up")."\" />\n";
+                echo "</p>\n";          
+                echo "</form>\n";
+                echo "<p>"._("You need to be a member of ")."<a href=\"http://sucs.org/\">SUCS</a>"._(" to register")."<br />"._("The normal ")."<a href=\"http://sucs.org/info/conditions.php\">"._("Terms and Conditions")."</a>"._(" apply")."</p>\n";
+                echo "</div>\n";        
-        }
-}

admin.php

@@ -108 +108 @@
-                                }
-                }
-                //else offer login box
-                else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-

blog.lib.php

@@ -501 +501 @@
-                        echo "<p>"._("Welcome to SUCS Blogs - The multi-user web log system created by SUCS members for SUCS members.")."</p>\n";
-                        echo "<p>"._("Browse the blogs below or use the links on the left to navigate the site. Happy blogging!")."</p>\n";
+                        echo "<p>"._("Want to join the ranks of SUCS bloggers? - ")."<a href=\"{$this->adminPath}signup\">"._("Start a Blog!")."</a></p>\n";
-                        echo "</div>\n";
-                        echo "<div id=\"listofblogs\">\n";
@@ -555 +556 @@
-                echo "<ul class=\"side-menu\">\n";
-                echo "<li><a href=\"{$this->adminPath}\">"._("Blog admin")."</a></li>\n";
+                echo "<li><a href=\"{$this->adminPath}signup\">"._("Start a Blog")."</a></li>\n";
-                echo "</ul>\n";
-        }

blog.sql

@@ -10 +10 @@
-CREATE TABLE users (
-        id serial NOT NULL PRIMARY KEY,
-
+ UNIQUE
-        password text NOT NULL,
-        type integer DEFAULT 1,
@@ -31 +31 @@
-    user_id integer REFERENCES users ON DELETE CASCADE NOT NULL
-);
+CREATE UNIQUE INDEX entries_shortsubject_key ON entries (shortsubject, user_id);
-
-CREATE TABLE comments (
@@ -48 +49 @@
-    name text
-);
+CREATE UNIQUE INDEX entries_shortsubject_key ON entries (email, user_id);