Changeset 19
- Timestamp:
- 2007-11-23 12:07:31 (4 years ago)
- Files:
-
- trunk/admin/classes/pages/Addcategory.php (modified) (2 diffs)
- trunk/admin/classes/pages/Addforum.php (modified) (2 diffs)
- trunk/admin/classes/pages/Banning.php (modified) (2 diffs)
- trunk/admin/classes/pages/Category.php (modified) (1 diff)
- trunk/admin/classes/pages/Deletecategory.php (modified) (2 diffs)
- trunk/admin/classes/pages/Deleteforum.php (modified) (2 diffs)
- trunk/admin/classes/pages/Editmember.php (modified) (2 diffs)
- trunk/admin/classes/pages/Footer.php (modified) (2 diffs)
- trunk/admin/classes/pages/Groups.php (modified) (2 diffs)
- trunk/admin/classes/pages/Header.php (modified) (2 diffs)
- trunk/admin/classes/pages/Memberstages.php (modified) (2 diffs)
- trunk/admin/classes/pages/Moderators.php (modified) (2 diffs)
- trunk/admin/classes/pages/Modifycategory.php (modified) (2 diffs)
- trunk/admin/classes/pages/Modifyforum.php (modified) (2 diffs)
- trunk/admin/classes/pages/Permissions.php (modified) (8 diffs)
- trunk/admin/classes/pages/Settings.php (modified) (2 diffs)
- trunk/admin/redirectors/logout.php (modified) (1 diff)
- trunk/classes/misc/Forumjump.php (modified) (2 diffs)
- trunk/classes/misc/Member.php (modified) (3 diffs)
- trunk/classes/misc/Post.php (modified) (4 diffs)
- trunk/classes/pages/Calendar.php (modified) (1 diff)
- trunk/classes/pages/Category.php (modified) (1 diff)
- trunk/classes/pages/Delete.php (modified) (1 diff)
- trunk/classes/pages/Edit.php (modified) (1 diff)
- trunk/classes/pages/Forum.php (modified) (1 diff)
- trunk/classes/pages/Help.php (modified) (1 diff)
- trunk/classes/pages/Login.php (modified) (1 diff)
- trunk/classes/pages/Lostpassword.php (modified) (2 diffs)
- trunk/classes/pages/Mail.php (modified) (2 diffs)
- trunk/classes/pages/Members.php (modified) (1 diff)
- trunk/classes/pages/Messenger.php (modified) (8 diffs)
- trunk/classes/pages/Moderate.php (modified) (9 diffs)
- trunk/classes/pages/Newpoll.php (modified) (1 diff)
- trunk/classes/pages/Newtopic.php (modified) (1 diff)
- trunk/classes/pages/Page.php (modified) (1 diff)
- trunk/classes/pages/Profile.php (modified) (1 diff)
- trunk/classes/pages/Register.php (modified) (2 diffs)
- trunk/classes/pages/Reply.php (modified) (1 diff)
- trunk/classes/pages/Rules.php (modified) (1 diff)
- trunk/classes/pages/Search.php (modified) (5 diffs)
- trunk/classes/pages/Topic.php (modified) (1 diff)
- trunk/classes/pages/Userpanel.php (modified) (2 diffs)
- trunk/db/data.sql (added)
- trunk/db/spamboard.sql (modified) (3 diffs)
- trunk/includes/login.php (modified) (1 diff)
- trunk/install.php (modified) (3 diffs)
- trunk/redirectors/forumjump.php (modified) (1 diff)
- trunk/redirectors/login.php (modified) (1 diff)
- trunk/redirectors/logout.php (modified) (1 diff)
- trunk/redirectors/markasread.php (modified) (1 diff)
- trunk/redirectors/pollvote.php (modified) (2 diffs)
- trunk/redirectors/postinghelp.php (modified) (1 diff)
- trunk/redirectors/preview.php (modified) (1 diff)
- trunk/redirectors/showip.php (modified) (1 diff)
- trunk/redirectors/uploadavatar.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/admin/classes/pages/Addcategory.php
r18 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // get biggest 'order' value 44 44 $q = $C->prepare('SELECT MAX(category_order) AS neworder FROM ' . $SETTINGS['dbtableprefix'] . 'categories'); … … 61 61 } else { 62 62 // pre-commit 63 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {63 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 64 64 $form = new Form($F->link('addcategory')); 65 65 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Addforum.php
r18 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // get biggest 'order' value 44 44 $q = $C->prepare('SELECT MAX(forum_order) FROM ' . $SETTINGS['dbtableprefix'] . 'forums WHERE forum_category = :id'); … … 63 63 } else { 64 64 // pre-commit 65 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {65 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 66 66 $form = new Form($F->link('addforum')); 67 67 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Banning.php
r1 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // open settings file for write access 44 44 if ($file = @fopen('../includes/config/bans.php', 'w')) { … … 104 104 } else { 105 105 // pre-commit 106 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {106 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 107 107 $form = new Form($F->link('banning')); 108 108 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Category.php
r18 r19 37 37 // call parent constructor (general HTML 'skeleton') 38 38 parent::__construct(TRUE); 39 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {39 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 40 40 $div = $this->html->body->addChild('div', str_replace('%membername%', $_SESSION['membername'], $LANG['admin_panel_welcome'])); 41 41 $div->addAttribute('id', 'admin_main'); trunk/admin/classes/pages/Deletecategory.php
r18 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 if ($newcategory == '0') { 44 44 // no moving necessary … … 101 101 } else { 102 102 // pre-commit 103 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {103 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 104 104 $this->html->body->addChild('b', $LANG['warning_deleting_category']); 105 105 $form = new Form($F->link('deletecategory')); trunk/admin/classes/pages/Deleteforum.php
r18 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 if ($newcategory != $id) { 44 44 if ($newcategory == '0') { … … 92 92 } else { 93 93 // pre-commit 94 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {94 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 95 95 $this->html->body->addChild('b', $LANG['warning_deleting_forum']); 96 96 $form = new Form($F->link('deleteforum')); trunk/admin/classes/pages/Editmember.php
r18 r19 46 46 if ($commit == 'y' || $submit == $LANG['Delete']) { 47 47 // post-commit 48 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {48 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 49 49 // check if valid member id 50 50 $q = $C->prepare('SELECT COUNT(*) FROM ' . $SETTINGS['dbtableprefix'] . 'members WHERE memberid = :id'); … … 236 236 } else { 237 237 // pre-commit 238 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {238 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 239 239 $form = new Form($F->link('editmember')); 240 240 $form->createTable('adminform'); trunk/admin/classes/pages/Footer.php
r1 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // check if input is well-formed 44 44 $newheader = trim($newheader); … … 67 67 } else { 68 68 // pre-commit 69 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {69 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 70 70 $form = new Form($F->link('footer')); 71 71 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Groups.php
r18 r19 45 45 if ($commit == 'y') { 46 46 // post-commit 47 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {47 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 48 48 // go through all existing groups to update them accordingly 49 49 foreach ($C->query('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups') as $row) { … … 96 96 } else { 97 97 // pre-commit 98 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {98 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 99 99 $form = new Form($F->link('groups')); 100 100 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Header.php
r1 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // check if input is well-formed 44 44 $newheader = trim($newheader); … … 67 67 } else { 68 68 // pre-commit 69 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {69 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 70 70 $form = new Form($F->link('header')); 71 71 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Memberstages.php
r1 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // open file for write access 44 44 if ($file = @fopen('../includes/config/memberstages.php', 'w')) { … … 66 66 } else { 67 67 // pre-commit 68 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {68 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 69 69 $form = new Form($F->link('memberstages')); 70 70 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Moderators.php
r18 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 $_warnings = ''; 44 44 // go through all forums … … 100 100 } else { 101 101 // pre-commit 102 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {102 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 103 103 $form = new Form($F->link('moderators')); 104 104 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Modifycategory.php
r18 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // go through all categories 44 44 foreach ($C->query('SELECT category_id FROM ' . $SETTINGS['dbtableprefix'] . 'categories') as $row) { … … 59 59 } else { 60 60 // pre-commit 61 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {61 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 62 62 $form = new Form($F->link('modifycategory')); 63 63 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Modifyforum.php
r18 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // go through all forums 44 44 foreach ($C->query('SELECT forumid FROM ' . $SETTINGS['dbtableprefix'] . 'forums') as $row) { … … 61 61 } else { 62 62 // pre-commit 63 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {63 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 64 64 $form = new Form($F->link('modifyforum')); 65 65 $form->addInput('hidden', 'commit', 'y'); trunk/admin/classes/pages/Permissions.php
r18 r19 51 51 if ($commit == 'y') { 52 52 // post-commit 53 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {53 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 54 54 // check if that group exists 55 55 $q = $C->prepare('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups WHERE id = :id'); … … 70 70 $q3 = NULL; 71 71 foreach ($rows3 as $row3) { 72 $q4 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r ead, write) VALUES (:page, :group, :read, :write)');72 $q4 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r, w) VALUES (:page, :group, :read, :write)'); 73 73 $q4->bindParam(':page', $row3['page'], PDO::PARAM_STR); 74 74 $q4->bindParam(':group', $id, PDO::PARAM_INT, 12); 75 $q4->bindParam(':read', $row3['r ead'], PDO::PARAM_INT, 12);76 $q4->bindParam(':write', $row3['w rite'], PDO::PARAM_INT, 12);75 $q4->bindParam(':read', $row3['r'], PDO::PARAM_INT, 12); 76 $q4->bindParam(':write', $row3['w'], PDO::PARAM_INT, 12); 77 77 $q4->execute(); 78 78 $q4 = NULL; … … 82 82 foreach ($C->query('SELECT forumid FROM ' . $SETTINGS['dbtableprefix'] . 'forums') as $row4) { 83 83 foreach ($_forum_pages as $_page_stub) { 84 $q5 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r ead, write) VALUES (:page, :group, :read, :write)');84 $q5 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r, w) VALUES (:page, :group, :read, :write)'); 85 85 $q5->bindValue(':page', $_page_stub . '=' . $row4['forumid'], PDO::PARAM_STR); 86 86 $q5->bindParam(':group', $id, PDO::PARAM_INT, 12); … … 95 95 // insert the new permissions of this group 96 96 foreach ($newpagepermissions as $_page) { 97 $q2 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r ead, write) VALUES (:page, :group, :read, :write)');97 $q2 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r, w) VALUES (:page, :group, :read, :write)'); 98 98 $q2->bindParam(':page', $_page, PDO::PARAM_STR); 99 99 $q2->bindParam(':group', $id, PDO::PARAM_INT, 12); … … 127 127 } else { 128 128 // pre-commit 129 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {129 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 130 130 // check if that group exists 131 131 $q = $C->prepare('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups WHERE id = :id'); … … 163 163 } 164 164 $q2 = NULL; 165 if (!isset($_row->r ead)) {165 if (!isset($_row->r)) { 166 166 // nothing set yet, so 'default deny' 167 $_row->r ead= 0;168 $_row->w rite= 0;167 $_row->r = 0; 168 $_row->w = 0; 169 169 } 170 170 $_col2 = '<input name="newpageread[' . $_page . ']" type="checkbox"'; 171 if ($_row->r ead== 1) {171 if ($_row->r == 1) { 172 172 $_col2 .= ' checked="checked"'; 173 173 } 174 174 $_col2 .= ' value="1" />'; 175 175 $_col3 = '<input name="newpagewrite[' . $_page . ']" type="checkbox"'; 176 if ($_row->w rite== 1) {176 if ($_row->w == 1) { 177 177 $_col3 .= ' checked="checked"'; 178 178 } … … 195 195 } 196 196 $q2 = NULL; 197 if (!isset($_row->r ead)) {197 if (!isset($_row->r)) { 198 198 // nothing set yet, so 'default deny' 199 $_row->r ead= 0;200 $_row->w rite= 0;199 $_row->r = 0; 200 $_row->w = 0; 201 201 } 202 202 $_col2 = '<input name="newpageread[' . $_page . ']" type="checkbox"'; 203 if ($_row->r ead== 1) {203 if ($_row->r == 1) { 204 204 $_col2 .= ' checked="checked"'; 205 205 } 206 206 $_col2 .= ' value="1" />'; 207 207 $_col3 = '<input name="newpagewrite[' . $_page . ']" type="checkbox"'; 208 if ($_row->w rite== 1) {208 if ($_row->w == 1) { 209 209 $_col3 .= ' checked="checked"'; 210 210 } … … 224 224 } 225 225 $q2 = NULL; 226 if (!isset($_row->r ead)) {226 if (!isset($_row->r)) { 227 227 // nothing set yet, so 'default deny' 228 $_row->r ead= 0;229 $_row->w rite= 0;228 $_row->r = 0; 229 $_row->w = 0; 230 230 } 231 231 $_col2 = '<input name="newpageread[' . $_page . ']" type="checkbox"'; 232 if ($_row->r ead== 1) {232 if ($_row->r == 1) { 233 233 $_col2 .= ' checked="checked"'; 234 234 } 235 235 $_col2 .= ' value="1" />'; 236 236 $_col3 = '<input name="newpagewrite[' . $_page . ']" type="checkbox"'; 237 if ($_row->w rite== 1) {237 if ($_row->w == 1) { 238 238 $_col3 .= ' checked="checked"'; 239 239 } trunk/admin/classes/pages/Settings.php
r13 r19 40 40 if ($commit == 'y') { 41 41 // post-commit 42 if (Member::checkRights('admin/', 'w rite') && $_SESSION['auth_admin'] == 'yes') {42 if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 43 43 // open settings file for write access 44 44 if ($file = @fopen('../includes/config/settings.php', 'w')) { … … 116 116 } else { 117 117 // pre-commit 118 if (Member::checkRights('admin/', 'r ead') && $_SESSION['auth_admin'] == 'yes') {118 if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 119 119 // show form to change all basic settings 120 120 $form = new Form($F->link('settings')); trunk/admin/redirectors/logout.php
r1 r19 47 47 48 48 // check if user has permission; required: write; independent from id 49 if (Member::checkRights('admin/', 'w rite')) {49 if (Member::checkRights('admin/', 'w')) { 50 50 // permission granted 51 51 // remove authentication flag trunk/classes/misc/Forumjump.php
r18 r19 44 44 foreach ($rows as $row) { 45 45 // offer only categories which the user may read 46 if (Member::checkRights('Category', 'r ead', $row['category_id'])) {46 if (Member::checkRights('Category', 'r', $row['category_id'])) { 47 47 // set number of forums in this category to zero 48 48 $n = 0; … … 57 57 foreach ($rows2 as $row2) { 58 58 // offer only forums which the user may read 59 if (Member::checkRights('Forum', 'r ead', $row2['forumid'])) {59 if (Member::checkRights('Forum', 'r', $row2['forumid'])) { 60 60 // increase number of forums 61 61 $n++; trunk/classes/misc/Member.php
r18 r19 529 529 * Input: $page - page the user is trying to access (apart from 530 530 * a few special cases, this is the class name) 531 * $action - 'read' or 'write'access531 * $action - 'read' (r) or 'write' (w) access 532 532 * $id - some permissions aren't set globally per page, 533 533 * but depend on the called id in addition … … 541 541 if ($_SESSION['memberid'] > 0) { 542 542 // get member's groups 543 $q = $C->prepare('SELECT usergroup FROM ' . $SETTINGS['dbtableprefix'] . 'groupmemberships WHERE member =:id');543 $q = $C->prepare('SELECT usergroup FROM ' . $SETTINGS['dbtableprefix'] . 'groupmemberships WHERE member = :id'); 544 544 $q->bindParam(':id', $_SESSION['memberid'], PDO::PARAM_INT, 12); 545 545 $q->execute(); … … 553 553 foreach ($_groups as $key=>$val) { 554 554 // check if this member is part of a group which has access to admin panel 555 $q = $C->prepare('SELECT COUNT(*) FROM ' . $SETTINGS['dbtableprefix'] . 'rights WHERE page=:admin AND usergroup =:group AND read=:one');555 $q = $C->prepare('SELECT COUNT(*) FROM ' . $SETTINGS['dbtableprefix'] . 'rights WHERE page=:admin AND usergroup = :group AND r = :one'); 556 556 $q->bindValue(':admin', 'admin/', PDO::PARAM_STR); 557 557 $q->bindParam(':group', $val, PDO::PARAM_INT, 12); trunk/classes/misc/Post.php
r18 r19 110 110 // check required permissions; required: 'write' on the kind of post (reply, new topic, new poll) 111 111 if ($show_orig === 'reply') { 112 if (Member::checkRights('Reply', 'w rite', $reply)) {112 if (Member::checkRights('Reply', 'w', $reply)) { 113 113 $ok = 1; 114 114 } else { … … 116 116 } 117 117 } elseif ($show_orig === 'newtopic') { 118 if (Member::checkRights('Newtopic', 'w rite', $forum)) {118 if (Member::checkRights('Newtopic', 'w', $forum)) { 119 119 $ok = 1; 120 120 } else { … … 122 122 } 123 123 } elseif ($show_orig === 'newpoll') { 124 if (Member::checkRights('Newpoll', 'w rite', $forum)) {124 if (Member::checkRights('Newpoll', 'w', $forum)) { 125 125 $ok = 1; 126 126 } else { … … 276 276 if ($_FILES['attachment']['tmp_name'] != 'none' && $_FILES['attachment']['tmp_name'] != '') { 277 277 // guests can't attach files 278 if (Member::checkRights('Attachments', 'w rite')) {278 if (Member::checkRights('Attachments', 'w')) { 279 279 // if member 280 280 if (!is_uploaded_file($_FILES['attachment']['tmp_name'])) { trunk/classes/pages/Calendar.php
r18 r19 39 39 parent::__construct(); 40 40 // check if user has permission; required: read; 41 $_permit = Member::checkRights('Calendar', 'r ead');41 $_permit = Member::checkRights('Calendar', 'r'); 42 42 if ($_permit) { 43 43 // get current date trunk/classes/pages/Category.php
r18 r19 74 74 /* check if user has permission on this forum; 75 75 * required: read; dependent on id */ 76 $_permit = Member::checkRights('Forum', 'r ead', $row2['forumid']);76 $_permit = Member::checkRights('Forum', 'r', $row2['forumid']); 77 77 if ($_permit) { 78 78 // increase number of permitted forums trunk/classes/pages/Delete.php
r18 r19 57 57 parent::__construct(); 58 58 // check if user has permission; required: write; dependent on id 59 if (Member::checkRights('Delete', 'w rite', $id)) {59 if (Member::checkRights('Delete', 'w', $id)) { 60 60 // permission granted 61 61 $this->html->body->addChild('h2', $LANG['Delete_Post']); trunk/classes/pages/Edit.php
r18 r19 57 57 parent::__construct(); 58 58 // check if user has permission; required: write; dependent on id 59 if (Member::checkRights('Edit', 'w rite', $id)) {59 if (Member::checkRights('Edit', 'w', $id)) { 60 60 // permission granted 61 61 $this->html->body->addChild('h2', $LANG['Edit_Post']); trunk/classes/pages/Forum.php
r18 r19 45 45 parent::__construct(); 46 46 // check if user has permission; required: read; dependent on id 47 $_permit = Member::checkRights('Forum', 'r ead', $id);47 $_permit = Member::checkRights('Forum', 'r', $id); 48 48 if ($_permit) { 49 49 // get forum name, id etc. to print heading trunk/classes/pages/Help.php
r1 r19 40 40 parent::__construct(); 41 41 // check if user has permission; required: read; independent from id 42 if (Member::checkRights('Help', 'r ead')) {42 if (Member::checkRights('Help', 'r')) { 43 43 // permission granted 44 44 $this->html->body->addChild('h2', $LANG['Help']); trunk/classes/pages/Login.php
r1 r19 40 40 $this->html->body->addChild('h2', $LANG['Login']); 41 41 // check if user has permission; required: read; independent from id 42 if (Member::checkRights('Login', 'r ead')) {42 if (Member::checkRights('Login', 'r')) { 43 43 // permission granted 44 44 // form trunk/classes/pages/Lostpassword.php
r18 r19 42 42 if ($GLOBALS['commit'] == 'y') { 43 43 // check if user has permission; required: write; independent from id 44 if (Member::checkRights('Lostpassword', 'w rite')) {44 if (Member::checkRights('Lostpassword', 'w')) { 45 45 // permission granted 46 46 if (isset($email) && $email != '') { … … 71 71 } else { 72 72 // check if user has permission; required: read; independent from id 73 if (Member::checkRights('Lostpassword', 'r ead')) {73 if (Member::checkRights('Lostpassword', 'r')) { 74 74 // permission granted 75 75 // form trunk/classes/pages/Mail.php
r18 r19 44 44 if ($GLOBALS['commit'] == 'y') { 45 45 // check if user has permission; required: write; independent from id 46 if (Member::checkRights('Mail', 'w rite')) {46 if (Member::checkRights('Mail', 'w')) { 47 47 // permission granted 48 48 // get sender information … … 87 87 } else { 88 88 // check if user has permission; required: read; independent from id 89 if (Member::checkRights('Mail', 'r ead')) {89 if (Member::checkRights('Mail', 'r')) { 90 90 // permission granted 91 91 if ($receipient->getMailHidden() === FALSE) { trunk/classes/pages/Members.php
r18 r19 39 39 parent::__construct(); 40 40 // check if user has permission; required: read; 41 $_permit = Member::checkRights('Members', 'r ead');41 $_permit = Member::checkRights('Members', 'r'); 42 42 if ($_permit) { 43 43 // default page trunk/classes/pages/Messenger.php
r18 r19 70 70 /* check if user has permission; 71 71 * required: write; independent from id */ 72 if (Member::checkRights('Messenger', 'w rite')) {72 if (Member::checkRights('Messenger', 'w')) { 73 73 // permission granted 74 74 if ($id == 0) { … … 125 125 /* check if user has permission; 126 126 * required: read; independent from id */ 127 if (Member::checkRights('Messenger', 'r ead')) {127 if (Member::checkRights('Messenger', 'r')) { 128 128 // permission granted 129 129 $q = $C->prepare('SELECT addressbook FROM ' . $SETTINGS['dbtableprefix'] . 'members WHERE memberid=:id'); … … 169 169 /* check if user has permission; 170 170 * required: write; independent from id */ 171 if (Member::checkRights('Messenger', 'w rite')) {171 if (Member::checkRights('Messenger', 'w')) { 172 172 // permission granted 173 173 // get message … … 215 215 /* check if user has permission; 216 216 * required: write; independent from id */ 217 if (Member::checkRights('Messenger', 'w rite')) {217 if (Member::checkRights('Messenger', 'w')) { 218 218 // permission granted 219 219 // IP banning … … 305 305 /* check if user has permission; 306 306 * required: write; independent from id */ 307 if (Member::checkRights('Messenger', 'w rite')) {307 if (Member::checkRights('Messenger', 'w')) { 308 308 // permission granted 309 309 if (isset($reply) && $reply > 0) { … … 338 338 /* check if user has permission; 339 339 * required: read; independent from id */ 340 if (Member::checkRights('Messenger', 'r ead')) {340 if (Member::checkRights('Messenger', 'r')) { 341 341 // permission granted 342 342 $q = $C->prepare('SELECT messageid, messagereceipient, messagetitle, messagetime FROM ' . $SETTINGS['dbtableprefix'] . 'messages WHERE messagesender=:id AND messagesenderflag > :zero ORDER BY messagetime DESC'); … … 365 365 /* check if user has permission; 366 366 * required: read; independent from id */ 367 if (Member::checkRights('Messenger', 'r ead')) {367 if (Member::checkRights('Messenger', 'r')) { 368 368 // permission granted 369 369 $q = $C->prepare('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'messages WHERE messageid=:id'); … … 401 401 /* check if user has permission; 402 402 * required: read; independent from id */ 403 if (Member::checkRights('Messenger', 'r ead')) {403 if (Member::checkRights('Messenger', 'r')) { 404 404 // permission granted 405 405 $q = $C->prepare('SELECT messageid, messagesender, messagetitle, messagetime, messagereceipientflag FROM ' . $SETTINGS['dbtableprefix'] . 'messages WHERE messagereceipient=:id AND messagereceipientflag > :zero ORDER BY messagetime DESC'); trunk/classes/pages/Moderate.php
r18 r19 57 57 /* check if user has permission; required: write; 58 58 * dependent on id (for topic starter and forum moderator, not for groups which have global rights) */ 59 if (Member::checkRights('Edit_Title', 'w rite', $id)) {59 if (Member::checkRights('Edit_Title', 'w', $id)) { 60 60 // permission granted 61 61 $this->html->body->addChild('h2', $LANG['Edit_Title']); … … 91 91 /* check if user has permission; required: write; 92 92 * dependent on id for groups which don't have global rights on this feature (i.e. per-forum moderators) */ 93 if (Member::checkRights('Lock', 'w rite', $id)) {93 if (Member::checkRights('Lock', 'w', $id)) { 94 94 // permission granted 95 95 $this->html->body->addChild('h2', $LANG['Lock_Topic']); … … 111 111 /* check if user has permission; required: write; 112 112 * dependent on id (again, OR global rights) */ 113 if (Member::checkRights('Unlock', 'w rite', $id)) {113 if (Member::checkRights('Unlock', 'w', $id)) { 114 114 // permission granted 115 115 $this->html->body->addChild('h2', $LANG['Unlock_Topic']); … … 131 131 /* check if user has permission; required: write; 132 132 * dependent on id (OR global rights) */ 133 if (Member::checkRights('Pin', 'w rite', $id)) {133 if (Member::checkRights('Pin', 'w', $id)) { 134 134 // permission granted 135 135 $this->html->body->addChild('h2', $LANG['Pin_Topic']); … … 151 151 /* check if user has permission; required: write; 152 152 * dependent on id (or global rights) */ 153 if (Member::checkRights('Unpin', 'w rite', $id)) {153 if (Member::checkRights('Unpin', 'w', $id)) { 154 154 // permission granted 155 155 $this->html->body->addChild('h2', $LANG['Unpin_Topic']); … … 171 171 /* check if user has permission; required: write; 172 172 * dependent on id (unless global rights apply) */ 173 if (Member::checkRights('Delete_Topic', 'w rite', $id)) {173 if (Member::checkRights('Delete_Topic', 'w', $id)) { 174 174 // permission granted 175 175 $this->html->body->addChild('h2', $LANG['Delete_Topic']); … … 207 207 /* check if user has permission; required: write; 208 208 * independent from id (global rights only) */ 209 if (Member::checkRights('Move', 'w rite')) {209 if (Member::checkRights('Move', 'w')) { 210 210 // permission granted 211 211 $this->html->body->addChild('h2', $LANG['Move_Topic']); … … 258 258 /* check if user has permission; required: write; 259 259 * dependent on id (unless global rights apply) */ 260 if (Member::checkRights('Merge', 'w rite', $id)) {260 if (Member::checkRights('Merge', 'w', $id)) { 261 261 // permission granted 262 262 $this->html->body->addChild('h2', $LANG['Merge_Topic']); … … 344 344 /* check if user has permission; required: write; 345 345 * dependent on id (unless user equipped with global rights) */ 346 if (Member::checkRights('Split', 'w rite', $id)) {346 if (Member::checkRights('Split', 'w', $id)) { 347 347 // permission granted 348 348 $this->html->body->addChild('h2', $LANG['Split_Topic']); trunk/classes/pages/Newpoll.php
r18 r19 55 55 // show form 56 56 // check if user has permission; required: read; dependent on id 57 if (Member::checkRights('Newpoll', 'r ead', $id)) {57 if (Member::checkRights('Newpoll', 'r', $id)) { 58 58 // permission granted 59 59 // form trunk/classes/pages/Newtopic.php
r18 r19 55 55 // show reply form 56 56 // check if user has permission; required: read; dependent on id 57 if (Member::checkRights('Newtopic', 'r ead', $id)) {57 if (Member::checkRights('Newtopic', 'r', $id)) { 58 58 // permission granted 59 59 // form trunk/classes/pages/Page.php
r18 r19 165 165 $_str = '<div><span>' . $LANG['Logged_in_as'] . '</span> <a href="' . $F->link('profile') . 'id=' . $_SESSION['memberid'] . '">' . $_SESSION['membername'] . '</a>'; 166 166 // link to admin panel 167 if (Member::checkRights('admin/', 'r ead')) {167 if (Member::checkRights('admin/', 'r')) { 168 168 $_str .= ' <a href="admin/" target="_blank">' . $LANG['Admin_Panel'] . '</a>'; 169 169 // maintainance mode trunk/classes/pages/Profile.php
r1 r19 42 42 parent::__construct(); 43 43 // check if user has permission; required: read; independent from id 44 $_permit = Member::checkRights('Profile', 'r ead');44 $_permit = Member::checkRights('Profile', 'r'); 45 45 if ($_permit) { 46 46 // start normal output trunk/classes/pages/Register.php
r18 r19 42 42 if ($GLOBALS['commit'] == 'y') { 43 43 // check if user has permission; required: write; independent from id 44 if (Member::checkRights('Register', 'w rite')) {44 if (Member::checkRights('Register', 'w')) { 45 45 // permission granted 46 46 if ($auth_code == $_SESSION['pw']) { … … 146 146 } else { 147 147 // check if user has permission; required: read; independent from id 148 if (Member::checkRights('Register', 'r ead')) {148 if (Member::checkRights('Register', 'r')) { 149 149 // permission granted 150 150 // generate new session password trunk/classes/pages/Reply.php
r18 r19 60 60 // show reply form 61 61 // check if user has permission; required: read; dependent on id 62 if (Member::checkRights('Reply', 'r ead', $row->forum)) {62 if (Member::checkRights('Reply', 'r', $row->forum)) { 63 63 // permission granted 64 64 // get text to quote (if needed) trunk/classes/pages/Rules.php
r1 r19 39 39 parent::__construct(); 40 40 // check if user has permission; required: read; independent from id 41 if (Member::checkRights('Rules', 'r ead')) {41 if (Member::checkRights('Rules', 'r')) { 42 42 // permission granted 43 43 $this->html->body->addChild('h2', $LANG['Rules']); trunk/classes/pages/Search.php
r18 r19 40 40 if ($results == 'y') { 41 41 // check if user has permission; required: write; 42 $_permit = Member::checkRights('Search', 'w rite');42 $_permit = Member::checkRights('Search', 'w'); 43 43 if ($_permit) { 44 44 // also check for flood control … … 64 64 foreach ($C->query('SELECT forumid FROM ' . $SETTINGS['dbtableprefix'] . 'forums') as $row) { 65 65 // put forum ids for which access is NOT granted into search condition 66 if (!Member::checkRights('Forum', 'r ead', $row['forumid'])) {66 if (!Member::checkRights('Forum', 'r', $row['forumid'])) { 67 67 $_cond .= ' AND t.forum!=' . $row['forumid']; 68 68 } … … 229 229 } else { 230 230 // check if user has permission; required: read; 231 $_permit = Member::checkRights('Search', 'r ead');231 $_permit = Member::checkRights('Search', 'r'); 232 232 if ($_permit) { 233 233 // header … … 248 248 foreach ($rows as $row) { 249 249 // offer only categories which the user may read 250 if (Member::checkRights('Category', 'r ead', $row['category_id'])) {250 if (Member::checkRights('Category', 'r', $row['category_id'])) { 251 251 // set number of forums in this category to zero 252 252 $n = 0; … … 262 262 foreach ($rows2 as $row2) { 263 263 // offer only forums which the user may read 264 if (Member::checkRights('Forum', 'r ead', $row2['forumid'])) {264 if (Member::checkRights('Forum', 'r', $row2['forumid'])) { 265 265 // increase number of forums 266 266 $n++; trunk/classes/pages/Topic.php
r18 r19 53 53 parent::__construct(); 54 54 // check if user has permission on the forum; required: read; dependent on id 55 $_permit = Member::checkRights('Forum', 'r ead', $row->forum);55 $_permit = Member::checkRights('Forum', 'r', $row->forum); 56 56 // if user may see topics in this forum, continue 57 57 if ($_permit) { trunk/classes/pages/Userpanel.php
r18 r19 44 44 if ($GLOBALS['commit'] == 'y') { 45 45 // check if user has permission; required: write; independent from id 46 if (Member::checkRights('Userpanel', 'w rite')) {46 if (Member::checkRights('Userpanel', 'w')) { 47 47 // permission granted 48 48 switch ($action) { … … 328 328 } else { 329 329 // check if user has permission; required: read; independent from id 330 if (Member::checkRights('Userpanel', 'r ead')) {330 if (Member::checkRights('Userpanel', 'r')) { 331 331 // permission granted 332 332 switch ($action) { trunk/db/spamboard.sql
r18 r19 74 74 ); 75 75 76 CREATE TABLE %prefix%rights (77 page VARCHAR(255),78 usergroup INTEGER,79 read INTEGER,80 write INTEGER,81 PRIMARY KEY (page,usergroup)82 );83 INSERT INTO %prefix%rights VALUES('Profile',1,1,0);84 INSERT INTO %prefix%rights VALUES('Profile',2,1,0);85 INSERT INTO %prefix%rights VALUES('Profile',4,1,0);86 INSERT INTO %prefix%rights VALUES('Profile',5,0,0);87 INSERT INTO %prefix%rights VALUES('admin/',1,1,1);88 INSERT INTO %prefix%rights VALUES('Lostpassword',1,1,1);89 INSERT INTO %prefix%rights VALUES('Lostpassword',2,1,1);90 INSERT INTO %prefix%rights VALUES('Lostpassword',4,1,1);91 INSERT INTO %prefix%rights VALUES('Lostpassword',5,1,1);92 INSERT INTO %prefix%rights VALUES('Login',1,1,1);93 INSERT INTO %prefix%rights VALUES('Login',2,1,1);94 INSERT INTO %prefix%rights VALUES('Login',4,1,1);95 INSERT INTO %prefix%rights VALUES('Login',5,1,1);96 INSERT INTO %prefix%rights VALUES('Calendar',1,1,1);97 INSERT INTO %prefix%rights VALUES('Calendar',2,1,1);98 INSERT INTO %prefix%rights VALUES('Calendar',4,1,1);99 INSERT INTO %prefix%rights VALUES('Calendar',5,1,1);100 INSERT INTO %prefix%rights VALUES('Register',1,1,1);101 INSERT INTO %prefix%rights VALUES('Register',2,1,1);102 INSERT INTO %prefix%rights VALUES('Register',4,1,1);103 INSERT INTO %prefix%rights VALUES('Register',5,1,1);104 INSERT INTO %prefix%rights VALUES('Members',1,1,0);105 INSERT INTO %prefix%rights VALUES('Members',2,1,0);106 INSERT INTO %prefix%rights VALUES('Members',4,1,0);107 INSERT INTO %prefix%rights VALUES('Members',5,1,0);108 INSERT INTO %prefix%rights VALUES('Search',1,1,1);109 INSERT INTO %prefix%rights VALUES('Search',2,1,1);110 INSERT INTO %prefix%rights VALUES('Search',4,1,1);111 INSERT INTO %prefix%rights VALUES('Search',5,1,1);112 INSERT INTO %prefix%rights VALUES('Mail',1,1,1);113 INSERT INTO %prefix%rights VALUES('Mail',2,1,1);114 INSERT INTO %prefix%rights VALUES('Mail',4,1,1);115 INSERT INTO %prefix%rights VALUES('Mail',5,0,0);116 INSERT INTO %prefix%rights VALUES('Attachments',1,1,1);117 INSERT INTO %prefix%rights VALUES('Attachments',2,1,1);118 INSERT INTO %prefix%rights VALUES('Attachments',4,1,1);119 INSERT INTO %prefix%rights VALUES('Attachments',5,0,0);120 INSERT INTO %prefix%rights VALUES('Markasread',1,1,1);121 INSERT INTO %prefix%rights VALUES('Markasread',2,1,1);122 INSERT INTO %prefix%rights VALUES('Markasread',4,1,1);123 INSERT INTO %prefix%rights VALUES('Markasread',5,1,1);124 INSERT INTO %prefix%rights VALUES('Rules',1,1,1);125 INSERT INTO %prefix%rights VALUES('Rules',2,1,1);126 INSERT INTO %prefix%rights VALUES('Rules',4,1,1);127 INSERT INTO %prefix%rights VALUES('Rules',5,1,1);128 INSERT INTO %prefix%rights VALUES('Help',1,1,1);129 INSERT INTO %prefix%rights VALUES('Help',2,1,1);130 INSERT INTO %prefix%rights VALUES('Help',4,1,1);131 INSERT INTO %prefix%rights VALUES('Help',5,1,1);132 INSERT INTO %prefix%rights VALUES('Pollvote',1,1,1);133 INSERT INTO %prefix%rights VALUES('Pollvote',2,1,1);134 INSERT INTO %prefix%rights VALUES('Pollvote',4,1,1);135 INSERT INTO %prefix%rights VALUES('Pollvote',5,1,0);136 INSERT INTO %prefix%rights VALUES('Showip',1,1,1);137 INSERT INTO %prefix%rights VALUES('Showip',2,1,1);138 INSERT INTO %prefix%rights VALUES('Showip',4,0,0);139 INSERT INTO %prefix%rights VALUES('Showip',5,0,0);140 INSERT INTO %prefix%rights VALUES('Messenger',1,1,1);141 INSERT INTO %prefix%rights VALUES('Messenger',2,1,1);142 INSERT INTO %prefix%rights VALUES('Messenger',4,1,1);143 INSERT INTO %prefix%rights VALUES('Messenger',5,0,0);144 INSERT INTO %prefix%rights VALUES('Postinghelp',1,1,1);145 INSERT INTO %prefix%rights VALUES('Postinghelp',2,1,1);146 INSERT INTO %prefix%rights VALUES('Postinghelp',4,1,1);147 INSERT INTO %prefix%rights VALUES('Postinghelp',5,1,1);148 INSERT INTO %prefix%rights VALUES('Preview',1,1,1);149 INSERT INTO %prefix%rights VALUES('Preview',2,1,1);150 INSERT INTO %prefix%rights VALUES('Preview',4,1,1);151 INSERT INTO %prefix%rights VALUES('Preview',5,1,1);152 INSERT INTO %prefix%rights VALUES('Edit_Title',1,1,1);153 INSERT INTO %prefix%rights VALUES('Edit_Title',2,1,1);154 INSERT INTO %prefix%rights VALUES('Edit_Title',4,0,0);155 INSERT INTO %prefix%rights VALUES('Edit_Title',5,0,0);156 INSERT INTO %prefix%rights VALUES('Lock',1,1,1);157 INSERT INTO %prefix%rights VALUES('Lock',2,1,1);158 INSERT INTO %prefix%rights VALUES('Lock',4,0,0);159 INSERT INTO %prefix%rights VALUES('Lock',5,0,0);160 INSERT INTO %prefix%rights VALUES('Unlock',1,1,1);161 INSERT INTO %prefix%rights VALUES('Unlock',2,1,1);162 INSERT INTO %prefix%rights VALUES('Unlock',4,0,0);163 INSERT INTO %prefix%rights VALUES('Unlock',5,0,0);164 INSERT INTO %prefix%rights VALUES('Delete_Topic',1,1,1);165 INSERT INTO %prefix%rights VALUES('Delete_Topic',2,1,1);166 INSERT INTO %prefix%rights VALUES('Delete_Topic',4,0,0);167 INSERT INTO %prefix%rights VALUES('Delete_Topic',5,0,0);168 INSERT INTO %prefix%rights VALUES('Pin',1,1,1);169 INSERT INTO %prefix%rights VALUES('Pin',2,1,1);170 INSERT INTO %prefix%rights VALUES('Pin',4,0,0);171 INSERT INTO %prefix%rights VALUES('Pin',5,0,0);172 INSERT INTO %prefix%rights VALUES('Unpin',1,1,1);173 INSERT INTO %prefix%rights VALUES('Unpin',2,1,1);174 INSERT INTO %prefix%rights VALUES('Unpin',4,0,0);175 INSERT INTO %prefix%rights VALUES('Unpin',5,0,0);176 INSERT INTO %prefix%rights VALUES('Move',1,1,1);177 INSERT INTO %prefix%rights VALUES('Move',2,1,1);178 INSERT INTO %prefix%rights VALUES('Move',4,0,0);179 INSERT INTO %prefix%rights VALUES('Move',5,0,0);180 INSERT INTO %prefix%rights VALUES('Merge',1,1,1);181 INSERT INTO %prefix%rights VALUES('Merge',2,1,1);182 INSERT INTO %prefix%rights VALUES('Merge',4,0,0);183 INSERT INTO %prefix%rights VALUES('Merge',5,0,0);184 INSERT INTO %prefix%rights VALUES('Split',5,0,0);185 INSERT INTO %prefix%rights VALUES('Split',4,0,0);186 INSERT INTO %prefix%rights VALUES('Split',2,1,1);187 INSERT INTO %prefix%rights VALUES('Split',1,1,1);188 INSERT INTO %prefix%rights VALUES('Delete',1,1,1);189 INSERT INTO %prefix%rights VALUES('Delete',2,1,1);190 INSERT INTO %prefix%rights VALUES('Delete',4,0,0);191 INSERT INTO %prefix%rights VALUES('Delete',5,0,0);192 INSERT INTO %prefix%rights VALUES('Edit',1,1,1);193 INSERT INTO %prefix%rights VALUES('Edit',2,1,1);194 INSERT INTO %prefix%rights VALUES('Edit',4,0,0);195 INSERT INTO %prefix%rights VALUES('Edit',5,0,0);196 INSERT INTO %prefix%rights VALUES('Profile',3,1,0);197 INSERT INTO %prefix%rights VALUES('Lostpassword',3,1,1);198 INSERT INTO %prefix%rights VALUES('Login',3,1,1);199 INSERT INTO %prefix%rights VALUES('Calendar',3,1,1);200 INSERT INTO %prefix%rights VALUES('Register',3,1,1);201 INSERT INTO %prefix%rights VALUES('Members',3,1,0);202 INSERT INTO %prefix%rights VALUES('Search',3,1,1);203 INSERT INTO %prefix%rights VALUES('Mail',3,1,1);204 INSERT INTO %prefix%rights VALUES('Attachments',3,1,1);205 INSERT INTO %prefix%rights VALUES('Markasread',3,1,1);206 INSERT INTO %prefix%rights VALUES('Rules',3,1,1);207 INSERT INTO %prefix%rights VALUES('Help',3,1,1);208 INSERT INTO %prefix%rights VALUES('Pollvote',3,1,1);209 INSERT INTO %prefix%rights VALUES('Showip',3,0,0);210 INSERT INTO %prefix%rights VALUES('Messenger',3,1,1);211 INSERT INTO %prefix%rights VALUES('Postinghelp',3,1,1);212 INSERT INTO %prefix%rights VALUES('Preview',3,1,1);213 INSERT INTO %prefix%rights VALUES('Edit_Title',3,0,0);214 INSERT INTO %prefix%rights VALUES('Lock',3,0,0);215 INSERT INTO %prefix%rights VALUES('Unlock',3,0,0);216 INSERT INTO %prefix%rights VALUES('Delete_Topic',3,0,0);217 INSERT INTO %prefix%rights VALUES('Pin',3,0,0);218 INSERT INTO %prefix%rights VALUES('Unpin',3,0,0);219 INSERT INTO %prefix%rights VALUES('Move',3,0,0);220 INSERT INTO %prefix%rights VALUES('Merge',3,0,0);221 INSERT INTO %prefix%rights VALUES('Split',3,0,0);222 INSERT INTO %prefix%rights VALUES('Delete',3,0,0);223 INSERT INTO %prefix%rights VALUES('Edit',3,0,0);224 INSERT INTO %prefix%rights VALUES('Uploadavatar',1,1,1);225 INSERT INTO %prefix%rights VALUES('Uploadavatar',2,1,1);226 INSERT INTO %prefix%rights VALUES('Uploadavatar',3,1,1);227 INSERT INTO %prefix%rights VALUES('Uploadavatar',4,1,1);228 INSERT INTO %prefix%rights VALUES('Uploadavatar',5,0,0);229 INSERT INTO %prefix%rights VALUES('Userpanel',1,1,1);230 INSERT INTO %prefix%rights VALUES('Userpanel',2,1,1);231 INSERT INTO %prefix%rights VALUES('Userpanel',3,1,1);232 INSERT INTO %prefix%rights VALUES('Userpanel',4,1,1);233 INSERT INTO %prefix%rights VALUES('Userpanel',5,0,0);234 235 CREATE TABLE %prefix%rights_default (236 page VARCHAR(255),237 usergroup INTEGER,238 read INTEGER,239 write INTEGER,240 PRIMARY KEY (page,usergroup)241 );242 INSERT INTO %prefix%rights_default VALUES('Profile',1,1,0);243 INSERT INTO %prefix%rights_default VALUES('Profile',2,1,0);244 INSERT INTO %prefix%rights_default VALUES('Profile',4,1,0);245 INSERT INTO %prefix%rights_default VALUES('Profile',5,0,0);246 INSERT INTO %prefix%rights_default VALUES('admin/',1,1,1);247 INSERT INTO %prefix%rights_default VALUES('Lostpassword',1,1,1);248 INSERT INTO %prefix%rights_default VALUES('Lostpassword',2,1,1);249 INSERT INTO %prefix%rights_default VALUES('Lostpassword',4,1,1);250 INSERT INTO %prefix%rights_default VALUES('Lostpassword',5,1,1);251 INSERT INTO %prefix%rights_default VALUES('Login',1,1,1);252 INSERT INTO %prefix%rights_default VALUES('Login',2,1,1);253 INSERT INTO %prefix%rights_default VALUES('Login',4,1,1);254 INSERT INTO %prefix%rights_default VALUES('Login',5,1,1);255 INSERT INTO %prefix%rights_default VALUES('Calendar',1,1,1);256 INSERT INTO %prefix%rights_default VALUES('Calendar',2,1,1);257 INSERT INTO %prefix%rights_default VALUES('Calendar',4,1,1);258 INSERT INTO %prefix%rights_default VALUES('Calendar',5,1,1);259 INSERT INTO %prefix%rights_default VALUES('Register',1,1,1);260 INSERT INTO %prefix%rights_default VALUES('Register',2,1,1);261 INSERT INTO %prefix%rights_default VALUES('Register',4,1,1);262 INSERT INTO %prefix%rights_default VALUES('Register',5,1,1);263 INSERT INTO %prefix%rights_default VALUES('Members',1,1,0);264 INSERT INTO %prefix%rights_default VALUES('Members',2,1,0);265 INSERT INTO %prefix%rights_default VALUES('Members',4,1,0);266 INSERT INTO %prefix%rights_default VALUES('Members',5,1,0);267 INSERT INTO %prefix%rights_default VALUES('Search',1,1,1);268 INSERT INTO %prefix%rights_default VALUES('Search',2,1,1);269 INSERT INTO %prefix%rights_default VALUES('Search',4,1,1);270 INSERT INTO %prefix%rights_default VALUES('Search',5,1,1);271 INSERT INTO %prefix%rights_default VALUES('Mail',1,1,1);272 INSERT INTO %prefix%rights_default VALUES('Mail',2,1,1);273 INSERT INTO %prefix%rights_default VALUES('Mail',4,1,1);274 INSERT INTO %prefix%rights_default VALUES('Mail',5,0,0);275 INSERT INTO %prefix%rights_default VALUES('Attachments',1,1,1);276 INSERT INTO %prefix%rights_default VALUES('Attachments',2,1,1);277 INSERT INTO %prefix%rights_default VALUES('Attachments',4,1,1);278 INSERT INTO %prefix%rights_default VALUES('Attachments',5,0,0);279 INSERT INTO %prefix%rights_default VALUES('Markasread',1,1,1);280 INSERT INTO %prefix%rights_default VALUES('Markasread',2,1,1);281 INSERT INTO %prefix%rights_default VALUES('Markasread',4,1,1);282 INSERT INTO %prefix%rights_default VALUES('Markasread',5,1,1);283 INSERT INTO %prefix%rights_default VALUES('Rules',1,1,1);284 INSERT INTO %prefix%rights_default VALUES('Rules',2,1,1);285 INSERT INTO %prefix%rights_default VALUES('Rules',4,1,1);286 INSERT INTO %prefix%rights_default VALUES('Rules',5,1,1);287 INSERT INTO %prefix%rights_default VALUES('Help',1,1,1);288 INSERT INTO %prefix%rights_default VALUES('Help',2,1,1);289 INSERT INTO %prefix%rights_default VALUES('Help',4,1,1);290 INSERT INTO %prefix%rights_default VALUES('Help',5,1,1);291 INSERT INTO %prefix%rights_default VALUES('Pollvote',1,1,1);292 INSERT INTO %prefix%rights_default VALUES('Pollvote',2,1,1);293 INSERT INTO %prefix%rights_default VALUES('Pollvote',4,1,1);294 INSERT INTO %prefix%rights_default VALUES('Pollvote',5,1,0);295 INSERT INTO %prefix%rights_default VALUES('Showip',1,1,1);296 INSERT INTO %prefix%rights_default VALUES('Showip',2,1,1);297 INSERT INTO %prefix%rights_default VALUES('Showip',4,0,0);298 INSERT INTO %prefix%rights_default VALUES('Showip',5,0,0);299 INSERT INTO %prefix%rights_default VALUES('Messenger',1,1,1);300 INSERT INTO %prefix%rights_default VALUES('Messenger',2,1,1);301 INSERT INTO %prefix%rights_default VALUES('Messenger',4,1,1);302 INSERT INTO %prefix%rights_default VALUES('Messenger',5,0,0);303 INSERT INTO %prefix%rights_default VALUES('Postinghelp',1,1,1);304 INSERT INTO %prefix%rights_default VALUES('Postinghelp',2,1,1);305 INSERT INTO %prefix%rights_default VALUES('Postinghelp',4,1,1);306 INSERT INTO %prefix%rights_default VALUES('Postinghelp',5,1,1);307 INSERT INTO %prefix%rights_default VALUES('Preview',1,1,1);308 INSERT INTO %prefix%rights_default VALUES('Preview',2,1,1);309 INSERT INTO %prefix%rights_default VALUES('Preview',4,1,1);310 INSERT INTO %prefix%rights_default VALUES('Preview',5,1,1);311 INSERT INTO %prefix%rights_default VALUES('Edit_Title',1,1,1);312 INSERT INTO %prefix%rights_default VALUES('Edit_Title',2,1,1);313 INSERT INTO %prefix%rights_default VALUES('Edit_Title',4,0,0);314 INSERT INTO %prefix%rights_default VALUES('Edit_Title',5,0,0);315 INSERT INTO %prefix%rights_default VALUES('Lock',1,1,1);316 INSERT INTO %prefix%rights_default VALUES('Lock',2,1,1);317 INSERT INTO %prefix%rights_default VALUES('Lock',4,0,0);318 INSERT INTO %prefix%rights_default VALUES('Lock',5,0,0);319 INSERT INTO %prefix%rights_default VALUES('Unlock',1,1,1);320 INSERT INTO %prefix%rights_default VALUES('Unlock',2,1,1);321 INSERT INTO %prefix%rights_default VALUES('Unlock',4,0,0);322 INSERT INTO %prefix%rights_default VALUES('Unlock',5,0,0);323 INSERT INTO %prefix%rights_default VALUES('Delete_Topic',1,1,1);324 INSERT INTO %prefix%rights_default VALUES('Delete_Topic',2,1,1);325 INSERT INTO %prefix%rights_default VALUES('Delete_Topic',4,0,0);326 INSERT INTO %prefix%rights_default VALUES('Delete_Topic',5,0,0);327 INSERT INTO %prefix%rights_default VALUES('Pin',1,1,1);328 INSERT INTO %prefix%rights_default VALUES('Pin',2,1,1);329 INSERT INTO %prefix%rights_default VALUES('Pin',4,0,0);330 INSERT INTO %prefix%rights_default VALUES('Pin',5,0,0);331 INSERT INTO %prefix%rights_default VALUES('Unpin',1,1,1);332 INSERT INTO %prefix%rights_default VALUES('Unpin',2,1,1);333 INSERT INTO %prefix%rights_default VALUES('Unpin',4,0,0);334 INSERT INTO %prefix%rights_default VALUES('Unpin',5,0,0);335 INSERT INTO %prefix%rights_default VALUES('Move',1,1,1);336 INSERT INTO %prefix%rights_default VALUES('Move',2,1,1);337 INSERT INTO %prefix%rights_default VALUES('Move',4,0,0);338 INSERT INTO %prefix%rights_default VALUES('Move',5,0,0);339 INSERT INTO %prefix%rights_default VALUES('Merge',1,1,1);340 INSERT INTO %prefix%rights_default VALUES('Merge',2,1,1);341 INSERT INTO %prefix%rights_default VALUES('Merge',4,0,0);342 INSERT INTO %prefix%rights_default VALUES('Merge',5,0,0);343 INSERT INTO %prefix%rights_default VALUES('Split',5,0,0);344 INSERT INTO %prefix%rights_default VALUES('Split',4,0,0);345 INSERT INTO %prefix%rights_default VALUES('Split',2,1,1);346 INSERT INTO %prefix%rights_default VALUES('Split',1,1,1);347 INSERT INTO %prefix%rights_default VALUES('Delete',1,1,1);348 INSERT INTO %prefix%rights_default VALUES('Delete',2,1,1);349 INSERT INTO %prefix%rights_default VALUES('Delete',4,0,0);350 INSERT INTO %prefix%rights_default VALUES('Delete',5,0,0);351 INSERT INTO %prefix%rights_default VALUES('Edit',1,1,1);352 INSERT INTO %prefix%rights_default VALUES('Edit',2,1,1);353 INSERT INTO %prefix%rights_default VALUES('Edit',4,0,0);354 INSERT INTO %prefix%rights_default VALUES('Edit',5,0,0);355 INSERT INTO %prefix%rights_default VALUES('Profile',3,1,0);356 INSERT INTO %prefix%rights_default VALUES('Lostpassword',3,1,1);357 INSERT INTO %prefix%rights_default VALUES('Login',3,1,1);358 INSERT INTO %prefix%rights_default VALUES('Calendar',3,1,1);359 INSERT INTO %prefix%rights_default VALUES('Register',3,1,1);360 INSERT INTO %prefix%rights_default VALUES('Members',3,1,0);361 INSERT INTO %prefix%rights_default VALUES('Search',3,1,1);362 INSERT INTO %prefix%rights_default VALUES('Mail',3,1,1);363 INSERT INTO %prefix%rights_default VALUES('Attachments',3,1,1);364 INSERT INTO %prefix%rights_default VALUES('Markasread',3,1,1);365 INSERT INTO %prefix%rights_default VALUES('Rules',3,1,1);366 INSERT INTO %prefix%rights_default VALUES('Help',3,1,1);367 INSERT INTO %prefix%rights_default VALUES('Pollvote',3,1,1);368 INSERT INTO %prefix%rights_default VALUES('Showip',3,0,0);369 INSERT INTO %prefix%rights_default VALUES('Messenger',3,1,1);370 INSERT INTO %prefix%rights_default VALUES('Postinghelp',3,1,1);371 INSERT INTO %prefix%rights_default VALUES('Preview',3,1,1);372 INSERT INTO %prefix%rights_default VALUES('Edit_Title',3,0,0);373 INSERT INTO %prefix%rights_default VALUES('Lock',3,0,0);374 INSERT INTO %prefix%rights_default VALUES('Unlock',3,0,0);375 INSERT INTO %prefix%rights_default VALUES('Delete_Topic',3,0,0);376 INSERT INTO %prefix%rights_default VALUES('Pin',3,0,0);377 INSERT INTO %prefix%rights_default VALUES('Unpin',3,0,0);378 INSERT INTO %prefix%rights_default VALUES('Move',3,0,0);379 INSERT INTO %prefix%rights_default VALUES('Merge',3,0,0);380 INSERT INTO %prefix%rights_default VALUES('Split',3,0,0);381 INSERT INTO %prefix%rights_default VALUES('Delete',3,0,0);382 INSERT INTO %prefix%rights_default VALUES('Edit',3,0,0);383 INSERT INTO %prefix%rights_default VALUES('Uploadavatar',1,1,1);384 INSERT INTO %prefix%rights_default VALUES('Uploadavatar',2,1,1);385 INSERT INTO %prefix%rights_default VALUES('Uploadavatar',3,1,1);386 INSERT INTO %prefix%rights_default VALUES('Uploadavatar',4,1,1);387 INSERT INTO %prefix%rights_default VALUES('Uploadavatar',5,0,0);388 INSERT INTO %prefix%rights_default VALUES('Userpanel',1,1,1);389 INSERT INTO %prefix%rights_default VALUES('Userpanel',2,1,1);390 INSERT INTO %prefix%rights_default VALUES('Userpanel',3,1,1);391 INSERT INTO %prefix%rights_default VALUES('Userpanel',4,1,1);392 INSERT INTO %prefix%rights_default VALUES('Userpanel',5,0,0);393 394 76 CREATE TABLE %prefix%usergroups ( 395 77 id INTEGER, … … 398 80 PRIMARY KEY (id) 399 81 ); 400 401 INSERT INTO %prefix%usergroups VALUES(1,'Admin',0);402 INSERT INTO %prefix%usergroups VALUES(2,'Global Moderator',0);403 INSERT INTO %prefix%usergroups VALUES(3,'Moderator',0);404 INSERT INTO %prefix%usergroups VALUES(4,'Member',0);405 INSERT INTO %prefix%usergroups VALUES(5,'Guest',0);406 82 407 83 CREATE TABLE %prefix%members ( … … 450 126 member INTEGER NOT NULL 451 127 ); 128 129 CREATE TABLE %prefix%rights ( 130 page VARCHAR(255), 131 usergroup INTEGER, 132 r INTEGER, 133 w INTEGER, 134 PRIMARY KEY (page,usergroup) 135 ); 136 137 CREATE TABLE %prefix%rights_default ( 138 page VARCHAR(255), 139 usergroup INTEGER, 140 r INTEGER, 141 w INTEGER, 142 PRIMARY KEY (page,usergroup) 143 ); trunk/includes/login.php
r18 r19 68 68 // set special admin flag if necessary 69 69 if ($admin) { 70 if (Member::checkRights('admin/', 'r ead')) {70 if (Member::checkRights('admin/', 'r')) { 71 71 // everything alright 72 72 $_SESSION['auth_admin'] = 'yes'; trunk/install.php
r16 r19 220 220 // open SQL connection 221 221 if ($C = new Connection()) { 222 // get table structure and default groups / rights222 // get table structure 223 223 if ($db = @file_get_contents('db/spamboard.sql')) { 224 224 // one SQL query at a time … … 227 227 $C->query(str_replace('%prefix%', $SETTINGS['dbtableprefix'], $query)); 228 228 } 229 // MySQL specialities230 if ( $SETTINGS['sqltype'] == 'mysql') {231 if ($db = @file_get_contents('db/ mysql.sql')) {229 // specialities dependent on database type 230 if (is_file('db/' . $SETTINGS['sqltype'] . '.sql')) { 231 if ($db = @file_get_contents('db/' . $SETTINGS['sqltype'] . '.sql')) { 232 232 // one SQL query at a time 233 233 $db = explode(';', $db); … … 236 236 } 237 237 } else { $ok = 0; } 238 } 239 // finally, fill in default data 240 if ($db = @file_get_contents('db/data.sql')) { 241 // one SQL query at a time 242 $db = explode(';', $db); 243 foreach ($db as $query) { 244 $C->query(str_replace('%prefix%', $SETTINGS['dbtableprefix'], $query)); 245 } 238 246 } 239 247 // write the admin account trunk/redirectors/forumjump.php
r1 r19 51 51 52 52 // check if user has permission; required: read; dependent on id 53 if (Member::checkRights(ucfirst($_red[0]), 'r ead', $_red[1])) {53 if (Member::checkRights(ucfirst($_red[0]), 'r', $_red[1])) { 54 54 // permission granted 55 55 // close database connection trunk/redirectors/login.php
r1 r19 52 52 53 53 // check if user has permission; required: write; independent from id 54 if (Member::checkRights('Login', 'w rite')) {54 if (Member::checkRights('Login', 'w')) { 55 55 // permission granted 56 56 // try authenticating member trunk/redirectors/logout.php
r18 r19 48 48 49 49 // check if user has permission; required: write; independent from id 50 if (Member::checkRights('Login', 'w rite')) {50 if (Member::checkRights('Login', 'w')) { 51 51 // permission granted 52 52 // update session trunk/redirectors/markasread.php
r1 r19 48 48 49 49 // check if user has permission; required: write; independent from id 50 if (Member::checkRights('Markasread', 'w rite')) {50 if (Member::checkRights('Markasread', 'w')) { 51 51 // permission granted 52 52 // close databast connection trunk/redirectors/pollvote.php
r18 r19 56 56 case 'yes': 57 57 // check if user has permission; required: read; independent from id 58 if (Member::checkRights('Pollvote', 'r ead')) {58 if (Member::checkRights('Pollvote', 'r')) { 59 59 // permission granted 60 60 // get poll info … … 118 118 default: 119 119 // check if user has permission; required: write; independent from id 120 if (Member::checkRights('Pollvote', 'w rite') && $_SESSION['memberid'] > 0 && $_SESSION['membername'] != '') {120 if (Member::checkRights('Pollvote', 'w') && $_SESSION['memberid'] > 0 && $_SESSION['membername'] != '') { 121 121 // permission granted 122 122 $q = $C->prepare('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'polls WHERE pollid=:id'); trunk/redirectors/postinghelp.php
r8 r19 53 53 54 54 // check if user has permission; required: read; independent from id 55 if (Member::checkRights('Postinghelp', 'r ead')) {55 if (Member::checkRights('Postinghelp', 'r')) { 56 56 // permission granted 57 57 // output trunk/redirectors/preview.php
r18 r19 53 53 54 54 // check if user has permission; required: read; independent from id 55 if (Member::checkRights('Preview', 'r ead')) {55 if (Member::checkRights('Preview', 'r')) { 56 56 // permission granted 57 57 // header trunk/redirectors/showip.php
r18 r19 53 53 54 54 // check if user has permission; required: read; dependent on id 55 if (Member::checkRights('Showip', 'r ead', $id)) {55 if (Member::checkRights('Showip', 'r', $id)) { 56 56 // permission granted 57 57 // get IP form database trunk/redirectors/uploadavatar.php
r8 r19 55 55 // post-commit 56 56 // check if user has permission; required: write; independent from id 57 if (Member::checkRights('Uploadavatar', 'w rite')) {57 if (Member::checkRights('Uploadavatar', 'w')) { 58 58 // permission granted 59 59 if (is_array($_FILES['avatarfile']) && is_uploaded_file($_FILES['avatarfile']['tmp_name'])) { … … 125 125 // pre-commit 126 126 // check if user has permission; required: read; independent from id 127 if (Member::checkRights('Uploadavatar', 'r ead')) {127 if (Member::checkRights('Uploadavatar', 'r')) { 128 128 // permission granted 129 129 $html->body->addElement(new XMLElement($LANG['upload_avatar_hints']));
