Changeset 19

Show
Ignore:
Timestamp:
2007-11-23 12:07:31 (4 years ago)
Author:
hannes
Message:

rights table: renaming 'read' r and 'write' w to avoid escaping problem

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/admin/classes/pages/Addcategory.php

    r18 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // get biggest 'order' value 
    4444                $q = $C->prepare('SELECT MAX(category_order) AS neworder FROM ' . $SETTINGS['dbtableprefix'] . 'categories'); 
     
    6161        } else { 
    6262            // pre-commit 
    63             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     63            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    6464                $form = new Form($F->link('addcategory')); 
    6565                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Addforum.php

    r18 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // get biggest 'order' value 
    4444                $q = $C->prepare('SELECT MAX(forum_order) FROM ' . $SETTINGS['dbtableprefix'] . 'forums WHERE forum_category = :id'); 
     
    6363        } else { 
    6464            // pre-commit 
    65             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     65            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    6666                $form = new Form($F->link('addforum')); 
    6767                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Banning.php

    r1 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // open settings file for write access 
    4444                if ($file = @fopen('../includes/config/bans.php', 'w')) { 
     
    104104        } else { 
    105105            // pre-commit 
    106             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     106            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    107107                $form = new Form($F->link('banning')); 
    108108                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Category.php

    r18 r19  
    3737        // call parent constructor (general HTML 'skeleton') 
    3838        parent::__construct(TRUE); 
    39         if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     39        if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    4040            $div = $this->html->body->addChild('div', str_replace('%membername%', $_SESSION['membername'], $LANG['admin_panel_welcome'])); 
    4141            $div->addAttribute('id', 'admin_main'); 
  • trunk/admin/classes/pages/Deletecategory.php

    r18 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                if ($newcategory == '0') { 
    4444                    // no moving necessary 
     
    101101        } else { 
    102102            // pre-commit 
    103             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     103            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    104104                $this->html->body->addChild('b', $LANG['warning_deleting_category']); 
    105105                $form = new Form($F->link('deletecategory')); 
  • trunk/admin/classes/pages/Deleteforum.php

    r18 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                if ($newcategory != $id) { 
    4444                    if ($newcategory == '0') { 
     
    9292        } else { 
    9393            // pre-commit 
    94             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     94            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    9595                $this->html->body->addChild('b', $LANG['warning_deleting_forum']); 
    9696                $form = new Form($F->link('deleteforum')); 
  • trunk/admin/classes/pages/Editmember.php

    r18 r19  
    4646        if ($commit == 'y' || $submit == $LANG['Delete']) { 
    4747            // post-commit 
    48             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     48            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4949                // check if valid member id 
    5050                $q = $C->prepare('SELECT COUNT(*) FROM ' . $SETTINGS['dbtableprefix'] . 'members WHERE memberid = :id'); 
     
    236236        } else { 
    237237            // pre-commit 
    238             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     238            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    239239                $form = new Form($F->link('editmember')); 
    240240                $form->createTable('adminform'); 
  • trunk/admin/classes/pages/Footer.php

    r1 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // check if input is well-formed 
    4444                $newheader = trim($newheader); 
     
    6767        } else { 
    6868            // pre-commit 
    69             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     69            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    7070                $form = new Form($F->link('footer')); 
    7171                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Groups.php

    r18 r19  
    4545        if ($commit == 'y') { 
    4646            // post-commit 
    47             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     47            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4848                // go through all existing groups to update them accordingly 
    4949                foreach ($C->query('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups') as $row) { 
     
    9696        } else { 
    9797            // pre-commit 
    98             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     98            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    9999                $form = new Form($F->link('groups')); 
    100100                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Header.php

    r1 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // check if input is well-formed 
    4444                $newheader = trim($newheader); 
     
    6767        } else { 
    6868            // pre-commit 
    69             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     69            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    7070                $form = new Form($F->link('header')); 
    7171                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Memberstages.php

    r1 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // open file for write access 
    4444                if ($file = @fopen('../includes/config/memberstages.php', 'w')) { 
     
    6666        } else { 
    6767            // pre-commit 
    68             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     68            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    6969                $form = new Form($F->link('memberstages')); 
    7070                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Moderators.php

    r18 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                $_warnings = ''; 
    4444                // go through all forums 
     
    100100        } else { 
    101101            // pre-commit 
    102             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     102            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    103103                $form = new Form($F->link('moderators')); 
    104104                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Modifycategory.php

    r18 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // go through all categories 
    4444                foreach ($C->query('SELECT category_id FROM ' . $SETTINGS['dbtableprefix'] . 'categories') as $row) { 
     
    5959        } else { 
    6060            // pre-commit 
    61             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     61            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    6262                $form = new Form($F->link('modifycategory')); 
    6363                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Modifyforum.php

    r18 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // go through all forums 
    4444                foreach ($C->query('SELECT forumid FROM ' . $SETTINGS['dbtableprefix'] . 'forums') as $row) { 
     
    6161        } else { 
    6262            // pre-commit 
    63             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     63            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    6464                $form = new Form($F->link('modifyforum')); 
    6565                $form->addInput('hidden', 'commit', 'y'); 
  • trunk/admin/classes/pages/Permissions.php

    r18 r19  
    5151        if ($commit == 'y') { 
    5252            // post-commit 
    53             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     53            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    5454                // check if that group exists 
    5555                $q = $C->prepare('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups WHERE id = :id'); 
     
    7070                        $q3 = NULL; 
    7171                        foreach ($rows3 as $row3) { 
    72                             $q4 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, read, write) VALUES (:page, :group, :read, :write)'); 
     72                            $q4 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r, w) VALUES (:page, :group, :read, :write)'); 
    7373                            $q4->bindParam(':page', $row3['page'], PDO::PARAM_STR); 
    7474                            $q4->bindParam(':group', $id, PDO::PARAM_INT, 12); 
    75                             $q4->bindParam(':read', $row3['read'], PDO::PARAM_INT, 12); 
    76                             $q4->bindParam(':write', $row3['write'], PDO::PARAM_INT, 12); 
     75                            $q4->bindParam(':read', $row3['r'], PDO::PARAM_INT, 12); 
     76                            $q4->bindParam(':write', $row3['w'], PDO::PARAM_INT, 12); 
    7777                            $q4->execute(); 
    7878                            $q4 = NULL; 
     
    8282                            foreach ($C->query('SELECT forumid FROM ' . $SETTINGS['dbtableprefix'] . 'forums') as $row4) { 
    8383                                foreach ($_forum_pages as $_page_stub) { 
    84                                     $q5 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, read, write) VALUES (:page, :group, :read, :write)'); 
     84                                    $q5 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r, w) VALUES (:page, :group, :read, :write)'); 
    8585                                    $q5->bindValue(':page', $_page_stub . '=' . $row4['forumid'], PDO::PARAM_STR); 
    8686                                    $q5->bindParam(':group', $id, PDO::PARAM_INT, 12); 
     
    9595                        // insert the new permissions of this group 
    9696                        foreach ($newpagepermissions as $_page) { 
    97                             $q2 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, read, write) VALUES (:page, :group, :read, :write)'); 
     97                            $q2 = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'rights (page, usergroup, r, w) VALUES (:page, :group, :read, :write)'); 
    9898                            $q2->bindParam(':page', $_page, PDO::PARAM_STR); 
    9999                            $q2->bindParam(':group', $id, PDO::PARAM_INT, 12); 
     
    127127        } else { 
    128128            // pre-commit 
    129             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     129            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    130130                // check if that group exists 
    131131                $q = $C->prepare('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'usergroups WHERE id = :id'); 
     
    163163                                    } 
    164164                                    $q2 = NULL; 
    165                                     if (!isset($_row->read)) { 
     165                                    if (!isset($_row->r)) { 
    166166                                        // nothing set yet, so 'default deny' 
    167                                         $_row->read = 0; 
    168                                         $_row->write = 0; 
     167                                        $_row->r = 0; 
     168                                        $_row->w = 0; 
    169169                                    } 
    170170                                    $_col2 = '<input name="newpageread[' . $_page . ']" type="checkbox"'; 
    171                                     if ($_row->read == 1) { 
     171                                    if ($_row->r == 1) { 
    172172                                        $_col2 .= ' checked="checked"'; 
    173173                                    } 
    174174                                    $_col2 .= ' value="1" />'; 
    175175                                    $_col3 = '<input name="newpagewrite[' . $_page . ']" type="checkbox"'; 
    176                                     if ($_row->write == 1) { 
     176                                    if ($_row->w == 1) { 
    177177                                        $_col3 .= ' checked="checked"'; 
    178178                                    } 
     
    195195                        } 
    196196                        $q2 = NULL; 
    197                         if (!isset($_row->read)) { 
     197                        if (!isset($_row->r)) { 
    198198                            // nothing set yet, so 'default deny' 
    199                             $_row->read = 0; 
    200                             $_row->write = 0; 
     199                            $_row->r = 0; 
     200                            $_row->w = 0; 
    201201                        } 
    202202                        $_col2 = '<input name="newpageread[' . $_page . ']" type="checkbox"'; 
    203                         if ($_row->read == 1) { 
     203                        if ($_row->r == 1) { 
    204204                            $_col2 .= ' checked="checked"'; 
    205205                        } 
    206206                        $_col2 .= ' value="1" />'; 
    207207                        $_col3 = '<input name="newpagewrite[' . $_page . ']" type="checkbox"'; 
    208                         if ($_row->write == 1) { 
     208                        if ($_row->w == 1) { 
    209209                            $_col3 .= ' checked="checked"'; 
    210210                        } 
     
    224224                            } 
    225225                            $q2 = NULL; 
    226                             if (!isset($_row->read)) { 
     226                            if (!isset($_row->r)) { 
    227227                                // nothing set yet, so 'default deny' 
    228                                 $_row->read = 0; 
    229                                 $_row->write = 0; 
     228                                $_row->r = 0; 
     229                                $_row->w = 0; 
    230230                            } 
    231231                            $_col2 = '<input name="newpageread[' . $_page . ']" type="checkbox"'; 
    232                             if ($_row->read == 1) { 
     232                            if ($_row->r == 1) { 
    233233                                $_col2 .= ' checked="checked"'; 
    234234                            } 
    235235                            $_col2 .= ' value="1" />'; 
    236236                            $_col3 = '<input name="newpagewrite[' . $_page . ']" type="checkbox"'; 
    237                             if ($_row->write == 1) { 
     237                            if ($_row->w == 1) { 
    238238                                $_col3 .= ' checked="checked"'; 
    239239                            } 
  • trunk/admin/classes/pages/Settings.php

    r13 r19  
    4040        if ($commit == 'y') { 
    4141            // post-commit 
    42             if (Member::checkRights('admin/', 'write') && $_SESSION['auth_admin'] == 'yes') { 
     42            if (Member::checkRights('admin/', 'w') && $_SESSION['auth_admin'] == 'yes') { 
    4343                // open settings file for write access 
    4444                if ($file = @fopen('../includes/config/settings.php', 'w')) { 
     
    116116        } else { 
    117117            // pre-commit 
    118             if (Member::checkRights('admin/', 'read') && $_SESSION['auth_admin'] == 'yes') { 
     118            if (Member::checkRights('admin/', 'r') && $_SESSION['auth_admin'] == 'yes') { 
    119119                // show form to change all basic settings 
    120120                $form = new Form($F->link('settings')); 
  • trunk/admin/redirectors/logout.php

    r1 r19  
    4747 
    4848// check if user has permission; required: write; independent from id 
    49 if (Member::checkRights('admin/', 'write')) { 
     49if (Member::checkRights('admin/', 'w')) { 
    5050    // permission granted 
    5151    // remove authentication flag 
  • trunk/classes/misc/Forumjump.php

    r18 r19  
    4444            foreach ($rows as $row) { 
    4545                // offer only categories which the user may read 
    46                 if (Member::checkRights('Category', 'read', $row['category_id'])) { 
     46                if (Member::checkRights('Category', 'r', $row['category_id'])) { 
    4747                    // set number of forums in this category to zero 
    4848                    $n = 0; 
     
    5757                        foreach ($rows2 as $row2) { 
    5858                            // offer only forums which the user may read 
    59                             if (Member::checkRights('Forum', 'read', $row2['forumid'])) { 
     59                            if (Member::checkRights('Forum', 'r', $row2['forumid'])) { 
    6060                                // increase number of forums 
    6161                                $n++; 
  • trunk/classes/misc/Member.php

    r18 r19  
    529529     * Input:       $page   - page the user is trying to access (apart from 
    530530     *                        a few special cases, this is the class name) 
    531      *              $action - 'read' or 'write' access 
     531     *              $action - 'read' (r) or 'write' (w) access 
    532532     *              $id     - some permissions aren't set globally per page, 
    533533     *                        but depend on the called id in addition 
     
    541541            if ($_SESSION['memberid'] > 0) { 
    542542                // 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'); 
    544544                $q->bindParam(':id', $_SESSION['memberid'], PDO::PARAM_INT, 12); 
    545545                $q->execute(); 
     
    553553                foreach ($_groups as $key=>$val) { 
    554554                    // 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'); 
    556556                    $q->bindValue(':admin', 'admin/', PDO::PARAM_STR); 
    557557                    $q->bindParam(':group', $val, PDO::PARAM_INT, 12); 
  • trunk/classes/misc/Post.php

    r18 r19  
    110110        // check required permissions; required: 'write' on the kind of post (reply, new topic, new poll) 
    111111        if ($show_orig === 'reply') { 
    112             if (Member::checkRights('Reply', 'write', $reply)) { 
     112            if (Member::checkRights('Reply', 'w', $reply)) { 
    113113                $ok = 1; 
    114114            } else { 
     
    116116            } 
    117117        } elseif ($show_orig === 'newtopic') { 
    118             if (Member::checkRights('Newtopic', 'write', $forum)) { 
     118            if (Member::checkRights('Newtopic', 'w', $forum)) { 
    119119                $ok = 1; 
    120120            } else { 
     
    122122            } 
    123123        } elseif ($show_orig === 'newpoll') { 
    124             if (Member::checkRights('Newpoll', 'write', $forum)) { 
     124            if (Member::checkRights('Newpoll', 'w', $forum)) { 
    125125                $ok = 1; 
    126126            } else { 
     
    276276                            if ($_FILES['attachment']['tmp_name'] != 'none' && $_FILES['attachment']['tmp_name'] != '') { 
    277277                                // guests can't attach files 
    278                                 if (Member::checkRights('Attachments', 'write')) { 
     278                                if (Member::checkRights('Attachments', 'w')) { 
    279279                                    // if member 
    280280                                    if (!is_uploaded_file($_FILES['attachment']['tmp_name'])) { 
  • trunk/classes/pages/Calendar.php

    r18 r19  
    3939        parent::__construct(); 
    4040        // check if user has permission; required: read; 
    41         $_permit = Member::checkRights('Calendar', 'read'); 
     41        $_permit = Member::checkRights('Calendar', 'r'); 
    4242        if ($_permit) { 
    4343            // get current date 
  • trunk/classes/pages/Category.php

    r18 r19  
    7474                /* check if user has permission on this forum; 
    7575                 * required: read; dependent on id */ 
    76                 $_permit = Member::checkRights('Forum', 'read', $row2['forumid']); 
     76                $_permit = Member::checkRights('Forum', 'r', $row2['forumid']); 
    7777                if ($_permit) { 
    7878                    // increase number of permitted forums 
  • trunk/classes/pages/Delete.php

    r18 r19  
    5757        parent::__construct(); 
    5858        // check if user has permission; required: write; dependent on id 
    59         if (Member::checkRights('Delete', 'write', $id)) { 
     59        if (Member::checkRights('Delete', 'w', $id)) { 
    6060            // permission granted 
    6161            $this->html->body->addChild('h2', $LANG['Delete_Post']); 
  • trunk/classes/pages/Edit.php

    r18 r19  
    5757        parent::__construct(); 
    5858        // check if user has permission; required: write; dependent on id 
    59         if (Member::checkRights('Edit', 'write', $id)) { 
     59        if (Member::checkRights('Edit', 'w', $id)) { 
    6060            // permission granted 
    6161            $this->html->body->addChild('h2', $LANG['Edit_Post']); 
  • trunk/classes/pages/Forum.php

    r18 r19  
    4545        parent::__construct(); 
    4646        // check if user has permission; required: read; dependent on id 
    47         $_permit = Member::checkRights('Forum', 'read', $id); 
     47        $_permit = Member::checkRights('Forum', 'r', $id); 
    4848        if ($_permit) { 
    4949            // get forum name, id etc. to print heading 
  • trunk/classes/pages/Help.php

    r1 r19  
    4040        parent::__construct(); 
    4141        // check if user has permission; required: read; independent from id 
    42         if (Member::checkRights('Help', 'read')) { 
     42        if (Member::checkRights('Help', 'r')) { 
    4343            // permission granted 
    4444            $this->html->body->addChild('h2', $LANG['Help']); 
  • trunk/classes/pages/Login.php

    r1 r19  
    4040        $this->html->body->addChild('h2', $LANG['Login']); 
    4141        // check if user has permission; required: read; independent from id 
    42         if (Member::checkRights('Login', 'read')) { 
     42        if (Member::checkRights('Login', 'r')) { 
    4343            // permission granted 
    4444            // form 
  • trunk/classes/pages/Lostpassword.php

    r18 r19  
    4242        if ($GLOBALS['commit'] == 'y') { 
    4343            // check if user has permission; required: write; independent from id 
    44             if (Member::checkRights('Lostpassword', 'write')) { 
     44            if (Member::checkRights('Lostpassword', 'w')) { 
    4545                // permission granted 
    4646                if (isset($email) && $email != '') { 
     
    7171        } else { 
    7272            // check if user has permission; required: read; independent from id 
    73             if (Member::checkRights('Lostpassword', 'read')) { 
     73            if (Member::checkRights('Lostpassword', 'r')) { 
    7474                // permission granted 
    7575                // form 
  • trunk/classes/pages/Mail.php

    r18 r19  
    4444        if ($GLOBALS['commit'] == 'y') { 
    4545            // check if user has permission; required: write; independent from id 
    46             if (Member::checkRights('Mail', 'write')) { 
     46            if (Member::checkRights('Mail', 'w')) { 
    4747                // permission granted 
    4848                // get sender information 
     
    8787        } else { 
    8888            // check if user has permission; required: read; independent from id 
    89             if (Member::checkRights('Mail', 'read')) { 
     89            if (Member::checkRights('Mail', 'r')) { 
    9090                // permission granted 
    9191                if ($receipient->getMailHidden() === FALSE) { 
  • trunk/classes/pages/Members.php

    r18 r19  
    3939        parent::__construct(); 
    4040        // check if user has permission; required: read; 
    41         $_permit = Member::checkRights('Members', 'read'); 
     41        $_permit = Member::checkRights('Members', 'r'); 
    4242        if ($_permit) { 
    4343            // default page 
  • trunk/classes/pages/Messenger.php

    r18 r19  
    7070                /* check if user has permission; 
    7171                 * required: write; independent from id */ 
    72                 if (Member::checkRights('Messenger', 'write')) { 
     72                if (Member::checkRights('Messenger', 'w')) { 
    7373                    // permission granted 
    7474                    if ($id == 0) { 
     
    125125                /* check if user has permission; 
    126126                 * required: read; independent from id */ 
    127                 if (Member::checkRights('Messenger', 'read')) { 
     127                if (Member::checkRights('Messenger', 'r')) { 
    128128                    // permission granted 
    129129                    $q = $C->prepare('SELECT addressbook FROM ' . $SETTINGS['dbtableprefix'] . 'members WHERE memberid=:id'); 
     
    169169                /* check if user has permission; 
    170170                 * required: write; independent from id */ 
    171                 if (Member::checkRights('Messenger', 'write')) { 
     171                if (Member::checkRights('Messenger', 'w')) { 
    172172                    // permission granted 
    173173                    // get message 
     
    215215                /* check if user has permission; 
    216216                 * required: write; independent from id */ 
    217                 if (Member::checkRights('Messenger', 'write')) { 
     217                if (Member::checkRights('Messenger', 'w')) { 
    218218                    // permission granted 
    219219                    // IP banning 
     
    305305                /* check if user has permission; 
    306306                 * required: write; independent from id */ 
    307                 if (Member::checkRights('Messenger', 'write')) { 
     307                if (Member::checkRights('Messenger', 'w')) { 
    308308                    // permission granted 
    309309                    if (isset($reply) && $reply > 0) { 
     
    338338                /* check if user has permission; 
    339339                 * required: read; independent from id */ 
    340                 if (Member::checkRights('Messenger', 'read')) { 
     340                if (Member::checkRights('Messenger', 'r')) { 
    341341                    // permission granted 
    342342                    $q = $C->prepare('SELECT messageid, messagereceipient, messagetitle, messagetime FROM ' . $SETTINGS['dbtableprefix'] . 'messages WHERE messagesender=:id AND messagesenderflag > :zero ORDER BY messagetime DESC'); 
     
    365365                /* check if user has permission; 
    366366                 * required: read; independent from id */ 
    367                 if (Member::checkRights('Messenger', 'read')) { 
     367                if (Member::checkRights('Messenger', 'r')) { 
    368368                    // permission granted 
    369369                    $q = $C->prepare('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'messages WHERE messageid=:id'); 
     
    401401                /* check if user has permission; 
    402402                 * required: read; independent from id */ 
    403                 if (Member::checkRights('Messenger', 'read')) { 
     403                if (Member::checkRights('Messenger', 'r')) { 
    404404                    // permission granted 
    405405                    $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  
    5757                /* check if user has permission; required: write; 
    5858                 * dependent on id (for topic starter and forum moderator, not for groups which have global rights) */ 
    59                 if (Member::checkRights('Edit_Title', 'write', $id)) { 
     59                if (Member::checkRights('Edit_Title', 'w', $id)) { 
    6060                    // permission granted 
    6161                    $this->html->body->addChild('h2', $LANG['Edit_Title']); 
     
    9191                /* check if user has permission; required: write; 
    9292                 * dependent on id for groups which don't have global rights on this feature (i.e. per-forum moderators) */ 
    93                 if (Member::checkRights('Lock', 'write', $id)) { 
     93                if (Member::checkRights('Lock', 'w', $id)) { 
    9494                    // permission granted 
    9595                    $this->html->body->addChild('h2', $LANG['Lock_Topic']); 
     
    111111                /* check if user has permission; required: write; 
    112112                 * dependent on id (again, OR global rights) */ 
    113                 if (Member::checkRights('Unlock', 'write', $id)) { 
     113                if (Member::checkRights('Unlock', 'w', $id)) { 
    114114                    // permission granted 
    115115                    $this->html->body->addChild('h2', $LANG['Unlock_Topic']); 
     
    131131                /* check if user has permission; required: write; 
    132132                 * dependent on id (OR global rights) */ 
    133                 if (Member::checkRights('Pin', 'write', $id)) { 
     133                if (Member::checkRights('Pin', 'w', $id)) { 
    134134                    // permission granted 
    135135                    $this->html->body->addChild('h2', $LANG['Pin_Topic']); 
     
    151151                /* check if user has permission; required: write; 
    152152                 * dependent on id (or global rights) */ 
    153                 if (Member::checkRights('Unpin', 'write', $id)) { 
     153                if (Member::checkRights('Unpin', 'w', $id)) { 
    154154                    // permission granted 
    155155                    $this->html->body->addChild('h2', $LANG['Unpin_Topic']); 
     
    171171                /* check if user has permission; required: write; 
    172172                 * dependent on id (unless global rights apply) */ 
    173                 if (Member::checkRights('Delete_Topic', 'write', $id)) { 
     173                if (Member::checkRights('Delete_Topic', 'w', $id)) { 
    174174                    // permission granted 
    175175                    $this->html->body->addChild('h2', $LANG['Delete_Topic']); 
     
    207207                /* check if user has permission; required: write; 
    208208                 * independent from id (global rights only) */ 
    209                 if (Member::checkRights('Move', 'write')) { 
     209                if (Member::checkRights('Move', 'w')) { 
    210210                    // permission granted 
    211211                    $this->html->body->addChild('h2', $LANG['Move_Topic']); 
     
    258258                /* check if user has permission; required: write; 
    259259                 * dependent on id (unless global rights apply) */ 
    260                 if (Member::checkRights('Merge', 'write', $id)) { 
     260                if (Member::checkRights('Merge', 'w', $id)) { 
    261261                    // permission granted 
    262262                    $this->html->body->addChild('h2', $LANG['Merge_Topic']); 
     
    344344                /* check if user has permission; required: write; 
    345345                 * dependent on id (unless user equipped with global rights) */ 
    346                 if (Member::checkRights('Split', 'write', $id)) { 
     346                if (Member::checkRights('Split', 'w', $id)) { 
    347347                    // permission granted 
    348348                    $this->html->body->addChild('h2', $LANG['Split_Topic']); 
  • trunk/classes/pages/Newpoll.php

    r18 r19  
    5555            // show form 
    5656            // check if user has permission; required: read; dependent on id 
    57             if (Member::checkRights('Newpoll', 'read', $id)) { 
     57            if (Member::checkRights('Newpoll', 'r', $id)) { 
    5858                // permission granted 
    5959                // form 
  • trunk/classes/pages/Newtopic.php

    r18 r19  
    5555            // show reply form 
    5656            // check if user has permission; required: read; dependent on id 
    57             if (Member::checkRights('Newtopic', 'read', $id)) { 
     57            if (Member::checkRights('Newtopic', 'r', $id)) { 
    5858                // permission granted 
    5959                // form 
  • trunk/classes/pages/Page.php

    r18 r19  
    165165                $_str = '<div><span>' . $LANG['Logged_in_as'] . '</span> <a href="' . $F->link('profile') . 'id=' . $_SESSION['memberid'] . '">' . $_SESSION['membername'] . '</a>'; 
    166166                // link to admin panel 
    167                 if (Member::checkRights('admin/', 'read')) { 
     167                if (Member::checkRights('admin/', 'r')) { 
    168168                    $_str .= ' <a href="admin/" target="_blank">' . $LANG['Admin_Panel'] . '</a>'; 
    169169                    // maintainance mode 
  • trunk/classes/pages/Profile.php

    r1 r19  
    4242        parent::__construct(); 
    4343        // check if user has permission; required: read; independent from id 
    44         $_permit = Member::checkRights('Profile', 'read'); 
     44        $_permit = Member::checkRights('Profile', 'r'); 
    4545        if ($_permit) { 
    4646            // start normal output 
  • trunk/classes/pages/Register.php

    r18 r19  
    4242        if ($GLOBALS['commit'] == 'y') { 
    4343            // check if user has permission; required: write; independent from id 
    44             if (Member::checkRights('Register', 'write')) { 
     44            if (Member::checkRights('Register', 'w')) { 
    4545                // permission granted 
    4646                if ($auth_code == $_SESSION['pw']) { 
     
    146146        } else { 
    147147            // check if user has permission; required: read; independent from id 
    148             if (Member::checkRights('Register', 'read')) { 
     148            if (Member::checkRights('Register', 'r')) { 
    149149                // permission granted 
    150150                // generate new session password 
  • trunk/classes/pages/Reply.php

    r18 r19  
    6060            // show reply form 
    6161            // check if user has permission; required: read; dependent on id 
    62             if (Member::checkRights('Reply', 'read', $row->forum)) { 
     62            if (Member::checkRights('Reply', 'r', $row->forum)) { 
    6363                // permission granted 
    6464                // get text to quote (if needed) 
  • trunk/classes/pages/Rules.php

    r1 r19  
    3939        parent::__construct(); 
    4040        // check if user has permission; required: read; independent from id 
    41         if (Member::checkRights('Rules', 'read')) { 
     41        if (Member::checkRights('Rules', 'r')) { 
    4242            // permission granted 
    4343            $this->html->body->addChild('h2', $LANG['Rules']); 
  • trunk/classes/pages/Search.php

    r18 r19  
    4040        if ($results == 'y') { 
    4141            // check if user has permission; required: write; 
    42             $_permit = Member::checkRights('Search', 'write'); 
     42            $_permit = Member::checkRights('Search', 'w'); 
    4343            if ($_permit) { 
    4444                // also check for flood control 
     
    6464                    foreach ($C->query('SELECT forumid FROM ' . $SETTINGS['dbtableprefix'] . 'forums') as $row) { 
    6565                        // put forum ids for which access is NOT granted into search condition 
    66                         if (!Member::checkRights('Forum', 'read', $row['forumid'])) { 
     66                        if (!Member::checkRights('Forum', 'r', $row['forumid'])) { 
    6767                            $_cond .= ' AND t.forum!=' . $row['forumid']; 
    6868                        } 
     
    229229        } else { 
    230230            // check if user has permission; required: read; 
    231             $_permit = Member::checkRights('Search', 'read'); 
     231            $_permit = Member::checkRights('Search', 'r'); 
    232232            if ($_permit) { 
    233233                // header 
     
    248248                    foreach ($rows as $row) { 
    249249                        // offer only categories which the user may read 
    250                         if (Member::checkRights('Category', 'read', $row['category_id'])) { 
     250                        if (Member::checkRights('Category', 'r', $row['category_id'])) { 
    251251                            // set number of forums in this category to zero 
    252252                            $n = 0; 
     
    262262                                foreach ($rows2 as $row2) { 
    263263                                    // offer only forums which the user may read 
    264                                     if (Member::checkRights('Forum', 'read', $row2['forumid'])) { 
     264                                    if (Member::checkRights('Forum', 'r', $row2['forumid'])) { 
    265265                                        // increase number of forums 
    266266                                        $n++; 
  • trunk/classes/pages/Topic.php

    r18 r19  
    5353        parent::__construct(); 
    5454        // check if user has permission on the forum; required: read; dependent on id 
    55         $_permit = Member::checkRights('Forum', 'read', $row->forum); 
     55        $_permit = Member::checkRights('Forum', 'r', $row->forum); 
    5656        // if user may see topics in this forum, continue 
    5757        if ($_permit) { 
  • trunk/classes/pages/Userpanel.php

    r18 r19  
    4444        if ($GLOBALS['commit'] == 'y') { 
    4545            // check if user has permission; required: write; independent from id 
    46             if (Member::checkRights('Userpanel', 'write')) { 
     46            if (Member::checkRights('Userpanel', 'w')) { 
    4747                // permission granted 
    4848                switch ($action) { 
     
    328328        } else { 
    329329            // check if user has permission; required: read; independent from id 
    330             if (Member::checkRights('Userpanel', 'read')) { 
     330            if (Member::checkRights('Userpanel', 'r')) { 
    331331                // permission granted 
    332332                switch ($action) { 
  • trunk/db/spamboard.sql

    r18 r19  
    7474); 
    7575 
    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  
    39476CREATE TABLE %prefix%usergroups ( 
    39577  id INTEGER, 
     
    39880  PRIMARY KEY (id) 
    39981); 
    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); 
    40682 
    40783CREATE TABLE %prefix%members ( 
     
    450126    member INTEGER NOT NULL 
    451127); 
     128 
     129CREATE TABLE %prefix%rights ( 
     130    page VARCHAR(255), 
     131    usergroup INTEGER, 
     132    r INTEGER, 
     133    w INTEGER, 
     134    PRIMARY KEY (page,usergroup) 
     135); 
     136 
     137CREATE 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  
    6868// set special admin flag if necessary 
    6969if ($admin) { 
    70     if (Member::checkRights('admin/', 'read')) { 
     70    if (Member::checkRights('admin/', 'r')) { 
    7171        // everything alright 
    7272        $_SESSION['auth_admin'] = 'yes'; 
  • trunk/install.php

    r16 r19  
    220220                    // open SQL connection 
    221221                    if ($C = new Connection()) { 
    222                         // get table structure and default groups / rights 
     222                        // get table structure 
    223223                        if ($db = @file_get_contents('db/spamboard.sql')) { 
    224224                            // one SQL query at a time 
     
    227227                                $C->query(str_replace('%prefix%', $SETTINGS['dbtableprefix'], $query)); 
    228228                            } 
    229                             // MySQL specialities 
    230                             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')) { 
    232232                                    // one SQL query at a time 
    233233                                    $db = explode(';', $db); 
     
    236236                                    } 
    237237                                } 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                                } 
    238246                            } 
    239247                            // write the admin account 
  • trunk/redirectors/forumjump.php

    r1 r19  
    5151 
    5252// check if user has permission; required: read; dependent on id 
    53 if (Member::checkRights(ucfirst($_red[0]), 'read', $_red[1])) { 
     53if (Member::checkRights(ucfirst($_red[0]), 'r', $_red[1])) { 
    5454    // permission granted 
    5555    // close database connection 
  • trunk/redirectors/login.php

    r1 r19  
    5252 
    5353// check if user has permission; required: write; independent from id 
    54 if (Member::checkRights('Login', 'write')) { 
     54if (Member::checkRights('Login', 'w')) { 
    5555    // permission granted 
    5656    // try authenticating member 
  • trunk/redirectors/logout.php

    r18 r19  
    4848 
    4949// check if user has permission; required: write; independent from id 
    50 if (Member::checkRights('Login', 'write')) { 
     50if (Member::checkRights('Login', 'w')) { 
    5151    // permission granted 
    5252    // update session 
  • trunk/redirectors/markasread.php

    r1 r19  
    4848 
    4949// check if user has permission; required: write; independent from id 
    50 if (Member::checkRights('Markasread', 'write')) { 
     50if (Member::checkRights('Markasread', 'w')) { 
    5151    // permission granted 
    5252    // close databast connection 
  • trunk/redirectors/pollvote.php

    r18 r19  
    5656    case 'yes': 
    5757        // check if user has permission; required: read; independent from id 
    58         if (Member::checkRights('Pollvote', 'read')) { 
     58        if (Member::checkRights('Pollvote', 'r')) { 
    5959            // permission granted 
    6060            // get poll info 
     
    118118    default: 
    119119        // check if user has permission; required: write; independent from id 
    120         if (Member::checkRights('Pollvote', 'write') && $_SESSION['memberid'] > 0 && $_SESSION['membername'] != '') { 
     120        if (Member::checkRights('Pollvote', 'w') && $_SESSION['memberid'] > 0 && $_SESSION['membername'] != '') { 
    121121            // permission granted 
    122122            $q = $C->prepare('SELECT * FROM ' . $SETTINGS['dbtableprefix'] . 'polls WHERE pollid=:id'); 
  • trunk/redirectors/postinghelp.php

    r8 r19  
    5353 
    5454// check if user has permission; required: read; independent from id 
    55 if (Member::checkRights('Postinghelp', 'read')) { 
     55if (Member::checkRights('Postinghelp', 'r')) { 
    5656    // permission granted 
    5757    // output 
  • trunk/redirectors/preview.php

    r18 r19  
    5353 
    5454// check if user has permission; required: read; independent from id 
    55 if (Member::checkRights('Preview', 'read')) { 
     55if (Member::checkRights('Preview', 'r')) { 
    5656    // permission granted 
    5757    // header 
  • trunk/redirectors/showip.php

    r18 r19  
    5353 
    5454// check if user has permission; required: read; dependent on id 
    55 if (Member::checkRights('Showip', 'read', $id)) { 
     55if (Member::checkRights('Showip', 'r', $id)) { 
    5656    // permission granted 
    5757    // get IP form database 
  • trunk/redirectors/uploadavatar.php

    r8 r19  
    5555    // post-commit 
    5656    // check if user has permission; required: write; independent from id 
    57     if (Member::checkRights('Uploadavatar', 'write')) { 
     57    if (Member::checkRights('Uploadavatar', 'w')) { 
    5858        // permission granted 
    5959        if (is_array($_FILES['avatarfile']) && is_uploaded_file($_FILES['avatarfile']['tmp_name'])) { 
     
    125125    // pre-commit 
    126126    // check if user has permission; required: read; independent from id 
    127     if (Member::checkRights('Uploadavatar', 'read')) { 
     127    if (Member::checkRights('Uploadavatar', 'r')) { 
    128128        // permission granted 
    129129        $html->body->addElement(new XMLElement($LANG['upload_avatar_hints']));