Changeset 9

Timestamp:

2007-11-21 19:14:26 (5 years ago)

Author:

hannes

Message:

• User Panel added in the place of 'Edit Profile' page (ticket #4)
  
• changed thread subscription model
  

Files:

• trunk/admin/classes/pages/Editmember.php (modified) (1 diff)
• trunk/classes/misc/Member.php (modified) (1 diff)
• trunk/classes/misc/Post.php (modified) (2 diffs)
• trunk/classes/pages/Editprofile.php (deleted)
• trunk/classes/pages/Page.php (modified) (3 diffs)
• trunk/classes/pages/Register.php (modified) (1 diff)
• trunk/classes/pages/Reply.php (modified) (1 diff)
• trunk/classes/pages/Userpanel.php (added)
• trunk/db/spamboard.sql (modified) (8 diffs)
• trunk/includes/input.php (modified) (2 diffs)
• trunk/includes/lang/en.php (modified) (4 diffs)

trunk/admin/classes/pages/Editmember.php

@@ -181 +181 @@
-                        $q->bindParam(':id', $id, PDO::PARAM_INT, 12);
-                        $q->execute();
+                        // delete subscriptions
+                        $q = $C->prepare('DELETE FROM ' . $SETTINGS['dbtableprefix'] . 'subscriptions WHERE member = :id');
+                        $q->bindParam(':id', $id, PDO::PARAM_INT, 12);
+                        $q->execute();
+                        // done
-                        $div = $this->html->body->addChild('div', $LANG['member_deleted']);
-                        $div->addAttribute('id', 'admin_main');

trunk/classes/misc/Member.php

@@ -597 +597 @@
-                return $_permit;
-            } elseif ($page == 'Reply' || $page == 'Newtopic' || $page == 'Newpoll') {
+                if ($page == 'Reply') {
+                    // $id is given as topic id, but forum id is required
+                    $q2 = $C->prepare('SELECT forum FROM ' . $SETTINGS['dbtableprefix'] . 'topics WHERE topicid=:id');
+                    $q2->bindParam(':id', $id, PDO::PARAM_INT, 12);
+                    $q2->execute();
+                    $row = $q2->fetchObject();
+                    $id = $row->forum;
+                }
-                // check for each of the user's groups
-                foreach ($_groups as $key=>$val) {

trunk/classes/misc/Post.php

@@ -372 +372 @@
-                            $q->execute();
-                            // topic subscription
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                            $q->bindParam(':id', $reply, PDO::PARAM_INT, 12);
-                            $q->execute();
-
-
+
+
+
+
-                            // check if this user has already been subscribed
-                            $found = 0;
@@ -409 +426 @@
-                                $q->execute();
-                            }
+                            */
-                            // get last page of topic
-                            $q = $C->prepare('SELECT COUNT(postid) FROM ' . $SETTINGS['dbtableprefix'] . 'posts WHERE topic=:id');

trunk/classes/pages/Page.php

@@ -52 +52 @@
-        $this->exec_time_start = microtime(TRUE);
-        /* Have some kind of manual per-page login credentials been posted?
-Editprofile
-editprofile
+Userpanel
+userpanel
-            if (Member::authenticate($user, $password)) {
-                // authenticated for this step
@@ -183 +183 @@
-            }
-            // the rest is always the same
-editprofile') . '">' . $LANG['Profile
+userpanel') . '">' . $LANG['User_Panel
-            $_span = new XMLElement($_str);
-            $div->addElement($_span);
@@ -190 +190 @@
-        $this->locationbar = $this->html->body->addChild('div');
-        $this->locationbar->addAttribute('id', 'location');
+        // user panel menu
+        if ($show == 'userpanel') {
+            $this->html->body->addChild('h2', $LANG['User_Panel']);
+            $div = $this->html->body->addChild('div');
+            $div->addAttribute('class', 'message');
+            $div->addAttribute('align', 'center');
+            $_str = '<span><a href="' . $F->link('userpanel') . 'action=password">' . $LANG['Password'] . '</a> - <a href="' . $F->link('userpanel') . 'action=email">' . $LANG['E-Mail'] . '</a> - <a href="' . $F->link('userpanel') . 'action=profile">' . $LANG['Profile'] . '</a> - <a href="' . $F->link('userpanel') . 'action=subscriptions">' . $LANG['Subscriptions'] . '</a> - <a href="' . $F->link('userpanel') . 'action=groups">' . $LANG['User_Groups'] . '</a></span>';
+            $div->addElement(new XMLElement($_str));
+        }
-    } /* constructor */
-

trunk/classes/pages/Register.php

@@ -127 +127 @@
-                            @mail($email, $SETTINGS['forumname'] . ' - ' . $LANG['Registration'], str_replace('%password%', $p->get(), $LANG['welcome_mail']), 'From: ' . $SETTINGS['forumadminemail']);
-                            $div = $this->html->body->addChild('div', $LANG['registration_success']);
-
+class', '
-                        }
-                    } else {

trunk/classes/pages/Reply.php

@@ -70 +70 @@
-                // default: not previously subscribed
-                $subscribed = FALSE;
-
+_
-                    // check if member is subscribed to topic
-subscribed FROM ' . $SETTINGS['dbtableprefix'] . 'topics WHERE topicid=:id
+COUNT(*) FROM ' . $SETTINGS['dbtableprefix'] . 'subscriptions WHERE topic = :id AND member = :member
-                    $q->bindParam(':id', $id, PDO::PARAM_INT, 12);
+                    $q->bindParam(':member', $_SESSION['memberid'], PDO::PARAM_INT, 12);
-                    $q->execute();
-
-
-
-
+
-                        $subscribed = TRUE;
-                    }

trunk/db/spamboard.sql

@@ -64 +64 @@
-  closed INTEGER NOT NULL DEFAULT 0,
-  pinned INTEGER NOT NULL DEFAULT 0,
-  subscribed TEXT NOT NULL,
-  poll INTEGER NOT NULL DEFAULT 0,
-  topic_views INTEGER NOT NULL,
@@ -99 +98 @@
-INSERT INTO "sb_rights" VALUES('Calendar',4,1,1);
-INSERT INTO "sb_rights" VALUES('Calendar',5,1,1);
-INSERT INTO "sb_rights" VALUES('Editprofile',1,1,1);
-INSERT INTO "sb_rights" VALUES('Register',1,1,1);
-INSERT INTO "sb_rights" VALUES('Register',2,1,1);
-INSERT INTO "sb_rights" VALUES('Register',4,1,1);
-INSERT INTO "sb_rights" VALUES('Register',5,1,1);
-INSERT INTO "sb_rights" VALUES('Editprofile',2,1,1);
-INSERT INTO "sb_rights" VALUES('Editprofile',4,1,1);
-INSERT INTO "sb_rights" VALUES('Editprofile',5,0,0);
-INSERT INTO "sb_rights" VALUES('Members',1,1,0);
-INSERT INTO "sb_rights" VALUES('Members',2,1,0);
@@ -204 +199 @@
-INSERT INTO "sb_rights" VALUES('Calendar',3,1,1);
-INSERT INTO "sb_rights" VALUES('Register',3,1,1);
-INSERT INTO "sb_rights" VALUES('Editprofile',3,1,1);
-INSERT INTO "sb_rights" VALUES('Members',3,1,0);
-INSERT INTO "sb_rights" VALUES('Search',3,1,1);
@@ -233 +227 @@
-INSERT INTO "sb_rights" VALUES('Uploadavatar',4,1,1);
-INSERT INTO "sb_rights" VALUES('Uploadavatar',5,0,0);
+INSERT INTO "sb_rights" VALUES('Userpanel',1,1,1);
+INSERT INTO "sb_rights" VALUES('Userpanel',2,1,1);
+INSERT INTO "sb_rights" VALUES('Userpanel',3,1,1);
+INSERT INTO "sb_rights" VALUES('Userpanel',4,1,1);
+INSERT INTO "sb_rights" VALUES('Userpanel',5,0,0);
-
-CREATE TABLE sb_rights_default (
@@ -258 +257 @@
-INSERT INTO "sb_rights_default" VALUES('Calendar',4,1,1);
-INSERT INTO "sb_rights_default" VALUES('Calendar',5,1,1);
-INSERT INTO "sb_rights_default" VALUES('Editprofile',1,1,1);
-INSERT INTO "sb_rights_default" VALUES('Register',1,1,1);
-INSERT INTO "sb_rights_default" VALUES('Register',2,1,1);
-INSERT INTO "sb_rights_default" VALUES('Register',4,1,1);
-INSERT INTO "sb_rights_default" VALUES('Register',5,1,1);
-INSERT INTO "sb_rights_default" VALUES('Editprofile',2,1,1);
-INSERT INTO "sb_rights_default" VALUES('Editprofile',4,1,1);
-INSERT INTO "sb_rights_default" VALUES('Editprofile',5,0,0);
-INSERT INTO "sb_rights_default" VALUES('Members',1,1,0);
-INSERT INTO "sb_rights_default" VALUES('Members',2,1,0);
@@ -363 +358 @@
-INSERT INTO "sb_rights_default" VALUES('Calendar',3,1,1);
-INSERT INTO "sb_rights_default" VALUES('Register',3,1,1);
-INSERT INTO "sb_rights_default" VALUES('Editprofile',3,1,1);
-INSERT INTO "sb_rights_default" VALUES('Members',3,1,0);
-INSERT INTO "sb_rights_default" VALUES('Search',3,1,1);
@@ -392 +386 @@
-INSERT INTO "sb_rights_default" VALUES('Uploadavatar',4,1,1);
-INSERT INTO "sb_rights_default" VALUES('Uploadavatar',5,0,0);
+INSERT INTO "sb_rights_default" VALUES('Userpanel',1,1,1);
+INSERT INTO "sb_rights_default" VALUES('Userpanel',2,1,1);
+INSERT INTO "sb_rights_default" VALUES('Userpanel',3,1,1);
+INSERT INTO "sb_rights_default" VALUES('Userpanel',4,1,1);
+INSERT INTO "sb_rights_default" VALUES('Userpanel',5,0,0);
-
-CREATE TABLE sb_usergroups (
@@ -446 +445 @@
-    member INTEGER NOT NULL
-);
+
+CREATE TABLE sb_subscriptions (
+    topic INTEGER NOT NULL,
+    member INTEGER NOT NULL
+);

trunk/includes/input.php

@@ -461 +461 @@
-$changegrouppublic = $_POST['changegrouppublic'];
-if (is_array($changegrouppublic)) {
-
-
+key=>$
+ || preg_match('/^[0-9]+$/', $key) != 1
-            die($LANG['error_input']);
-        }
@@ -554 +554 @@
-}
-
+$subscribe = $_POST['subscribe'];
+if (preg_match('/^[0-1]?$/', $subscribe) != 1) {
+    die($LANG['error_input']);
+}
+
+$newsubscribed = $_POST['newsubscribed'];
+if (is_array($newsubscribed)) {
+    foreach ($newsubscribed as $key=>$val) {
+        if (preg_match('/^[0-9]+$/', $val) != 1 || preg_match('/^[0-9]+$/', $key) != 1) {
+            die($LANG['error_input']);
+        }
+    }
+}
+
-?>

trunk/includes/lang/en.php

@@ -72 +72 @@
-$LANG['none'] = 'none';
-$LANG['Profile'] = 'Profile';
+$LANG['User_Panel'] = 'User Panel';
-$LANG['Forum'] = 'Forum';
-$LANG['Topic'] = 'Topic';
@@ -184 +185 @@
-$LANG['Suggestion'] = 'Suggestion';
-$LANG['Polls'] = 'Polls';
+$LANG['Subscriptions'] = 'Subscriptions';
+$LANG['Error'] = 'Error';
+$LANG['Subscribed'] = 'Subscribed';
-
-/* multi-word statements */
@@ -301 +305 @@
-$LANG['Filesystem_Path'] = 'Filesystem Path';
-$LANG['Webserver_Path'] = 'Webserver Path';
+$LANG['New_Subscription'] = 'New Subscription';
-
-/* actual sentences */
@@ -370 +375 @@
-$LANG['upload_avatar_hints'] = "<ul><li>File size must be smaller or equal 50KB</li><li>Width and height of the image mustn't exceed " . $SETTINGS['maxavatarsize'] . " pixels each</li><li>Allow file types are PNG, JPEG and GIF</li></ul>";
-$LANG['upload_avatar_success'] = 'Your avatar has been uploaded successfully. You can now safely close this window, then reload the page from which you opened it and the new file should appear in the list.';
+$LANG['password_updated'] = 'Your password has been changed successfully.';
+$LANG['email_changed'] = 'Your e-mail address has been changed successfully.';
+$LANG['subscriptions_updated'] = 'Your subscriptions have been updated successfully.';
+$LANG['group_memberships_updated'] = 'Your group memberships have been updated successfully.';
-
-/* error messages */