OSDN Git Service

CHANGE:クエリ生成に使われているi18n::formatted_datetime()をDB::formatDateTime()に変更
[nucleus-jp/nucleus-next.git] / nucleus / libs / ADMIN.php
index f5079b0..ad4b6b4 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
- * Copyright (C) 2002-2012 The Nucleus Group
+ * Copyright (C) 2002-2009 The Nucleus Group
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -13,7 +13,7 @@
  * The code for the Nucleus admin area
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
- * @copyright Copyright (C) 2002-2012 The Nucleus Group
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group
  * @version $Id: ADMIN.php 1661 2012-02-12 11:55:39Z sakamocchi $
 
  */
@@ -168,11 +168,11 @@ class Admin
         <br />
         <input name="action" value="login" type="hidden" />
         <br />
-        <input type="submit" value="<?php echo _LOGIN?>" tabindex="30" />
+        <input type="submit" value="<?php echo _LOGIN ?>" tabindex="30" />
         <br />
         <small>
-            <input type="checkbox" value="1" name="shared" tabindex="40" id="shared" /><label for="shared"><?php echo _LOGIN_SHARED?></label>
-            <br /><a href="forgotpassword.html"><?php echo _LOGIN_FORGOT?></a>
+            <input type="checkbox" value="1" name="shared" tabindex="40" id="shared" /><label for="shared"><?php echo _LOGIN_SHARED ?></label>
+            <br /><a href="forgotpassword.html"><?php echo _LOGIN_FORGOT ?></a>
         </small>
         <?php           // pass through vars
 
@@ -221,7 +221,7 @@ class Admin
         $amount = showlist($query,'table',$template);
 
         if (($showAll != 'yes') && ($member->isAdmin())) {
-            $total = quickQuery('SELECT COUNT(*) as result FROM ' . sql_table('blog'));
+            $total = DB::getValue('SELECT COUNT(*) as result FROM ' . sql_table('blog'));
             if ($total > $amount)
                 echo '<p><a href="index.php?action=overview&amp;showall=yes">' . _OVERVIEW_SHOWALL . '</a></p>';
         }
@@ -334,68 +334,88 @@ class Admin
         $this->pagefoot();
     }
 
-    /**
-     * @todo document this
-     */
-    function action_itemlist($blogid = '') {
-        global $member, $manager, $CONF;
-
-        if ($blogid == '')
-            $blogid = intRequestVar('blogid');
-
-        $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
-
-        $this->pagehead();
-        $blog =& $manager->getBlog($blogid);
-
-        echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
-        echo '<h2>' . _ITEMLIST_BLOG . ' ' . $this->bloglink($blog) . '</h2>';
-
-        // start index
-        if (postVar('start'))
-            $start = intPostVar('start');
-        else
-            $start = 0;
-
-        if ($start == 0)
-            echo '<p><a href="index.php?action=createitem&amp;blogid='.$blogid.'">',_ITEMLIST_ADDNEW,'</a></p>';
-
-        // amount of items to show
-        if (postVar('amount'))
-            $amount = intPostVar('amount');
-        else {
-            $amount = intval($CONF['DefaultListSize']);
-            if ($amount < 1)
-                $amount = 10;
-        }
-
-        $search = postVar('search');    // search through items
-
-        $query =  'SELECT bshortname, cname, mname, ititle, ibody, inumber, idraft, itime'
-               . ' FROM ' . sql_table('item') . ', ' . sql_table('blog') . ', ' . sql_table('member') . ', ' . sql_table('category')
-               . ' WHERE iblog=bnumber and iauthor=mnumber and icat=catid and iblog=' . $blogid;
-
-        if ($search)
-            $query .= ' and ((ititle LIKE "%' . sql_real_escape_string($search) . '%") or (ibody LIKE "%' . sql_real_escape_string($search) . '%") or (imore LIKE "%' . sql_real_escape_string($search) . '%"))';
-
-        // non-blog-admins can only edit/delete their own items
-        if (!$member->blogAdminRights($blogid))
-            $query .= ' and iauthor=' . $member->getID();
-
-
-        $query .= ' ORDER BY itime DESC'
-                . " LIMIT $start,$amount";
-
-        $template['content'] = 'itemlist';
-        $template['now'] = $blog->getCorrectTime(time());
-
-        $manager->loadClass("ENCAPSULATE");
-        $navList = new NavList('itemlist', $start, $amount, 0, 1000, $blogid, $search, 0);
-        $navList->showBatchList('item',$query,'table',$template);
-
-
-        $this->pagefoot();
-    }
+       /**
+        * Admin::action_itemlist()
+        * 
+        * @param       integer $blogid ID for weblog
+        * @return      void
+        */
+       public function action_itemlist($blogid = '')
+       {
+               global $member, $manager, $CONF;
+               
+               if ( $blogid == '' )
+               {
+                       $blogid = intRequestVar('blogid');
+               }
+               
+               $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
+               
+               $this->pagehead();
+               $blog =& $manager->getBlog($blogid);
+               
+               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
+               echo '<h2>' . _ITEMLIST_BLOG . ' ' . $this->bloglink($blog) . '</h2>';
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               if ( $start == 0 )
+               {
+                       echo '<p><a href="index.php?action=createitem&amp;blogid='.$blogid.'">' . _ITEMLIST_ADDNEW . "</a></p>\n";
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = intval($CONF['DefaultListSize']);
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');    // search through items
+               
+               $query = 'SELECT bshortname, cname, mname, ititle, ibody, inumber, idraft, itime'
+                      . ' FROM ' . sql_table('item') . ', ' . sql_table('blog') . ', ' . sql_table('member') . ', ' . sql_table('category')
+                      . ' WHERE iblog=bnumber and iauthor=mnumber and icat=catid and iblog=' . $blogid;
+               
+               if ( $search )
+               {
+                       $query .= " AND ((ititle LIKE " . DB::quoteValue('%'.$search.'%') . ") OR (ibody LIKE " . DB::quoteValue('%'.$search.'%') . ") OR (imore LIKE " . DB::quoteValue('%'.$search.'%') . "))";
+               }
+               
+               // non-blog-admins can only edit/delete their own items
+               if ( !$member->blogAdminRights($blogid) )
+               {
+                       $query .= ' and iauthor=' . $member->getID();
+               }
+               
+               $query .= ' ORDER BY itime DESC'
+                       . " LIMIT $start, $amount";
+               
+               $template['content'] = 'itemlist';
+               $template['now'] = $blog->getCorrectTime(time());
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('itemlist', $start, $amount, 0, 1000, $blogid, $search, 0);
+               $navList->showBatchList('item',$query,'table',$template);
+               
+               $this->pagefoot();
+               return;
+       }
 
     /**
      * @todo document this
@@ -558,16 +578,16 @@ class Admin
                     break;
                 case 'setadmin':
                     // always succeeds
-                    sql_query('UPDATE ' . sql_table('member') . ' SET madmin=1 WHERE mnumber='.$memberid);
+                    DB::execute('UPDATE ' . sql_table('member') . ' SET madmin=1 WHERE mnumber='.$memberid);
                     $error = '';
                     break;
                 case 'unsetadmin':
                     // there should always remain at least one super-admin
-                    $r = sql_query('SELECT * FROM '.sql_table('member'). ' WHERE madmin=1 and mcanlogin=1');
-                    if (sql_num_rows($r) < 2)
+                    $r = DB::getResult('SELECT * FROM '.sql_table('member'). ' WHERE madmin=1 and mcanlogin=1');
+                    if ($r->rowCount() < 2)
                         $error = _ERROR_ATLEASTONEADMIN;
                     else
-                        sql_query('UPDATE ' . sql_table('member') .' SET madmin=0 WHERE mnumber='.$memberid);
+                        DB::execute('UPDATE ' . sql_table('member') .' SET madmin=0 WHERE mnumber='.$memberid);
                     break;
                 default:
                     $error = _BATCH_UNKNOWN . Entity::hsc($action);
@@ -628,16 +648,16 @@ class Admin
                     break;
                 case 'setadmin':
                     // always succeeds
-                    sql_query('UPDATE '.sql_table('team').' SET tadmin=1 WHERE tblog='.$blogid.' and tmember='.$memberid);
+                    DB::execute('UPDATE '.sql_table('team').' SET tadmin=1 WHERE tblog='.$blogid.' and tmember='.$memberid);
                     $error = '';
                     break;
                 case 'unsetadmin':
                     // there should always remain at least one admin
-                    $r = sql_query('SELECT * FROM '.sql_table('team').' WHERE tadmin=1 and tblog='.$blogid);
-                    if (sql_num_rows($r) < 2)
+                    $r = DB::getResult('SELECT * FROM '.sql_table('team').' WHERE tadmin=1 and tblog='.$blogid);
+                    if ($r->rowCount() < 2)
                         $error = _ERROR_ATLEASTONEBLOGADMIN;
                     else
-                        sql_query('UPDATE '.sql_table('team').' SET tadmin=0 WHERE tblog='.$blogid.' and tmember='.$memberid);
+                        DB::execute('UPDATE '.sql_table('team').' SET tadmin=0 WHERE tblog='.$blogid.' and tmember='.$memberid);
                     break;
                 default:
                     $error = _BATCH_UNKNOWN . Entity::hsc($action);
@@ -725,10 +745,10 @@ class Admin
         global $manager;
         $this->pagehead();
         ?>
-        <h2><?php echo _MOVE_TITLE?></h2>
+        <h2><?php echo _MOVE_TITLE ?></h2>
         <form method="post" action="index.php"><div>
 
-            <input type="hidden" name="action" value="batch<?php echo $type?>" />
+            <input type="hidden" name="action" value="batch<?php echo $type ?>" />
             <input type="hidden" name="batchaction" value="move" />
             <?php
                 $manager->addTicketHidden();
@@ -744,7 +764,7 @@ class Admin
             ?>
 
 
-            <input type="submit" value="<?php echo _MOVE_BTN?>" onclick="return checkSubmit();" />
+            <input type="submit" value="<?php echo _MOVE_BTN ?>" onclick="return checkSubmit();" />
 
         </div></form>
         <?php       $this->pagefoot();
@@ -758,10 +778,10 @@ class Admin
         global $manager;
         $this->pagehead();
         ?>
-        <h2><?php echo _MOVECAT_TITLE?></h2>
+        <h2><?php echo _MOVECAT_TITLE ?></h2>
         <form method="post" action="index.php"><div>
 
-            <input type="hidden" name="action" value="batch<?php echo $type?>" />
+            <input type="hidden" name="action" value="batch<?php echo $type ?>" />
             <input type="hidden" name="batchaction" value="move" />
             <?php
                 $manager->addTicketHidden();
@@ -777,7 +797,7 @@ class Admin
             ?>
 
 
-            <input type="submit" value="<?php echo _MOVECAT_BTN?>" onclick="return checkSubmit();" />
+            <input type="submit" value="<?php echo _MOVECAT_BTN ?>" onclick="return checkSubmit();" />
 
         </div></form>
         <?php       $this->pagefoot();
@@ -792,10 +812,10 @@ class Admin
 
         $this->pagehead();
         ?>
-        <h2><?php echo _BATCH_DELETE_CONFIRM?></h2>
+        <h2><?php echo _BATCH_DELETE_CONFIRM ?></h2>
         <form method="post" action="index.php"><div>
 
-            <input type="hidden" name="action" value="batch<?php echo $type?>" />
+            <input type="hidden" name="action" value="batch<?php echo $type ?>" />
             <?php $manager->addTicketHidden() ?>
             <input type="hidden" name="batchaction" value="delete" />
             <input type="hidden" name="confirmation" value="yes" />
@@ -816,7 +836,7 @@ class Admin
 
             ?>
 
-            <input type="submit" value="<?php echo _BATCH_DELETE_CONFIRM_BTN?>" onclick="return checkSubmit();" />
+            <input type="submit" value="<?php echo _BATCH_DELETE_CONFIRM_BTN ?>" onclick="return checkSubmit();" />
 
         </div></form>
         <?php       $this->pagefoot();
@@ -833,348 +853,469 @@ class Admin
         Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude);
     }
 
-    /**
-     * Inserts a HTML select element with choices for all blogs to which the user has access
-     *      mode = 'blog' => shows blognames and values are blogids
-     *      mode = 'category' => show category names and values are catids
-     *
-     * @param $iForcedBlogInclude
-     *      ID of a blog that always needs to be included, without checking if the
-     *      member is on the blog team (-1 = none)
-     * @todo document parameters
-     */
-    function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) {
-        global $member, $CONF;
-
-        // 0. get IDs of blogs to which member can post items (+ forced blog)
-        $aBlogIds = array();
-        if ($iForcedBlogInclude != -1)
-            $aBlogIds[] = intval($iForcedBlogInclude);
-
-        if (($member->isAdmin()) && ($CONF['ShowAllBlogs']))
-            $queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').' ORDER BY bname';
-        else
-            $queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').', '.sql_table('team').' WHERE tblog=bnumber and tmember=' . $member->getID();
-        $rblogids = sql_query($queryBlogs);
-        while ($o = sql_fetch_object($rblogids))
-            if ($o->bnumber != $iForcedBlogInclude)
-                $aBlogIds[] = intval($o->bnumber);
-
-        if (count($aBlogIds) == 0)
-            return;
-
-        echo '<select name="',$name,'" tabindex="',$tabindex,'">';
-
-        // 1. select blogs (we'll create optiongroups)
-        // (only select those blogs that have the user on the team)
-        $queryBlogs =  'SELECT bnumber, bname FROM '.sql_table('blog').' WHERE bnumber in ('.implode(',',$aBlogIds).') ORDER BY bname';
-        $blogs = sql_query($queryBlogs);
-        if ($mode == 'category') {
-            if (sql_num_rows($blogs) > 1)
-                $multipleBlogs = 1;
-
-            while ($oBlog = sql_fetch_object($blogs)) {
-                if ($multipleBlogs)
-                    echo '<optgroup label="',Entity::hsc($oBlog->bname),'">';
-
-                // show selection to create new category when allowed/wanted
-                if ($showNewCat) {
-                    // check if allowed to do so
-                    if ($member->blogAdminRights($oBlog->bnumber))
-                        echo '<option value="newcat-',$oBlog->bnumber,'">',_ADD_NEWCAT,'</option>';
-                }
-
-                // 2. for each category in that blog
-                $categories = sql_query('SELECT cname, catid FROM '.sql_table('category').' WHERE cblog=' . $oBlog->bnumber . ' ORDER BY cname ASC');
-                while ($oCat = sql_fetch_object($categories)) {
-                    if ($oCat->catid == $selected)
-                        $selectText = ' selected="selected" ';
-                    else
-                        $selectText = '';
-                    echo '<option value="',$oCat->catid,'" ', $selectText,'>',Entity::hsc($oCat->cname),'</option>';
-                }
-
-                if ($multipleBlogs)
-                    echo '</optgroup>';
-            }
-        } else {
-            // blog mode
-            while ($oBlog = sql_fetch_object($blogs)) {
-                echo '<option value="',$oBlog->bnumber,'"';
-                if ($oBlog->bnumber == $selected)
-                    echo ' selected="selected"';
-                echo'>',Entity::hsc($oBlog->bname),'</option>';
-            }
-        }
-        echo '</select>';
-
-    }
-
-    /**
-     * @todo document this
-     */
-    function action_browseownitems() {
-        global $member, $manager, $CONF;
-
-        $this->pagehead();
-
-        echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
-        echo '<h2>' . _ITEMLIST_YOUR. '</h2>';
-
-        // start index
-        if (postVar('start'))
-            $start = intPostVar('start');
-        else
-            $start = 0;
-
-        // amount of items to show
-        if (postVar('amount'))
-            $amount = intPostVar('amount');
-        else {
-            $amount = intval($CONF['DefaultListSize']);
-            if ($amount < 1)
-                $amount = 10;
-        }
-
-        $search = postVar('search');    // search through items
-
-        $query =  'SELECT bshortname, cname, mname, ititle, ibody, idraft, inumber, itime'
-               . ' FROM '.sql_table('item').', '.sql_table('blog') . ', '.sql_table('member') . ', '.sql_table('category')
-               . ' WHERE iauthor='. $member->getID() .' and iauthor=mnumber and iblog=bnumber and icat=catid';
-
-        if ($search)
-            $query .= ' and ((ititle LIKE "%' . sql_real_escape_string($search) . '%") or (ibody LIKE "%' . sql_real_escape_string($search) . '%") or (imore LIKE "%' . sql_real_escape_string($search) . '%"))';
-
-        $query .= ' ORDER BY itime DESC'
-                . " LIMIT $start,$amount";
-
-        $template['content'] = 'itemlist';
-        $template['now'] = time();
-
-        $manager->loadClass("ENCAPSULATE");
-        $navList = new NavList('browseownitems', $start, $amount, 0, 1000, /*$blogid*/ 0, $search, 0);
-        $navList->showBatchList('item',$query,'table',$template);
-
-        $this->pagefoot();
-
-    }
-
-    /**
-     * Show all the comments for a given item
-     * @param int $itemid
-     */
-    function action_itemcommentlist($itemid = '') {
-        global $member, $manager, $CONF;
-
-        if ($itemid == '')
-            $itemid = intRequestVar('itemid');
-
-        // only allow if user is allowed to alter item
-        $member->canAlterItem($itemid) or $this->disallow();
-
-        $blogid = getBlogIdFromItemId($itemid);
-
-        $this->pagehead();
-
-        // start index
-        if (postVar('start'))
-            $start = intPostVar('start');
-        else
-            $start = 0;
-
-        // amount of items to show
-        if (postVar('amount'))
-            $amount = intPostVar('amount');
-        else {
-            $amount = intval($CONF['DefaultListSize']);
-            if ($amount < 1)
-                $amount = 10;
-        }
-
-        $search = postVar('search');
-
-        echo '<p>(<a href="index.php?action=itemlist&amp;blogid=',$blogid,'">',_BACKTOOVERVIEW,'</a>)</p>';
-        echo '<h2>',_COMMENTS,'</h2>';
-
-        $query = 'SELECT cbody, cuser, cmail, cemail, mname, ctime, chost, cnumber, cip, citem FROM ' . sql_table('comment') . ' LEFT OUTER JOIN ' . sql_table('member') . ' ON mnumber = cmember WHERE citem = ' . $itemid;
-
-        if ($search)
-            $query .= ' and cbody LIKE "%' . sql_real_escape_string($search) . '%"';
-
-        $query .= ' ORDER BY ctime ASC'
-                . " LIMIT $start,$amount";
-
-        $template['content'] = 'commentlist';
-        $template['canAddBan'] = $member->blogAdminRights(getBlogIDFromItemID($itemid));
-
-        $manager->loadClass("ENCAPSULATE");
-        $navList = new NavList('itemcommentlist', $start, $amount, 0, 1000, 0, $search, $itemid);
-        $navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS);
-
-        $this->pagefoot();
-    }
-
-    /**
-     * Browse own comments
-     */
-    function action_browseowncomments() {
-        global $member, $manager, $CONF;
-
-        // start index
-        if (postVar('start'))
-            $start = intPostVar('start');
-        else
-            $start = 0;
-
-        // amount of items to show
-        if (postVar('amount'))
-            $amount = intPostVar('amount');
-        else {
-            $amount = intval($CONF['DefaultListSize']);
-            if ($amount < 1)
-                $amount = 10;
-        }
-
-        $search = postVar('search');
-
-
-        $query =  'SELECT cbody, cuser, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cmember=' . $member->getID();
-
-        if ($search)
-            $query .= ' and cbody LIKE "%' . sql_real_escape_string($search) . '%"';
-
-        $query .= ' ORDER BY ctime DESC'
-                . " LIMIT $start,$amount";
-
-        $this->pagehead();
-
-        echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
-        echo '<h2>', _COMMENTS_YOUR ,'</h2>';
-
-        $template['content'] = 'commentlist';
-        $template['canAddBan'] = 0; // doesn't make sense to allow banning yourself
-
-        $manager->loadClass("ENCAPSULATE");
-        $navList = new NavList('browseowncomments', $start, $amount, 0, 1000, 0, $search, 0);
-        $navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS_YOUR);
-
-        $this->pagefoot();
-    }
-
-    /**
-     * Browse all comments for a weblog
-     * @param int $blogid
-     */
-    function action_blogcommentlist($blogid = '')
-    {
-        global $member, $manager, $CONF;
-
-        if ($blogid == '')
-            $blogid = intRequestVar('blogid');
-        else
-            $blogid = intval($blogid);
-
-        $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
-
-        // start index
-        if (postVar('start'))
-            $start = intPostVar('start');
-        else
-            $start = 0;
-
-        // amount of items to show
-        if (postVar('amount'))
-            $amount = intPostVar('amount');
-        else {
-            $amount = intval($CONF['DefaultListSize']);
-            if ($amount < 1)
-                $amount = 10;
-        }
-
-        $search = postVar('search');        // search through comments
-
-
-        $query =  'SELECT cbody, cuser, cemail, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cblog=' . intval($blogid);
-
-        if ($search != '')
-            $query .= ' and cbody LIKE "%' . sql_real_escape_string($search) . '%"';
-
-
-        $query .= ' ORDER BY ctime DESC'
-                . " LIMIT $start,$amount";
-
-
-        $blog =& $manager->getBlog($blogid);
-
-        $this->pagehead();
-
-        echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
-        echo '<h2>', _COMMENTS_BLOG , ' ' , $this->bloglink($blog), '</h2>';
-
-        $template['content'] = 'commentlist';
-        $template['canAddBan'] = $member->blogAdminRights($blogid);
-
-        $manager->loadClass("ENCAPSULATE");
-        $navList = new NavList('blogcommentlist', $start, $amount, 0, 1000, $blogid, $search, 0);
-        $navList->showBatchList('comment',$query,'table',$template, _NOCOMMENTS_BLOG);
-
-        $this->pagefoot();
-    }
-
-    /**
-     * Provide a page to item a new item to the given blog
-     */
-    function action_createitem() {
-        global $member, $manager;
-
-        $blogid = intRequestVar('blogid');
-
-        // check if allowed
-        $member->teamRights($blogid) or $this->disallow();
-
-        $memberid = $member->getID();
-
-        $blog =& $manager->getBlog($blogid);
-
-        $this->pagehead();
-
-        // generate the add-item form
-        $formfactory = new PageFactory($blogid);
-        $formfactory->createAddForm('admin');
-
-        $this->pagefoot();
-    }
-
-    /**
-     * @todo document this
-     */
-    function action_itemedit()
+       /**
+        * Admin::selectBlog()
+        * Inserts a HTML select element with choices for all blogs to which the user has access
+        *  mode = 'blog' => shows blognames and values are blogids
+        *  mode = 'category' => show category names and values are catids
+        * 
+        * @param       string  $name                           name of 
+        * @param       string  $mode                           blog/category
+        * @param       integer $selected                       category ID to be selected
+        * @param       integer $tabindex                       tab index value
+        * @param       integer $showNewCat                     show category to newly be created
+        * @param       integer $iForcedBlogInclude     ID of a blog that always needs to be included,
+        *                                              without checking if the member is on the blog team (-1 = none)
+        * @return      void
+        */
+       public function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)
+       {
+               global $member, $CONF;
+               
+               // 0. get IDs of blogs to which member can post items (+ forced blog)
+               $aBlogIds = array();
+               if ( $iForcedBlogInclude != -1 )
+               {
+                       $aBlogIds[] = intval($iForcedBlogInclude);
+               }
+               
+               if ( !$member->isAdmin() || !array_key_exists('ShowAllBlogs', $CONF) || !$CONF['ShowAllBlogs'] )
+               {
+                       $query = "SELECT bnumber FROM %s,%s WHERE tblog=bnumber and tmember=%d;";
+                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());
+               }
+               else
+               {
+                       $query = "SELECT bnumber FROM %s ORDER BY bname;";
+                       $query = sprintf($query, sql_table('blog'));
+               }
+               
+               $rblogids = DB::getResult($query);
+               foreach ( $rblogids as $row )
+               {
+                       if ( $row['bnumber'] != $iForcedBlogInclude )
+                       {
+                               $aBlogIds[] = (integer) $row['bnumber'];
+                       }
+               }
+               if ( count($aBlogIds) == 0 )
+               {
+                       return;
+               }
+               
+               echo "<select name=\"{$name}\" tabindex=\"{$tabindex}\">\n";
+               
+               // 1. select blogs (we'll create optiongroups)
+               // (only select those blogs that have the user on the team)
+               $query = "SELECT bnumber, bname FROM %s WHERE bnumber in (%s) ORDER BY bname;";
+               $query = sprintf($query, sql_table('blog'), implode(',',$aBlogIds));
+               $blogs = DB::getResult($query);
+               
+               if ( $mode == 'category' )
+               {
+                       if ( $blogs->rowCount() > 1 )
+                       {
+                               $multipleBlogs = 1;
+                       }
+                       
+                       foreach ( $blogs as $row )
+                       {
+                               if ( $multipleBlogs )
+                               {
+                                       echo '<optgroup label="' . Entity::hsc($row['bname']) . '">' . "\n";
+                               }
+                               
+                               // show selection to create new category when allowed/wanted
+                               if ( $showNewCat )
+                               {
+                                       // check if allowed to do so
+                                       if ( $member->blogAdminRights($row['bnumber']) )
+                                       {
+                                               echo "<option value=\"newcat-{$row['bnumber']}\">" . _ADD_NEWCAT . "</option>\n";
+                                       }
+                               }
+                               
+                               // 2. for each category in that blog
+                               $query = "SELECT cname, catid FROM %s WHERE cblog=%d ORDER BY cname ASC;";
+                               $query = sprintf($query, sql_table('category'), (integer) $row['bnumber']);
+                               $categories = DB::getResult($query);
+                               foreach ( $categories as $cat )
+                               {
+                                       if ( $cat['catid'] != $selected )
+                                       {
+                                       echo "<option value=\"{$cat['catid']}\" {$selectText} >" . Entity::hsc($cat['cname']) . "</option>\n";
+                                       }
+                                       else
+                                       {
+                                       echo "<option value=\"{$cat['catid']}\" selected=\"selected\" >" . Entity::hsc($cat['cname']) . "</option>\n";
+                                       }
+                               }
+                               
+                               if ( $multipleBlogs )
+                               {
+                                       echo "</optgroup>\n";
+                               }
+                       }
+               }
+               else
+               {
+                       // blog mode
+                       foreach ( $blogs as $row )
+                       {
+                               if ( $row['bnumber'] != $selected )
+                               {
+                                       echo "<option value=\"{$row['bnumber']}\">" . Entity::hsc($row['bname']) . "</option>\n";
+                               }
+                               else
+                               {
+                                       echo "<option value=\"{$row['bnumber']}\" selected=\"selected\">" . Entity::hsc($row['bname']) . "</option>\n";
+                               }
+                       }
+               }
+               echo "</select>\n";
+               return;
+       }
+       
+       /**
+        * Admin::action_browseownitems()
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_browseownitems()
+       {
+               global $member, $manager, $CONF;
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               echo '<h2>' . _ITEMLIST_YOUR . "</h2>\n";
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = (integer) $CONF['DefaultListSize'];
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');    // search through items
+               
+               $query = 'SELECT bshortname, cname, mname, ititle, ibody, idraft, inumber, itime'
+                      . ' FROM '.sql_table('item').', '.sql_table('blog') . ', '.sql_table('member') . ', '.sql_table('category')
+                      . ' WHERE iauthor='. $member->getID() .' and iauthor=mnumber and iblog=bnumber and icat=catid';
+               
+               if ( $search )
+               {
+                       $query .= " and ((ititle LIKE " . DB::quoteValue('%'.$search.'%') . ") or (ibody LIKE " . DB::quoteValue('%'.$search.'%') . ") or (imore LIKE " . DB::quoteValue('%'.$search.'%') . "))";
+               }
+               
+               $query .= ' ORDER BY itime DESC'
+                       . " LIMIT $start, $amount";
+               
+               $template['content'] = 'itemlist';
+               $template['now'] = time();
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('browseownitems', $start, $amount, 0, 1000, /*$blogid*/ 0, $search, 0);
+               $navList->showBatchList('item',$query,'table',$template);
+               
+               $this->pagefoot();
+               return;
+       }
+       
+       /**
+        * Admin::action_itemcommentlist()
+        * 
+        * Show all the comments for a given item
+        * @param       integer $itemid ID for item
+        * @return      void
+        */
+       public function action_itemcommentlist($itemid = '')
+       {
+               global $member, $manager, $CONF;
+               
+               if ( $itemid == '' )
+               {
+                       $itemid = intRequestVar('itemid');
+               }
+               
+               // only allow if user is allowed to alter item
+               $member->canAlterItem($itemid) or $this->disallow();
+               
+               $blogid = getBlogIdFromItemId($itemid);
+               
+               $this->pagehead();
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = (integer) $CONF['DefaultListSize'];
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');
+               
+               echo '<p>(<a href="index.php?action=itemlist&amp;blogid=' . $blogid . '">' . _BACKTOOVERVIEW . "</a>)</p>\n";
+               echo '<h2>',_COMMENTS,'</h2>';
+               
+               $query = 'SELECT cbody, cuser, cmail, cemail, mname, ctime, chost, cnumber, cip, citem FROM ' . sql_table('comment') . ' LEFT OUTER JOIN ' . sql_table('member') . ' ON mnumber = cmember WHERE citem = ' . $itemid;
+               
+               if ( $search )
+               {
+                       $query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+               }
+               
+               $query .= ' ORDER BY ctime ASC'
+                       . " LIMIT $start,$amount";
+               
+               $template['content'] = 'commentlist';
+               $template['canAddBan'] = $member->blogAdminRights(getBlogIDFromItemID($itemid));
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('itemcommentlist', $start, $amount, 0, 1000, 0, $search, $itemid);
+               $navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS);
+               
+               $this->pagefoot();
+               return;
+       }
+       
+       /**
+        * Admin::action_browseowncomments()
+        * Browse own comments
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_browseowncomments()
+       {
+               global $member, $manager, $CONF;
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = intval($CONF['DefaultListSize']);
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');
+               
+               $query =  'SELECT cbody, cuser, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cmember=' . $member->getID();
+               
+               if ( $search )
+               {
+                       $query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+               }
+               
+               $query .= ' ORDER BY ctime DESC'
+                       . " LIMIT $start,$amount";
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               echo '<h2>' . _COMMENTS_YOUR . "</h2>\n";
+               
+               $template['content'] = 'commentlist';
+               $template['canAddBan'] = 0; // doesn't make sense to allow banning yourself
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('browseowncomments', $start, $amount, 0, 1000, 0, $search, 0);
+               $navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS_YOUR);
+               
+               $this->pagefoot();
+               return;
+       }
+       
+       /**
+        * Admin::action_blogcommentlist()
+        * 
+        * Browse all comments for a weblog
+        * @param       integer $blogid ID for weblog
+        * @return      void
+        */
+       function action_blogcommentlist($blogid = '')
+       {
+               global $member, $manager, $CONF;
+               
+               if ( $blogid == '' )
+               {
+                       $blogid = intRequestVar('blogid');
+               }
+               else
+               {
+                       $blogid = intval($blogid);
+               }
+               
+               $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = intval($CONF['DefaultListSize']);
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');            // search through comments
+               
+               $query =  'SELECT cbody, cuser, cemail, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cblog=' . intval($blogid);
+               
+               if ( $search != '' )
+               {
+                       $query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+               }
+               
+               $query .= ' ORDER BY ctime DESC'
+                       . " LIMIT $start,$amount";
+               
+               $blog =& $manager->getBlog($blogid);
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               echo '<h2>', _COMMENTS_BLOG , ' ' , $this->bloglink($blog), '</h2>';
+               
+               $template['content'] = 'commentlist';
+               $template['canAddBan'] = $member->blogAdminRights($blogid);
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('blogcommentlist', $start, $amount, 0, 1000, $blogid, $search, 0);
+               $navList->showBatchList('comment',$query,'table',$template, _NOCOMMENTS_BLOG);
+               
+               $this->pagefoot();
+               return;
+       }
+       
+       /**
+        * Admin::action_createitem()
+        * Provide a page to item a new item to the given blog
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_createitem()
        {
                global $member, $manager;
-
+               
+               $blogid = intRequestVar('blogid');
+               
+               // check if allowed
+               $member->teamRights($blogid) or $this->disallow();
+               
+               $memberid = $member->getID();
+               
+               $blog =& $manager->getBlog($blogid);
+               
+               $this->pagehead();
+               
+               // generate the add-item form
+               $formfactory = new PageFactory($blogid);
+               $formfactory->createAddForm('admin');
+               
+               $this->pagefoot();
+               return;
+       }
+       
+       /**
+        * Admin::action_itemedit()
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_itemedit()
+       {
+               global $member, $manager;
+               
                $itemid = intRequestVar('itemid');
-
+               
                // only allow if user is allowed to alter item
                $member->canAlterItem($itemid) or $this->disallow();
-
+               
                $item =& $manager->getItem($itemid, 1, 1);
                $blog =& $manager->getBlog(getBlogIDFromItemID($itemid));
-
+               
                $manager->notify('PrepareItemForEdit', array('item' => &$item));
-
-               if ($blog->convertBreaks())
+               
+               if ( $blog->convertBreaks() )
                {
                        $item['body'] = removeBreaks($item['body']);
                        $item['more'] = removeBreaks($item['more']);
                }
-
+               
                // form to edit blog items
                $this->pagehead();
                $formfactory = new PageFactory($blog->getID());
                $formfactory->createEditForm('admin', $item);
                $this->pagefoot();
-    }
-
+               return;
+       }
+       
     /**
      * @todo document this
      */
@@ -1370,10 +1511,10 @@ class Admin
                $currenttime = $blog->getCorrectTime(time());
                
                $query = "SELECT * FROM %s WHERE iblog=%d AND iposted=0 AND itime>'%s'";
-               $query = sprintf($query, sql_table('item'), (integer) $blogid, i18n::formatted_datetime('mysql', $currenttime));
-               $result = sql_query($query);
+               $query = sprintf($query, sql_table('item'), (integer) $blogid, DB::formatDateTime($currenttime));
+               $result = DB::getResult($query);
                
-               if ( sql_num_rows($result) > 0 )
+               if ( $result->rowCount() > 0 )
                {
                                $blog->setFuturePost();
                }
@@ -1399,7 +1540,7 @@ class Admin
 
         $this->pagehead();
         ?>
-            <h2><?php echo _MOVE_TITLE?></h2>
+            <h2><?php echo _MOVE_TITLE ?></h2>
             <form method="post" action="index.php"><div>
                 <input type="hidden" name="action" value="itemmoveto" />
                 <input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />
@@ -1410,7 +1551,7 @@ class Admin
                     $this->selectBlogCategory('catid',$item['catid'],10,1);
                 ?>
 
-                <input type="submit" value="<?php echo _MOVE_BTN?>" tabindex="10000" onclick="return checkSubmit();" />
+                <input type="submit" value="<?php echo _MOVE_BTN ?>" tabindex="10000" onclick="return checkSubmit();" />
             </div></form>
         <?php
         $this->pagefoot();
@@ -1520,14 +1661,14 @@ class Admin
                $comment['body'] = str_replace('<br />', '', $comment['body']);
 
                // replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
-               /* original eregi_replace: eregi_replace("<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\")?>[^<]*</a>", "\\1", $comment['body']) */
+               /* original eregi_replace: eregi_replace("<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\") ?>[^<]*</a>", "\\1", $comment['body']) */
 
-        $comment['body'] = preg_replace("#<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\")?>[^<]*</a>#i", "\\1", $comment['body']);
+        $comment['body'] = preg_replace("#<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\") ?>[^<]*</a>#i", "\\1", $comment['body']);
 
         $this->pagehead();
 
         ?>
-        <h2><?php echo _EDITC_TITLE?></h2>
+        <h2><?php echo _EDITC_TITLE ?></h2>
 
         <form action="index.php" method="post"><div>
 
@@ -1535,9 +1676,9 @@ class Admin
         <?php $manager->addTicketHidden(); ?>
         <input type="hidden" name="commentid" value="<?php echo  $commentid; ?>" />
         <table><tr>
-            <th colspan="2"><?php echo _EDITC_TITLE?></th>
+            <th colspan="2"><?php echo _EDITC_TITLE ?></th>
         </tr><tr>
-            <td><?php echo _EDITC_WHO?></td>
+            <td><?php echo _EDITC_WHO ?></td>
             <td>
             <?php               if ($comment['member'])
                     echo $comment['member'] . " (" . _EDITC_MEMBER . ")";
@@ -1546,10 +1687,10 @@ class Admin
             ?>
             </td>
         </tr><tr>
-            <td><?php echo _EDITC_WHEN?></td>
+            <td><?php echo _EDITC_WHEN ?></td>
             <td><?php echo  date("Y-m-d @ H:i",$comment['timestamp']); ?></td>
         </tr><tr>
-            <td><?php echo _EDITC_HOST?></td>
+            <td><?php echo _EDITC_HOST ?></td>
             <td><?php echo  $comment['host']; ?></td>
         </tr>
         <tr>
@@ -1561,15 +1702,15 @@ class Admin
             <td><input type="text" name="email" size="30" tabindex="8" value="<?php echo $comment['email']; ?>" /></td>
         </tr>
         <tr>
-            <td><?php echo _EDITC_TEXT?></td>
+            <td><?php echo _EDITC_TEXT ?></td>
             <td>
                 <textarea name="body" tabindex="10" rows="10" cols="50"><?php                   // htmlspecialchars not needed (things should be escaped already)
                     echo $comment['body'];
                 ?></textarea>
             </td>
         </tr><tr>
-            <td><?php echo _EDITC_EDIT?></td>
-            <td><input type="submit"  tabindex="20" value="<?php echo _EDITC_EDIT?>" onclick="return checkSubmit();" /></td>
+            <td><?php echo _EDITC_EDIT ?></td>
+            <td><input type="submit"  tabindex="20" value="<?php echo _EDITC_EDIT ?>" onclick="return checkSubmit();" /></td>
         </tr></table>
 
         </div></form>
@@ -1612,26 +1753,25 @@ class Admin
                        $this->error(_ERROR_COMMENT_TOOLONG);
                }
 
-        // prepare body
-        $body = Comment::prepareBody($body);
+               // prepare body
+               $body = Comment::prepareBody($body);
 
-        // call plugins
-        $manager->notify('PreUpdateComment',array('body' => &$body));
+               // call plugins
+               $manager->notify('PreUpdateComment',array('body' => &$body));
 
-        $query = 'UPDATE ' . sql_table('comment')
-               . " SET cmail = '" . sql_real_escape_string($url) . "', cemail = '" . sql_real_escape_string($email) . "', cbody = '" . sql_real_escape_string($body) . "'"
-               . " WHERE cnumber = " . $commentid;
-        sql_query($query);
+               $query = 'UPDATE ' . sql_table('comment')
+                       . ' SET cmail = ' . DB::quoteValue($url) . ', cemail = ' . DB::quoteValue($email) . ', cbody = ' . DB::quoteValue($body)
+                       . ' WHERE cnumber = ' . $commentid;
+               DB::execute($query);
 
-        // get itemid
-        $res = sql_query('SELECT citem FROM '.sql_table('comment').' WHERE cnumber=' . $commentid);
-        $o = sql_fetch_object($res);
-        $itemid = $o->citem;
+               // get itemid
+               $res = DB::getValue('SELECT citem FROM '.sql_table('comment').' WHERE cnumber=' . $commentid);
+               $itemid = $res;
 
-        if ($member->canAlterItem($itemid))
-            $this->action_itemcommentlist($itemid);
-        else
-            $this->action_browseowncomments();
+               if ($member->canAlterItem($itemid))
+                       $this->action_itemcommentlist($itemid);
+               else
+                       $this->action_browseowncomments();
 
     }
        
@@ -1691,9 +1831,8 @@ class Admin
         $commentid = intRequestVar('commentid');
 
         // get item id first
-        $res = sql_query('SELECT citem FROM '.sql_table('comment') .' WHERE cnumber=' . $commentid);
-        $o = sql_fetch_object($res);
-        $itemid = $o->citem;
+        $res = DB::getValue('SELECT citem FROM '.sql_table('comment') .' WHERE cnumber=' . $commentid);
+        $itemid = $res;
 
         $error = $this->deleteOneComment($commentid);
         if ($error)
@@ -1718,91 +1857,115 @@ class Admin
 
         $manager->notify('PreDeleteComment', array('commentid' => $commentid));
 
-        // delete the comments associated with the item
-        $query = 'DELETE FROM '.sql_table('comment').' WHERE cnumber=' . $commentid;
-        sql_query($query);
-
-        $manager->notify('PostDeleteComment', array('commentid' => $commentid));
-
-        return '';
-    }
-
-    /**
-     * Usermanagement main
-     */
-    function action_usermanagement() {
-        global $member, $manager;
-
-        // check if allowed
-        $member->isAdmin() or $this->disallow();
-
-        $this->pagehead();
-
-        echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
-
-        echo '<h2>' . _MEMBERS_TITLE .'</h2>';
-
-        echo '<h3>' . _MEMBERS_CURRENT .'</h3>';
-
-        // show list of members with actions
-        $query =  'SELECT *'
-               . ' FROM '.sql_table('member');
-        $template['content'] = 'memberlist';
-        $template['tabindex'] = 10;
-
-        $manager->loadClass("ENCAPSULATE");
-        $batch = new Batch('member');
-        $batch->showlist($query,'table',$template);
-
-        echo '<h3>' . _MEMBERS_NEW .'</h3>';
-        ?>
-            <form method="post" action="index.php" name="memberedit"><div>
-
-            <input type="hidden" name="action" value="memberadd" />
-            <?php $manager->addTicketHidden() ?>
-
-            <table>
-            <tr>
-                <th colspan="2"><?php echo _MEMBERS_NEW?></th>
-            </tr><tr>
-                <td><?php echo _MEMBERS_DISPLAY?> <?php help('shortnames');?>
-                <br /><small><?php echo _MEMBERS_DISPLAY_INFO?></small>
-                </td>
-                <td><input tabindex="10010" name="name" size="32" maxlength="32" /></td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_REALNAME?></td>
-                <td><input name="realname" tabindex="10020" size="40" maxlength="60" /></td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_PWD?></td>
-                <td><input name="password" tabindex="10030" size="16" maxlength="40" type="password" /></td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_REPPWD?></td>
-                <td><input name="repeatpassword" tabindex="10035" size="16" maxlength="40" type="password" /></td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_EMAIL?></td>
-                <td><input name="email" tabindex="10040" size="40" maxlength="60" /></td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_URL?></td>
-                <td><input name="url" tabindex="10050" size="40" maxlength="100" /></td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_SUPERADMIN?> <?php help('superadmin'); ?></td>
-                <td><?php $this->input_yesno('admin',0,10060); ?> </td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_CANLOGIN?> <?php help('canlogin'); ?></td>
-                <td><?php $this->input_yesno('canlogin',1,10070); ?></td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_NOTES?></td>
-                <td><input name="notes" maxlength="100" size="40" tabindex="10080" /></td>
-            </tr><tr>
-                <td><?php echo _MEMBERS_NEW?></td>
-                <td><input type="submit" value="<?php echo _MEMBERS_NEW_BTN?>" tabindex="10090" onclick="return checkSubmit();" /></td>
-            </tr></table>
+        // delete the comments associated with the item
+        $query = 'DELETE FROM '.sql_table('comment').' WHERE cnumber=' . $commentid;
+        DB::execute($query);
 
-            </div></form>
-        <?php
-        $this->pagefoot();
+        $manager->notify('PostDeleteComment', array('commentid' => $commentid));
+
+        return '';
     }
 
+       /**
+        * Admin::action_usermanagement()
+        * 
+        * Usermanagement main
+        * @param       void
+        * @return      void
+        */
+       public function action_usermanagement()
+       {
+               global $member, $manager;
+               
+               // check if allowed
+               $member->isAdmin() or $this->disallow();
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=manage">(' . _BACKTOMANAGE . ")</a></p>\n";
+               
+               echo '<h2>' . _MEMBERS_TITLE . "</h2>\n";
+               
+               echo '<h3>' . _MEMBERS_CURRENT . "</h3>\n";
+               
+               // show list of members with actions
+               $query =  'SELECT * FROM '.sql_table('member');
+               $template['content'] = 'memberlist';
+               $template['tabindex'] = 10;
+               
+               $manager->loadClass("ENCAPSULATE");
+               $batch = new Batch('member');
+               $batch->showlist($query,'table',$template);
+               
+               echo '<h3>' . _MEMBERS_NEW .'</h3>';
+               echo "<form method=\"post\" action=\"index.php\" name=\"memberedit\">\n";
+               echo "<div>\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"memberadd\" />\n";
+               $manager->addTicketHidden();
+               
+               echo '<table frame="box" rules="rules" summary="' . _MEMBERS_NEW . '">' ."\n";
+               echo "<tr>\n";
+               echo '<th colspan="2">' . _MEMBERS_NEW . "</th>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_DISPLAY;
+               help('shortnames');
+               echo '<br />';
+               echo '<small>' . _MEMBERS_DISPLAY_INFO . '</small>';
+               echo "</td>\n";
+               echo "<td><input tabindex=\"10010\" name=\"name\" size=\"32\" maxlength=\"32\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_REALNAME . "</td>\n";
+               echo "<td><input name=\"realname\" tabindex=\"10020\" size=\"40\" maxlength=\"60\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_PWD . "</td>\n";
+               echo "<td><input name=\"password\" tabindex=\"10030\" size=\"16\" maxlength=\"40\" type=\"password\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_REPPWD . "</td>\n";
+               echo "<td><input name=\"repeatpassword\" tabindex=\"10035\" size=\"16\" maxlength=\"40\" type=\"password\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_EMAIL . "</td>\n";
+               echo "<td><input name=\"email\" tabindex=\"10040\" size=\"40\" maxlength=\"60\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_URL . "</td>\n";
+               echo "<td><input name=\"url\" tabindex=\"10050\" size=\"40\" maxlength=\"100\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_SUPERADMIN;
+               help('superadmin');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('admin',0,10060);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_CANLOGIN;
+               help('canlogin');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('canlogin',1,10070);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_NOTES . "</td>\n";
+               echo "<td><input name=\"notes\" maxlength=\"100\" size=\"40\" tabindex=\"10080\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_NEW . "</td>\n";
+               echo '<td><input type="submit" value="' . _MEMBERS_NEW_BTN . '" tabindex="10090" onclick="return checkSubmit();" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</table>\n";
+               echo "</div>\n";
+               echo "</form>\n";
+               $this->pagefoot();
+               return;
+       }
+       
     /**
      * Edit member settings
      */
@@ -1847,10 +2010,10 @@ class Admin
                <?php $manager->addTicketHidden() ?>
                
                <table><tr>
-                       <th colspan="2"><?php echo _MEMBERS_EDIT?></th>
+                       <th colspan="2"><?php echo _MEMBERS_EDIT ?></th>
                </tr><tr>
-                       <td><?php echo _MEMBERS_DISPLAY?> <?php help('shortnames');?>
-                               <br /><small><?php echo _MEMBERS_DISPLAY_INFO?></small>
+                       <td><?php echo _MEMBERS_DISPLAY ?> <?php help('shortnames'); ?>
+                               <br /><small><?php echo _MEMBERS_DISPLAY_INFO ?></small>
                        </td>
                        <td>
                        <?php if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { ?>
@@ -1861,40 +2024,40 @@ class Admin
                        ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _MEMBERS_REALNAME?></td>
+                       <td><?php echo _MEMBERS_REALNAME ?></td>
                        <td><input name="realname" tabindex="20" maxlength="60" size="40" value="<?php echo  Entity::hsc($mem->getRealName()); ?>" /></td>
                </tr><tr>
                <?php if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { ?>
-                       <td><?php echo _MEMBERS_PWD?></td>
+                       <td><?php echo _MEMBERS_PWD ?></td>
                        <td><input type="password" tabindex="30" maxlength="40" size="16" name="password" /></td>
                </tr><tr>
-                       <td><?php echo _MEMBERS_REPPWD?></td>
+                       <td><?php echo _MEMBERS_REPPWD ?></td>
                        <td><input type="password" tabindex="35" maxlength="40" size="16" name="repeatpassword" /></td>
                <?php } ?>
                </tr><tr>
-                       <td><?php echo _MEMBERS_EMAIL?>
-                               <br /><small><?php echo _MEMBERS_EMAIL_EDIT?></small>
+                       <td><?php echo _MEMBERS_EMAIL ?>
+                               <br /><small><?php echo _MEMBERS_EMAIL_EDIT ?></small>
                        </td>
                        <td><input name="email" tabindex="40" size="40" maxlength="60" value="<?php echo  Entity::hsc($mem->getEmail()); ?>" /></td>
                </tr><tr>
-                       <td><?php echo _MEMBERS_URL?></td>
+                       <td><?php echo _MEMBERS_URL ?></td>
                        <td><input name="url" tabindex="50" size="40" maxlength="100" value="<?php echo  Entity::hsc($mem->getURL()); ?>" /></td>
                <?php // only allow to change this by super-admins
                   // we don't want normal users to 'upgrade' themselves to super-admins, do we? ;-)
                   if ($member->isAdmin()) {
                ?>
                        </tr><tr>
-                               <td><?php echo _MEMBERS_SUPERADMIN?> <?php help('superadmin'); ?></td>
+                               <td><?php echo _MEMBERS_SUPERADMIN ?> <?php help('superadmin'); ?></td>
                                <td><?php $this->input_yesno('admin',$mem->isAdmin(),60); ?></td>
                        </tr><tr>
-                               <td><?php echo _MEMBERS_CANLOGIN?> <?php help('canlogin'); ?></td>
+                               <td><?php echo _MEMBERS_CANLOGIN ?> <?php help('canlogin'); ?></td>
                                <td><?php $this->input_yesno('canlogin',$mem->canLogin(),70,1,0,_YES,_NO,$mem->isAdmin()); ?></td>
                <?php } ?>
                </tr><tr>
-                       <td><?php echo _MEMBERS_NOTES?></td>
+                       <td><?php echo _MEMBERS_NOTES ?></td>
                        <td><input name="notes" tabindex="80" size="40" maxlength="100" value="<?php echo  Entity::hsc($mem->getNotes()); ?>" /></td>
                </tr><tr>
-                       <td><?php echo _MEMBERS_LOCALE?> <?php help('locale'); ?>
+                       <td><?php echo _MEMBERS_LOCALE ?> <?php help('locale'); ?>
                        </td>
                        <td>
                        
@@ -1927,7 +2090,7 @@ class Admin
                        </td>
                </tr>
                <tr>
-                       <td><?php echo _MEMBERS_USEAUTOSAVE?> <?php help('autosave'); ?></td>
+                       <td><?php echo _MEMBERS_USEAUTOSAVE ?> <?php help('autosave'); ?></td>
                        <td><?php $this->input_yesno('autosave', $mem->getAutosave(), 87); ?></td>
                </tr>
                <?php
@@ -1937,8 +2100,8 @@ class Admin
                <tr>
                        <th colspan="2"><?php echo _MEMBERS_EDIT ?></th>
                </tr><tr>
-                       <td><?php echo _MEMBERS_EDIT?></td>
-                       <td><input type="submit" tabindex="90" value="<?php echo _MEMBERS_EDIT_BTN?>" onclick="return checkSubmit();" /></td>
+                       <td><?php echo _MEMBERS_EDIT ?></td>
+                       <td><input type="submit" tabindex="90" value="<?php echo _MEMBERS_EDIT_BTN ?>" onclick="return checkSubmit();" /></td>
                </tr></table>
                
                </div></form>
@@ -2030,8 +2193,8 @@ class Admin
              || (!$canlogin && $mem->isAdmin() && $mem->canLogin())
            )
         {
-            $r = sql_query('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');
-            if (sql_num_rows($r) < 2)
+            $r = DB::getResult('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');
+            if ($r->rowCount() < 2)
                 $this->error(_ERROR_ATLEASTONEADMIN);
         }
 
@@ -2158,7 +2321,7 @@ class Admin
         if (!$info)
             $this->error(_ERROR_ACTIVATE);
 
-        $mem = Member::createFromId($info->vmember);
+        $mem = Member::createFromId($info['vmember']);
 
         if (!$mem)
             $this->error(_ERROR_ACTIVATE);
@@ -2167,7 +2330,7 @@ class Admin
         $title = '';
         $bNeedsPasswordChange = true;
 
-        switch ($info->vtype)
+        switch ($info['vtype'])
         {
             case 'forgot':
                 $title = _ACTIVATE_FORGOT_TITLE;
@@ -2211,10 +2374,10 @@ class Admin
                         <input type="hidden" name="key" value="<?php echo Entity::hsc($key) ?>" />
 
                         <table><tr>
-                            <td><?php echo _MEMBERS_PWD?></td>
+                            <td><?php echo _MEMBERS_PWD ?></td>
                             <td><input type="password" maxlength="40" size="16" name="password" /></td>
                         </tr><tr>
-                            <td><?php echo _MEMBERS_REPPWD?></td>
+                            <td><?php echo _MEMBERS_REPPWD ?></td>
                             <td><input type="password" maxlength="40" size="16" name="repeatpassword" /></td>
                         <?php
 
@@ -2253,10 +2416,10 @@ class Admin
         // get activation info
         $info = Member::getActivationInfo($key);
 
-        if (!$info || ($info->type == 'addresschange'))
+        if (!$info || ($info['type'] == 'addresschange'))
             return $this->_showActivationPage($key, _ERROR_ACTIVATE);
 
-        $mem = Member::createFromId($info->vmember);
+        $mem = Member::createFromId($info['vmember']);
 
         if (!$mem)
             return $this->_showActivationPage($key, _ERROR_ACTIVATE);
@@ -2300,70 +2463,85 @@ class Admin
         $this->pagefoot();
     }
 
-    /**
-     * Manage team
-     */
-    function action_manageteam() {
-        global $member, $manager;
-
-        $blogid = intRequestVar('blogid');
-
-        // check if allowed
-        $member->blogAdminRights($blogid) or $this->disallow();
-
-        $this->pagehead();
-
-        echo "<p><a href='index.php?action=blogsettings&amp;blogid=$blogid'>(",_BACK_TO_BLOGSETTINGS,")</a></p>";
-
-        echo '<h2>' . _TEAM_TITLE . getBlogNameFromID($blogid) . '</h2>';
-
-        echo '<h3>' . _TEAM_CURRENT . '</h3>';
-
-
-
-        $query =  'SELECT tblog, tmember, mname, mrealname, memail, tadmin'
-               . ' FROM '.sql_table('member').', '.sql_table('team')
-               . ' WHERE tmember=mnumber and tblog=' . $blogid;
-
-        $template['content'] = 'teamlist';
-        $template['tabindex'] = 10;
-
-        $manager->loadClass("ENCAPSULATE");
-        $batch = new Batch('team');
-        $batch->showlist($query, 'table', $template);
-
-        ?>
-            <h3><?php echo _TEAM_ADDNEW?></h3>
-
-            <form method='post' action='index.php'><div>
-
-            <input type='hidden' name='action' value='teamaddmember' />
-            <input type='hidden' name='blogid' value='<?php echo  $blogid; ?>' />
-            <?php $manager->addTicketHidden() ?>
-
-            <table><tr>
-                <td><?php echo _TEAM_CHOOSEMEMBER?></td>
-                <td><?php                   // TODO: try to make it so only non-team-members are listed
-                    $query =  'SELECT mname as text, mnumber as value'
-                           . ' FROM '.sql_table('member');
-
-                    $template['name'] = 'memberid';
-                    $template['tabindex'] = 10000;
-                    showlist($query,'select',$template);
-                ?></td>
-            </tr><tr>
-                <td><?php echo _TEAM_ADMIN?><?php help('teamadmin'); ?></td>
-                <td><?php $this->input_yesno('admin',0,10020); ?></td>
-            </tr><tr>
-                <td><?php echo _TEAM_ADD?></td>
-                <td><input type='submit' value='<?php echo _TEAM_ADD_BTN?>' tabindex="10030" /></td>
-            </tr></table>
-
-            </div></form>
-        <?php
-        $this->pagefoot();
-    }
-
+       /**
+        * Admin::action_manageteam()
+        * 
+        * Manage team
+        * @param       void
+        * @return      void
+        */
+       public function action_manageteam()
+       {
+               global $member, $manager;
+               
+               $blogid = intRequestVar('blogid');
+               
+               // check if allowed
+               $member->blogAdminRights($blogid) or $this->disallow();
+               
+               $this->pagehead();
+               
+               echo "<p><a href='index.php?action=blogsettings&amp;blogid=$blogid'>(" . _BACK_TO_BLOGSETTINGS . ")</a></p>\n";
+               
+               echo '<h2>' . _TEAM_TITLE . getBlogNameFromID($blogid) . "</h2>\n";
+               
+               echo '<h3>' . _TEAM_CURRENT . "</h3>\n";
+               
+               $query = 'SELECT tblog, tmember, mname, mrealname, memail, tadmin'
+                      . ' FROM '.sql_table('member').', '.sql_table('team')
+                      . ' WHERE tmember=mnumber and tblog=' . $blogid;
+               
+               $template['content'] = 'teamlist';
+               $template['tabindex'] = 10;
+               
+               $manager->loadClass("ENCAPSULATE");
+               $batch = new Batch('team');
+               $batch->showlist($query, 'table', $template);
+               
+               echo '<h3>' . _TEAM_ADDNEW . "</h3>\n";
+                       
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               
+               echo "<input type=\"hidden\" name=\"action\" value=\"teamaddmember\" />\n";
+               echo "<input type=\"hidden\" name=\"blogid\" value=\"{$blogid}\" />\n";
+               $manager->addTicketHidden();
+                       
+               echo '<table frame="box" rules="all" summary="' . _TEAM_ADDNEW . '">' . "\n";
+               echo "<tr>\n";
+               echo '<td>' . _TEAM_CHOOSEMEMBER . "</td>\n";
+               
+               // TODO: try to make it so only non-team-members are listed
+               echo "<td>\n";
+               
+               $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
+               $template['name'] = 'memberid';
+               $template['tabindex'] = 10000;
+               showlist($query,'select',$template);
+               
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _TEAM_ADMIN;
+               help('teamadmin');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('admin',0,10020);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _TEAM_ADD . "</td>\n";
+               echo '<td><input type="submit" value="' . _TEAM_ADD_BTN . '" tabindex="10030" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</table>\n";
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               $this->pagefoot();
+               return;
+       }
+       
     /**
      * Add member to team
      */
@@ -2402,9 +2580,9 @@ class Admin
 
         $this->pagehead();
         ?>
-            <h2><?php echo _DELETE_CONFIRM?></h2>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
 
-            <p><?php echo _CONFIRMTXT_TEAM1?><b><?php echo  Entity::hsc($teammem->getDisplayName()) ?></b><?php echo _CONFIRMTXT_TEAM2?><b><?php echo  Entity::hsc(strip_tags($blog->getName())) ?></b>
+            <p><?php echo _CONFIRMTXT_TEAM1 ?><b><?php echo  Entity::hsc($teammem->getDisplayName()) ?></b><?php echo _CONFIRMTXT_TEAM2 ?><b><?php echo  Entity::hsc(strip_tags($blog->getName())) ?></b>
             </p>
 
 
@@ -2413,7 +2591,7 @@ class Admin
             <?php $manager->addTicketHidden() ?>
             <input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />
             <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
-            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
             </div></form>
         <?php
         $this->pagefoot();
@@ -2437,279 +2615,352 @@ class Admin
     }
 
     /**
-     * @todo document this
-     */
-    function deleteOneTeamMember($blogid, $memberid) {
-        global $member, $manager;
-
-        $blogid = intval($blogid);
-        $memberid = intval($memberid);
-
-        // check if allowed
-        if (!$member->blogAdminRights($blogid))
-            return _ERROR_DISALLOWED;
-
-        // check if: - there remains at least one blog admin
-        //           - (there remains at least one team member)
-        $tmem = Member::createFromID($memberid);
-
-        $manager->notify('PreDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
-
-        if ($tmem->isBlogAdmin($blogid)) {
-            // check if there are more blog members left and at least one admin
-            // (check for at least two admins before deletion)
-            $query = 'SELECT * FROM '.sql_table('team') . ' WHERE tblog='.$blogid.' and tadmin=1';
-            $r = sql_query($query);
-            if (sql_num_rows($r) < 2)
-                return _ERROR_ATLEASTONEBLOGADMIN;
-        }
-
-        $query = 'DELETE FROM '.sql_table('team')." WHERE tblog=$blogid and tmember=$memberid";
-        sql_query($query);
-
-        $manager->notify('PostDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
-
-        return '';
-    }
-
-    /**
-     * @todo document this
-     */
-    function action_teamchangeadmin() {
-        global $member;
-
-        $blogid = intRequestVar('blogid');
-        $memberid = intRequestVar('memberid');
-
-        // check if allowed
-        $member->blogAdminRights($blogid) or $this->disallow();
-
-        $mem = Member::createFromID($memberid);
-
-        // don't allow when there is only one admin at this moment
-        if ($mem->isBlogAdmin($blogid)) {
-            $r = sql_query('SELECT * FROM '.sql_table('team') . " WHERE tblog=$blogid and tadmin=1");
-            if (sql_num_rows($r) == 1)
-                $this->error(_ERROR_ATLEASTONEBLOGADMIN);
-        }
-
-        if ($mem->isBlogAdmin($blogid))
-            $newval = 0;
-        else
-            $newval = 1;
-
-        $query = 'UPDATE '.sql_table('team') ." SET tadmin=$newval WHERE tblog=$blogid and tmember=$memberid";
-        sql_query($query);
-
-        // only show manageteam if member did not change its own admin privileges
-        if ($member->isBlogAdmin($blogid))
-            $this->action_manageteam();
-        else
-            $this->action_overview(_MSG_ADMINCHANGED);
-    }
-
-    /**
-     * @todo document this
-     */
-    function action_blogsettings() {
-        global $member, $manager;
-
-        $blogid = intRequestVar('blogid');
-
-        // check if allowed
-        $member->blogAdminRights($blogid) or $this->disallow();
-
-        $blog =& $manager->getBlog($blogid);
-
-        $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';
-        $this->pagehead($extrahead);
-
-        echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
-        ?>
-        <h2><?php echo _EBLOG_TITLE?>: '<?php echo $this->bloglink($blog)?>'</h2>
-
-        <h3><?php echo _EBLOG_TEAM_TITLE?></h3>
-
-        <p><?php echo _EBLOG_CURRENT_TEAM_MEMBER; ?>
-        <?php
-            $res = sql_query('SELECT mname, mrealname FROM ' . sql_table('member') . ',' . sql_table('team') . ' WHERE mnumber=tmember AND tblog=' . intval($blogid));
-            $aMemberNames = array();
-            while ($o = sql_fetch_object($res))
-                array_push($aMemberNames, Entity::hsc($o->mname) . ' (' . Entity::hsc($o->mrealname). ')');
-            echo implode(',', $aMemberNames);
-        ?>
-        </p>
-
-
-
-        <p>
-        <a href="index.php?action=manageteam&amp;blogid=<?php echo $blogid?>"><?php echo _EBLOG_TEAM_TEXT?></a>
-        </p>
-
-        <h3><?php echo _EBLOG_SETTINGS_TITLE?></h3>
-
-        <form method="post" action="index.php"><div>
-
-        <input type="hidden" name="action" value="blogsettingsupdate" />
-        <?php $manager->addTicketHidden() ?>
-        <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
-        <table><tr>
-            <td><?php echo _EBLOG_NAME?></td>
-            <td><input name="name" tabindex="10" size="40" maxlength="60" value="<?php echo  Entity::hsc($blog->getName()) ?>" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_SHORTNAME?> <?php help('shortblogname'); ?>
-                <?php echo _EBLOG_SHORTNAME_EXTRA?>
-            </td>
-            <td><input name="shortname" tabindex="20" maxlength="15" size="15" value="<?php echo  Entity::hsc($blog->getShortName()) ?>" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_DESC?></td>
-            <td><input name="desc" tabindex="30" maxlength="200" size="40" value="<?php echo  Entity::hsc($blog->getDescription()) ?>" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_URL?></td>
-            <td><input name="url" tabindex="40" size="40" maxlength="100" value="<?php echo  Entity::hsc($blog->getURL()) ?>" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_DEFSKIN?>
-                <?php help('blogdefaultskin'); ?>
-            </td>
-            <td>
-                <?php
-                    $query =  'SELECT sdname as text, sdnumber as value'
-                           . ' FROM '.sql_table('skin_desc');
-                    $template['name'] = 'defskin';
-                    $template['selected'] = $blog->getDefaultSkin();
-                    $template['tabindex'] = 50;
-                    showlist($query,'select',$template);
-                ?>
-
-            </td>
-        </tr><tr>
-            <td><?php echo _EBLOG_LINEBREAKS?> <?php help('convertbreaks'); ?>
-            </td>
-            <td><?php $this->input_yesno('convertbreaks',$blog->convertBreaks(),55); ?></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_ALLOWPASTPOSTING?> <?php help('allowpastposting'); ?>
-            </td>
-            <td><?php $this->input_yesno('allowpastposting',$blog->allowPastPosting(),57); ?></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_DISABLECOMMENTS?>
-            </td>
-            <td><?php $this->input_yesno('comments',$blog->commentsEnabled(),60); ?></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_ANONYMOUS?>
-            </td>
-            <td><?php $this->input_yesno('public',$blog->isPublic(),70); ?></td>
-        </tr><tr>
-    <td><?php echo _EBLOG_REQUIREDEMAIL?>
-         </td>
-         <td><?php $this->input_yesno('reqemail',$blog->emailRequired(),72); ?></td>
-      </tr><tr>
-            <td><?php echo _EBLOG_NOTIFY?> <?php help('blognotify'); ?></td>
-            <td><input name="notify" tabindex="80" maxlength="128" size="40" value="<?php echo  Entity::hsc($blog->getNotifyAddress()); ?>" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_NOTIFY_ON?></td>
-            <td>
-                <input name="notifyComment" value="3" type="checkbox" tabindex="81" id="notifyComment"
-                    <?php if  ($blog->notifyOnComment()) echo "checked='checked'" ?>
-                /><label for="notifyComment"><?php echo _EBLOG_NOTIFY_COMMENT?></label>
-                <br />
-                <input name="notifyVote" value="5" type="checkbox" tabindex="82" id="notifyVote"
-                    <?php if  ($blog->notifyOnVote()) echo "checked='checked'" ?>
-                /><label for="notifyVote"><?php echo _EBLOG_NOTIFY_KARMA?></label>
-                <br />
-                <input name="notifyNewItem" value="7" type="checkbox" tabindex="83" id="notifyNewItem"
-                    <?php if  ($blog->notifyOnNewItem()) echo "checked='checked'" ?>
-                /><label for="notifyNewItem"><?php echo _EBLOG_NOTIFY_ITEM?></label>
-            </td>
-        </tr><tr>
-            <td><?php echo _EBLOG_MAXCOMMENTS?> <?php help('blogmaxcomments'); ?></td>
-            <td><input name="maxcomments" tabindex="90" size="3" value="<?php echo  Entity::hsc($blog->getMaxComments()); ?>" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_UPDATE?> <?php help('blogupdatefile'); ?></td>
-            <td><input name="update" tabindex="100" size="40" maxlength="60" value="<?php echo  Entity::hsc($blog->getUpdateFile()) ?>" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_DEFCAT?></td>
-            <td>
-                <?php
-                    $query =  'SELECT cname as text, catid as value'
-                           . ' FROM '.sql_table('category')
-                           . ' WHERE cblog=' . $blog->getID();
-                    $template['name'] = 'defcat';
-                    $template['selected'] = $blog->getDefaultCategory();
-                    $template['tabindex'] = 110;
-                    showlist($query,'select',$template);
-                ?>
-            </td>
-        </tr><tr>
-            <td><?php echo _EBLOG_OFFSET?> <?php help('blogtimeoffset'); ?>
-                <br /><?php echo _EBLOG_STIME?> <b><?php echo  i18n::formatted_datetime('%H:%M', time()); ?></b>
-                <br /><?php echo _EBLOG_BTIME?> <b><?php echo  i18n::formatted_datetime('%H:%M', $blog->getCorrectTime()); ?></b>
-                </td>
-            <td><input name="timeoffset" tabindex="120" size="3" value="<?php echo  Entity::hsc($blog->getTimeOffset()); ?>" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_SEARCH?> <?php help('blogsearchable'); ?></td>
-            <td><?php $this->input_yesno('searchable',$blog->getSearchable(),122); ?></td>
-        </tr>
-        <?php
-            // plugin options
-            $this->_insertPluginOptions('blog',$blogid);
-        ?>
-        <tr>
-            <th colspan="2"><?php echo _EBLOG_CHANGE?></th>
-        </tr><tr>
-            <td><?php echo _EBLOG_CHANGE?></td>
-            <td><input type="submit" tabindex="130" value="<?php echo _EBLOG_CHANGE_BTN?>" onclick="return checkSubmit();" /></td>
-        </tr></table>
+     * @todo document this
+     */
+    function deleteOneTeamMember($blogid, $memberid) {
+        global $member, $manager;
 
-        </div></form>
+        $blogid = intval($blogid);
+        $memberid = intval($memberid);
 
-        <h3><?php echo _EBLOG_CAT_TITLE?></h3>
+        // check if allowed
+        if (!$member->blogAdminRights($blogid))
+            return _ERROR_DISALLOWED;
 
+        // check if: - there remains at least one blog admin
+        //           - (there remains at least one team member)
+        $tmem = Member::createFromID($memberid);
 
-        <?php
-        $query = 'SELECT * FROM '.sql_table('category').' WHERE cblog='.$blog->getID().' ORDER BY cname';
-        $template['content'] = 'categorylist';
-        $template['tabindex'] = 200;
+        $manager->notify('PreDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
 
-        $manager->loadClass("ENCAPSULATE");
-        $batch = new Batch('category');
-        $batch->showlist($query,'table',$template);
+        if ($tmem->isBlogAdmin($blogid)) {
+            // check if there are more blog members left and at least one admin
+            // (check for at least two admins before deletion)
+            $query = 'SELECT * FROM '.sql_table('team') . ' WHERE tblog='.$blogid.' and tadmin=1';
+            $r = DB::getResult($query);
+            if ($r->rowCount() < 2)
+                return _ERROR_ATLEASTONEBLOGADMIN;
+        }
 
-        ?>
+        $query = 'DELETE FROM '.sql_table('team')." WHERE tblog=$blogid and tmember=$memberid";
+        DB::execute($query);
 
+        $manager->notify('PostDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
 
-        <form action="index.php" method="post"><div>
-        <input name="action" value="categorynew" type="hidden" />
-        <?php $manager->addTicketHidden() ?>
-        <input name="blogid" value="<?php echo $blog->getID()?>" type="hidden" />
+        return '';
+    }
 
-        <table><tr>
-            <th colspan="2"><?php echo _EBLOG_CAT_CREATE?></th>
-        </tr><tr>
-            <td><?php echo _EBLOG_CAT_NAME?></td>
-            <td><input name="cname" size="40" maxlength="40" tabindex="300" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_CAT_DESC?></td>
-            <td><input name="cdesc" size="40" maxlength="200" tabindex="310" /></td>
-        </tr><tr>
-            <td><?php echo _EBLOG_CAT_CREATE?></td>
-            <td><input type="submit" value="<?php echo _EBLOG_CAT_CREATE?>" tabindex="320" /></td>
-        </tr></table>
+    /**
+     * @todo document this
+     */
+    function action_teamchangeadmin() {
+        global $member;
 
-        </div></form>
+        $blogid = intRequestVar('blogid');
+        $memberid = intRequestVar('memberid');
 
-        <?php
+        // check if allowed
+        $member->blogAdminRights($blogid) or $this->disallow();
 
-            echo '<h3>',_PLUGINS_EXTRA,'</h3>';
+        $mem = Member::createFromID($memberid);
 
-            $manager->notify(
-                'BlogSettingsFormExtras',
-                array(
-                    'blog' => &$blog
-                )
-            );
+        // don't allow when there is only one admin at this moment
+        if ($mem->isBlogAdmin($blogid)) {
+            $r = DB::getResult('SELECT * FROM '.sql_table('team') . " WHERE tblog=$blogid and tadmin=1");
+            if ($r->rowCount() == 1)
+                $this->error(_ERROR_ATLEASTONEBLOGADMIN);
+        }
 
-        $this->pagefoot();
+        if ($mem->isBlogAdmin($blogid))
+            $newval = 0;
+        else
+            $newval = 1;
+
+        $query = 'UPDATE '.sql_table('team') ." SET tadmin=$newval WHERE tblog=$blogid and tmember=$memberid";
+        DB::execute($query);
+
+        // only show manageteam if member did not change its own admin privileges
+        if ($member->isBlogAdmin($blogid))
+            $this->action_manageteam();
+        else
+            $this->action_overview(_MSG_ADMINCHANGED);
     }
+       
+       /**
+        * Admin::action_blogsettings()
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_blogsettings()
+       {
+               global $member, $manager;
+               
+               $blogid = intRequestVar('blogid');
+               
+               // check if allowed
+               $member->blogAdminRights($blogid) or $this->disallow();
+               
+               $blog =& $manager->getBlog($blogid);
+               
+               $extrahead = "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";
+               $this->pagehead($extrahead);
+               
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               echo '<h2>' . _EBLOG_TITLE . ": '{$this->bloglink($blog)}'</h2>\n";
+               
+               echo '<h3>' . _EBLOG_TEAM_TITLE . "</h3>\n";
+               
+               echo '<p>' . _EBLOG_CURRENT_TEAM_MEMBER;
+               
+               $query = "SELECT mname, mrealname FROM %s, %s WHERE mnumber=tmember AND tblog=%d;";
+               $query = sprintf($query, sql_table('member'), sql_table('team'), (integer) $blogid);
+               $res = DB::getResult($query);
+               $aMemberNames = array();
+               foreach ( $res as $row )
+               {
+                       $aMemberNames[] = Entity::hsc($row['mname']) . ' (' . Entity::hsc($row['mrealname']). ')';
+               }
+               echo implode(',', $aMemberNames);
+                       
+               echo "</p>\n";
+               echo '<p>';
+               echo '<a href="index.php?action=manageteam&amp;blogid=' . $blogid . '">' . _EBLOG_TEAM_TEXT . '</a>';
+               echo "</p>\n";
+               
+               echo '<h3>' . _EBLOG_SETTINGS_TITLE . "</h3>\n";
+               
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               
+               echo "<input type=\"hidden\" name=\"action\" value=\"blogsettingsupdate\" />\n";
+               $manager->addTicketHidden() . "\n";
+               echo "<input type=\"hidden\" name=\"blogid\" value=\"{$blogid}\" />\n";
+               
+               echo '<table frame="box" rules="all" summary="' . _EBLOG_SETTINGS_TITLE . '">' . "\n";
+               echo "<tfoot>\n";
+               echo "<tr>\n";
+               echo '<th colspan="2">' . _EBLOG_CHANGE . "</th>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_CHANGE . "</td>\n";
+               echo '<td><input type="submit" tabindex="130" value="' . _EBLOG_CHANGE_BTN . '" onclick="return checkSubmit();" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</tfoot>\n";
+               echo "<tbody>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_NAME . "</td>\n";
+               echo '<td><input name="name" tabindex="10" size="40" maxlength="60" value="' . Entity::hsc($blog->getName()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_SHORTNAME;
+               help('shortblogname');
+               echo _EBLOG_SHORTNAME_EXTRA;
+               echo "</td>\n";
+               echo '<td><input name="shortname" tabindex="20" maxlength="15" size="15" value="' . Entity::hsc($blog->getShortName()) .'" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_DESC . "</td>\n";
+               echo '<td><input name="desc" tabindex="30" maxlength="200" size="40" value="' . Entity::hsc($blog->getDescription()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_URL . "</td>\n";
+               echo '<td><input name="url" tabindex="40" size="40" maxlength="100" value="' . Entity::hsc($blog->getURL()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_DEFSKIN;
+               help('blogdefaultskin');
+               echo "</td>\n";
+               echo "<td>\n";
+               
+               $query = 'SELECT sdname as text, sdnumber as value FROM ' . sql_table('skin_desc');
+               $template['name'] = 'defskin';
+               $template['selected'] = $blog->getDefaultSkin();
+               $template['tabindex'] = 50;
+               showlist($query, 'select', $template);
+               
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_LINEBREAKS;
+               help('convertbreaks');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('convertbreaks',$blog->convertBreaks(),55);
+               echo "</td>\n";
+               echo "</tr>\n";
+               
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_ALLOWPASTPOSTING;
+               help('allowpastposting');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('allowpastposting',$blog->allowPastPosting(),57);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_DISABLECOMMENTS;
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('comments', $blog->commentsEnabled(), 60);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_ANONYMOUS . "</td>\n";
+               echo '<td>';
+               $this->input_yesno('public',$blog->isPublic(),70);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_REQUIREDEMAIL . "</td>\n";
+               echo '<td>';
+               $this->input_yesno('reqemail', $blog->emailRequired(),72);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_NOTIFY;
+               help('blognotify');
+               echo "</td>\n";
+               echo '<td><input name="notify" tabindex="80" maxlength="128" size="40" value="' . Entity::hsc($blog->getNotifyAddress()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_NOTIFY_ON . "</td>\n";
+               echo "<td>\n";
+               
+               if ( !$blog->notifyOnComment() )
+               {
+                       echo "<input name=\"notifyComment\" value=\"3\" type=\"checkbox\" tabindex=\"81\" id=\"notifyComment\" />\n";
+               }
+               else
+               {
+                       echo "<input name=\"notifyComment\" value=\"3\" type=\"checkbox\" tabindex=\"81\" id=\"notifyComment\" checked=\"checked\"/>\n";
+               }
+               echo '<label for="notifyComment">' . _EBLOG_NOTIFY_COMMENT . "</label><br />\n";
+               
+               if ( !$blog->notifyOnVote() )
+               {
+                       echo "<input name=\"notifyVote\" value=\"5\" type=\"checkbox\" tabindex=\"82\" id=\"notifyVote\" />\n";
+               }
+               else
+               {
+                       echo "<input name=\"notifyVote\" value=\"5\" type=\"checkbox\" tabindex=\"82\" id=\"notifyVote\" checked=\"checked\" />\n";
+               }
+               
+               echo '<label for="notifyVote">' . _EBLOG_NOTIFY_KARMA . "</label><br />\n";
+               
+               if ( !$blog->notifyOnNewItem() )
+               {
+                       echo "<input name=\"notifyNewItem\" value=\"7\" type=\"checkbox\" tabindex=\"83\" id=\"notifyNewItem\" />\n";
+               
+               }
+               else
+               {
+                       echo "<input name=\"notifyNewItem\" value=\"7\" type=\"checkbox\" tabindex=\"83\" id=\"notifyNewItem\" checked=\"checked\" />\n";
+               }
+               
+               echo '<label for="notifyNewItem">' . _EBLOG_NOTIFY_ITEM . "</label>\n";
+               
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_MAXCOMMENTS;
+               help('blogmaxcomments');
+               echo "</td>\n";
+               echo '<td><input name="maxcomments" tabindex="90" size="3" value="' . Entity::hsc($blog->getMaxComments()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_UPDATE;
+               help('blogupdatefile');
+               echo "</td>\n";
+               echo '<td><input name="update" tabindex="100" size="40" maxlength="60" value="' . Entity::hsc($blog->getUpdateFile()) .'" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_DEFCAT . "</td>\n";
+               echo "<td>\n";
+               $query =  "SELECT cname as text, catid as value FROM %s WHERE cblog=%d;";
+               $query = sprintf($query, sql_table('category'), (integer) $blog->getID());
+               $template['name'] = 'defcat';
+               $template['selected'] = $blog->getDefaultCategory();
+               $template['tabindex'] = 110;
+               showlist($query, 'select', $template);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_OFFSET;
+               help('blogtimeoffset');
+               echo "<br />\n";
+               echo _EBLOG_STIME;
+               echo ' <b>' . i18n::formatted_datetime('%H:%M', time()) . '</b><br />';
+               echo _EBLOG_BTIME;
+               echo '<b>' . i18n::formatted_datetime('%H:%M', $blog->getCorrectTime()) . '</b>';
+               echo "</td>\n";
+               echo '<td><input name="timeoffset" tabindex="120" size="3" value="' . Entity::hsc($blog->getTimeOffset()) .'" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_SEARCH;
+               help('blogsearchable');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('searchable', $blog->getSearchable(), 122);
+               echo "</td>\n";
+               echo "</tr>\n";
+               
+               // plugin options
+               $this->_insertPluginOptions('blog', $blogid);
+               
+               echo "</tbody>\n";
+               echo "</table>\n";
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               echo '<h3>' . _EBLOG_CAT_TITLE . "</h3>\n";
+               
+               $query = 'SELECT * FROM '.sql_table('category').' WHERE cblog='.$blog->getID().' ORDER BY cname';
+               $template['content'] = 'categorylist';
+               $template['tabindex'] = 200;
+               
+               $manager->loadClass("ENCAPSULATE");
+               $batch = new Batch('category');
+               $batch->showlist($query,'table',$template);
+               
+               echo "<form action=\"index.php\" method=\"post\">\n";
+               echo "<div>\n";
+               echo "<input name=\"action\" value=\"categorynew\" type=\"hidden\" />\n";
+               $manager->addTicketHidden() . "\n";
+               echo "<input name=\"blogid\" value=\"{$blog->getID()}\" type=\"hidden\" />\n";
+               
+               echo '<table frame="box" rules="all" summary="' . _EBLOG_CAT_CREATE . '">' . "\n";
+               echo "<thead>\n";
+               echo "<tr>\n";
+               echo '<th colspan="2">' . _EBLOG_CAT_CREATE . "</th>\n";
+               echo "</tr>\n";
+               echo "</thead>\n";
+               echo "<tbody>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_CAT_NAME . "</td>\n";
+               echo "<td><input name=\"cname\" size=\"40\" maxlength=\"40\" tabindex=\"300\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_CAT_DESC . "</td>\n";
+               echo "<td><input name=\"cdesc\" size=\"40\" maxlength=\"200\" tabindex=\"310\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_CAT_CREATE . "</td>\n";
+               echo '<td><input type="submit" value="' . _EBLOG_CAT_CREATE . '" tabindex="320" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</tbody>\n";
+               echo "</table>\n";
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               echo '<h3>' . _PLUGINS_EXTRA . "</h3>\n";
+               $manager->notify('BlogSettingsFormExtras', array('blog' => &$blog));
+               
+               $this->pagefoot();
+               return;
+       }
 
     /**
      * @todo document this
@@ -2727,9 +2978,9 @@ class Admin
         if (!isValidCategoryName($cname))
             $this->error(_ERROR_BADCATEGORYNAME);
 
-        $query = 'SELECT * FROM '.sql_table('category') . ' WHERE cname=\'' . sql_real_escape_string($cname).'\' and cblog=' . intval($blogid);
-        $res = sql_query($query);
-        if (sql_num_rows($res) > 0)
+        $query = 'SELECT * FROM '.sql_table('category') . ' WHERE cname=' . DB::quoteValue($cname).' and cblog=' . intval($blogid);
+        $res = DB::getResult($query);
+        if ($res->rowCount() > 0)
             $this->error(_ERROR_DUPCATEGORYNAME);
 
         $blog       =& $manager->getBlog($blogid);
@@ -2755,11 +3006,10 @@ class Admin
 
         $member->blogAdminRights($blogid) or $this->disallow();
 
-        $res = sql_query('SELECT * FROM '.sql_table('category')." WHERE cblog=$blogid AND catid=$catid");
-        $obj = sql_fetch_object($res);
+        $res = DB::getRow('SELECT * FROM '.sql_table('category')." WHERE cblog=$blogid AND catid=$catid");
 
-        $cname = $obj->cname;
-        $cdesc = $obj->cdesc;
+        $cname = $res['cname'];
+        $cdesc = $res['cdesc'];
 
         $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';
         $this->pagehead($extrahead);
@@ -2767,10 +3017,10 @@ class Admin
         echo "<p><a href='index.php?action=blogsettings&amp;blogid=$blogid'>(",_BACK_TO_BLOGSETTINGS,")</a></p>";
 
         ?>
-        <h2><?php echo _EBLOG_CAT_UPDATE?> '<?php echo Entity::hsc($cname)?>'</h2>
+        <h2><?php echo _EBLOG_CAT_UPDATE ?> '<?php echo Entity::hsc($cname) ?>'</h2>
         <form method='post' action='index.php'><div>
-        <input name="blogid" type="hidden" value="<?php echo $blogid?>" />
-        <input name="catid" type="hidden" value="<?php echo $catid?>" />
+        <input name="blogid" type="hidden" value="<?php echo $blogid ?>" />
+        <input name="catid" type="hidden" value="<?php echo $catid ?>" />
         <input name="desturl" type="hidden" value="<?php echo Entity::hsc($desturl) ?>" />
         <input name="action" type="hidden" value="categoryupdate" />
         <?php $manager->addTicketHidden(); ?>
@@ -2778,11 +3028,11 @@ class Admin
         <table><tr>
             <th colspan="2"><?php echo _EBLOG_CAT_UPDATE ?></th>
         </tr><tr>
-            <td><?php echo _EBLOG_CAT_NAME?></td>
-            <td><input type="text" name="cname" value="<?php echo Entity::hsc($cname)?>" size="40" maxlength="40" /></td>
+            <td><?php echo _EBLOG_CAT_NAME ?></td>
+            <td><input type="text" name="cname" value="<?php echo Entity::hsc($cname) ?>" size="40" maxlength="40" /></td>
         </tr><tr>
-            <td><?php echo _EBLOG_CAT_DESC?></td>
-            <td><input type="text" name="cdesc" value="<?php echo Entity::hsc($cdesc)?>" size="40" maxlength="200" /></td>
+            <td><?php echo _EBLOG_CAT_DESC ?></td>
+            <td><input type="text" name="cdesc" value="<?php echo Entity::hsc($cdesc) ?>" size="40" maxlength="200" /></td>
         </tr>
         <?php
             // insert plugin options
@@ -2791,8 +3041,8 @@ class Admin
         <tr>
             <th colspan="2"><?php echo _EBLOG_CAT_UPDATE ?></th>
         </tr><tr>
-            <td><?php echo _EBLOG_CAT_UPDATE?></td>
-            <td><input type="submit" value="<?php echo _EBLOG_CAT_UPDATE_BTN?>" /></td>
+            <td><?php echo _EBLOG_CAT_UPDATE ?></td>
+            <td><input type="submit" value="<?php echo _EBLOG_CAT_UPDATE_BTN ?>" /></td>
         </tr></table>
 
         </div></form>
@@ -2817,17 +3067,17 @@ class Admin
         if (!isValidCategoryName($cname))
             $this->error(_ERROR_BADCATEGORYNAME);
 
-        $query = 'SELECT * FROM '.sql_table('category').' WHERE cname=\'' . sql_real_escape_string($cname).'\' and cblog=' . intval($blogid) . " and not(catid=$catid)";
-        $res = sql_query($query);
-        if (sql_num_rows($res) > 0)
+        $query = 'SELECT * FROM '.sql_table('category').' WHERE cname=' . DB::quoteValue($cname).' and cblog=' . intval($blogid) . " and not(catid=$catid)";
+        $res = DB::getResult($query);
+        if ($res->rowCount() > 0)
             $this->error(_ERROR_DUPCATEGORYNAME);
 
         $query =  'UPDATE '.sql_table('category').' SET'
-               . " cname='" . sql_real_escape_string($cname) . "',"
-               . " cdesc='" . sql_real_escape_string($cdesc) . "'"
-               . " WHERE catid=" . $catid;
+               . ' cname=' . DB::quoteValue($cname) . ','
+               . ' cdesc=' . DB::quoteValue($cdesc)
+               . ' WHERE catid=' . $catid;
 
-        sql_query($query);
+        DB::execute($query);
 
         // store plugin options
         $aOptions = requestArray('plugoption');
@@ -2866,25 +3116,25 @@ class Admin
 
         // check if catid is the only category left for blogid
         $query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;
-        $res = sql_query($query);
-        if (sql_num_rows($res) == 1)
+        $res = DB::getResult($query);
+        if ($res->rowCount() == 1)
             $this->error(_ERROR_DELETELASTCATEGORY);
 
 
         $this->pagehead();
         ?>
-            <h2><?php echo _DELETE_CONFIRM?></h2>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
 
             <div>
-            <?php echo _CONFIRMTXT_CATEGORY?><b><?php echo  Entity::hsc($blog->getCategoryName($catid))?></b>
+            <?php echo _CONFIRMTXT_CATEGORY ?><b><?php echo  Entity::hsc($blog->getCategoryName($catid)) ?></b>
             </div>
 
             <form method="post" action="index.php"><div>
             <input type="hidden" name="action" value="categorydeleteconfirm" />
             <?php $manager->addTicketHidden() ?>
-            <input type="hidden" name="blogid" value="<?php echo $blogid?>" />
-            <input type="hidden" name="catid" value="<?php echo $catid?>" />
-            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+            <input type="hidden" name="blogid" value="<?php echo $blogid ?>" />
+            <input type="hidden" name="catid" value="<?php echo $catid ?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
             </div></form>
         <?php
         $this->pagefoot();
@@ -2946,8 +3196,8 @@ class Admin
                
                // check if catid is the only category left for blogid
                $query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;
-               $res = sql_query($query);
-               if ( sql_num_rows($res) == 1 )
+               $res = DB::getResult($query);
+               if ( $res->rowCount() == 1 )
                {
                        return _ERROR_DELETELASTCATEGORY;
                }
@@ -2956,14 +3206,14 @@ class Admin
                
                // change category for all items to the default category
                $query = 'UPDATE '.sql_table('item')." SET icat=$destcatid WHERE icat=$catid";
-               sql_query($query);
+               DB::execute($query);
                
                // delete all associated plugin options
                NucleusPlugin::delete_option_values('category', $catid);
                
                // delete category
                $query = 'DELETE FROM '.sql_table('category').' WHERE catid=' .$catid;
-               sql_query($query);
+               DB::execute($query);
                
                $manager->notify('PostDeleteCategory', array('catid' => $catid));
                return;
@@ -3074,20 +3324,20 @@ class Admin
 
         $this->pagehead();
         ?>
-            <h2><?php echo _DELETE_CONFIRM?></h2>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
 
-            <p><?php echo _WARNINGTXT_BLOGDEL?>
+            <p><?php echo _WARNINGTXT_BLOGDEL ?>
             </p>
 
             <div>
-            <?php echo _CONFIRMTXT_BLOG?><b><?php echo  Entity::hsc($blog->getName())?></b>
+            <?php echo _CONFIRMTXT_BLOG ?><b><?php echo  Entity::hsc($blog->getName()) ?></b>
             </div>
 
             <form method="post" action="index.php"><div>
             <input type="hidden" name="action" value="deleteblogconfirm" />
             <?php $manager->addTicketHidden() ?>
             <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
-            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
             </div></form>
         <?php
         $this->pagefoot();
@@ -3116,30 +3366,30 @@ class Admin
                
                // delete all comments
                $query = 'DELETE FROM '.sql_table('comment').' WHERE cblog='.$blogid;
-               sql_query($query);
+               DB::execute($query);
                
                // delete all items
                $query = 'DELETE FROM '.sql_table('item').' WHERE iblog='.$blogid;
-               sql_query($query);
+               DB::execute($query);
                
                // delete all team members
                $query = 'DELETE FROM '.sql_table('team').' WHERE tblog='.$blogid;
-               sql_query($query);
+               DB::execute($query);
                
                // delete all bans
                $query = 'DELETE FROM '.sql_table('ban').' WHERE blogid='.$blogid;
-               sql_query($query);
+               DB::execute($query);
                
                // delete all categories
                $query = 'DELETE FROM '.sql_table('category').' WHERE cblog='.$blogid;
-               sql_query($query);
+               DB::execute($query);
                
                // delete all associated plugin options
                NucleusPlugin::delete_option_values('blog', $blogid);
                
                // delete the blog itself
                $query = 'DELETE FROM '.sql_table('blog').' WHERE bnumber='.$blogid;
-               sql_query($query);
+               DB::execute($query);
                
                $manager->notify('PostDeleteBlog', array('blogid' => $blogid));
                
@@ -3161,9 +3411,9 @@ class Admin
 
         $this->pagehead();
         ?>
-            <h2><?php echo _DELETE_CONFIRM?></h2>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
 
-            <p><?php echo _CONFIRMTXT_MEMBER?><b><?php echo Entity::hsc($mem->getDisplayName()) ?></b>
+            <p><?php echo _CONFIRMTXT_MEMBER ?><b><?php echo Entity::hsc($mem->getDisplayName()) ?></b>
             </p>
 
             <p>
@@ -3174,7 +3424,7 @@ class Admin
             <input type="hidden" name="action" value="memberdeleteconfirm" />
             <?php $manager->addTicketHidden() ?>
             <input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />
-            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
             </div></form>
         <?php
         $this->pagefoot();
@@ -3225,19 +3475,19 @@ class Admin
                /* unlink comments from memberid */
                if ( $memberid )
                {
-                       $query = "UPDATE %s SET cmember=0, cuser='%s' WHERE cmember=%d";
-                       $query = sprintf($query, sql_table('comment'), sql_real_escape_string($mem->getDisplayName()), $memberid);
-                       sql_query($query);
+                       $query = "UPDATE %s SET cmember=0, cuser=%s WHERE cmember=%d";
+                       $query = sprintf($query, sql_table('comment'), DB::quoteValue($mem->getDisplayName()), $memberid);
+                       DB::execute($query);
                }
                
                $query = 'DELETE FROM '.sql_table('member').' WHERE mnumber='.$memberid;
-               sql_query($query);
+               DB::execute($query);
                
                $query = 'DELETE FROM '.sql_table('team').' WHERE tmember='.$memberid;
-               sql_query($query);
+               DB::execute($query);
                
                $query = 'DELETE FROM '.sql_table('activation').' WHERE vmember='.$memberid;
-               sql_query($query);
+               DB::execute($query);
                
                // delete all associated plugin options
                NucleusPlugin::delete_option_values('member', $memberid);
@@ -3260,7 +3510,7 @@ class Admin
 
         echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
         ?>
-        <h2><?php echo _EBLOG_CREATE_TITLE?></h2>
+        <h2><?php echo _EBLOG_CREATE_TITLE ?></h2>
 
         <h3><?php echo _ADMIN_NOTABILIA ?></h3>
 
@@ -3276,7 +3526,7 @@ class Admin
         <h3><?php echo _ADMIN_HOW_TO_CREATE ?></h3>
 
         <p>
-        <?php echo _EBLOG_CREATE_TEXT?>
+        <?php echo _EBLOG_CREATE_TEXT ?>
         </p>
 
         <form method="post" action="index.php"><div>
@@ -3286,18 +3536,18 @@ class Admin
 
 
         <table><tr>
-            <td><?php echo _EBLOG_NAME?></td>
+            <td><?php echo _EBLOG_NAME ?></td>
             <td><input name="name" tabindex="10" size="40" maxlength="60" /></td>
         </tr><tr>
-            <td><?php echo _EBLOG_SHORTNAME?>
+            <td><?php echo _EBLOG_SHORTNAME ?>
                 <?php help('shortblogname'); ?>
             </td>
             <td><input name="shortname" tabindex="20" maxlength="15" size="15" /></td>
         </tr><tr>
-            <td><?php echo _EBLOG_DESC?></td>
+            <td><?php echo _EBLOG_DESC ?></td>
             <td><input name="desc" tabindex="30" maxlength="200" size="40" /></td>
         </tr><tr>
-            <td><?php echo _EBLOG_DEFSKIN?>
+            <td><?php echo _EBLOG_DEFSKIN ?>
                 <?php help('blogdefaultskin'); ?>
             </td>
             <td>
@@ -3311,19 +3561,19 @@ class Admin
                 ?>
             </td>
         </tr><tr>
-            <td><?php echo _EBLOG_OFFSET?>
+            <td><?php echo _EBLOG_OFFSET ?>
                 <?php help('blogtimeoffset'); ?>
-                <br /><?php echo _EBLOG_STIME?> <b><?php echo i18n::formatted_datetime('%H:%M',time()); ?></b>
+                <br /><?php echo _EBLOG_STIME ?> <b><?php echo i18n::formatted_datetime('%H:%M',time()); ?></b>
             </td>
             <td><input name="timeoffset" tabindex="110" size="3" value="0" /></td>
         </tr><tr>
-            <td><?php echo _EBLOG_ADMIN?>
+            <td><?php echo _EBLOG_ADMIN ?>
                 <?php help('teamadmin'); ?>
             </td>
-            <td><?php echo _EBLOG_ADMIN_MSG?></td>
+            <td><?php echo _EBLOG_ADMIN_MSG ?></td>
         </tr><tr>
-            <td><?php echo _EBLOG_CREATE?></td>
-            <td><input type="submit" tabindex="120" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
+            <td><?php echo _EBLOG_CREATE ?></td>
+            <td><input type="submit" tabindex="120" value="<?php echo _EBLOG_CREATE_BTN ?>" onclick="return checkSubmit();" /></td>
         </tr></table>
 
         </div></form>
@@ -3364,27 +3614,30 @@ class Admin
         );
 
 
-        // add slashes for sql queries
-        $bname =        sql_real_escape_string($bname);
-        $bshortname =   sql_real_escape_string($bshortname);
-        $btimeoffset =  sql_real_escape_string($btimeoffset);
-        $bdesc =        sql_real_escape_string($bdesc);
-        $bdefskin =     sql_real_escape_string($bdefskin);
-
         // create blog
-        $query = 'INSERT INTO '.sql_table('blog')." (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES ('$bname', '$bshortname', '$bdesc', '$btimeoffset', '$bdefskin')";
-        sql_query($query);
-        $blogid = sql_insert_id();
+               $query = sprintf('INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES (%s, %s, %s, %s, %s)',
+                       sql_table('blog'),
+                       DB::quoteValue($bname),
+                       DB::quoteValue($bshortname),
+                       DB::quoteValue($bdesc),
+                       DB::quoteValue($btimeoffset),
+                       DB::quoteValue($bdefskin)
+               );
+        DB::execute($query);
+        $blogid = DB::getInsertId();
         $blog   =& $manager->getBlog($blogid);
 
         // create new category
         $catdefname = (defined('_EBLOGDEFAULTCATEGORY_NAME') ? _EBLOGDEFAULTCATEGORY_NAME : 'General');
         $catdefdesc = (defined('_EBLOGDEFAULTCATEGORY_DESC') ? _EBLOGDEFAULTCATEGORY_DESC : 'Items that do not fit in other categories');
-        $sql = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, "%s", "%s")';
-        sql_query(sprintf($sql, sql_table('category'), $blogid, $catdefname, $catdefdesc));
-//             sql_query(sprintf($sql, sql_table('category'), $blogid, _EBLOGDEFAULTCATEGORY_NAME, _EBLOGDEFAULTCATEGORY_DESC));
-//             sql_query('INSERT INTO '.sql_table('category')." (cblog, cname, cdesc) VALUES ($blogid, _EBLOGDEFAULTCATEGORY_NAME, _EBLOGDEFAULTCATEGORY_DESC)");
-        $catid = sql_insert_id();
+               $query = sprintf('INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)',
+                       sql_table('category'),
+                       $blogid,
+                       DB::quoteValue($catdefname),
+                       DB::quoteValue($catdefdesc)
+               );
+        DB::execute($query);
+        $catid = DB::getInsertId();
 
         // set as default category
         $blog->setDefaultCategory($catid);
@@ -3392,17 +3645,15 @@ class Admin
 
         // create team member
         $memberid = $member->getID();
-        $query = 'INSERT INTO '.sql_table('team')." (tmember, tblog, tadmin) VALUES ($memberid, $blogid, 1)";
-        sql_query($query);
+        $query = sprintf('INSERT INTO %s (tmember, tblog, tadmin) VALUES (%d, %d, 1)', sql_table('team'), $memberid, $blogid);
+        DB::execute($query);
 
         $itemdeftitle = (defined('_EBLOG_FIRSTITEM_TITLE') ? _EBLOG_FIRSTITEM_TITLE : 'First Item');
         $itemdefbody = (defined('_EBLOG_FIRSTITEM_BODY') ? _EBLOG_FIRSTITEM_BODY : 'This is the first item in your weblog. Feel free to delete it.');
 
         $blog->additem($blog->getDefaultCategory(),$itemdeftitle,$itemdefbody,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);
-        //$blog->additem($blog->getDefaultCategory(),_EBLOG_FIRSTITEM_TITLE,_EBLOG_FIRSTITEM_BODY,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);
-
-
 
+        
         $manager->notify(
             'PostAddBlog',
             array(
@@ -3436,11 +3687,11 @@ class Admin
         <p><?php echo sprintf(_BLOGCREATED_SIMPLEDESC2, Entity::hsc($bshortname)) ?></p>
 <pre><code>&lt;?php
 
-$CONF['Self'] = '<b><?php echo Entity::hsc($bshortname)?>.php</b>';
+$CONF['Self'] = '<b><?php echo Entity::hsc($bshortname) ?>.php</b>';
 
 include('<i>./config.php</i>');
 
-selectBlog('<b><?php echo Entity::hsc($bshortname)?></b>');
+selectBlog('<b><?php echo Entity::hsc($bshortname) ?></b>');
 selector();
 
 ?&gt;</code></pre>
@@ -3452,13 +3703,13 @@ selector();
         <form action="index.php" method="post"><div>
             <input type="hidden" name="action" value="addnewlog2" />
             <?php $manager->addTicketHidden() ?>
-            <input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />
+            <input type="hidden" name="blogid" value="<?php echo intval($blogid) ?>" />
             <table><tr>
-                <td><?php echo _EBLOG_URL?></td>
-                <td><input name="url" maxlength="100" size="40" value="<?php echo Entity::hsc($CONF['IndexURL'].$bshortname.'.php')?>" /></td>
+                <td><?php echo _EBLOG_URL ?></td>
+                <td><input name="url" maxlength="100" size="40" value="<?php echo Entity::hsc($CONF['IndexURL'].$bshortname.'.php') ?>" /></td>
             </tr><tr>
-                <td><?php echo _EBLOG_CREATE?></td>
-                <td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
+                <td><?php echo _EBLOG_CREATE ?></td>
+                <td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN ?>" onclick="return checkSubmit();" /></td>
             </tr></table>
         </div></form>
 
@@ -3469,13 +3720,13 @@ selector();
         <form action="index.php" method="post"><div>
             <input type="hidden" name="action" value="addnewlog2" />
             <?php $manager->addTicketHidden() ?>
-            <input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />
+            <input type="hidden" name="blogid" value="<?php echo intval($blogid) ?>" />
             <table><tr>
-                <td><?php echo _EBLOG_URL?></td>
+                <td><?php echo _EBLOG_URL ?></td>
                 <td><input name="url" maxlength="100" size="40" /></td>
             </tr><tr>
-                <td><?php echo _EBLOG_CREATE?></td>
-                <td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
+                <td><?php echo _EBLOG_CREATE ?></td>
+                <td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN ?>" onclick="return checkSubmit();" /></td>
             </tr></table>
         </div></form>
 
@@ -3517,9 +3768,9 @@ selector();
         echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
 
     ?>
-        <h2><?php echo _SKINIE_TITLE_IMPORT?></h2>
+        <h2><?php echo _SKINIE_TITLE_IMPORT ?></h2>
 
-                <p><label for="skinie_import_local"><?php echo _SKINIE_LOCAL?></label>
+                <p><label for="skinie_import_local"><?php echo _SKINIE_LOCAL ?></label>
                 <?php                   global $DIR_SKINS;
 
                     $candidates = SkinImport::searchForCandidates($DIR_SKINS);
@@ -3537,7 +3788,7 @@ selector();
                                     }
                                 ?>
                                 </select>
-                                <input type="submit" value="<?php echo _SKINIE_BTN_IMPORT?>" />
+                                <input type="submit" value="<?php echo _SKINIE_BTN_IMPORT ?>" />
                             </div></form>
                         <?php                   } else {
                         echo _SKINIE_NOCANDIDATES;
@@ -3545,58 +3796,58 @@ selector();
                 ?>
                 </p>
 
-                <p><em><?php echo _OR?></em></p>
+                <p><em><?php echo _OR ?></em></p>
 
                 <form method="post" action="index.php"><p>
                     <?php $manager->addTicketHidden() ?>
                     <input type="hidden" name="action" value="skinieimport" />
                     <input type="hidden" name="mode" value="url" />
-                    <label for="skinie_import_url"><?php echo _SKINIE_FROMURL?></label>
+                    <label for="skinie_import_url"><?php echo _SKINIE_FROMURL ?></label>
                     <input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />
-                    <input type="submit" value="<?php echo _SKINIE_BTN_IMPORT?>" />
+                    <input type="submit" value="<?php echo _SKINIE_BTN_IMPORT ?>" />
                 </p></form>
 
 
-        <h2><?php echo _SKINIE_TITLE_EXPORT?></h2>
+        <h2><?php echo _SKINIE_TITLE_EXPORT ?></h2>
         <form method="post" action="index.php"><div>
             <input type="hidden" name="action" value="skinieexport" />
             <?php $manager->addTicketHidden() ?>
 
-            <p><?php echo _SKINIE_EXPORT_INTRO?></p>
+            <p><?php echo _SKINIE_EXPORT_INTRO ?></p>
 
             <table><tr>
-                <th colspan="2"><?php echo _SKINIE_EXPORT_SKINS?></th>
+                <th colspan="2"><?php echo _SKINIE_EXPORT_SKINS ?></th>
             </tr><tr>
     <?php       // show list of skins
-        $res = sql_query('SELECT * FROM '.sql_table('skin_desc'));
-        while ($skinObj = sql_fetch_object($res)) {
-            $id = 'skinexp' . $skinObj->sdnumber;
-            echo '<td><input type="checkbox" name="skin[',$skinObj->sdnumber,']"  id="',$id,'" />';
-            echo '<label for="',$id,'">',Entity::hsc($skinObj->sdname),'</label></td>';
-            echo '<td>',Entity::hsc($skinObj->sddesc),'</td>';
+        $res = DB::getResult('SELECT * FROM '.sql_table('skin_desc'));
+        foreach ( $res as $row) {
+            $id = 'skinexp' . $row['sdnumber'];
+            echo '<td><input type="checkbox" name="skin[',$row['sdnumber'],']"  id="',$id,'" />';
+            echo '<label for="',$id,'">',Entity::hsc($row['sdname']),'</label></td>';
+            echo '<td>',Entity::hsc($row['sddesc']),'</td>';
             echo '</tr><tr>';
         }
 
         echo '<th colspan="2">',_SKINIE_EXPORT_TEMPLATES,'</th></tr><tr>';
 
         // show list of templates
-        $res = sql_query('SELECT * FROM '.sql_table('template_desc'));
-        while ($templateObj = sql_fetch_object($res)) {
-            $id = 'templateexp' . $templateObj->tdnumber;
-            echo '<td><input type="checkbox" name="template[',$templateObj->tdnumber,']" id="',$id,'" />';
-            echo '<label for="',$id,'">',Entity::hsc($templateObj->tdname),'</label></td>';
-            echo '<td>',Entity::hsc($templateObj->tddesc),'</td>';
+        $res = DB::getResult('SELECT * FROM '.sql_table('template_desc'));
+        foreach ( $res as $row ) {
+            $id = 'templateexp' . $row['tdnumber'];
+            echo '<td><input type="checkbox" name="template[',$row['tdnumber'],']" id="',$id,'" />';
+            echo '<label for="',$id,'">',Entity::hsc($row['tdname']),'</label></td>';
+            echo '<td>',Entity::hsc($row['tddesc']),'</td>';
             echo '</tr><tr>';
         }
 
     ?>
-                <th colspan="2"><?php echo _SKINIE_EXPORT_EXTRA?></th>
+                <th colspan="2"><?php echo _SKINIE_EXPORT_EXTRA ?></th>
             </tr><tr>
                 <td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>
             </tr><tr>
-                <th colspan="2"><?php echo _SKINIE_TITLE_EXPORT?></th>
+                <th colspan="2"><?php echo _SKINIE_TITLE_EXPORT ?></th>
             </tr><tr>
-                <td colspan="2"><input type="submit" value="<?php echo _SKINIE_BTN_EXPORT?>" /></td>
+                <td colspan="2"><input type="submit" value="<?php echo _SKINIE_BTN_EXPORT ?>" /></td>
             </tr></table>
         </div></form>
 
@@ -3647,18 +3898,18 @@ selector();
 
         echo '<p><a href="index.php?action=skinieoverview">(',_BACK,')</a></p>';
         ?>
-        <h2><?php echo _SKINIE_CONFIRM_TITLE?></h2>
+        <h2><?php echo _SKINIE_CONFIRM_TITLE ?></h2>
 
         <ul>
-            <li><p><strong><?php echo _SKINIE_INFO_GENERAL?></strong> <?php echo Entity::hsc($importer->getInfo())?></p></li>
-            <li><p><strong><?php echo _SKINIE_INFO_SKINS?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getSkinNames())?></p></li>
-            <li><p><strong><?php echo _SKINIE_INFO_TEMPLATES?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getTemplateNames())?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_GENERAL ?></strong> <?php echo Entity::hsc($importer->getInfo()) ?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_SKINS ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getSkinNames()) ?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_TEMPLATES ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getTemplateNames()) ?></p></li>
             <?php
                 if ($hasNameClashes)
                 {
             ?>
-            <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_SKINCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$skinNameClashes)?></p></li>
-            <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_TEMPLCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$templateNameClashes)?></p></li>
+            <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_SKINCLASH ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$skinNameClashes) ?></p></li>
+            <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_TEMPLCLASH ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$templateNameClashes) ?></p></li>
             <?php
                 } // if (hasNameClashes)
             ?>
@@ -3667,15 +3918,15 @@ selector();
         <form method="post" action="index.php"><div>
             <input type="hidden" name="action" value="skiniedoimport" />
             <?php $manager->addTicketHidden() ?>
-            <input type="hidden" name="skinfile" value="<?php echo Entity::hsc(postVar('skinfile'))?>" />
-            <input type="hidden" name="mode" value="<?php echo Entity::hsc($mode)?>" />
-            <input type="submit" value="<?php echo _SKINIE_CONFIRM_IMPORT?>" />
+            <input type="hidden" name="skinfile" value="<?php echo Entity::hsc(postVar('skinfile')) ?>" />
+            <input type="hidden" name="mode" value="<?php echo Entity::hsc($mode) ?>" />
+            <input type="submit" value="<?php echo _SKINIE_CONFIRM_IMPORT ?>" />
             <?php
                 if ($hasNameClashes)
                 {
             ?>
             <br />
-            <input type="checkbox" name="overwrite" value="1" id="cb_overwrite" /><label for="cb_overwrite"><?php echo _SKINIE_CONFIRM_OVERWRITE?></label>
+            <input type="checkbox" name="overwrite" value="1" id="cb_overwrite" /><label for="cb_overwrite"><?php echo _SKINIE_CONFIRM_OVERWRITE ?></label>
             <?php
                 } // if (hasNameClashes)
             ?>
@@ -3731,12 +3982,12 @@ selector();
 
         echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
     ?>
-        <h2><?php echo _SKINIE_DONE?></h2>
+        <h2><?php echo _SKINIE_DONE ?></h2>
 
         <ul>
-            <li><p><strong><?php echo _SKINIE_INFO_GENERAL?></strong> <?php echo Entity::hsc($importer->getInfo())?></p></li>
-            <li><p><strong><?php echo _SKINIE_INFO_IMPORTEDSKINS?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getSkinNames())?></p></li>
-            <li><p><strong><?php echo _SKINIE_INFO_IMPORTEDTEMPLS?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getTemplateNames())?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_GENERAL ?></strong> <?php echo Entity::hsc($importer->getInfo()) ?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_IMPORTEDSKINS ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getSkinNames()) ?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_IMPORTEDTEMPLS ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getTemplateNames()) ?></p></li>
         </ul>
 
     <?php       $this->pagefoot();
@@ -3805,14 +4056,14 @@ selector();
         <input name="action" value="templatenew" type="hidden" />
         <?php $manager->addTicketHidden() ?>
         <table><tr>
-            <td><?php echo _TEMPLATE_NAME?> <?php help('shortnames');?></td>
+            <td><?php echo _TEMPLATE_NAME ?> <?php help('shortnames'); ?></td>
             <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>
         </tr><tr>
-            <td><?php echo _TEMPLATE_DESC?></td>
+            <td><?php echo _TEMPLATE_DESC ?></td>
             <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>
         </tr><tr>
-            <td><?php echo _TEMPLATE_CREATE?></td>
-            <td><input type="submit" tabindex="10030" value="<?php echo _TEMPLATE_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
+            <td><?php echo _TEMPLATE_CREATE ?></td>
+            <td><input type="submit" tabindex="10030" value="<?php echo _TEMPLATE_CREATE_BTN ?>" onclick="return checkSubmit();" /></td>
         </tr></table>
 
         </div></form>
@@ -3832,7 +4083,7 @@ selector();
         $member->isAdmin() or $this->disallow();
 
         $extrahead = '<script type="text/javascript" src="javascript/templateEdit.js"></script>';
-        $extrahead .= '<script type="text/javascript">setTemplateEditText("'.sql_real_escape_string(_EDITTEMPLATE_EMPTY).'");</script>';
+        $extrahead .= '<script type="text/javascript">setTemplateEditText('.DB::quoteValue(_EDITTEMPLATE_EMPTY).');</script>';
 
         $this->pagehead($extrahead);
 
@@ -3842,15 +4093,15 @@ selector();
 
         ?>
         <p>
-        <a href="index.php?action=templateoverview">(<?php echo _TEMPLATE_BACK?>)</a>
+        <a href="index.php?action=templateoverview">(<?php echo _TEMPLATE_BACK ?>)</a>
         </p>
 
-        <h2><?php echo _TEMPLATE_EDIT_TITLE?> '<?php echo  Entity::hsc($templatename); ?>'</h2>
+        <h2><?php echo _TEMPLATE_EDIT_TITLE ?> '<?php echo  Entity::hsc($templatename); ?>'</h2>
 
         <?php                   if ($msg) echo "<p>"._MESSAGE.": $msg</p>";
         ?>
 
-        <p><?php echo _TEMPLATE_EDIT_MSG?></p>
+        <p><?php echo _TEMPLATE_EDIT_MSG ?></p>
 
         <form method="post" action="index.php">
         <div>
@@ -3860,23 +4111,23 @@ selector();
         <input type="hidden" name="templateid" value="<?php echo  $templateid; ?>" />
 
         <table><tr>
-            <th colspan="2"><?php echo _TEMPLATE_SETTINGS?></th>
+            <th colspan="2"><?php echo _TEMPLATE_SETTINGS ?></th>
         </tr><tr>
-            <td><?php echo _TEMPLATE_NAME?> <?php help('shortnames');?></td>
+            <td><?php echo _TEMPLATE_NAME ?> <?php help('shortnames'); ?></td>
             <td><input name="tname" tabindex="4" size="20" maxlength="20" value="<?php echo  Entity::hsc($templatename) ?>" /></td>
         </tr><tr>
-            <td><?php echo _TEMPLATE_DESC?></td>
+            <td><?php echo _TEMPLATE_DESC ?></td>
             <td><input name="tdesc" tabindex="5" size="50" maxlength="200" value="<?php echo  Entity::hsc($templatedescription) ?>" /></td>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_UPDATE?></th>
+            <th colspan="2"><?php echo _TEMPLATE_UPDATE ?></th>
         </tr><tr>
-            <td><?php echo _TEMPLATE_UPDATE?></td>
+            <td><?php echo _TEMPLATE_UPDATE ?></td>
             <td>
-                <input type="submit" tabindex="6" value="<?php echo _TEMPLATE_UPDATE_BTN?>" onclick="return checkSubmit();" />
-                <input type="reset" tabindex="7" value="<?php echo _TEMPLATE_RESET_BTN?>" />
+                <input type="submit" tabindex="6" value="<?php echo _TEMPLATE_UPDATE_BTN ?>" onclick="return checkSubmit();" />
+                <input type="reset" tabindex="7" value="<?php echo _TEMPLATE_RESET_BTN ?>" />
             </td>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_ITEMS?> <?php help('templateitems'); ?></th>
+            <th colspan="2"><?php echo _TEMPLATE_ITEMS ?> <?php help('templateitems'); ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_ITEMHEADER, 'ITEM_HEADER', '', 8);
     $this->_templateEditRow($template, _TEMPLATE_ITEMBODY, 'ITEM', '', 9, 1);
     $this->_templateEditRow($template, _TEMPLATE_ITEMFOOTER, 'ITEM_FOOTER', '', 10);
@@ -3885,7 +4136,7 @@ selector();
     $this->_templateEditRow($template, _TEMPLATE_NEW, 'NEW', 'new', 30);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_ANY?> <?php help('templatecomments'); ?></th>
+            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_ANY ?> <?php help('templatecomments'); ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_CHEADER, 'COMMENTS_HEADER', 'commentheaders', 40);
     $this->_templateEditRow($template, _TEMPLATE_CBODY, 'COMMENTS_BODY', 'commentbody', 50, 1);
     $this->_templateEditRow($template, _TEMPLATE_CFOOTER, 'COMMENTS_FOOTER', 'commentheaders', 60);
@@ -3895,34 +4146,34 @@ selector();
     $this->_templateEditRow($template, _TEMPLATE_CMEXTRA, 'COMMENTS_AUTH', 'memberextra', 100);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_NONE?> <?php help('templatecomments'); ?></th>
+            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_NONE ?> <?php help('templatecomments'); ?></th>
 <?php
     $this->_templateEditRow($template, _TEMPLATE_CNONE, 'COMMENTS_NONE', '', 110);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_TOOMUCH?> <?php help('templatecomments'); ?></th>
+            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_TOOMUCH ?> <?php help('templatecomments'); ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_CTOOMUCH, 'COMMENTS_TOOMUCH', '', 120);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_ARCHIVELIST?> <?php help('templatearchivelists'); ?></th>
+            <th colspan="2"><?php echo _TEMPLATE_ARCHIVELIST ?> <?php help('templatearchivelists'); ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_AHEADER, 'ARCHIVELIST_HEADER', '', 130);
     $this->_templateEditRow($template, _TEMPLATE_AITEM, 'ARCHIVELIST_LISTITEM', '', 140);
     $this->_templateEditRow($template, _TEMPLATE_AFOOTER, 'ARCHIVELIST_FOOTER', '', 150);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_BLOGLIST?> <?php help('templatebloglists'); ?></th>
+            <th colspan="2"><?php echo _TEMPLATE_BLOGLIST ?> <?php help('templatebloglists'); ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_BLOGHEADER, 'BLOGLIST_HEADER', '', 160);
     $this->_templateEditRow($template, _TEMPLATE_BLOGITEM, 'BLOGLIST_LISTITEM', '', 170);
     $this->_templateEditRow($template, _TEMPLATE_BLOGFOOTER, 'BLOGLIST_FOOTER', '', 180);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_CATEGORYLIST?> <?php help('templatecategorylists'); ?></th>
+            <th colspan="2"><?php echo _TEMPLATE_CATEGORYLIST ?> <?php help('templatecategorylists'); ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_CATHEADER, 'CATLIST_HEADER', '', 190);
     $this->_templateEditRow($template, _TEMPLATE_CATITEM, 'CATLIST_LISTITEM', '', 200);
     $this->_templateEditRow($template, _TEMPLATE_CATFOOTER, 'CATLIST_FOOTER', '', 210);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_DATETIME?></th>
+            <th colspan="2"><?php echo _TEMPLATE_DATETIME ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_DHEADER, 'DATE_HEADER', 'dateheads', 220);
     $this->_templateEditRow($template, _TEMPLATE_DFOOTER, 'DATE_FOOTER', 'dateheads', 230);
     $this->_templateEditRow($template, _TEMPLATE_DFORMAT, 'FORMAT_DATE', 'datetime', 240);
@@ -3930,18 +4181,18 @@ selector();
     $this->_templateEditRow($template, _TEMPLATE_LOCALE, 'LOCALE', 'locale', 260);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_IMAGE?> <?php help('templatepopups'); ?></th>
+            <th colspan="2"><?php echo _TEMPLATE_IMAGE ?> <?php help('templatepopups'); ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_PCODE, 'POPUP_CODE', '', 270);
     $this->_templateEditRow($template, _TEMPLATE_ICODE, 'IMAGE_CODE', '', 280);
     $this->_templateEditRow($template, _TEMPLATE_MCODE, 'MEDIA_CODE', '', 290);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_SEARCH?></th>
+            <th colspan="2"><?php echo _TEMPLATE_SEARCH ?></th>
 <?php  $this->_templateEditRow($template, _TEMPLATE_SHIGHLIGHT, 'SEARCH_HIGHLIGHT', 'highlight',300);
     $this->_templateEditRow($template, _TEMPLATE_SNOTFOUND, 'SEARCH_NOTHINGFOUND', 'nothingfound',310);
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_PLUGIN_FIELDS?></th>
+            <th colspan="2"><?php echo _TEMPLATE_PLUGIN_FIELDS ?></th>
 <?php
         $tab = 600;
         $pluginfields = array();
@@ -3956,12 +4207,12 @@ selector();
         }
 ?>
         </tr><tr>
-            <th colspan="2"><?php echo _TEMPLATE_UPDATE?></th>
+            <th colspan="2"><?php echo _TEMPLATE_UPDATE ?></th>
         </tr><tr>
-            <td><?php echo _TEMPLATE_UPDATE?></td>
+            <td><?php echo _TEMPLATE_UPDATE ?></td>
             <td>
-                <input type="submit" tabindex="800" value="<?php echo _TEMPLATE_UPDATE_BTN?>" onclick="return checkSubmit();" />
-                <input type="reset" tabindex="810" value="<?php echo _TEMPLATE_RESET_BTN?>" />
+                <input type="submit" tabindex="800" value="<?php echo _TEMPLATE_UPDATE_BTN ?>" onclick="return checkSubmit();" />
+                <input type="reset" tabindex="810" value="<?php echo _TEMPLATE_RESET_BTN ?>" />
             </td>
         </tr></table>
 
@@ -3979,8 +4230,8 @@ selector();
         if (!isset($template[$name])) $template[$name] = '';
     ?>
         </tr><tr>
-            <td><?php echo $description?> <?php if ($help) help('template'.$help); ?></td>
-            <td id="td<?php echo $count?>"><textarea class="templateedit" name="<?php echo $name?>" tabindex="<?php echo $tabindex?>" cols="50" rows="<?php echo $big?10:5?>" id="textarea<?php echo $count?>"><?php echo  Entity::hsc($template[$name]); ?></textarea></td>
+            <td><?php echo $description ?> <?php if ($help) help('template'.$help); ?></td>
+            <td id="td<?php echo $count ?>"><textarea class="templateedit" name="<?php echo $name ?>" tabindex="<?php echo $tabindex ?>" cols="50" rows="<?php echo $big?10:5 ?>" id="textarea<?php echo $count ?>"><?php echo  Entity::hsc($template[$name]); ?></textarea></td>
     <?php       $count++;
     }
 
@@ -4004,19 +4255,19 @@ selector();
             $this->error(_ERROR_DUPTEMPLATENAME);
 
 
-        $name = sql_real_escape_string($name);
-        $desc = sql_real_escape_string($desc);
+        $name = DB::quoteValue($name);
+        $desc = DB::quoteValue($desc);
 
         // 1. Remove all template parts
         $query = 'DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid;
-        sql_query($query);
+        DB::execute($query);
 
         // 2. Update description
         $query =  'UPDATE '.sql_table('template_desc').' SET'
-               . " tdname='" . $name . "',"
-               . " tddesc='" . $desc . "'"
-               . " WHERE tdnumber=" . $templateid;
-        sql_query($query);
+               . ' tdname=' . $name . ','
+               . ' tddesc=' . $desc
+               . ' WHERE tdnumber=' . $templateid;
+        DB::execute($query);
 
         // 3. Add non-empty template parts
         $this->addToTemplate($templateid, 'ITEM_HEADER', postVar('ITEM_HEADER'));
@@ -4084,13 +4335,17 @@ selector();
                        return -1;
                }
                
-               $partname = sql_real_escape_string($partname);
-               $content = sql_real_escape_string($content);
+               $partname = DB::quoteValue($partname);
+               $content = DB::quoteValue($content);
                
-               $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, '%s', '%s')";
+               $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, %s, %s)";
                $query = sprintf($query, sql_table('template'), (integer) $id, $partname, $content);
-               sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());
-               return sql_insert_id();
+               if ( DB::execute($query) === FALSE )
+               {
+                       $err = DB::getError();
+                       exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]);
+               }
+               return DB::getInsertId();
        }
        
     /**
@@ -4110,17 +4365,17 @@ selector();
         $desc = Template::getDesc($templateid);
 
         ?>
-            <h2><?php echo _DELETE_CONFIRM?></h2>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
 
             <p>
-            <?php echo _CONFIRMTXT_TEMPLATE?><b><?php echo Entity::hsc($name)?></b> (<?php echo  Entity::hsc($desc) ?>)
+            <?php echo _CONFIRMTXT_TEMPLATE ?><b><?php echo Entity::hsc($name) ?></b> (<?php echo  Entity::hsc($desc) ?>)
             </p>
 
             <form method="post" action="index.php"><div>
                 <input type="hidden" name="action" value="templatedeleteconfirm" />
                 <?php $manager->addTicketHidden() ?>
                 <input type="hidden" name="templateid" value="<?php echo  $templateid ?>" />
-                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
             </div></form>
         <?php
         $this->pagefoot();
@@ -4139,10 +4394,10 @@ selector();
         $manager->notify('PreDeleteTemplate', array('templateid' => $templateid));
 
         // 1. delete description
-        sql_query('DELETE FROM '.sql_table('template_desc').' WHERE tdnumber=' . $templateid);
+        DB::execute('DELETE FROM '.sql_table('template_desc').' WHERE tdnumber=' . $templateid);
 
         // 2. delete parts
-        sql_query('DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
+        DB::execute('DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
 
         $manager->notify('PostDeleteTemplate', array('templateid' => $templateid));
 
@@ -4200,61 +4455,69 @@ selector();
 
         // 3. create clone
         // go through parts of old template and add them to the new one
-        $res = sql_query('SELECT tpartname, tcontent FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
-        while ($o = sql_fetch_object($res)) {
-            $this->addToTemplate($newid, $o->tpartname, $o->tcontent);
+        $res = DB::getResult('SELECT tpartname, tcontent FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
+        foreach ( $res as $row ) {
+            $this->addToTemplate($newid, $row['tpartname'], $row['tcontent']);
         }
 
         $this->action_templateoverview();
     }
-
-    /**
-     * @todo document this
-     */
-    function action_skinoverview() {
-        global $member, $manager;
-
-        $member->isAdmin() or $this->disallow();
-
-        $this->pagehead();
-
-        echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
-
-        echo '<h2>' . _SKIN_EDIT_TITLE . '</h2>';
-
-        echo '<h3>' . _SKIN_AVAILABLE_TITLE . '</h3>';
-
-        $query = 'SELECT * FROM '.sql_table('skin_desc').' ORDER BY sdname';
-        $template['content'] = 'skinlist';
-        $template['tabindex'] = 10;
-        showlist($query,'table',$template);
-
-        echo '<h3>' . _SKIN_NEW_TITLE . '</h3>';
-
-        ?>
-        <form method="post" action="index.php">
-        <div>
-
-        <input name="action" value="skinnew" type="hidden" />
-        <?php $manager->addTicketHidden() ?>
-        <table><tr>
-            <td><?php echo _SKIN_NAME?> <?php help('shortnames');?></td>
-            <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>
-        </tr><tr>
-            <td><?php echo _SKIN_DESC?></td>
-            <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>
-        </tr><tr>
-            <td><?php echo _SKIN_CREATE?></td>
-            <td><input type="submit" tabindex="10030" value="<?php echo _SKIN_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
-        </tr></table>
-
-        </div>
-        </form>
-
-        <?php
-        $this->pagefoot();
-    }
-
+       
+       /**
+        * Admin::action_skinoverview()
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_skinoverview()
+       {
+               global $member, $manager;
+               
+               $member->isAdmin() or $this->disallow();
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=manage">(' . _BACKTOMANAGE . ")</a></p>\n";
+               echo '<h2>' . _SKIN_EDIT_TITLE . "</h2>\n";
+               echo '<h3>' . _SKIN_AVAILABLE_TITLE . "</h3>\n";
+               
+               $query = 'SELECT * FROM '.sql_table('skin_desc').' ORDER BY sdname;';
+               $template['content'] = 'skinlist';
+               $template['tabindex'] = 10;
+               
+               showlist($query,'table',$template);
+               
+               echo '<h3>' . _SKIN_NEW_TITLE . "</h3>\n";
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               echo "<input name=\"action\" value=\"skinnew\" type=\"hidden\" />\n";
+               
+               $manager->addTicketHidden() . "\n";
+               
+               echo "<table frame=\"box\" rules=\"all\" summary=\"skinoverview\">\n";
+               echo "<tr>\n";
+               echo "<td>" . _SKIN_NAME;
+               echo help('shortnames');
+               echo "</td>\n";
+               echo "<td><input name=\"name\" tabindex=\"10010\" maxlength=\"20\" size=\"20\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo "<td>" . _SKIN_DESC . "</td>\n";
+               echo "<td><input name=\"desc\" tabindex=\"10020\" maxlength=\"200\" size=\"50\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _SKIN_CREATE . "</td>\n";
+               echo '<td><input type="submit" tabindex="10030" value="' . _SKIN_CREATE_BTN . '" onclick="return checkSubmit();" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</table>\n";
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               $this->pagefoot();
+               return;
+       }
+       
     /**
      * @todo document this
      */
@@ -4269,105 +4532,138 @@ selector();
         if (!isValidSkinName($name))
             $this->error(_ERROR_BADSKINNAME);
 
-        if (SKIN::exists($name))
+        if (Skin::exists($name))
             $this->error(_ERROR_DUPSKINNAME);
 
-        $newId = SKIN::createNew($name, $desc);
+        $newId = Skin::createNew($name, $desc);
 
         $this->action_skinoverview();
     }
 
-    /**
-     * @todo document this
-     */
-    function action_skinedit() {
-        global $member, $manager;
-
-        $skinid = intRequestVar('skinid');
-
-        $member->isAdmin() or $this->disallow();
-
-        $skin = new SKIN($skinid);
-
-        $this->pagehead();
-        ?>
-        <p>
-            <a href="index.php?action=skinoverview">(<?php echo _SKIN_BACK?>)</a>
-        </p>
-        <h2><?php echo _SKIN_EDITONE_TITLE?> '<?php echo  $skin->getName() ?>'</h2>
-
-        <h3><?php echo _SKIN_PARTS_TITLE?></h3>
-        <?php echo _SKIN_PARTS_MSG?>
-        <ul>
-            <li><a tabindex="10" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=index"><?php echo _SKIN_PART_MAIN?></a> <?php help('skinpartindex')?></li>
-            <li><a tabindex="20" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=item"><?php echo _SKIN_PART_ITEM?></a> <?php help('skinpartitem')?></li>
-            <li><a tabindex="30" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=archivelist"><?php echo _SKIN_PART_ALIST?></a> <?php help('skinpartarchivelist')?></li>
-            <li><a tabindex="40" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=archive"><?php echo _SKIN_PART_ARCHIVE?></a> <?php help('skinpartarchive')?></li>
-            <li><a tabindex="50" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=search"><?php echo _SKIN_PART_SEARCH?></a> <?php help('skinpartsearch')?></li>
-            <li><a tabindex="60" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=error"><?php echo _SKIN_PART_ERROR?></a> <?php help('skinparterror')?></li>
-            <li><a tabindex="70" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=member"><?php echo _SKIN_PART_MEMBER?></a> <?php help('skinpartmember')?></li>
-            <li><a tabindex="75" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=imagepopup"><?php echo _SKIN_PART_POPUP?></a> <?php help('skinpartimagepopup')?></li>
-        </ul>
-
-        <?php
-
-        $query = "SELECT stype FROM " . sql_table('skin') . " WHERE stype NOT IN ('index', 'item', 'error', 'search', 'archive', 'archivelist', 'imagepopup', 'member') and sdesc = " . $skinid;
-        $res = sql_query($query);
-
-        echo '<h3>' . _SKIN_PARTS_SPECIAL . '</h3>';
-        echo '<form method="get" action="index.php">' . "\r\n";
-        echo '<input type="hidden" name="action" value="skinedittype" />' . "\r\n";
-        echo '<input type="hidden" name="skinid" value="' . $skinid . '" />' . "\r\n";
-        echo '<input name="type" tabindex="89" size="20" maxlength="20" />' . "\r\n";
-        echo '<input type="submit" tabindex="140" value="' . _SKIN_CREATE . '" onclick="return checkSubmit();" />' . "\r\n";
-        echo '</form>' . "\r\n";
-
-        if ($res && sql_num_rows($res) > 0) {
-            echo '<ul>';
-            $tabstart = 75;
-
-            while ($row = sql_fetch_assoc($res)) {
-                echo '<li><a tabindex="' . ($tabstart++) . '" href="index.php?action=skinedittype&amp;skinid=' . $skinid . '&amp;type=' . Entity::hsc(strtolower($row['stype'])) . '">' . Entity::hsc(ucfirst($row['stype'])) . '</a> (<a tabindex="' . ($tabstart++) . '" href="index.php?action=skinremovetype&amp;skinid=' . $skinid . '&amp;type=' . Entity::hsc(strtolower($row['stype'])) . '">remove</a>)</li>';
-            }
-
-            echo '</ul>';
-        }
-
-        ?>
-
-        <h3><?php echo _SKIN_GENSETTINGS_TITLE; ?></h3>
-        <form method="post" action="index.php">
-        <div>
-
-        <input type="hidden" name="action" value="skineditgeneral" />
-        <?php $manager->addTicketHidden() ?>
-        <input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />
-        <table><tr>
-            <td><?php echo _SKIN_NAME?> <?php help('shortnames');?></td>
-            <td><input name="name" tabindex="90" value="<?php echo  Entity::hsc($skin->getName()) ?>" maxlength="20" size="20" /></td>
-        </tr><tr>
-            <td><?php echo _SKIN_DESC?></td>
-            <td><input name="desc" tabindex="100" value="<?php echo  Entity::hsc($skin->getDescription()) ?>" maxlength="200" size="50" /></td>
-        </tr><tr>
-            <td><?php echo _SKIN_TYPE?></td>
-            <td><input name="type" tabindex="110" value="<?php echo  Entity::hsc($skin->getContentType()) ?>" maxlength="40" size="20" /></td>
-        </tr><tr>
-            <td><?php echo _SKIN_INCLUDE_MODE?> <?php help('includemode')?></td>
-            <td><?php $this->input_yesno('inc_mode',$skin->getIncludeMode(),120,'skindir','normal',_PARSER_INCMODE_SKINDIR,_PARSER_INCMODE_NORMAL);?></td>
-        </tr><tr>
-            <td><?php echo _SKIN_INCLUDE_PREFIX?> <?php help('includeprefix')?></td>
-            <td><input name="inc_prefix" tabindex="130" value="<?php echo  Entity::hsc($skin->getIncludePrefix()) ?>" maxlength="40" size="20" /></td>
-        </tr><tr>
-            <td><?php echo _SKIN_CHANGE?></td>
-            <td><input type="submit" tabindex="140" value="<?php echo _SKIN_CHANGE_BTN?>" onclick="return checkSubmit();" /></td>
-        </tr></table>
-
-        </div>
-        </form>
-
-
-        <?php       $this->pagefoot();
-    }
+       /**
+        * Admin::action_skinedit()
+        * @param       void
+        * @return      void
+        */
+       public function action_skinedit()
+       {
+               global $member, $manager;
+               
+               $skinid = intRequestVar('skinid');
+               
+               $member->isAdmin() or $this->disallow();
+               
+               $skin = new SKIN($skinid);
+               $default_skin_types = $skin->getDefaultTypes();
+               $available_skin_types = $skin->getAvailableTypes();
+               
+               $this->pagehead();
+               
+               echo "<p>";
+               echo '( <a href="index.php?action=skinoverview">' . _SKIN_BACK . "</a> )";
+               echo "</p>\n";
+               echo '<h2>' . _SKIN_EDITONE_TITLE . $skin->getName() . "</h2>\n";
+               
+               echo '<h3>' . _SKIN_PARTS_TITLE . "</h3>\n";
+               echo _SKIN_PARTS_MSG . "\n";
+               echo "<ul>\n";
+               
+               $tabindex = 10;
+               foreach ( $default_skin_types as $type => $friendly_name )
+               {
+                       echo "<li>\n";
+                       echo "<a tabindex=\"{$tabindex}\" href=\"index.php?action=skinedittype&amp;skinid={$skinid}&amp;type={$type}\">";
+                       echo $friendly_name;
+                       echo "</a>\n";
+                       help("skinpart{$type}");
+                       echo "</li>\n";
+                       $tabindex++;
+               }
+               echo "</ul>\n";
+               
+               echo '<h3>' . _SKIN_PARTS_SPECIAL . '</h3>';
+               echo "<form method=\"get\" action=\"index.php\">\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"skinedittype\" />\n";
+               echo "<input type=\"hidden\" name=\"skinid\" value=\"{$skinid}\" />\n";
+               echo "<input type=\"text\" name=\"type\" tabindex=\"89\" size=\"20\" maxlength=\"20\" />\n";
+               echo '<input type="submit" tabindex="140" value="' . _SKIN_CREATE . "\" onclick=\"return checkSubmit();\" />\n";
+               echo "</form>\n";
+               
+               /* NOTE: special skin parts has FALSE in its value */
+               if ( in_array(FALSE, array_values($available_skin_types)) )
+               {
+                       $tabstart = 75;
+                       
+                       echo '<ul>';
+                       foreach ( $available_skin_types as $type => $friendly_name )
+                       {
+                               if ( !$friendly_name )
+                               {
+                                       $tabstart++;
+                                       echo "<li>\n";
+                                       echo "<a tabindex=\"{$tabstart}\" href=\"index.php?action=skinedittype&amp;skinid={$skinid}&amp;type=" . Entity::hsc(strtolower($type)) . '">';
+                                       echo Entity::hsc(ucfirst($type));
+                                       echo "</a>\n";
+                                       $tabstart++;
+                                       echo "(<a tabindex=\"{$tabstart}\" href=\"index.php?action=skinremovetype&amp;skinid={$skinid}&amp;type=" . Entity::hsc(strtolower($type)) . '">';
+                                       echo _LISTS_DELETE;
+                                       echo "</a>)\n";
+                                       echo "</li>\n";
+                               }
+                       }
+                       echo '</ul>';
+               }
+               
+               echo '<h3>' . _SKIN_GENSETTINGS_TITLE . "</h3>\n";
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"skineditgeneral\" />\n";
+               $manager->addTicketHidden() . "\n";
+               echo "<input type=\"hidden\" name=\"skinid\" value=\"{$skinid}\" />\n";
+               
+               echo '<table frame="box" rules="all" summary="' . _SKIN_GENSETTINGS_TITLE . '">' . "\n";
+               echo "<tr>\n";
+               echo '<td>';
+               echo _SKIN_NAME;
+               help('shortnames');
+               echo "</td>\n";
+               echo '<td><input type="text" name="name" tabindex="90" value="' . Entity::hsc($skin->getName()) . '" maxlength="20" size="20" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _SKIN_DESC . "</td>\n";
+               echo '<td><input type="text" name="desc" tabindex="100" value="' . Entity::hsc($skin->getDescription()) . '" maxlength="200" size="50" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _SKIN_TYPE . "</td>\n";
+               echo '<td><input type="text" name="type" tabindex="110" value="' . Entity::hsc($skin->getContentType()) . '" maxlength="40" size="20" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>';
+               echo _SKIN_INCLUDE_MODE;
+               help('includemode');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('inc_mode', $skin->getIncludeMode(), 120, 'skindir', 'normal', _PARSER_INCMODE_SKINDIR, _PARSER_INCMODE_NORMAL);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>';
+               echo _SKIN_INCLUDE_PREFIX;
+               help('includeprefix');
+               echo "</td>\n";
+               echo '<td><input type="text" name="inc_prefix" tabindex="130" value="' . Entity::hsc($skin->getIncludePrefix()) . '" maxlength="40" size="20" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _SKIN_CHANGE . "</td>\n";
+               echo '<td><input type="submit" tabindex="140" value="' . _SKIN_CHANGE_BTN . '" onclick="return checkSubmit();" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</table>\n";
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               $this->pagefoot();
+               return;
+       }
 
     /**
      * @todo document this
@@ -4391,7 +4687,7 @@ selector();
         if (!isValidSkinName($name))
             $this->error(_ERROR_BADSKINNAME);
 
-        if (($skin->getName() != $name) && SKIN::exists($name))
+        if (($skin->getName() != $name) && Skin::exists($name))
             $this->error(_ERROR_DUPSKINNAME);
 
         if (!$type) $type = 'text/html';
@@ -4404,87 +4700,126 @@ selector();
 
     }
 
-    /**
-     * @todo document this
-     */
-    function action_skinedittype($msg = '') {
-        global $member, $manager;
-
-        $skinid = intRequestVar('skinid');
-        $type = requestVar('type');
-
-        $member->isAdmin() or $this->disallow();
-
-        $type = trim($type);
-        $type = strtolower($type);
-
-        if (!isValidShortName($type)) {
-            $this->error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);
-        }
-
-        $skin = new SKIN($skinid);
-
-        $friendlyNames = SKIN::getFriendlyNames();
-
-        $this->pagehead();
-        ?>
-        <p>(<a href="index.php?action=skinoverview"><?php echo _SKIN_GOBACK?></a>)</p>
-
-        <h2><?php echo _SKIN_EDITPART_TITLE?> '<?php echo Entity::hsc($skin->getName()) ?>': <?php echo Entity::hsc(isset($friendlyNames[$type]) ? $friendlyNames[$type] : ucfirst($type)); ?></h2>
-
-        <?php           if ($msg) echo "<p>"._MESSAGE.": $msg</p>";
-        ?>
-
-
-        <form method="post" action="index.php">
-        <div>
-
-        <input type="hidden" name="action" value="skinupdate" />
-        <?php $manager->addTicketHidden() ?>
-        <input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />
-        <input type="hidden" name="type" value="<?php echo  $type ?>" />
-
-        <input type="submit" value="<?php echo _SKIN_UPDATE_BTN?>" onclick="return checkSubmit();" />
-        <input type="reset" value="<?php echo _SKIN_RESET_BTN?>" />
-        (skin type: <?php echo Entity::hsc(isset($friendlyNames[$type]) ? $friendlyNames[$type] : ucfirst($type)); ?>)
-        <?php if (in_array($type, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup'))) {
-            help('skinpart' . $type);
-        } else {
-            help('skinpartspecial');
-        }?>
-        <br />
-
-        <textarea class="skinedit" tabindex="10" rows="20" cols="80" name="content"><?php echo  Entity::hsc($skin->getContent($type)) ?></textarea>
-
-        <br />
-        <input type="submit" tabindex="20" value="<?php echo _SKIN_UPDATE_BTN?>" onclick="return checkSubmit();" />
-        <input type="reset" value="<?php echo _SKIN_RESET_BTN?>" />
-        (skin type: <?php echo Entity::hsc(isset($friendlyNames[$type]) ? $friendlyNames[$type] : ucfirst($type)); ?>)
-
-        <br /><br />
-        <?php echo _SKIN_ALLOWEDVARS?>
-        <?php           $actions = SKIN::getAllowedActionsForType($type);
-
-            sort($actions);
-
-            while ($current = array_shift($actions)) {
-                // skip deprecated vars
-                if ($current == 'ifcat') continue;
-                if ($current == 'imagetext') continue;
-                if ($current == 'vars') continue;
-
-                echo helplink('skinvar-' . $current) . "$current</a>";
-                if (count($actions) != 0) echo ", ";
-            }
-        echo '<br /><br />' . _SKINEDIT_ALLOWEDBLOGS;
-        $query = 'SELECT bshortname, bname FROM '.sql_table('blog');
-        showlist($query,'table',array('content'=>'shortblognames'));
-        echo '<br />' . _SKINEDIT_ALLOWEDTEMPLATESS;
-        $query = 'SELECT tdname as name, tddesc as description FROM '.sql_table('template_desc');
-        showlist($query,'table',array('content'=>'shortnames'));
-        echo '</div></form>';
-        $this->pagefoot();
-    }
+       /**
+        * Admin::action_skinedittype()
+        * 
+        * @param       string  $msg    message for pageheader
+        * @return      void
+        */
+       public function action_skinedittype($msg = '')
+       {
+               global $member, $manager;
+               
+               $skinid = intRequestVar('skinid');
+               $type = requestVar('type');
+               
+               $member->isAdmin() or $this->disallow();
+               
+               $type = trim($type);
+               $type = strtolower($type);
+               
+               if ( !isValidShortName($type) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);
+               }
+               
+               $skin = new SKIN($skinid);
+               $skin_types = $skin->getAvailableTypes();
+               if ( !array_key_exists($type, $skin_types) || !$skin_types[$type] )
+               {
+                       $friendlyName = ucfirst($type);
+               }
+               else
+               {
+                       $friendlyName = $skin_types[$type];
+               }
+               
+               $this->pagehead();
+               
+               echo '<p>(<a href="index.php?action=skinoverview">' . _SKIN_GOBACK . "</a>)</p>\n";
+               
+               echo '<h2>' . _SKIN_EDITPART_TITLE . " '" . Entity::hsc($skin->getName()) . "': " . Entity::hsc($friendlyName) . "</h2>\n";
+               
+               if ( $msg != '')
+               {
+                       echo "<p>" . _MESSAGE . ": $msg</p>\n";
+               }
+               
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               
+               echo "<input type=\"hidden\" name=\"action\" value=\"skinupdate\" />\n";
+               $manager->addTicketHidden() . "\n";
+               echo "<input type=\"hidden\" name=\"skinid\" value=\"{$skinid}\" />\n";
+               echo "<input type=\"hidden\" name=\"type\" value=\"{$type}\" />\n";
+               
+               echo '<input type="submit" value="' . _SKIN_UPDATE_BTN . '" onclick="return checkSubmit();" />' . "\n";
+               echo '<input type="reset" value="' . _SKIN_RESET_BTN . '" />' . "\n";
+               echo '(skin type: ' . Entity::hsc($friendlyName) . ")\n";
+               
+               if ( !array_key_exists($type, $skin_types) || !$skin_types[$type] )
+               {
+                       help('skinpartspecial');
+               }
+               else
+               {
+                       help('skinpart' . $type);
+               }
+               echo "<br />\n";
+               
+               echo "<textarea class=\"skinedit\" tabindex=\"10\" rows=\"20\" cols=\"80\" name=\"content\">\n";
+               echo Entity::hsc($skin->getContent($type)) . "\n";
+               echo "</textarea>\n";
+               
+               echo "<br />\n";
+               echo '<input type="submit" tabindex="20" value="' . _SKIN_UPDATE_BTN . '" onclick="return checkSubmit();" />' . "\n";
+               echo '<input type="reset" value="' . _SKIN_RESET_BTN . '" />' . "\n";
+               echo '(skin type: ' . Entity::hsc($friendlyName) . ")\n";
+               
+               echo "<br />\n";
+               echo "<br />\n";
+               echo _SKIN_ALLOWEDVARS;
+               
+               $actions = $skin->getAllowedActionsForType($type);
+               
+               sort($actions);
+               
+               while ( $current = array_shift($actions) )
+               {
+                       // skip deprecated vars
+                       if ( in_array($current, array('ifcat', 'imagetext', 'vars')) )
+                       {
+                               continue;
+                       }
+                       
+                       echo helplink("skinvar-{$current}") . "{$current}</a>\n";
+                       
+                       if ( count($actions) != 0 )
+                       {
+                               echo ", ";
+                       }
+               }
+               
+               echo "<br />\n";
+               echo "<br />\n";
+               echo _SKINEDIT_ALLOWEDBLOGS;
+               
+               $query = 'SELECT bshortname, bname FROM '.sql_table('blog');
+               showlist($query, 'table', array('content'=>'shortblognames'));
+               
+               echo "<br />\n";
+               echo _SKINEDIT_ALLOWEDTEMPLATESS;
+               
+               $query = 'SELECT tdname as name, tddesc as description FROM '.sql_table('template_desc');
+               showlist($query, 'table', array('content'=>'shortnames'));
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               $this->pagefoot();
+               
+               return;
+       }
 
     /**
      * @todo document this
@@ -4520,9 +4855,9 @@ selector();
 
         // don't allow deletion of default skins for blogs
         $query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;
-        $r = sql_query($query);
-        if ($o = sql_fetch_object($r))
-            $this->error(_ERROR_SKINDEFDELETE . Entity::hsc($o->bname));
+        $r = DB::getValue($query);
+        if ( $r )
+            $this->error(_ERROR_SKINDEFDELETE . Entity::hsc($r));
 
         $this->pagehead();
 
@@ -4531,17 +4866,17 @@ selector();
         $desc = $skin->getDescription();
 
         ?>
-            <h2><?php echo _DELETE_CONFIRM?></h2>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
 
             <p>
-                <?php echo _CONFIRMTXT_SKIN?><b><?php echo Entity::hsc($name) ?></b> (<?php echo  Entity::hsc($desc)?>)
+                <?php echo _CONFIRMTXT_SKIN ?><b><?php echo Entity::hsc($name) ?></b> (<?php echo  Entity::hsc($desc) ?>)
             </p>
 
             <form method="post" action="index.php"><div>
                 <input type="hidden" name="action" value="skindeleteconfirm" />
                 <?php $manager->addTicketHidden() ?>
                 <input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />
-                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
             </div></form>
         <?php
         $this->pagefoot();
@@ -4563,97 +4898,126 @@ selector();
 
         // don't allow deletion of default skins for blogs
         $query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;
-        $r = sql_query($query);
-        if ($o = sql_fetch_object($r))
-            $this->error(_ERROR_SKINDEFDELETE .$o->bname);
+        $r = DB::getValue($query);
+        if ($r)
+            $this->error(_ERROR_SKINDEFDELETE .$r);
 
         $manager->notify('PreDeleteSkin', array('skinid' => $skinid));
 
         // 1. delete description
-        sql_query('DELETE FROM '.sql_table('skin_desc').' WHERE sdnumber=' . $skinid);
+        DB::execute('DELETE FROM '.sql_table('skin_desc').' WHERE sdnumber=' . $skinid);
 
         // 2. delete parts
-        sql_query('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid);
+        DB::execute('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid);
 
         $manager->notify('PostDeleteSkin', array('skinid' => $skinid));
 
         $this->action_skinoverview();
     }
-
-    /**
-     * @todo document this
-     */
-    function action_skinremovetype() {
-        global $member, $manager, $CONF;
-
-        $skinid = intRequestVar('skinid');
-        $skintype = requestVar('type');
-
-        if (!isValidShortName($skintype)) {
-            $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
-        }
-
-        $member->isAdmin() or $this->disallow();
-
-        // don't allow default skinparts to be deleted
-        if (in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup'))) {
-            $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
-        }
-
-        $this->pagehead();
-
-        $skin = new SKIN($skinid);
-        $name = $skin->getName();
-        $desc = $skin->getDescription();
-
-        ?>
-            <h2><?php echo _DELETE_CONFIRM?></h2>
-
-            <p>
-                <?php echo _CONFIRMTXT_SKIN_PARTS_SPECIAL; ?> <b><?php echo Entity::hsc($skintype); ?> (<?php echo Entity::hsc($name); ?>)</b> (<?php echo  Entity::hsc($desc)?>)
-            </p>
-
-            <form method="post" action="index.php"><div>
-                <input type="hidden" name="action" value="skinremovetypeconfirm" />
-                <?php $manager->addTicketHidden() ?>
-                <input type="hidden" name="skinid" value="<?php echo $skinid; ?>" />
-                <input type="hidden" name="type" value="<?php echo Entity::hsc($skintype); ?>" />
-                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
-            </div></form>
-        <?php
-        $this->pagefoot();
-    }
-
-    /**
-     * @todo document this
-     */
-    function action_skinremovetypeconfirm() {
-        global $member, $CONF, $manager;
-
-        $skinid = intRequestVar('skinid');
-        $skintype = requestVar('type');
-
-        if (!isValidShortName($skintype)) {
-            $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
-        }
-
-        $member->isAdmin() or $this->disallow();
-
-        // don't allow default skinparts to be deleted
-        if (in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup'))) {
-            $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
-        }
-
-        $manager->notify('PreDeleteSkinPart', array('skinid' => $skinid, 'skintype' => $skintype));
-
-        // delete part
-        sql_query('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid . ' AND stype=\'' . $skintype . '\'');
-
-        $manager->notify('PostDeleteSkinPart', array('skinid' => $skinid, 'skintype' => $skintype));
-
-        $this->action_skinedit();
-    }
-
+       
+       /**
+        * Admin::action_skinremovetype()
+        *
+        * @param       void
+        * @return      void
+        */
+       public function action_skinremovetype()
+       {
+               global $member, $manager, $CONF;
+               
+               $skinid = intRequestVar('skinid');
+               $skintype = requestVar('type');
+               
+               if ( !isValidShortName($skintype) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+               }
+               
+               $member->isAdmin() or $this->disallow();
+               
+               // don't allow default skinparts to be deleted
+               $skin = new Skin($skinid);
+               $default_skin_types = $skin->getDefaultTypes();
+               if ( array_key_exists($skintype, $default_skin_types) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+               }
+               
+               $name = $skin->getName();
+               $desc = $skin->getDescription();
+               
+               $this->pagehead();
+               
+               echo '<h2>' . _DELETE_CONFIRM . "</h2>\n";
+               echo "<p>\n";
+               echo _CONFIRMTXT_SKIN_PARTS_SPECIAL;
+               echo Entity::hsc($skintype);
+               echo  '(' . Entity::hsc($name) . ')</b>';
+               echo ' (' . Entity::hsc($desc) . ')';
+               echo "</p>\n";
+               
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"skinremovetypeconfirm\" />\n";
+               $manager->addTicketHidden();
+               echo "<input type=\"hidden\" name=\"skinid\" value=\"{$skinid}\" />\n";
+               echo '<input type="hidden" name="type" value="' . Entity::hsc($skintype) . '" />' . "\n";
+               echo '<input type="submit" tabindex="10" value="' . _DELETE_CONFIRM_BTN . '" />' . "\n";
+               echo "</div>\n";
+               echo "</form>\n";
+               $this->pagefoot();
+               return;
+       }
+       
+       /**
+        * Admin::action_skinremovetypeconfirm()
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_skinremovetypeconfirm()
+       {
+               global $member, $CONF, $manager;
+               
+               $skinid = intRequestVar('skinid');
+               $skintype = requestVar('type');
+               
+               if ( !isValidShortName($skintype) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+               }
+               
+               $member->isAdmin() or $this->disallow();
+               
+               // don't allow default skinparts to be deleted
+               $skin = new Skin($skinid);
+               $default_skin_types = $skin->getDefaultTypes();
+               if ( array_key_exists($skintype, $default_skin_types) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+               }
+               
+               $data = array(
+                       'skinid'        => $skinid,
+                       'skintype'      => $skintype
+               );
+               $manager->notify('PreDeleteSkinPart', $data);
+               
+               // delete part
+               $query = "DELETE FROM %s WHERE sdesc=%d AND stype='%s';";
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid, $skintype);
+               DB::execute($query);
+               
+               $data = array(
+                       'skinid'        => $skinid,
+                       'skintype'      => $skintype
+               );
+               $manager->notify('PostDeleteSkinPart', $data);
+               
+               $this->action_skinedit();
+               return;
+       }
+       
     /**
      * @todo document this
      */
@@ -4670,38 +5034,25 @@ selector();
         $name = "clone_" . $skin->getName();
 
         // if a skin with that name already exists:
-        if (SKIN::exists($name)) {
+        if (Skin::exists($name)) {
             $i = 1;
-            while (SKIN::exists($name . $i))
+            while (Skin::exists($name . $i))
                 $i++;
             $name .= $i;
         }
 
         // 2. create skin desc
-        $newid = SKIN::createNew(
+        $newid = Skin::createNew(
             $name,
             $skin->getDescription(),
             $skin->getContentType(),
             $skin->getIncludeMode(),
             $skin->getIncludePrefix()
         );
-
-
-        // 3. clone
-        /*
-        $this->skinclonetype($skin, $newid, 'index');
-        $this->skinclonetype($skin, $newid, 'item');
-        $this->skinclonetype($skin, $newid, 'archivelist');
-        $this->skinclonetype($skin, $newid, 'archive');
-        $this->skinclonetype($skin, $newid, 'search');
-        $this->skinclonetype($skin, $newid, 'error');
-        $this->skinclonetype($skin, $newid, 'member');
-        $this->skinclonetype($skin, $newid, 'imagepopup');
-        */
-
+        
         $query = "SELECT stype FROM " . sql_table('skin') . " WHERE sdesc = " . $skinid;
-        $res = sql_query($query);
-        while ($row = sql_fetch_assoc($res)) {
+        $res = DB::getResult($query);
+        foreach ( $res as $row) {
             $this->skinclonetype($skin, $newid, $row['stype']);
         }
 
@@ -4726,7 +5077,7 @@ selector();
                {
                        $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, '%s', '%s')";
                        $query = sprintf($query, sql_table('skin'), (integer) $newid, $content, $type);
-                       sql_query($query);
+                       DB::execute($query);
                }
                return;
        }
@@ -4747,7 +5098,7 @@ selector();
                echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
                ?>
 
-               <h2><?php echo _SETTINGS_TITLE?></h2>
+               <h2><?php echo _SETTINGS_TITLE ?></h2>
 
                <form action="index.php" method="post">
                <div>
@@ -4756,9 +5107,9 @@ selector();
                <?php $manager->addTicketHidden() ?>
 
                <table><tr>
-                       <th colspan="2"><?php echo _SETTINGS_SUB_GENERAL?></th>
+                       <th colspan="2"><?php echo _SETTINGS_SUB_GENERAL ?></th>
                </tr><tr>
-                       <td><?php echo _SETTINGS_DEFBLOG?> <?php help('defaultblog'); ?></td>
+                       <td><?php echo _SETTINGS_DEFBLOG ?> <?php help('defaultblog'); ?></td>
                        <td>
                                <?php
                                        $query =  'SELECT bname as text, bnumber as value'
@@ -4770,7 +5121,7 @@ selector();
                                ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_BASESKIN?> <?php help('baseskin'); ?></td>
+                       <td><?php echo _SETTINGS_BASESKIN ?> <?php help('baseskin'); ?></td>
                        <td>
                                <?php
                                        $query =  'SELECT sdname as text, sdnumber as value'
@@ -4782,28 +5133,28 @@ selector();
                                ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_ADMINMAIL?></td>
+                       <td><?php echo _SETTINGS_ADMINMAIL ?></td>
                        <td><input name="AdminEmail" tabindex="10010" size="40" value="<?php echo  Entity::hsc($CONF['AdminEmail']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_SITENAME?></td>
+                       <td><?php echo _SETTINGS_SITENAME ?></td>
                        <td><input name="SiteName" tabindex="10020" size="40" value="<?php echo  Entity::hsc($CONF['SiteName']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_SITEURL?></td>
+                       <td><?php echo _SETTINGS_SITEURL ?></td>
                        <td><input name="IndexURL" tabindex="10030" size="40" value="<?php echo  Entity::hsc($CONF['IndexURL']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_ADMINURL?></td>
+                       <td><?php echo _SETTINGS_ADMINURL ?></td>
                        <td><input name="AdminURL" tabindex="10040" size="40" value="<?php echo  Entity::hsc($CONF['AdminURL']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_PLUGINURL?> <?php help('pluginurl');?></td>
+                       <td><?php echo _SETTINGS_PLUGINURL ?> <?php help('pluginurl'); ?></td>
                        <td><input name="PluginURL" tabindex="10045" size="40" value="<?php echo  Entity::hsc($CONF['PluginURL']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_SKINSURL?> <?php help('skinsurl');?></td>
+                       <td><?php echo _SETTINGS_SKINSURL ?> <?php help('skinsurl'); ?></td>
                        <td><input name="SkinsURL" tabindex="10046" size="40" value="<?php echo  Entity::hsc($CONF['SkinsURL']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_ACTIONSURL?> <?php help('actionurl');?></td>
+                       <td><?php echo _SETTINGS_ACTIONSURL ?> <?php help('actionurl'); ?></td>
                        <td><input name="ActionURL" tabindex="10047" size="40" value="<?php echo  Entity::hsc($CONF['ActionURL']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_LOCALE?> <?php help('locale'); ?>
+                       <td><?php echo _SETTINGS_LOCALE ?> <?php help('locale'); ?>
                        </td>
                        <td>
                                <select name="Locale" tabindex="10050">
@@ -4838,19 +5189,19 @@ selector();
 
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_DISABLESITE?> <?php help('disablesite'); ?>
+                       <td><?php echo _SETTINGS_DISABLESITE ?> <?php help('disablesite'); ?>
                        </td>
                        <td><?php $this->input_yesno('DisableSite',$CONF['DisableSite'],10060); ?>
                                        <br />
-                               <?php echo _SETTINGS_DISABLESITEURL ?> <input name="DisableSiteURL" tabindex="10070" size="40" value="<?php echo  Entity::hsc($CONF['DisableSiteURL'])?>" />
+                               <?php echo _SETTINGS_DISABLESITEURL ?> <input name="DisableSiteURL" tabindex="10070" size="40" value="<?php echo  Entity::hsc($CONF['DisableSiteURL']) ?>" />
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_DIRS?></td>
+                       <td><?php echo _SETTINGS_DIRS ?></td>
                        <td><?php echo  Entity::hsc($DIR_NUCLEUS) ?>
-                               <i><?php echo _SETTINGS_SEECONFIGPHP?></i></td>
+                               <i><?php echo _SETTINGS_SEECONFIGPHP ?></i></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_DBLOGIN?></td>
-                       <td><i><?php echo _SETTINGS_SEECONFIGPHP?></i></td>
+                       <td><?php echo _SETTINGS_DBLOGIN ?></td>
+                       <td><i><?php echo _SETTINGS_SEECONFIGPHP ?></i></td>
                </tr><tr>
                        <td>
                        <?php
@@ -4867,7 +5218,7 @@ selector();
                                */
                           ?>
                        </td>
-                       <td><?php /* $this->input_yesno('DisableJsTools',$CONF['DisableJsTools'],10075); */?>
+                       <td><?php /* $this->input_yesno('DisableJsTools',$CONF['DisableJsTools'],10075); */ ?>
                                <select name="DisableJsTools" tabindex="10075">
                        <?php                              $extra = ($CONF['DisableJsTools'] == 1) ? 'selected="selected"' : '';
                                        echo "<option $extra value='1'>",_SETTINGS_JSTOOLBAR_NONE,"</option>";
@@ -4879,7 +5230,7 @@ selector();
                                </select>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_URLMODE?> <?php help('urlmode');?></td>
+                       <td><?php echo _SETTINGS_URLMODE ?> <?php help('urlmode'); ?></td>
                                           <td><?php
 
                                           $this->input_yesno('URLMode',$CONF['URLMode'],10077,
@@ -4891,7 +5242,7 @@ selector();
 
                                           </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_DEBUGVARS?> <?php help('debugvars');?></td>
+                       <td><?php echo _SETTINGS_DEBUGVARS ?> <?php help('debugvars'); ?></td>
                                           <td><?php
 
                                                $this->input_yesno('DebugVars',$CONF['DebugVars'],10078);
@@ -4900,18 +5251,18 @@ selector();
 
                                           </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_DEFAULTLISTSIZE?> <?php help('defaultlistsize');?></td>
+                       <td><?php echo _SETTINGS_DEFAULTLISTSIZE ?> <?php help('defaultlistsize'); ?></td>
                        <td>
                        <?php
                                if (!array_key_exists('DefaultListSize',$CONF)) {
-                                       sql_query("INSERT INTO ".sql_table('config')." VALUES ('DefaultListSize', '10')");
+                                       DB::execute("INSERT INTO ".sql_table('config')." VALUES ('DefaultListSize', '10')");
                                        $CONF['DefaultListSize'] = 10;
                                }
                        ?>
                                <input name="DefaultListSize" tabindex="10079" size="40" value="<?php echo  Entity::hsc((intval($CONF['DefaultListSize']) < 1 ? '10' : $CONF['DefaultListSize'])) ?>" />
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_ADMINCSS?> 
+                       <td><?php echo _SETTINGS_ADMINCSS ?> 
                        </td>
                        <td>
 
@@ -4951,11 +5302,11 @@ selector();
 
                        </td>
                </tr><tr>
-                       <th colspan="2"><?php echo _SETTINGS_MEDIA?> <?php help('media'); ?></th>
+                       <th colspan="2"><?php echo _SETTINGS_MEDIA ?> <?php help('media'); ?></th>
                </tr><tr>
-                       <td><?php echo _SETTINGS_MEDIADIR?></td>
+                       <td><?php echo _SETTINGS_MEDIADIR ?></td>
                        <td><?php echo  Entity::hsc($DIR_MEDIA) ?>
-                               <i><?php echo _SETTINGS_SEECONFIGPHP?></i>
+                               <i><?php echo _SETTINGS_SEECONFIGPHP ?></i>
                                <?php                              if (!is_dir($DIR_MEDIA))
                                                echo "<br /><b>" . _WARNING_NOTADIR . "</b>";
                                        if (!is_readable($DIR_MEDIA))
@@ -4965,58 +5316,58 @@ selector();
                                ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_MEDIAURL?></td>
+                       <td><?php echo _SETTINGS_MEDIAURL ?></td>
                        <td>
                                <input name="MediaURL" tabindex="10090" size="40" value="<?php echo  Entity::hsc($CONF['MediaURL']) ?>" />
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_ALLOWUPLOAD?></td>
+                       <td><?php echo _SETTINGS_ALLOWUPLOAD ?></td>
                        <td><?php $this->input_yesno('AllowUpload',$CONF['AllowUpload'],10090); ?></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_ALLOWUPLOADTYPES?></td>
+                       <td><?php echo _SETTINGS_ALLOWUPLOADTYPES ?></td>
                        <td>
                                <input name="AllowedTypes" tabindex="10100" size="40" value="<?php echo  Entity::hsc($CONF['AllowedTypes']) ?>" />
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_MAXUPLOADSIZE?></td>
+                       <td><?php echo _SETTINGS_MAXUPLOADSIZE ?></td>
                        <td>
                                <input name="MaxUploadSize" tabindex="10105" size="40" value="<?php echo  Entity::hsc($CONF['MaxUploadSize']) ?>" />
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_MEDIAPREFIX?></td>
+                       <td><?php echo _SETTINGS_MEDIAPREFIX ?></td>
                        <td><?php $this->input_yesno('MediaPrefix',$CONF['MediaPrefix'],10110); ?></td>
 
                </tr><tr>
-                       <th colspan="2"><?php echo _SETTINGS_MEMBERS?></th>
+                       <th colspan="2"><?php echo _SETTINGS_MEMBERS ?></th>
                </tr><tr>
-                       <td><?php echo _SETTINGS_CHANGELOGIN?></td>
+                       <td><?php echo _SETTINGS_CHANGELOGIN ?></td>
                        <td><?php $this->input_yesno('AllowLoginEdit',$CONF['AllowLoginEdit'],10120); ?></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_ALLOWCREATE?>
+                       <td><?php echo _SETTINGS_ALLOWCREATE ?>
                                <?php help('allowaccountcreation'); ?>
                        </td>
                        <td><?php $this->input_yesno('AllowMemberCreate',$CONF['AllowMemberCreate'],10130); ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_NEWLOGIN?> <?php help('allownewmemberlogin'); ?>
-                               <br /><?php echo _SETTINGS_NEWLOGIN2?>
+                       <td><?php echo _SETTINGS_NEWLOGIN ?> <?php help('allownewmemberlogin'); ?>
+                               <br /><?php echo _SETTINGS_NEWLOGIN2 ?>
                        </td>
                        <td><?php $this->input_yesno('NewMemberCanLogon',$CONF['NewMemberCanLogon'],10140); ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_MEMBERMSGS?>
+                       <td><?php echo _SETTINGS_MEMBERMSGS ?>
                                <?php help('messageservice'); ?>
                        </td>
                        <td><?php $this->input_yesno('AllowMemberMail',$CONF['AllowMemberMail'],10150); ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_NONMEMBERMSGS?>
+                       <td><?php echo _SETTINGS_NONMEMBERMSGS ?>
                                <?php help('messageservice'); ?>
                        </td>
                        <td><?php $this->input_yesno('NonmemberMail',$CONF['NonmemberMail'],10155); ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_PROTECTMEMNAMES?>
+                       <td><?php echo _SETTINGS_PROTECTMEMNAMES ?>
                                <?php help('protectmemnames'); ?>
                        </td>
                        <td><?php $this->input_yesno('ProtectMemNames',$CONF['ProtectMemNames'],10156); ?>
@@ -5025,35 +5376,35 @@ selector();
 
 
                </tr><tr>
-                       <th colspan="2"><?php echo _SETTINGS_COOKIES_TITLE?> <?php help('cookies'); ?></th>
+                       <th colspan="2"><?php echo _SETTINGS_COOKIES_TITLE ?> <?php help('cookies'); ?></th>
                </tr><tr>
-                       <td><?php echo _SETTINGS_COOKIEPREFIX?></td>
-                       <td><input name="CookiePrefix" tabindex="10159" size="40" value="<?php echo  Entity::hsc($CONF['CookiePrefix'])?>" /></td>
+                       <td><?php echo _SETTINGS_COOKIEPREFIX ?></td>
+                       <td><input name="CookiePrefix" tabindex="10159" size="40" value="<?php echo  Entity::hsc($CONF['CookiePrefix']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_COOKIEDOMAIN?></td>
-                       <td><input name="CookieDomain" tabindex="10160" size="40" value="<?php echo  Entity::hsc($CONF['CookieDomain'])?>" /></td>
+                       <td><?php echo _SETTINGS_COOKIEDOMAIN ?></td>
+                       <td><input name="CookieDomain" tabindex="10160" size="40" value="<?php echo  Entity::hsc($CONF['CookieDomain']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_COOKIEPATH?></td>
-                       <td><input name="CookiePath" tabindex="10170" size="40" value="<?php echo  Entity::hsc($CONF['CookiePath'])?>" /></td>
+                       <td><?php echo _SETTINGS_COOKIEPATH ?></td>
+                       <td><input name="CookiePath" tabindex="10170" size="40" value="<?php echo  Entity::hsc($CONF['CookiePath']) ?>" /></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_COOKIESECURE?></td>
+                       <td><?php echo _SETTINGS_COOKIESECURE ?></td>
                        <td><?php $this->input_yesno('CookieSecure',$CONF['CookieSecure'],10180); ?></td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_COOKIELIFE?></td>
+                       <td><?php echo _SETTINGS_COOKIELIFE ?></td>
                        <td><?php $this->input_yesno('SessionCookie',$CONF['SessionCookie'],10190,
                                                          1,0,_SETTINGS_COOKIESESSION,_SETTINGS_COOKIEMONTH); ?>
                        </td>
                </tr><tr>
-                       <td><?php echo _SETTINGS_LASTVISIT?></td>
+                       <td><?php echo _SETTINGS_LASTVISIT ?></td>
                        <td><?php $this->input_yesno('LastVisit',$CONF['LastVisit'],10200); ?></td>
 
 
 
                </tr><tr>
-                       <th colspan="2"><?php echo _SETTINGS_UPDATE?></th>
+                       <th colspan="2"><?php echo _SETTINGS_UPDATE ?></th>
                </tr><tr>
-                       <td><?php echo _SETTINGS_UPDATE?></td>
-                       <td><input type="submit" tabindex="10210" value="<?php echo _SETTINGS_UPDATE_BTN?>" onclick="return checkSubmit();" /></td>
+                       <td><?php echo _SETTINGS_UPDATE ?></td>
+                       <td><input type="submit" tabindex="10210" value="<?php echo _SETTINGS_UPDATE_BTN ?>" onclick="return checkSubmit();" /></td>
                </tr></table>
 
                </div>
@@ -5166,7 +5517,7 @@ selector();
                        echo "</tr>\n";
                        echo "<tr>\n";
                        echo '<td>' . _ADMIN_SYSTEMOVERVIEW_MYSQLVERSION . "</td>\n";
-                       echo '<td>' . sql_get_server_info() . ' (' . sql_get_client_info() . ')' . "</td>\n";
+                       echo '<td>' . DB::getAttribute(PDO::ATTR_SERVER_VERSION) . ' (' . DB::getAttribute(PDO::ATTR_CLIENT_VERSION) . ')' . "</td>\n";
                        echo "</tr>\n";
                        echo "</tbody>\n";
                        echo "</table>\n\n";
@@ -5330,13 +5681,17 @@ selector();
         */
        function updateConfig($name, $val)
        {
-               $name = sql_real_escape_string($name);
-               $val = trim(sql_real_escape_string($val));
+               $name = DB::quoteValue($name);
+               $val = DB::quoteValue(trim($val));
                
-               $query = "UPDATE %s SET value='%s' WHERE name='%s'";
+               $query = "UPDATE %s SET value=%s WHERE name=%s";
                $query = sprintf($query, sql_table('config'), $val, $name);
-               sql_query($query) or die("Query error: " . sql_error());
-               return sql_insert_id();
+               if ( DB::execute($query) === FALSE )
+               {
+                       $err = DB::getError();
+                       die("Query error: " . $err[2]);
+               }
+               return DB::getInsertId();
        }
        
        /**
@@ -5388,7 +5743,7 @@ selector();
                $baseUrl = Entity::hsc($CONF['AdminURL']);
                if ( !array_key_exists('AdminCSS',$CONF) )
                {
-                       sql_query("INSERT INTO ".sql_table('config')." VALUES ('AdminCSS', 'original')");
+                       DB::execute("INSERT INTO ".sql_table('config')." VALUES ('AdminCSS', 'original')");
                        $CONF['AdminCSS'] = 'original';
                }
                
@@ -5723,8 +6078,8 @@ selector();
         $url = $manager->addTicketToUrl('index.php?action=clearactionlog');
 
         ?>
-            <h2><?php echo _ACTIONLOG_CLEAR_TITLE?></h2>
-            <p><a href="<?php echo Entity::hsc($url)?>"><?php echo _ACTIONLOG_CLEAR_TEXT?></a></p>
+            <h2><?php echo _ACTIONLOG_CLEAR_TITLE ?></h2>
+            <p><a href="<?php echo Entity::hsc($url) ?>"><?php echo _ACTIONLOG_CLEAR_TEXT ?></a></p>
         <?php
         echo '<h2>' . _ACTIONLOG_TITLE . '</h2>';
 
@@ -5785,33 +6140,33 @@ selector();
 
         $this->pagehead();
         ?>
-            <h2><?php echo _BAN_REMOVE_TITLE?></h2>
+            <h2><?php echo _BAN_REMOVE_TITLE ?></h2>
 
             <form method="post" action="index.php">
 
-            <h3><?php echo _BAN_IPRANGE?></h3>
+            <h3><?php echo _BAN_IPRANGE ?></h3>
 
             <p>
-                <?php echo _CONFIRMTXT_BAN?> <?php echo Entity::hsc($iprange) ?>
-                <input name="iprange" type="hidden" value="<?php echo Entity::hsc($iprange)?>" />
+                <?php echo _CONFIRMTXT_BAN ?> <?php echo Entity::hsc($iprange) ?>
+                <input name="iprange" type="hidden" value="<?php echo Entity::hsc($iprange) ?>" />
             </p>
 
-            <h3><?php echo _BAN_BLOGS?></h3>
+            <h3><?php echo _BAN_BLOGS ?></h3>
 
             <div>
-                <input type="hidden" name="blogid" value="<?php echo $blogid?>" />
+                <input type="hidden" name="blogid" value="<?php echo $blogid ?>" />
                 <input name="allblogs" type="radio" value="0" id="allblogs_one" />
                 <label for="allblogs_one"><?php echo sprintf(_BAN_BANBLOGNAME, $banBlogName) ?></label>
                 <br />
-                <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS?></label>
+                <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS ?></label>
             </div>
 
-            <h3><?php echo _BAN_DELETE_TITLE?></h3>
+            <h3><?php echo _BAN_DELETE_TITLE ?></h3>
 
             <div>
                 <?php $manager->addTicketHidden() ?>
                 <input type="hidden" name="action" value="banlistdeleteconfirm" />
-                <input type="submit" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+                <input type="submit" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
             </div>
 
             </form>
@@ -5889,14 +6244,14 @@ selector();
 
         $this->pagehead();
         ?>
-        <h2><?php echo _BAN_ADD_TITLE?></h2>
+        <h2><?php echo _BAN_ADD_TITLE ?></h2>
 
 
         <form method="post" action="index.php">
 
-        <h3><?php echo _BAN_IPRANGE?></h3>
+        <h3><?php echo _BAN_IPRANGE ?></h3>
 
-        <p><?php echo _BAN_IPRANGE_TEXT?></p>
+        <p><?php echo _BAN_IPRANGE_TEXT ?></p>
 
         <div class="note">
             <strong><?php echo _BAN_EXAMPLE_TITLE ?></strong>
@@ -5922,29 +6277,29 @@ selector();
         ?>
         </div>
 
-        <h3><?php echo _BAN_BLOGS?></h3>
+        <h3><?php echo _BAN_BLOGS ?></h3>
 
-        <p><?php echo _BAN_BLOGS_TEXT?></p>
+        <p><?php echo _BAN_BLOGS_TEXT ?></p>
 
         <div>
-            <input type="hidden" name="blogid" value="<?php echo $blogid?>" />
-            <input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">'<?php echo Entity::hsc($blog->getName())?>'</label>
+            <input type="hidden" name="blogid" value="<?php echo $blogid ?>" />
+            <input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">'<?php echo Entity::hsc($blog->getName()) ?>'</label>
             <br />
-            <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS?></label>
+            <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS ?></label>
         </div>
 
-        <h3><?php echo _BAN_REASON_TITLE?></h3>
+        <h3><?php echo _BAN_REASON_TITLE ?></h3>
 
-        <p><?php echo _BAN_REASON_TEXT?></p>
+        <p><?php echo _BAN_REASON_TEXT ?></p>
 
         <div><textarea name="reason" cols="40" rows="5"></textarea></div>
 
-        <h3><?php echo _BAN_ADD_TITLE?></h3>
+        <h3><?php echo _BAN_ADD_TITLE ?></h3>
 
         <div>
             <input name="action" type="hidden" value="banlistadd" />
             <?php $manager->addTicketHidden() ?>
-            <input type="submit" value="<?php echo _BAN_ADD_BTN?>" />
+            <input type="submit" value="<?php echo _BAN_ADD_BTN ?>" />
         </div>
 
         </form>
@@ -6013,41 +6368,41 @@ selector();
 
         echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
         ?>
-        <h2><?php echo _BACKUPS_TITLE?></h2>
+        <h2><?php echo _BACKUPS_TITLE ?></h2>
 
-        <h3><?php echo _BACKUP_TITLE?></h3>
+        <h3><?php echo _BACKUP_TITLE ?></h3>
 
-        <p><?php echo _BACKUP_INTRO?></p>
+        <p><?php echo _BACKUP_INTRO ?></p>
 
         <form method="post" action="index.php"><p>
         <input type="hidden" name="action" value="backupcreate" />
         <?php $manager->addTicketHidden() ?>
 
-        <input type="radio" name="gzip" value="1" checked="checked" id="gzip_yes" tabindex="10" /><label for="gzip_yes"><?php echo _BACKUP_ZIP_YES?></label>
+        <input type="radio" name="gzip" value="1" checked="checked" id="gzip_yes" tabindex="10" /><label for="gzip_yes"><?php echo _BACKUP_ZIP_YES ?></label>
         <br />
-        <input type="radio" name="gzip" value="0" id="gzip_no" tabindex="10" /><label for="gzip_no" ><?php echo _BACKUP_ZIP_NO?></label>
+        <input type="radio" name="gzip" value="0" id="gzip_no" tabindex="10" /><label for="gzip_no" ><?php echo _BACKUP_ZIP_NO ?></label>
         <br /><br />
-        <input type="submit" value="<?php echo _BACKUP_BTN?>" tabindex="20" />
+        <input type="submit" value="<?php echo _BACKUP_BTN ?>" tabindex="20" />
 
         </p></form>
 
-        <div class="note"><?php echo _BACKUP_NOTE?></div>
+        <div class="note"><?php echo _BACKUP_NOTE ?></div>
 
 
-        <h3><?php echo _RESTORE_TITLE?></h3>
+        <h3><?php echo _RESTORE_TITLE ?></h3>
 
-        <div class="note"><?php echo _RESTORE_NOTE?></div>
+        <div class="note"><?php echo _RESTORE_NOTE ?></div>
 
-        <p><?php echo _RESTORE_INTRO?></p>
+        <p><?php echo _RESTORE_INTRO ?></p>
 
         <form method="post" action="index.php" enctype="multipart/form-data"><p>
             <input type="hidden" name="action" value="backuprestore" />
             <?php $manager->addTicketHidden() ?>
             <input name="backup_file" type="file" tabindex="30" />
             <br /><br />
-            <input type="submit" value="<?php echo _RESTORE_BTN?>" tabindex="40" />
-            <br /><input type="checkbox" name="letsgo" value="1" id="letsgo" tabindex="50" /><label for="letsgo"><?php echo _RESTORE_IMSURE?></label>
-            <br /><?php echo _RESTORE_WARNING?>
+            <input type="submit" value="<?php echo _RESTORE_BTN ?>" tabindex="40" />
+            <br /><input type="checkbox" name="letsgo" value="1" id="letsgo" tabindex="50" /><label for="letsgo"><?php echo _RESTORE_IMSURE ?></label>
+            <br /><?php echo _RESTORE_WARNING ?>
         </p></form>
 
         <?php       $this->pagefoot();
@@ -6167,11 +6522,11 @@ selector();
                                $name = $matches[1];
                                
                                // only show in list when not yet installed
-                               $query = 'SELECT * FROM %s WHERE pfile = "NP_%s"';
-                               $query = sprintf($query, sql_table('plugin'), sql_real_escape_string($name));
-                               $res = sql_query($query);
+                               $query = 'SELECT * FROM %s WHERE pfile = %s';
+                               $query = sprintf($query, sql_table('plugin'), DB::quoteValue('NP_'.$name));
+                               $res = DB::getResult($query);
                                
-                               if ( sql_num_rows($res) == 0 )
+                               if ( $res->rowCount() == 0 )
                                {
                                        array_push($candidates, $name);
                                }
@@ -6272,8 +6627,8 @@ selector();
                }
                
                // get number of currently installed plugins
-               $res = sql_query('SELECT * FROM '.sql_table('plugin'));
-               $numCurrent = sql_num_rows($res);
+               $res = DB::getResult('SELECT * FROM '.sql_table('plugin'));
+               $numCurrent = $res->rowCount();
                
                // plugin will be added as last one in the list
                $newOrder = $numCurrent + 1;
@@ -6286,9 +6641,9 @@ selector();
                );
                
                // do this before calling getPlugin (in case the plugin id is used there)
-               $query = 'INSERT INTO '.sql_table('plugin').' (porder, pfile) VALUES ('.$newOrder.',"'.sql_real_escape_string($name).'")';
-               sql_query($query);
-               $iPid = sql_insert_id();
+               $query = 'INSERT INTO '.sql_table('plugin').' (porder, pfile) VALUES ('.$newOrder.','.DB::quoteValue($name).')';
+               DB::execute($query);
+               $iPid = DB::getInsertId();
                
                $manager->clearCachedInfo('installedPlugins');
                
@@ -6298,7 +6653,7 @@ selector();
                // check if it got loaded (could have failed)
                if ( !$plugin )
                {
-                       sql_query('DELETE FROM ' . sql_table('plugin') . ' WHERE pid='. intval($iPid));
+                       DB::execute('DELETE FROM ' . sql_table('plugin') . ' WHERE pid='. intval($iPid));
                        $manager->clearCachedInfo('installedPlugins');
                        $this->error(_ERROR_PLUGIN_LOAD);
                }
@@ -6326,8 +6681,8 @@ selector();
                $pluginList = $plugin->getPluginDep();
                foreach ( $pluginList as $pluginName )
                {
-                       $res = sql_query('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile="' . $pluginName . '"');
-                       if (sql_num_rows($res) == 0)
+                       $res = DB::getResult('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile=' . DB::quoteValue($pluginName));
+                       if ($res->rowCount() == 0)
                        {
                                // uninstall plugin again...
                                $this->deleteOnePlugin($plugin->getID());
@@ -6365,22 +6720,22 @@ selector();
                $member->isAdmin() or $this->disallow();
                
                // delete everything from plugin_events
-               sql_query('DELETE FROM '.sql_table('plugin_event'));
+               DB::execute('DELETE FROM '.sql_table('plugin_event'));
                
                // loop over all installed plugins
-               $res = sql_query('SELECT pid, pfile FROM '.sql_table('plugin'));
-               while ( $o = sql_fetch_object($res) )
+               $res = DB::getResult('SELECT pid, pfile FROM '.sql_table('plugin'));
+               foreach ( $res as $row )
                {
-                       $pid = $o->pid;
-                       $plug =& $manager->getPlugin($o->pfile);
+                       $pid = $row['pid'];
+                       $plug =& $manager->getPlugin($row['pfile']);
                        if ( $plug )
                        {
                                $eventList = $plug->getEventList();
                                foreach ( $eventList as $eventName )
                                {
-                                       $query = "INSERT INTO %s (pid, event) VALUES (%d, '%s')";
-                                       $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, sql_real_escape_string($eventName));
-                                       sql_query($query);
+                                       $query = "INSERT INTO %s (pid, event) VALUES (%d, %s)";
+                                       $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, DB::quoteValue($eventName));
+                                       DB::execute($query);
                                }
                        }
                }
@@ -6404,15 +6759,15 @@ selector();
 
         $this->pagehead();
         ?>
-            <h2><?php echo _DELETE_CONFIRM?></h2>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
 
-            <p><?php echo _CONFIRMTXT_PLUGIN?> <strong><?php echo getPluginNameFromPid($pid)?></strong>?</p>
+            <p><?php echo _CONFIRMTXT_PLUGIN ?> <strong><?php echo getPluginNameFromPid($pid) ?></strong>?</p>
 
             <form method="post" action="index.php"><div>
             <?php $manager->addTicketHidden() ?>
             <input type="hidden" name="action" value="plugindeleteconfirm" />
             <input type="hidden" name="plugid" value="<?php echo $pid; ?>" />
-            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
             </div></form>
         <?php
         $this->pagefoot();
@@ -6449,7 +6804,7 @@ selector();
         if (!$manager->pidInstalled($pid))
             return _ERROR_NOSUCHPLUGIN;
 
-        $name = quickQuery('SELECT pfile as result FROM '.sql_table('plugin').' WHERE pid='.$pid);
+        $name = DB::getValue('SELECT pfile as result FROM '.sql_table('plugin').' WHERE pid='.$pid);
 
 /*             // call the unInstall method of the plugin
         if ($callUninstall) {
@@ -6458,9 +6813,9 @@ selector();
         }*/
 
         // check dependency before delete
-        $res = sql_query('SELECT pfile FROM '.sql_table('plugin'));
-        while($o = sql_fetch_object($res)) {
-            $plug =& $manager->getPlugin($o->pfile);
+        $res = DB::getResult('SELECT pfile FROM '.sql_table('plugin'));
+        foreach ( $res as $row ) {
+            $plug =& $manager->getPlugin($row['pfile']);
             if ($plug)
             {
                 $depList = $plug->getPluginDep();
@@ -6468,7 +6823,7 @@ selector();
                 {
                     if ($name == $depName)
                     {
-                        return sprintf(_ERROR_DELREQPLUGIN, $o->pfile);
+                        return sprintf(_ERROR_DELREQPLUGIN, $row['pfile']);
                     }
                 }
             }
@@ -6483,28 +6838,27 @@ selector();
         }
 
         // delete all subscriptions
-        sql_query('DELETE FROM '.sql_table('plugin_event').' WHERE pid=' . $pid);
+        DB::execute('DELETE FROM '.sql_table('plugin_event').' WHERE pid=' . $pid);
 
         // delete all options
         // get OIDs from plugin_option_desc
-        $res = sql_query('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);
+        $res = DB::getResult('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);
         $aOIDs = array();
-        while ($o = sql_fetch_object($res)) {
-            array_push($aOIDs, $o->oid);
+        foreach ( $res as $row ) {
+            array_push($aOIDs, $row['oid']);
         }
 
         // delete from plugin_option and plugin_option_desc
-        sql_query('DELETE FROM '.sql_table('plugin_option_desc').' WHERE opid=' . $pid);
+        DB::execute('DELETE FROM '.sql_table('plugin_option_desc').' WHERE opid=' . $pid);
         if (count($aOIDs) > 0)
-            sql_query('DELETE FROM '.sql_table('plugin_option').' WHERE oid in ('.implode(',',$aOIDs).')');
+            DB::execute('DELETE FROM '.sql_table('plugin_option').' WHERE oid in ('.implode(',',$aOIDs).')');
 
         // update order numbers
-        $res = sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid=' . $pid);
-        $o = sql_fetch_object($res);
-        sql_query('UPDATE '.sql_table('plugin').' SET porder=(porder - 1) WHERE porder>'.$o->porder);
+        $res = DB::getValue('SELECT porder FROM '.sql_table('plugin').' WHERE pid=' . $pid);
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder=(porder - 1) WHERE porder>'.$res);
 
         // delete row
-        sql_query('DELETE FROM '.sql_table('plugin').' WHERE pid='.$pid);
+        DB::execute('DELETE FROM '.sql_table('plugin').' WHERE pid='.$pid);
 
         $manager->clearCachedInfo('installedPlugins');
         $manager->notify('PostDeletePlugin', array('plugid' => $pid));
@@ -6527,16 +6881,14 @@ selector();
             $this->error(_ERROR_NOSUCHPLUGIN);
 
         // 1. get old order number
-        $res = sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid);
-        $o = sql_fetch_object($res);
-        $oldOrder = $o->porder;
+        $oldOrder = DB::getValue('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid);
 
         // 2. calculate new order number
         $newOrder = ($oldOrder > 1) ? ($oldOrder - 1) : 1;
 
         // 3. update plug numbers
-        sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);
-        sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);
 
         //$this->action_pluginlist();
         // To avoid showing ticket in the URL, redirect to pluginlist, instead.
@@ -6557,19 +6909,17 @@ selector();
             $this->error(_ERROR_NOSUCHPLUGIN);
 
         // 1. get old order number
-        $res = sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid);
-        $o = sql_fetch_object($res);
-        $oldOrder = $o->porder;
+        $oldOrder = DB::getValue('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid);
 
-        $res = sql_query('SELECT * FROM '.sql_table('plugin'));
-        $maxOrder = sql_num_rows($res);
+        $res = DB::getResult('SELECT * FROM '.sql_table('plugin'));
+        $maxOrder = $res->rowCount();
 
         // 2. calculate new order number
         $newOrder = ($oldOrder < $maxOrder) ? ($oldOrder + 1) : $maxOrder;
 
         // 3. update plug numbers
-        sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);
-        sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);
 
         //$this->action_pluginlist();
         // To avoid showing ticket in the URL, redirect to pluginlist, instead.
@@ -6624,17 +6974,17 @@ selector();
                $aOIDs = array();
                $query = "SELECT * FROM %s WHERE ocontext='global' and opid=%d ORDER BY oid ASC";
                $query = sprintf($query, sql_table('plugin_option_desc'), $pid);
-               $result = sql_query($query);
-               while ( $object = sql_fetch_object($result) )
-               {
-                       array_push($aOIDs, $object->oid);
-                       $aOptions[$object->oid] = array(
-                                               'oid' => $object->oid,
-                                               'value' => $object->odef,
-                                               'name' => $object->oname,
-                                               'description' => $object->odesc,
-                                               'type' => $object->otype,
-                                               'typeinfo' => $object->oextra,
+               $result = DB::getResult($query);
+               foreach ( $result as $row )
+               {
+                       array_push($aOIDs, $row['oid']);
+                       $aOptions[$row['oid']] = array(
+                                               'oid' => $row['oid'],
+                                               'value' => $row['odef'],
+                                               'name' => $row['oname'],
+                                               'description' => $row['odesc'],
+                                               'type' => $row['otype'],
+                                               'typeinfo' => $row['oextra'],
                                                'contextid' => 0
                        );
                }
@@ -6643,10 +6993,10 @@ selector();
                {
                        $query = "SELECT oid, ovalue FROM %s WHERE oid in (%s)";
                        $query = sprintf($query, sql_table('plugin_option'), implode(',',$aOIDs));
-                       $result = sql_query($query);
-                       while ( $object = sql_fetch_object($result) )
+                       $result = DB::getResult($query);
+                       foreach ( $result as $row )
                        {
-                               $aOptions[$object->oid]['value'] = $object->ovalue;
+                               $aOptions[$row['oid']]['value'] = $row['ovalue'];
                        }
                }
                
@@ -6713,37 +7063,37 @@ selector();
                // get all current values for this contextid
                // (note: this might contain doubles for overlapping contextids)
                $aIdToValue = array();
-               $res = sql_query('SELECT oid, ovalue FROM ' . sql_table('plugin_option') . ' WHERE ocontextid=' . intval($contextid));
-               while ( $object = sql_fetch_object($res) )
+               $res = DB::getResult('SELECT oid, ovalue FROM ' . sql_table('plugin_option') . ' WHERE ocontextid=' . intval($contextid));
+               foreach ( $res as $row )
                {
-                       $aIdToValue[$object->oid] = $object->ovalue;
+                       $aIdToValue[$row['oid']] = $row['ovalue'];
                }
                
                // get list of oids per pid
                $query = 'SELECT * FROM ' . sql_table('plugin_option_desc') . ',' . sql_table('plugin')
-                          . ' WHERE opid=pid and ocontext=\''.sql_real_escape_string($context).'\' ORDER BY porder, oid ASC';
-               $res = sql_query($query);
+                          . ' WHERE opid=pid and ocontext='.DB::quoteValue($context).' ORDER BY porder, oid ASC';
+               $res = DB::getResult($query);
                $aOptions = array();
-               while ( $object = sql_fetch_object($res) )
+               foreach ( $res as $row )
                {
-                       if (in_array($object->oid, array_keys($aIdToValue)))
+                       if (in_array($row['oid'], array_keys($aIdToValue)))
                        {
-                               $value = $aIdToValue[$object->oid];
+                               $value = $aIdToValue[$row['oid']];
                        }
                        else
                        {
-                               $value = $object->odef;
+                               $value = $row['odef'];
                        }
                        
                        array_push($aOptions, array(
-                               'pid' => $object->pid,
-                               'pfile' => $object->pfile,
-                               'oid' => $object->oid,
+                               'pid' => $row['pid'],
+                               'pfile' => $row['pfile'],
+                               'oid' => $row['oid'],
                                'value' => $value,
-                               'name' => $object->oname,
-                               'description' => $object->odesc,
-                               'type' => $object->otype,
-                               'typeinfo' => $object->oextra,
+                               'name' => $row['oname'],
+                               'description' => $row['odesc'],
+                               'type' => $row['otype'],
+                               'typeinfo' => $row['oextra'],
                                'contextid' => $contextid,
                                'extra' => ''));
                }