Changeset 307

Timestamp:

2009-07-03 20:52:03 (3 years ago)

Author:

hannes

Message:

untested attempt at replacing member status with group based functionality

Files:

• trunk/admin/classes/pages/Editmember.php (modified) (7 diffs)
• trunk/admin/classes/pages/Groups.php (modified) (5 diffs)
• trunk/admin/classes/pages/Moderators.php (modified) (1 diff)
• trunk/admin/classes/pages/Permissions.php (modified) (3 diffs)
• trunk/admin/index.php (modified) (1 diff)
• trunk/classes/misc/Member.php (modified) (10 diffs)
• trunk/classes/misc/Post.php (modified) (2 diffs)
• trunk/classes/pages/Members.php (modified) (2 diffs)
• trunk/classes/pages/Messenger.php (modified) (1 diff)
• trunk/db/data.sql (modified) (1 diff)
• trunk/db/mysql.sql (modified) (4 diffs)
• trunk/db/postgresql.sql (modified) (4 diffs)
• trunk/db/sqlite.sql (modified) (4 diffs)
• trunk/includes/config/defaultgroups.php (added)
• trunk/includes/input.php (modified) (2 diffs)
• trunk/includes/lang/de.php (modified) (1 diff)
• trunk/includes/lang/en.php (modified) (1 diff)
• trunk/index.php (modified) (1 diff)
• trunk/install.php (modified) (2 diffs)

trunk/admin/classes/pages/Editmember.php

@@ -31 +31 @@
-     **/
-    public function __construct() {
-STATU
+DEFAULTGROUP
-        global $INPUT;
-        // define location and title parameter
@@ -38 +38 @@
-        // call parent constructor (general HTML 'skeleton')
-        parent::__construct(TRUE);
-        // define 'standard' groups which can only be modified by 'status'
-        $_def_groups = array_keys($STATUS);
-        if ((isset($INPUT['commit']) && $INPUT['commit'] == 'y') || (isset($INPUT['submit']) && $INPUT['submit'] == $LANG['Delete'])) {
-            // post-commit
@@ -136 +134 @@
-                                }
-                                // update rest in bulk
-=:lang, memberhomepage=:homepage, birthday=:birthday, location=:location, icq=:icq, aim=:aim, yahoo=:yahoo, msn=:msn, signature=:signature, memberemailhidden=:hideemail, messagenotification_email=:mn_email, messagenotification_popup=:mn_popup, boardstyle=:style, memberstatus=:status WHERE memberid=
+ = :lang, memberhomepage = :homepage, birthday = :birthday, location = :location, icq = :icq, aim = :aim, yahoo = :yahoo, msn = :msn, signature = :signature, memberemailhidden = :hideemail, messagenotification_email = :mn_email, messagenotification_popup = :mn_popup, boardstyle = :style, banned = :banned WHERE memberid = 
-                                $q->bindParam(':lang', trim($INPUT['newlanguage']), PDO::PARAM_STR, 2);
-                                if (isset($INPUT['homepage'])) {
@@ -154 +152 @@
-                                $q->bindParam(':mn_popup', $INPUT['messagenotification_popup'], PDO::PARAM_INT, 1);
-                                $q->bindParam(':style', $INPUT['boardstyle'], PDO::PARAM_STR, 2);
-
+
+
+
+
-                                $q->bindParam(':id', $INPUT['id'], PDO::PARAM_INT, 12);
-                                $q->execute();
-                                $q = NULL;
-                                // translate status to group membership
-                                // first, delete previous entries
-                                foreach ($STATUS as $key=>$val) {
-                                    if ($key != 'Banned' && $key != 'Member') {
-                                        $q2 = $C->prepare('SELECT id FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups WHERE name = :group');
-                                        $q2->bindParam(':group', str_replace('_', ' ', $key), PDO::PARAM_STR);
-                                        $q2->execute();
-                                        $_groupid = $q2->fetchColumn();
-                                        $q2 = NULL;
-                                        $q = $C->prepare('DELETE FROM ' . $SETTINGS['dbtableprefix'] . 'groupmemberships WHERE member = :id AND usergroup = :group');
-                                        $q->bindParam(':id', $INPUT['id'], PDO::PARAM_INT, 12);
-                                        $q->bindParam(':group', $_groupid, PDO::PARAM_INT, 12);
-                                        $q->execute();
-                                        $q = NULL;
-                                    }
-                                }
-                                // enter new
-                                if ($INPUT['status'] != 'Member' && $INPUT['status'] != 'Banned') {
-                                    $q2 = $C->prepare('SELECT id FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups WHERE name = :group');
-                                    $q2->bindParam(':group', $INPUT['status'], PDO::PARAM_STR);
-                                    $q2->execute();
-                                    $_groupid = $q2->fetchColumn();
-                                    $q2 = NULL;
-                                    $q = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'groupmemberships (member, usergroup) VALUES (:id, :group)');
-                                    $q->bindParam(':id', $INPUT['id'], PDO::PARAM_INT, 12);
-                                    $q->bindParam(':group', $_groupid, PDO::PARAM_INT, 12);
-                                    $q->execute();
-                                    $q = NULL;
-                                }
-                                // success
-                                $output = $LANG['profile_updated'];
@@ -219 +191 @@
-                        $q = NULL;
-                        foreach ($rows as $row) {
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                $q->bindParam(':id', $INPUT['id'], PDO::PARAM_INT, 12);
-                                $q->bindParam(':group', $row['id'], PDO::PARAM_INT, 12);
-                                $q->execute();
-                                $q = NULL;
-                                if (isset($INPUT['newgroupmemberships'][$row['id']]) && $INPUT['newgroupmemberships'][$row['id']] == 1) {
-                                    // insert
-                                    $q = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'groupmemberships (member, usergroup) VALUES (:id, :group)');
-                                    $q->bindParam(':id', $INPUT['id'], PDO::PARAM_INT, 12);
-                                    $q->bindParam(':group', $row['id'], PDO::PARAM_INT, 12);
-                                    $q->execute();
-                                    $q = NULL;
-                                }
-                            }
-                        }
@@ -268 +237 @@
-                        $form->addTableRow($LANG['Confirm_New_Password'] . ':', 'password', 'newpassword2');
-                        $form->addTableRow($LANG['E-Mail'] . ': *', 'text', 'email', $m->getEmail());
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                        // construct second column according to current settings
-                        if (!$m->getMailHidden()) {
@@ -453 +416 @@
-                        foreach ($rows2 as $row2) {
-                            $_col2 = '<td><input type="checkbox" name="newgroupmemberships[' . $row2['id'] . ']"';
-
-
-
-
+
+
-                            } else {
-                                // freely modifyable groups
-                                $_col1 = $row2['name'];
-                            }

trunk/admin/classes/pages/Groups.php

@@ -31 +31 @@
-     **/
-    public function __construct() {
-STATU
+DEFAULTGROUP
-        global $INPUT;
-        // define location and title parameter
@@ -38 +38 @@
-        // call parent constructor (general HTML 'skeleton')
-        parent::__construct(TRUE);
-        // define 'standard' groups which can't be modified
-        $_def_groups = array_keys($STATUS);
-        if (isset($INPUT['commit']) && $INPUT['commit'] == 'y') {
-            // post-commit
@@ -49 +47 @@
-                $q = NULL;
-                foreach ($rows as $row) {
-_def_groups
+DEFAULTGROUPS
-                        if (isset($INPUT['changegroupdelete'][$row['id']]) && $INPUT['changegroupdelete'][$row['id']] == 1) {
-                            // delete group memberships beloging to this group
@@ -101 +99 @@
-                $form->addInput('hidden', 'commit', 'y');
-                $form->createTable('adminform');
-
+, '<th>' . $LANG['Status'] . '</th>'
-                // get all current user groups
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        // default, non-modifyable groups
-STATUS[$row['name']] . '" disabled="disabled" /></td>', '<td><input name="changegrouppublic[' . $row['id'] . ']" type="checkbox" value="1" disabled="disabled" /></td>', '&nbsp;', '<td><a href="' . $F->link('permissions') . 'id=' . $row['id'] . '">' . $LANG['Edit'] . '</a>
+_name . '" disabled="disabled" /></td>', '<td><input name="changegrouppublic[' . $row['id'] . ']" type="checkbox" value="1" disabled="disabled" /></td>', '&nbsp;', '<td><a href="' . $F->link('permissions') . 'id=' . $row['id'] . '">' . $LANG['Edit'] . '</a></td>', '<td>' . $_col5 . '
-                    } else {
-                        // admin defined groups
@@ -114 +131 @@
-                        }
-                        $_col2 .= ' />';
-row['name'] . '" /></td>', '<td>' . $_col2 . '</td>', '<td><input name="changegroupdelete[' . $row['id'] . ']" type="checkbox" value="1" /></td>', '<td><a href="' . $F->link('permissions') . 'id=' . $row['id'] . '">' . $LANG['Edit'] . '</a>
+_name . '" /></td>', '<td>' . $_col2 . '</td>', '<td><input name="changegroupdelete[' . $row['id'] . ']" type="checkbox" value="1" /></td>', '<td><a href="' . $F->link('permissions') . 'id=' . $row['id'] . '">' . $LANG['Edit'] . '</a></td>', '<td>' . $_col5 . '
-                    }
-                }

trunk/admin/classes/pages/Moderators.php

@@ -53 +53 @@
-                    $_invalid = Array();
-                    foreach ($_newmods as $_mod) {
-
-
+
+
+
+
-                        if ($q->execute() && $row2 = $q->fetchObject()) {
+                            // valid
-                            $q = NULL;
-
-
-
-
-
-
-
+
-                        } else {
-                            // invalid

trunk/admin/classes/pages/Permissions.php

@@ -31 +31 @@
-     **/
-    public function __construct() {
-STATU
+DEFAULTGROUP
-        global $INPUT;
-        // define location and title parameter
@@ -38 +38 @@
-        // call parent constructor (general HTML 'skeleton')
-        parent::__construct(TRUE);
-        // define 'standard' groups
-        $_def_groups = array_keys($STATUS);
-        // define pages to exclude (these are mostly those which have forum-specific rights assigned
-        $_exclude_pages = Array('Page', 'Category', 'Forum', 'Topic', 'Newpoll', 'Reply', 'Moderate', 'Newtopic');
@@ -137 +135 @@
-                    $this->html->body->addChild('br');
-                    $this->html->body->addChild('div', $LANG['help_editing_permissions']);
-_def_groups
+DEFAULTGROUPS
-                        $this->html->body->addChild('br');
-                        $this->html->body->addChild('div', $LANG['warning_editing_permissions_of_default_group']);

trunk/admin/index.php

@@ -62 +62 @@
-require_once($SETTINGS['fspath'] . 'includes/config/memberstages.php');
-
+// default usergroups
+require_once($SETTINGS['fspath'] . 'includes/config/defaultgroups.php');
+
-// cryptography module
-require_once($SETTINGS['fspath'] . 'includes/config/crypt.php');

trunk/classes/misc/Member.php

@@ -34 +34 @@
-    private $avatar;
-    private $status;
+    private $banned;
-    private $stage;
-    private $posts;
@@ -107 +108 @@
-                }
-                $this->avatar = $row->memberavatar;
-
+
+
+
+
+
-                $this->homepage = $row->memberhomepage;
-                $this->registration = $row->registered;
@@ -137 +142 @@
-                    $_i++;
-                }
+                // member status
+                $q = $C->prepare('SELECT ug.name FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups AS ug INNER JOIN ' . $SETTINGS['dbtableprefix'] . 'groupmemberships AS gm ON gm.usergroup = ug.id WHERE gm.member = :memberid AND ug.status > :zero ORDER BY ug.status ASC LIMIT 1');
+                $q->bindParam(':memberid', $this->id, PDO::PARAM_INT);
+                $q->bindValue(':zero', 0, PDO::PARAM_INT);
+                $q->execute();
+                $row = $q->fetchObject();
+                $q = NULL;
+                $this->status = $row->name;
-            } else {
-                // member hasn't been found - deleted member
@@ -166 +179 @@
-    public function getPostside() {
-        // language, formatting
-TATUS, $S
+
-        // output
-        $_s = '<div><strong><a href="' . $F->link('profile') . 'id=' . $this->id . '">' . $this->name . '</a></strong></div>';
@@ -176 +189 @@
-        // translate status
-        $_s .= '<div>';
-STATUS[$this->status]) && $STATUS
-STATUS
+LANG[$this->status]) && $LANG
+LANG
-        }
-        else {
@@ -341 +354 @@
-     **/
-    public function getStatus($translated = FALSE) {
-STATUS
+LANG
-        if ($translated) {
-STATUS[$this->status]) && $STATUS
-STATUS
+LANG[$this->status]) && $LANG
+LANG
-            } else {
-                $_s = $this->status;
@@ -354 +367 @@
-        }
-    } /* function getStatus */
+
+    /**
+     * Function:    getBanned
+     * Description: check whether this member has been banned
+     * Input:       -
+     * Returns:     TRUE / FALSE
+     **/
+    public function getBanned() {
+        return $this->banned;
+    } /* function getBanned */
-
-    /* get registration date */
@@ -379 +402 @@
-    public function getProfile() {
-        // language, formatting
-STATUS, $F
+F, $C, $SETTINGS
-        // assemble info table
-        $table = new Table('blind');
-        $table->addRow(Array($LANG['Name'] . ':', $this->name));
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $table->addRow(Array($LANG['E-Mail'] . ':', '<td><a href="' . $F->link('mail') . 'id=' . $this->id . '">' . $LANG['Send'] . '</a></td>'));
-        $table->addRow(Array($LANG['Message'] . ':', '<td><a href="' . $F->link('messenger') . 'action=send&amp;id=' . $this->id . '">' . $LANG['Send'] . '</a></td>'));
@@ -848 +884 @@
-                     * not every db supports this, but usually, it should work without locking, too; there just is the risk of a wrong member id being returned in the second query which is very unlikely - it can only occur on forums with very high traffic */
-                    @$C->query('LOCK TABLES ' . $SETTINGS['dbtableprefix'] . 'members WRITE');
-status, memberavatar) VALUES (:user, :email, :pw, :ts, :member
+avatar) VALUES (:user, :email, :pw, :ts
-                    $_t = new DateTime('now', new DateTimeZone('UTC'));
-                    $q->bindParam(':user', $username, PDO::PARAM_STR);
@@ -855 +891 @@
-                    $q->bindValue(':pw', '*', PDO::PARAM_STR);
-                    $q->bindParam(':ts', $_t->format('Y-m-d H:i:s'), PDO::PARAM_STR, 19);
-                    $q->bindValue(':member', 'Member', PDO::PARAM_STR);
-                    $q->bindValue(':avatar', 'images/spacer.gif', PDO::PARAM_STR);
-                    $q->execute();

trunk/classes/misc/Post.php

@@ -333 +333 @@
-                    } else {
-                        // member authenticated
-memberstatus
+banned
-                        $q->bindParam(':id', $_SESSION['memberid'], PDO::PARAM_INT, 12);
-                        $s = $q->execute();
@@ -340 +340 @@
-                            $q = NULL;
-                            // check if he's banned
-memberstatus != 'Banned'
+banned != 0
-                                $INPUT['email'] = $row->memberemail;
-                                // set flag for 'registered member'

trunk/classes/pages/Members.php

@@ -52 +52 @@
-                    $orderdb = 'membername ASC';
-                break;
-                case 'status':
-                    $orderdb = 'memberstatus ASC';
-                break;
-                case 'posts':
-                    /* the total posts of a member are listed in the members table;
@@ -88 +85 @@
-                $table = new Table();
-                // column headers with links to order table
-<a href="' . $F->link('members') . 'order=status&amp;page=' . $INPUT['page'] . '">' . $LANG['Status'] . '</a>
+' . $LANG['Status'] . '
-                // display members
-                $i = $start + 1;

trunk/classes/pages/Messenger.php

@@ -232 +232 @@
-                    if ($ok === 1) {
-                        // check if user's account is banned
-memberstatus
+banned
-                        $q->bindParam(':id', $_SESSION['memberid'], PDO::PARAM_INT, 12);
-                        $q->execute();
-status
-
-status == 'Banned'
+banned
+
+banned != 0
-                            $ok = -1;
-                            $_error = $LANG['error_banned_username'];

trunk/db/data.sql

@@ -353 +353 @@
-INSERT INTO %prefix%rights_default VALUES('Who_is_online',5,0,0);
-
-
-
-
-
-
+,1
+,2
+,3
+,4
+,5

trunk/db/mysql.sql

@@ -70 +70 @@
-  id INTEGER PRIMARY KEY AUTO_INCREMENT,
-  name VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
-
+
+
-) CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
@@ -81 +82 @@
-  memberavatar VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
-  memberpassword VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  memberstatus VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  memberposts INTEGER NOT NULL DEFAULT 0,
-  location VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL,
@@ -100 +100 @@
-  attachments INTEGER NOT NULL DEFAULT 0,
-  timezone VARCHAR(8) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL,
-
+
+
-) CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
@@ -152 +153 @@
-CREATE INDEX idx_posts_poster ON %prefix%posts (poster ASC, posttime DESC);
-CREATE INDEX idx_members_membername ON %prefix%members (membername ASC);
-CREATE INDEX idx_members_memberstatus ON %prefix%members (memberstatus ASC);
-CREATE INDEX idx_members_memberposts ON %prefix%members (memberposts DESC);
-CREATE INDEX idx_members_registered ON %prefix%members (registered ASC);

trunk/db/postgresql.sql

@@ -70 +70 @@
-  id SERIAL PRIMARY KEY,
-  name VARCHAR(255) NOT NULL,
-
+
+
-);
-
@@ -81 +82 @@
-  memberavatar VARCHAR(255) NOT NULL,
-  memberpassword VARCHAR(255) NOT NULL,
-  memberstatus VARCHAR(255) NOT NULL,
-  memberposts INTEGER NOT NULL DEFAULT 0,
-  location VARCHAR(255) NULL,
@@ -100 +100 @@
-  attachments INTEGER NOT NULL DEFAULT 0,
-  timezone VARCHAR(8) NULL,
-
+
+
-);
-
@@ -152 +153 @@
-CREATE INDEX idx_posts_poster ON %prefix%posts (poster ASC, posttime DESC);
-CREATE INDEX idx_members_membername ON %prefix%members (membername ASC);
-CREATE INDEX idx_members_memberstatus ON %prefix%members (memberstatus ASC);
-CREATE INDEX idx_members_memberposts ON %prefix%members (memberposts DESC);
-CREATE INDEX idx_members_registered ON %prefix%members (registered ASC);

trunk/db/sqlite.sql

@@ -70 +70 @@
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  name VARCHAR(255) NOT NULL COLLATE NOCASE,
-
+
+
-);
-
@@ -81 +82 @@
-  memberavatar VARCHAR(255) NOT NULL,
-  memberpassword VARCHAR(255) NOT NULL COLLATE BINARY,
-  memberstatus VARCHAR(255) NOT NULL COLLATE NOCASE,
-  memberposts INTEGER NOT NULL DEFAULT 0,
-  location VARCHAR(255) NULL COLLATE NOCASE,
@@ -100 +100 @@
-  attachments INTEGER NOT NULL DEFAULT 0,
-  timezone VARCHAR(8) NULL COLLATE NOCASE,
-
+
+
-);
-
@@ -152 +153 @@
-CREATE INDEX idx_posts_poster ON %prefix%posts (poster ASC, posttime DESC);
-CREATE INDEX idx_members_membername ON %prefix%members (membername ASC);
-CREATE INDEX idx_members_memberstatus ON %prefix%members (memberstatus ASC);
-CREATE INDEX idx_members_memberposts ON %prefix%members (memberposts DESC);
-CREATE INDEX idx_members_registered ON %prefix%members (registered ASC);

trunk/includes/input.php

@@ -36 +36 @@
-    $not[] = 'LANG';
-    $not[] = 'RULES';
-STATU
+DEFAULTGROUP
-    // 'de-register' all local names of global variables
-    foreach ($_SERVER as $key=>$val) {
@@ -1027 +1027 @@
-if (isset($_POST['status']) && $_POST['status'] != '') {
-    $INPUT['status'] = $_POST['status'];
-
-
-
-
-
+
-        $WARNINGS[] = str_replace('%var%', 'status', $LANG['warning_input']);
-        unset($INPUT['status']);

trunk/includes/lang/de.php

@@ -36 +36 @@
-$RULES[5] = 'Es gibt keine Regel Nr. 6';
-
-/* translation of member status options */
-$STATUS = Array();
-$STATUS['Admin'] = 'Admin';
-$STATUS['Global Moderator'] = 'Globaler Moderator';
-$STATUS['Moderator'] = 'Moderator';
-$STATUS['Member'] = 'Mitglied';
-$STATUS['Guest'] = 'Gast';
-$STATUS['Banned'] = 'Verbannt';
-
-$LANG = Array();
+
+/* translation of user groups */
+$LANG['Admin'] = 'Admin';
+$LANG['Global Moderator'] = 'Globaler Moderator';
+$LANG['Moderator'] = 'Moderator';
+$LANG['Member'] = 'Mitglied';
+$LANG['Guest'] = 'Gast';
+$LANG['Banned'] = 'Verbannt';
-
-/* single words */

trunk/includes/lang/en.php

@@ -37 +37 @@
-$RULES[5] = 'There is nooooo rule 6';
-
-/* translation of member status options */
-$STATUS = Array();
-$STATUS['Admin'] = 'Admin';
-$STATUS['Global Moderator'] = 'Global Moderator';
-$STATUS['Moderator'] = 'Moderator';
-$STATUS['Member'] = 'Member';
-$STATUS['Guest'] = 'Guest';
-$STATUS['Banned'] = 'Banned';
-
-$LANG = Array();
+
+/* translation of user groups */
+$LANG['Admin'] = 'Admin';
+$LANG['Global Moderator'] = 'Global Moderator';
+$LANG['Moderator'] = 'Moderator';
+$LANG['Member'] = 'Member';
+$LANG['Guest'] = 'Guest';
+$LANG['Banned'] = 'Banned';
-
-/* single words */

trunk/index.php

@@ -59 +59 @@
-require_once($SETTINGS['fspath'] . 'includes/config/memberstages.php');
-
+// default usergroups
+require_once($SETTINGS['fspath'] . 'includes/config/defaultgroups.php');
+
-// cryptography module
-require_once($SETTINGS['fspath'] . 'includes/config/crypt.php');

trunk/install.php

@@ -258 +258 @@
-                            }
-                            // write the admin account
-, memberstatus) VALUES (:name, :email, :avatar, :password, :registered, :status
+) VALUES (:name, :email, :avatar, :password, :registered
-                            $_t = new DateTime('now', new DateTimeZone('UTC'));
-                            $q->bindParam(':name', $SETUPDATA['forumadmin'], PDO::PARAM_STR);
@@ -265 +265 @@
-                            $q->bindValue(':password', '*', PDO::PARAM_STR);
-                            $q->bindParam(':registered', $_t->format('Y-m-d H:i:s'), PDO::PARAM_STR, 19);
-                            $q->bindValue(':status', 'Admin', PDO::PARAM_STR);
-                            $q->execute();
-                            // get id of admin