Changeset 3604

Timestamp:

07/05/07 17:26:31 (2 years ago)

Author:

inureyes

Message:

#428

• '그거' 했습니다. 묵념.
• variable $owner, Table field 'owner' is deprecated.

Location:

trunk

Files:

• blog/checkup/index.php (modified) (1 diff)
• components/Textcube.Control.RSS.php (modified) (1 diff)
• components/Textcube.Core.php (modified) (3 diffs)
• components/Textcube.Data.Attachment.php (modified) (7 diffs)
• components/Textcube.Data.Category.php (modified) (7 diffs)
• components/Textcube.Data.Comment.php (modified) (6 diffs)
• components/Textcube.Data.DailyStatistics.php (modified) (4 diffs)
• components/Textcube.Data.DataMaintenance.php (modified) (2 diffs)
• components/Textcube.Data.Feed.php (modified) (13 diffs)
• components/Textcube.Data.Filter.php (modified) (4 diffs)
• components/Textcube.Data.GuestComment.php (modified) (5 diffs)
• components/Textcube.Data.Keyword.php (modified) (7 diffs)
• components/Textcube.Data.Link.php (modified) (4 diffs)
• components/Textcube.Data.Notice.php (modified) (7 diffs)
• components/Textcube.Data.PluginSetting.php (modified) (4 diffs)
• components/Textcube.Data.Post.php (modified) (22 diffs)
• components/Textcube.Data.RefererLog.php (modified) (4 diffs)
• components/Textcube.Data.RefererStatistics.php (modified) (4 diffs)
• components/Textcube.Data.SkinSetting.php (modified) (1 diff)
• components/Textcube.Data.SubscriptionLog.php (modified) (4 diffs)
• components/Textcube.Data.SubscriptionStatistics.php (modified) (4 diffs)
• components/Textcube.Data.Tag.php (modified) (10 diffs)
• components/Textcube.Data.Trackback.php (modified) (6 diffs)
• components/Textcube.Data.TrackbackLog.php (modified) (4 diffs)
• components/Textcube.Data.User.php (modified) (4 diffs)
• components/Textcube.Data.UserSetting.php (modified) (3 diffs)
• components/Textcube.Data.php (modified) (1 diff)
• components/Textcube.Model.PluginCustomConfig.php (modified) (4 diffs)
• components/Textcube.Model.Statistics.php (modified) (7 diffs)
• lib/auth.php (modified) (1 diff)
• lib/model/blog.archive.php (modified) (2 diffs)
• lib/model/blog.attachment.php (modified) (11 diffs)
• lib/model/blog.blogSetting.php (modified) (6 diffs)
• lib/model/blog.category.php (modified) (33 diffs)
• lib/model/blog.comment.php (modified) (36 diffs)
• lib/model/blog.entry.php (modified) (43 diffs)
• lib/model/blog.keyword.php (modified) (6 diffs)
• lib/model/blog.link.php (modified) (4 diffs)
• lib/model/blog.notice.php (modified) (3 diffs)
• lib/model/blog.rss.php (modified) (4 diffs)
• lib/model/blog.service.php (modified) (1 diff)
• lib/model/blog.statistics.php (modified) (8 diffs)
• lib/model/blog.tag.php (modified) (22 diffs)
• lib/model/blog.teamblog.php (modified) (6 diffs)
• lib/model/blog.trackback.php (modified) (12 diffs)
• lib/model/blog.trash.php (modified) (6 diffs)
• lib/model/common.plugin.php (modified) (6 diffs)
• lib/model/reader.common.php (modified) (17 diffs)
• lib/plugins.php (modified) (2 diffs)
• plugins/CL_OpenID/index.php (modified) (20 diffs)
• plugins/CT_RecentPS_Default/index.php (modified) (3 diffs)
• plugins/CT_RecentRP_Default/index.php (modified) (3 diffs)
• plugins/CT_Start_Default/index.php (modified) (5 diffs)
• plugins/CT_Statistics_Default/index.php (modified) (1 diff)
• plugins/EAS/index.php (modified) (1 diff)
• plugins/FM_Modern/index.php (modified) (2 diffs)
• plugins/FM_TTML/index.php (modified) (12 diffs)
• plugins/PN_Referer_Default/index.php (modified) (2 diffs)
• plugins/PN_Subscription_Default/index.php (modified) (4 diffs)
• plugins/PN_Visitor_Default/index.php (modified) (3 diffs)
• plugins/ST_TeamBlogSettings/index.php (modified) (7 diffs)
• plugins/StatGraph/index.php (modified) (1 diff)
• setup.php (modified) (20 diffs)

trunk/blog/checkup/index.php

@@ -692 +692 @@
 }
 
+if (DBQuery::queryExistence("DESC {$database['prefix']}Entries owner")) {
+    $changed = true;
+    echo '<li>', _text('본문 테이블의 필드 이름을 변경합니다.'), ': ';
+    if (DBQuery::execute("ALTER TABLE {$database['prefix']}Entries CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}Attachments CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}BlogStatistics CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}Categories CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}Comments CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}CommentsNotified CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}CommentsNotifiedQueue CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}DailyStatistics CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}FeedGroupRelations CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}FeedGroups CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}FeedReads CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}FeedSettings CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}FeedStarred CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}Filters CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}Links CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}Plugins CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}RefererLogs CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}RefererStatistics CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}TagRelations CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}Trackbacks CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}TrackbackLogs CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+       && DBQuery::execute("ALTER TABLE {$database['prefix']}XMLRPCPingSettings CHANGE owner blogid int(11) NOT NULL DEFAULT 0")
+    )
+        echo '<span style="color:#33CC33;">', _text('성공'), '</span></li>';
+    else
+        echo '<span style="color:#FF0066;">', _text('실패'), '</span></li>';
+}
+
 $filename = ROOT . '/.htaccess';
 $fp = fopen($filename, "r");

trunk/components/Textcube.Control.RSS.php

@@ -5 +5 @@
 class RSS {
     function refresh() {
-        global $owner;
-        @unlink(ROOT . "/cache/rss/$owner.xml");
+        @unlink(ROOT . "/cache/rss/".getBlogId().".xml");
     }
 }

trunk/components/Textcube.Core.php

@@ -17 +17 @@
     /*@static@*/
     function getName($userid = null) {
-        global $database, $owner;
+        global $database;
         if (!isset($userid))
-            $userid = $owner;
+            $userid = getUserId();
         return DBQuery::queryCell("SELECT name FROM {$database['prefix']}Users WHERE userid = $userid");
     }
@@ -25 +25 @@
     /*@static@*/
     function getEmail($userid = null) {
-        global $database, $owner;
+        global $database;
         if (!isset($userid))
-            $userid = $owner;
+            $userid = getUserId();
         return DBQuery::queryCell("SELECT loginid FROM {$database['prefix']}Users WHERE userid = $userid");
     }
@@ -33 +33 @@
     /*@static@*/
     function confirmPassword($password) {
-        global $database, $owner;
+        global $database;
         $password = md5($password);
-        return DBQuery::queryExistence("SELECT userid FROM {$database['prefix']}Users WHERE userid = $owner AND password = '$password'");
+        return DBQuery::queryExistence("SELECT userid FROM {$database['prefix']}Users WHERE userid = ".getBlogId()." AND password = '$password'");
     }
 
     function authorName($owner,$entryId){
         requireComponent('Eolin.PHP.Core');
-        global $database, $owner, $entry;
+        global $database, $entry;
 
         // Read userId of entry from relation table.
-        $userId = getUserIdOfEntry($owner,$entryId);
+        $userId = getUserIdOfEntry(getBlogId(),$entryId);
         if(isset($userId)) {
             $author = DBQuery::queryCell("SELECT name

trunk/components/Textcube.Data.Attachment.php

@@ -24 +24 @@
     
     function open($filter = '', $fields = '*', $sort = 'attached') {
-        global $database, $owner;
+        global $database;
+        $blogid = getBlogId();
         if (!empty($filter))
             $filter = 'AND ' . $filter;
@@ -30 +31 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Attachments WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Attachments WHERE blogid = $blogid $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -54 +55 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -97 +98 @@
     /*@static@*/
     function doesExist($name) {
-        global $database, $owner;
+        global $database;
         if (!Validator::filename($name))
             return null;
-        return DBQuery::queryExistence("SELECT parent FROM {$database['prefix']}Attachments WHERE owner = $owner AND name = '$name'");
+        return DBQuery::queryExistence("SELECT parent FROM {$database['prefix']}Attachments WHERE blogid = ".getBlogId()." AND name = '$name'");
     }
     
     /*@static@*/
     function getParent($name) {
-        global $database, $owner;
+        global $database;
         if (!Validator::filename($name))
             return null;
-        return DBQuery::queryCell("SELECT parent FROM {$database['prefix']}Attachments WHERE owner = $owner AND name = '$name'");
+        return DBQuery::queryCell("SELECT parent FROM {$database['prefix']}Attachments WHERE blogid = ".getBlogId()." AND name = '$name'");
     }
     
@@ -124 +125 @@
     /*@static@*/
     function confirmFolder() {
-        global $owner, $service;
-        $path = ROOT . "/attach/$owner";
+        global $service;
+        $path = ROOT . "/attach/".getBlogId();
         if (!file_exists($path)) {
             mkdir($path);
@@ -138 +139 @@
     
     function _generateName() {
-        global $owner;
+        $blogid = getBlogId();
         if (isset($this->name)) {
             if (!Validator::filename($this->name, false))
@@ -168 +169 @@
             return $this->_error('name');
 
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Attachments');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('name', $this->name, true);
         if (isset($this->parent)) {

trunk/components/Textcube.Data.Category.php

@@ -23 +23 @@
     /*@polymorphous(numeric $id, $fields, $sort)@*/
     function open($filter = true, $fields = '*', $sort = 'priority') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter)) {
             $filter = 'AND id = ' . $filter;
@@ -35 +35 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Categories WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result)
             $this->_count = mysql_num_rows($this->_result);
@@ -54 +54 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -72 +72 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         if($this->id != 0) $this->id = null;
         if (isset($this->parent) && !is_numeric($this->parent))
@@ -81 +81 @@
         
         $query = new TableQuery($database['prefix'] . 'Categories');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->parent)) {
             if (($parentLabel = Category::getLabel($this->parent)) === null)
@@ -117 +117 @@
 
     function getNextCategoryId($id = 0) {
-        global $database, $owner;
-        $maxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Categories WHERE owner = $owner"); 
+        global $database;
+        $maxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()); 
         if($id==0)
             return $maxId + 1;
@@ -144 +144 @@
     /*@static@*/
     function doesExist($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 0))
             return false;
         if ($id == 0) return true; // not specified case
-        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Categories WHERE owner = $owner AND id = $id");
+        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()." AND id = $id");
     }
     
     /*@static@*/
     function getId($label) {
-        global $database, $owner;
+        global $database;
         if (empty($label))
             return null;
-        return DBQuery::queryCell("SELECT id FROM {$database['prefix']}Categories WHERE owner = $owner AND label = '" . mysql_tt_escape_string($label) . "'");
+        return DBQuery::queryCell("SELECT id FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()." AND label = '" . mysql_tt_escape_string($label) . "'");
     }
     
     /*@static@*/
     function getLabel($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 1))
             return null;
-        return DBQuery::queryCell("SELECT label FROM {$database['prefix']}Categories WHERE owner = $owner AND id = $id");
+        return DBQuery::queryCell("SELECT label FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()." AND id = $id");
     }
 
     /*@static@*/
     function getParent($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 1))
             return null;
-        return DBQuery::queryCell("SELECT parent FROM {$database['prefix']}Categories WHERE owner = $owner AND id = $id");
+        return DBQuery::queryCell("SELECT parent FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()." AND id = $id");
     }
 

trunk/components/Textcube.Data.Comment.php

@@ -26 +26 @@
     
     function open($filter = '', $fields = '*', $sort = 'id') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -34 +34 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Comments WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Comments WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -58 +58 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -76 +76 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         if (!isset($this->entry))
             return $this->_error('entry');
@@ -100 +100 @@
             $this->entry = Comment::getEntry($this->parent);
         if ((isset($this->entry)) && ($this->isFiltered == 0))
-            DBQuery::execute("UPDATE {$database['prefix']}Entries SET comments = comments + 1 WHERE owner = $owner AND id = {$this->entry}");
+            DBQuery::execute("UPDATE {$database['prefix']}Entries SET comments = comments + 1 WHERE blogid = ".getBlogId()." AND id = {$this->entry}");
         return true;
     }
@@ -118 +118 @@
     /*@static@*/
     function getEntry($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 1))
             return null;
-        return DBQuery::queryCell("SELECT entry FROM {$database['prefix']}Comments WHERE owner = $owner AND id = {$id}");
+        return DBQuery::queryCell("SELECT entry FROM {$database['prefix']}Comments WHERE blogid = ".getBlogId()." AND id = {$id}");
     }
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Comments');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->id)) {
             if (!Validator::number($this->id, 1))

trunk/components/Textcube.Data.DailyStatistics.php

@@ -15 +15 @@
     
     function open($filter = '', $fields = '*', $sort = 'date DESC') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND date = ' . $filter;
@@ -23 +23 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}DailyStatistics WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}DailyStatistics WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -47 +47 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 $this->$name = $value;
@@ -110 +110 @@
             return $this->_error('date');
             
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'DailyStatistics');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('date', $this->date);
         if (isset($this->visits)) {

trunk/components/Textcube.Data.DataMaintenance.php

@@ -6 +6 @@
     /*@static@*/
     function removeAll($removeAttachments = true) {
-        global $database, $owner;
+        global $database;
+        $blogid = getBlogId();  
+        $tags = DBQuery::queryColumn("SELECT DISTINCT tag FROM {$database['prefix']}TagRelations WHERE blogid = $blogid");
         
-        $tags = DBQuery::queryColumn("SELECT DISTINCT tag FROM {$database['prefix']}TagRelations WHERE owner = $owner");
+        mysql_query("UPDATE {$database['prefix']}BlogStatistics SET visits = 0 WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}DailyStatistics WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Categories WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Attachments WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Comments WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Trackbacks WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}TrackbackLogs WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}TagRelations WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Entries WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Links WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}RefererLogs WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}RefererStatistics WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Plugins WHERE blogid = $blogid");
+        //mysql_query("DELETE FROM {$database['prefix']}UserSettings WHERE user = $blogid");
         
-        mysql_query("UPDATE {$database['prefix']}BlogStatistics SET visits = 0 WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}DailyStatistics WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Categories WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Attachments WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Comments WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Trackbacks WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}TrackbackLogs WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}TagRelations WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Entries WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Links WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}RefererLogs WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}RefererStatistics WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Plugins WHERE owner = $owner");
-        //mysql_query("DELETE FROM {$database['prefix']}UserSettings WHERE user = $owner");
-        
-        mysql_query("DELETE FROM {$database['prefix']}Filters WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}FeedStarred WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}FeedReads WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}FeedGroupRelations WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}FeedGroups WHERE owner = $owner AND id <> 0");
+        mysql_query("DELETE FROM {$database['prefix']}Filters WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}FeedStarred WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}FeedReads WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}FeedGroupRelations WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}FeedGroups WHERE blogid = $blogid AND id <> 0");
         
         if (count($tags) > 0) 
@@ -43 +43 @@
         }
         
-        if (file_exists(ROOT . "/cache/rss/$owner.xml"))
-            unlink(ROOT . "/cache/rss/$owner.xml");
+        if (file_exists(ROOT . "/cache/rss/$blogid.xml"))
+            unlink(ROOT . "/cache/rss/$blogid.xml");
         
         if ($removeAttachments) {
-            Path::removeFiles(Path::combine(ROOT, 'attach', $owner));
-            mysql_query("UPDATE {$database['prefix']}BlogSettings SET logo = '' WHERE owner = $owner");
+            Path::removeFiles(Path::combine(ROOT, 'attach', $blogid));
+            mysql_query("UPDATE {$database['prefix']}BlogSettings SET logo = '' WHERE blogid = $blogid");
         }
     }

trunk/components/Textcube.Data.Feed.php

@@ -6 +6 @@
     /*@static@*/
     function getId($name, $add = false) {
-        global $database, $owner;
+        global $database;
         $name = mysql_lessen($name);
         if (empty($name))
             return 0;
         $query = new TableQuery($database['prefix'] . 'FeedGroups');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('title', $name, true);
         $id = $query->getCell('id');
@@ -29 +29 @@
     /*@static@*/
     function getName($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 0))
             return null;
@@ -35 +35 @@
             return '';
         $query = new TableQuery($database['prefix'] . 'FeedGroups');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('id', $id);
         return $query->getCell('title');
@@ -60 +60 @@
     
     function open($filter = '', $fields = 'f.*, g.groupId', $sort = 'id') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -68 +68 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Feeds f JOIN {$database['prefix']}FeedGroupRelations g ON f.id = g.feed WHERE g.owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Feeds f JOIN {$database['prefix']}FeedGroupRelations g ON f.id = g.feed WHERE g.blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -92 +92 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -116 +116 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         $this->id = null;
         $this->url = trim($this->url);
@@ -134 +134 @@
         
         $query->reset($database['prefix'] . 'FeedGroupRelations');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', $blogid);
         $query->setQualifier('feed', $this->id);
         $query->setQualifier('groupId', $this->group);
@@ -188 +188 @@
     
     function open($filter = '', $fields = 'i.*', $sort = 'id') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -196 +196 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}FeedItems i JOIN {$database['prefix']}FeedGroupRelations g ON i.feed = g.feed WHERE g.owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields 
+                FROM {$database['prefix']}FeedItems i 
+                JOIN {$database['prefix']}FeedGroupRelations g ON i.feed = g.feed 
+                WHERE g.blogid = $blogid $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -220 +223 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -238 +241 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         $this->id = null;
         $this->link = mysql_lessen(trim($this->link), 255);
@@ -280 +283 @@
     
     function isRead() {
-        global $database, $owner;
+        global $database;
         if (isset($this->id))
-            return DBQuery::queryExistence("SELECT * FROM {$database['prefix']}FeedReads WHERE owner = $owner AND item = {$this->id}");
+            return DBQuery::queryExistence("SELECT * FROM {$database['prefix']}FeedReads WHERE blogid = ".getBlogId()." AND item = {$this->id}");
         return false;
     }
     
     function setRead() {
-        global $database, $owner;
+        global $database;
         if (isset($this->id))
-            return DBQuery::execute("INSERT INTO {$database['prefix']}FeedReads VALUES($owner, {$this->id})");
+            return DBQuery::execute("INSERT INTO {$database['prefix']}FeedReads VALUES(".getBlogId().", {$this->id})");
         return false;
     }
     
     function isStarred() {
-        global $database, $owner;
+        global $database;
         if (isset($this->id))
-            return DBQuery::queryExistence("SELECT * FROM {$database['prefix']}FeedStarred WHERE owner = $owner AND item = {$this->id}");
+            return DBQuery::queryExistence("SELECT * FROM {$database['prefix']}FeedStarred 
+                    WHERE blogid = ".getBlogId()." AND item = {$this->id}");
         return false;
     }
     
     function setStarred() {
-        global $database, $owner;
+        global $database;
         if (isset($this->id))
-            return DBQuery::execute("INSERT INTO {$database['prefix']}FeedStarred VALUES($owner, {$this->id})");
+            return DBQuery::execute("INSERT INTO {$database['prefix']}FeedStarred VALUES(".getBlogId().", {$this->id})");
         return false;
     }

trunk/components/Textcube.Data.Filter.php

@@ -17 +17 @@
     
     function open($filter = '', $sort = 'id') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -25 +25 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT * FROM {$database['prefix']}Filters WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT * FROM {$database['prefix']}Filters WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -49 +49 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 $this->$name = $value;
@@ -103 +103 @@
     /*@static@*/
     function isFiltered($type, $value) {
-        global $database, $owner;
+        global $database;
         $type = mysql_tt_escape_string($type);
         $value = mysql_tt_escape_string($value);
-        return DBQuery::queryExistence("SELECT * FROM {$database['prefix']}Filters WHERE owner = $owner AND type = '$type' AND '$value' LIKE CONCAT('%', pattern, '%')");
+        return DBQuery::queryExistence("SELECT * FROM {$database['prefix']}Filters WHERE blogid = ".getBlogId()." AND type = '$type' AND '$value' LIKE CONCAT('%', pattern, '%')");
     }
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Filters');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->id)) {
             if (!Validator::number($this->id, 1))

trunk/components/Textcube.Data.GuestComment.php

@@ -24 +24 @@
     
     function open($filter = '', $fields = '*', $sort = 'id') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -32 +32 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Comments WHERE owner = $owner AND entry = 0 $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Comments WHERE blogid = ".getBlogId()," AND entry = 0 $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -56 +56 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -74 +74 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         if (!isset($this->commenter) && !isset($this->name))
             return $this->_error('commenter');
@@ -107 +107 @@
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Comments');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('entry', 0);
         if (isset($this->id)) {

trunk/components/Textcube.Data.Keyword.php

@@ -24 +24 @@
     /*@polymorphous(numeric $id, $fields, $sort)@*/
     function open($filter = '', $fields = '*', $sort = 'published DESC') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -32 +32 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Entries WHERE owner = $owner AND draft = 0 AND category = -1 $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND draft = 0 AND category = -1 $filter $sort");
         if ($this->_result)
             $this->_count = mysql_num_rows($this->_result);
@@ -52 +52 @@
             foreach ($row as $name => $value) {
                 switch ($name) {
-                    case 'owner':
+                    case 'blogid':
                     case 'draft':
                     case 'category':
@@ -85 +85 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         if (isset($this->id) && !Validator::number($this->id, 1))
              return $this->_error('id');    
@@ -116 +116 @@
 
     function remove($id) {
-        global $database, $owner;
+        global $database;
         if (!is_numeric($id)) {
             return false;
         }
-        $result = mysql_query("DELETE FROM FROM {$database['prefix']}Entries WHERE owner = $owner AND category = -1 AND id = $id ");
+        $result = mysql_query("DELETE FROM FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND category = -1 AND id = $id ");
         if ($result && ($this->_count = mysql_affected_rows()))
             return true;
@@ -162 +162 @@
     /*@static@*/
     function doesExist($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 1))
             return false;
-        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Entries WHERE owner = $owner AND id = $id AND category = -1 AND draft = 0");
+        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND id = $id AND category = -1 AND draft = 0");
     }
     
     function nextEntryId($id = 0) {
-        global $database, $owner;
-        $maxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Entries WHERE owner = $owner");
+        global $database;
+        $maxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId());
         if($id==0)
             return $maxId + 1;
@@ -178 +178 @@
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Entries');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('category', -1);
         if (isset($this->id)) {

trunk/components/Textcube.Data.Link.php

@@ -19 +19 @@
     
     function open($filter = '', $fields = '*', $sort = 'id') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -27 +27 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Links WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Links WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result)
             $this->_count = mysql_num_rows($this->_result);
@@ -46 +46 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -102 +102 @@
     /*@static@*/
     function getId($url) {
-        global $database, $owner;
+        global $database;
         if (empty($url))
             return null;
-        return DBQuery::queryCell("SELECT id FROM {$database['prefix']}Links WHERE owner = $owner AND url = '" . mysql_tt_escape_string($url) . "'");
+        return DBQuery::queryCell("SELECT id FROM {$database['prefix']}Links WHERE blogid = ".getBlogId()." AND url = '" . mysql_tt_escape_string($url) . "'");
     }
     
     /*@static@*/
     function getURL($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 1))
             return null;
-        return DBQuery::queryCell("SELECT label FROM {$database['prefix']}Links WHERE owner = $owner AND id = $id");
+        return DBQuery::queryCell("SELECT label FROM {$database['prefix']}Links WHERE blogid = ".getBlogId()." AND id = $id");
     }
 
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Links');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->id)) {
             if (!Validator::number($this->id, 1))

trunk/components/Textcube.Data.Notice.php

@@ -24 +24 @@
     /*@polymorphous(numeric $id, $fields, $sort)@*/
     function open($filter = '', $fields = '*', $sort = 'published DESC') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -32 +32 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Entries WHERE owner = $owner AND draft = 0 AND category = -2 $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND draft = 0 AND category = -2 $filter $sort");
         if ($this->_result)
             $this->_count = mysql_num_rows($this->_result);
@@ -52 +52 @@
             foreach ($row as $name => $value) {
                 switch ($name) {
-                    case 'owner':
+                    case 'blogid':
                     case 'draft':
                     case 'category':
@@ -73 +73 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         if (isset($this->id) && !Validator::number($this->id, 1))
              return $this->_error('id');
@@ -104 +104 @@
     
     function remove($id) {
-        global $database, $owner;
+        global $database;
         if (is_numeric($id)) {
             return false;
         }
-        $result = mysql_query("DELETE FROM FROM {$database['prefix']}Entries WHERE owner = $owner AND category = -2 AND id = $id");
+        $result = mysql_query("DELETE FROM FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND category = -2 AND id = $id");
         if ($result && ($this->_count = mysql_affected_rows()))
             return true;
@@ -150 +150 @@
     /*@static@*/
     function doesExist($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 1))
             return false;
-        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Entries WHERE owner = $owner AND id = $id AND category = -2 AND draft = 0");
+        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND id = $id AND category = -2 AND draft = 0");
     }
 
     function nextEntryId($id = 0) {
-        global $database, $owner;
-        $maxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Entries WHERE owner = $owner");
+        global $database;
+        $maxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId());
         if($id==0)
             return $maxId + 1;
@@ -166 +166 @@
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Entries');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('category', -2);
         if (isset($this->id)) {

trunk/components/Textcube.Data.PluginSetting.php

@@ -16 +16 @@
     
     function open($name = '', $fields = '*', $sort = 'name') {
-        global $database, $owner;
+        global $database;
         if (!empty($name))
             $name = 'AND name = \'' . $name . '\'';
@@ -22 +22 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Plugins WHERE owner = $owner $name $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Plugins WHERE blogid = ".getBlogId()." $name $sort");
         if ($this->_result)
             $this->_count = mysql_num_rows($this->_result);
@@ -41 +41 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -77 +77 @@
             return $this->_error('name');
         
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Plugins');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('name', mysql_tt_escape_string(mysql_lessen($this->name, 255)), true);
         if (isset($this->setting))

trunk/components/Textcube.Data.Post.php

@@ -43 +43 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Entries WHERE owner = $blogid AND draft = 0 AND category >= 0 $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 AND category >= 0 $filter $sort");
         if ($this->_result)
             $this->_count = mysql_num_rows($this->_result);
@@ -62 +62 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -92 +92 @@
     
     function add($userid) {
-        global $database, $owner;
+        global $database;
         if (isset($this->id) && !Validator::number($this->id, 1))
             return $this->_error('id');
@@ -125 +125 @@
             $target = ($parentCategory = Category::getParent($this->category)) ? '(id = ' . $this->category . ' OR id = ' . $parentCategory . ')' : 'id = ' . $this->category;
             if (isset($this->visibility) && ($this->visibility != 'private'))
-                mysql_query("UPDATE {$database['prefix']}Categories SET entries = entries + 1, entriesInLogin = entriesInLogin + 1 WHERE owner = $owner AND " . $target);
+                mysql_query("UPDATE {$database['prefix']}Categories SET entries = entries + 1, entriesInLogin = entriesInLogin + 1 WHERE blogid = ".getBlogId()." AND " . $target);
             else
-                mysql_query("UPDATE {$database['prefix']}Categories SET entriesInLogin = entriesInLogin + 1 WHERE owner = $owner AND " . $target);
+                mysql_query("UPDATE {$database['prefix']}Categories SET entriesInLogin = entriesInLogin + 1 WHERE blogid = ".getBlogId()." AND " . $target);
         }
         $this->saveSlogan();
@@ -148 +148 @@
     
     function remove($id) { // attachment & category is own your risk!
-        global $database, $owner;
+        global $database;
         // step 0. Get Information
         if (!isset($this->id) || !Validator::number($this->id, 1))
@@ -166 +166 @@
         
         // step 2. Delete Entry
-        $result = DBQuery::execute("DELETE FROM {$database['prefix']}Entries WHERE owner = $owner AND id = $this->id");
+        $result = DBQuery::execute("DELETE FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND id = $this->id");
         if (mysql_affected_rows() > 0) {
         // step 3. Delete Comment
-            DBQuery::execute("DELETE FROM {$database['prefix']}Comments WHERE owner = $owner AND entry = $this->id");
+            DBQuery::execute("DELETE FROM {$database['prefix']}Comments WHERE blogid = ".getBlogId()." AND entry = $this->id");
         
         // step 4. Delete Trackback
-            DBQuery::execute("DELETE FROM {$database['prefix']}Trackbacks WHERE owner = $owner AND entry = $this->id");
+            DBQuery::execute("DELETE FROM {$database['prefix']}Trackbacks WHERE blogid = ".getBlogId()." AND entry = $this->id");
         
         // step 5. Delete Trackback Logs
-            DBQuery::execute("DELETE FROM {$database['prefix']}TrackbackLogs WHERE owner = $owner AND entry = $this->id");
+            DBQuery::execute("DELETE FROM {$database['prefix']}TrackbackLogs WHERE blogid = ".getBlogId()." AND entry = $this->id");
         
         // step 6. update Category
@@ -261 +261 @@
     
     function saveSlogan($slogan = null) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($this->id, 1))
             return $this->_error('id');
@@ -270 +270 @@
 
         $query = new TableQuery($database['prefix'] . 'Entries');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('userid', $this->userid);
         $query->setQualifier('id', $this->id);
@@ -288 +288 @@
             if (!DBQuery::queryExistence(
                 "SELECT id FROM {$database['prefix']}Entries " 
-                . "WHERE owner = $owner AND id <> {$this->id} AND slogan ='{$checkSlogan}'")
+                . "WHERE blogid = ".getBlogId()." AND id <> {$this->id} AND slogan ='{$checkSlogan}'")
                 ) 
             {
@@ -302 +302 @@
     
     function loadTags() {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($this->id, 1))
             return $this->_error('id');
         $this->tags = array();
-        if ($result = mysql_query("SELECT name FROM {$database['prefix']}TagRelations LEFT JOIN {$database['prefix']}Tags ON id = tag WHERE owner = $owner AND entry = {$this->id} ORDER BY name")) {
+        if ($result = mysql_query("SELECT name FROM {$database['prefix']}TagRelations 
+            LEFT JOIN {$database['prefix']}Tags ON id = tag 
+            WHERE blogid = ".getBlogId()." AND entry = {$this->id} 
+            ORDER BY name")) {
             while ($row = mysql_fetch_row($result))
                 array_push($this->tags, $row[0]);
@@ -345 +348 @@
     function addTags() {
         // Don't call outside of object!
-        global $database, $owner;
+        global $database;
         if (!Validator::number($this->id, 1))
             return $this->_error('id');
@@ -355 +358 @@
         
         requireComponent('Textcube.Data.Tag');
-        Tag::addTagsWithEntryId($owner, $this->id, $this->tags);
+        Tag::addTagsWithEntryId(getBlogId(), $this->id, $this->tags);
 
         return true;
@@ -363 +366 @@
     function updateTags() {
         // Don't call outside of object!
-        global $database, $owner;
+        global $database;
         if (!Validator::number($this->id, 1))
             return $this->_error('id');
@@ -372 +375 @@
         
         requireComponent('Textcube.Data.Tag');
-        Tag::modifyTagsWithEntryId($owner, $this->id, $this->tags);
+        Tag::modifyTagsWithEntryId(getBlogId(), $this->id, $this->tags);
         
         return true;
@@ -380 +383 @@
     function deleteTags() {
         // Don't call outside of object!
-        global $database, $owner;
+        global $database;
         if (!Validator::number($this->id, 1))
             return $this->_error('id');
         
         requireComponent('Textcube.Data.Tag');
-        Tag::deleteTagsWithEntryId($owner, $this->id);
+        Tag::deleteTagsWithEntryId(getBlogId(), $this->id);
         
         return true;
@@ -419 +422 @@
     /*@static@*/
     function doesExist($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 1))
             return false;
-        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Entries WHERE owner = $owner AND id = $id AND category >= 0 AND draft = 0");
+        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND id = $id AND category >= 0 AND draft = 0");
     }
     
     /*@static@*/
     function doesAcceptTrackback($id) {
-        global $database, $owner;
+        global $database;
         if (!Validator::number($id, 1))
             return false;
-        return DBQuery::queryExistence("SELECT id FROM {$database['prefix']}Entries WHERE owner = $owner AND id = $id AND draft = 0 AND visibility > 0 AND category >= 0 AND acceptTrackback = 1");
+        return DBQuery::queryExistence("SELECT id 
+            FROM {$database['prefix']}Entries 
+            WHERE blogid = ".getBlogId()." AND id = $id AND draft = 0 AND visibility > 0 AND category >= 0 AND acceptTrackback = 1");
     }
     
     /*@static@*/
     function updateComments($id = null) {
-        global $database, $owner;
+        global $database;
 
         if (($id !== null) && !is_numeric($id)) {
@@ -441 +446 @@
         }
 
-        $posts = ($id === null ? DBQuery::queryColumn("SELECT id FROM {$database['prefix']}Entries WHERE owner = $owner AND category >= 0 AND draft = 0") : array($id));
+        $posts = ($id === null ? DBQuery::queryColumn("SELECT id FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND category >= 0 AND draft = 0") : array($id));
         if (!is_array($posts))
             return false;
         $succeeded = true;
         foreach ($posts as $id) {
-            $comments = DBQuery::queryCell("SELECT COUNT(*) FROM {$database['prefix']}Comments WHERE owner = $owner AND entry = $id AND isFiltered = 0");
+            $comments = DBQuery::queryCell("SELECT COUNT(*) FROM {$database['prefix']}Comments WHERE blogid = ".getBlogId()." AND entry = $id AND isFiltered = 0");
             if ($comments !== null) {
-                if (DBQuery::execute("UPDATE {$database['prefix']}Entries SET comments = $comments WHERE owner = $owner AND id = $id"))
+                if (DBQuery::execute("UPDATE {$database['prefix']}Entries SET comments = $comments WHERE blogid = ".getBlogId()." AND id = $id"))
                     continue;
             }
@@ -458 +463 @@
     /*@static@*/
     function updateTrackbacks($id = null) {
-        global $database, $owner;
+        global $database;
 
         if (($id !== null) && !is_numeric($id)) {
@@ -464 +469 @@
         }
 
-        $posts = ($id === null ? DBQuery::queryColumn("SELECT id FROM {$database['prefix']}Entries WHERE owner = $owner AND category >= 0 AND draft = 0") : array($id));
+        $posts = ($id === null ? DBQuery::queryColumn("SELECT id FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND category >= 0 AND draft = 0") : array($id));
         if (!is_array($posts))
             return false; 
         $succeeded = true;
         foreach ($posts as $id) {
-            $trackbacks = DBQuery::queryCell("SELECT COUNT(*) FROM {$database['prefix']}Trackbacks WHERE owner = $owner AND entry = $id AND isFiltered = 0");
+            $trackbacks = DBQuery::queryCell("SELECT COUNT(*) FROM {$database['prefix']}Trackbacks WHERE blogid = ".getBlogId()." AND entry = $id AND isFiltered = 0");
             if ($trackbacks !== null) { 
-                if (DBQuery::execute("UPDATE {$database['prefix']}Entries SET trackbacks = $trackbacks WHERE owner = $owner AND id = $id"))
+                if (DBQuery::execute("UPDATE {$database['prefix']}Entries SET trackbacks = $trackbacks 
+                    WHERE blogid = ".getBlogId()." AND id = $id"))
                     continue;
             }
@@ -499 +505 @@
     
     function nextEntryId($id = 0) {
-        global $database, $owner;
-        $maxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Entries WHERE owner = $owner");
+        global $database;
+        $maxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Entries WHERE blogid = ".getBlgoId());
         if($id==0)
             return $maxId + 1;
@@ -508 +514 @@
 
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Entries');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->id)) {
             if (!Validator::number($this->id, 1))
@@ -585 +591 @@
                     $tagid = DBQuery::queryCell("SELECT id FROM {$database['prefix']}Tags WHERE name = '" . mysql_tt_escape_string($oldtag['name']) . "' LIMIT 1 ");
                     if ($tagid == null) { 
-                        DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE owner = {$target['owner']} AND tag = {$target['tag']} AND entry = {$target['entry']}");
+                        DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE blogid = {$target['blogid']} AND tag = {$target['tag']} AND entry = {$target['entry']}");
                     } else {
                         if ($tagid == $oldtag['id']) continue;
-                        if (DBQuery::execute("UPDATE {$database['prefix']}TagRelations SET tag = $tagid WHERE owner = {$target['owner']} AND tag = {$target['tag']} AND entry = {$target['entry']}") == false) { // maybe duplicated tag
-                            DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE owner = {$target['owner']} AND tag = {$target['tag']} AND entry = {$target['entry']}");
+                        if (DBQuery::execute("UPDATE {$database['prefix']}TagRelations SET tag = $tagid WHERE blogid = {$target['blogid']} AND tag = {$target['tag']} AND entry = {$target['entry']}") == false) { // maybe duplicated tag
+                            DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE blogid = {$target['blogid']} AND tag = {$target['tag']} AND entry = {$target['entry']}");
                         }
                     }
                 } else { // Ooops!
-                    DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE owner = {$target['owner']} AND tag = {$target['tag']} AND entry = {$target['entry']}");
+                    DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE blogid = {$target['blogid']} AND tag = {$target['tag']} AND entry = {$target['entry']}");
                 }
             }

trunk/components/Textcube.Data.RefererLog.php

@@ -17 +17 @@
     
     function open($filter = '', $fields = '*', $sort = 'referred DESC') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -25 +25 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}RefererLogs WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}RefererLogs WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -49 +49 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 $this->$name = $value;
@@ -81 +81 @@
 
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'RefererLogs');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->host)) {
             $this->host = mysql_lessen(trim($url['host']), 64);

trunk/components/Textcube.Data.RefererStatistics.php

@@ -16 +16 @@
     
     function open($filter = '', $fields = '*', $sort = 'count DESC') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -24 +24 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}RefererStatistics WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}RefererStatistics WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -48 +48 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 $this->$name = $value;
@@ -103 +103 @@
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $this->host = mysql_lessen(trim($this->host), 64);
         if (empty($this->host))
             return $this->_error('host');
         $query = new TableQuery($database['prefix'] . 'RefererStatistics');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         $query->setQualifier('host', $this->host, true);
         if (isset($this->count)) {

trunk/components/Textcube.Data.SkinSetting.php

@@ -65 +65 @@
         if (isset($this->skin)) {
             if (strncmp($this->skin, 'customize/', 10) == 0) {
-                if (strcmp($this->skin, "customize/$owner") != 0)
+                if (strcmp($this->skin, "customize/".getBlogId()) != 0)
                     return $this->_error('skin');
             } else {

trunk/components/Textcube.Data.SubscriptionLog.php

@@ -15 +15 @@
     
     function open($filter = '', $fields = '*', $sort = 'referred DESC') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -23 +23 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}SubscriptionLogs WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields 
+            FROM {$database['prefix']}SubscriptionLogs 
+            WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -47 +49 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 $this->$name = $value;
@@ -79 +81 @@
 
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'SubscriptionLogs');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->ip)) {
             if (!Validator::ip($this->ip))

trunk/components/Textcube.Data.SubscriptionStatistics.php

@@ -16 +16 @@
     
     function open($filter = '', $fields = '*', $sort = 'subscribed DESC') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -24 +24 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}SubscriptionStatistics WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}SubscriptionStatistics WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -48 +48 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 $this->$name = $value;
@@ -95 +95 @@
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $this->host = trim($this->host);
         if (empty($this->host))
             return $this->_error('host');
         $query = new TableQuery($database['prefix'] . 'SubscriptionStatistics');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->ip)) {
             if (!Validator::ip($this->ip))

trunk/components/Textcube.Data.Tag.php

@@ -11 +11 @@
 class Tag {
     /*@static@*/
-    function addTagsWithEntryId($owner, $entry, /*string array*/$taglist)
+    function addTagsWithEntryId($blogid, $entry, /*string array*/$taglist)
     {
         global $database;
@@ -40 +40 @@
         /*
         DBQuery::execute("INSERT INTO {$database['prefix']}TagRelations
-                                (SELECT $owner, t.id, $entry FROM {$database['prefix']}Tags as t 
+                                (SELECT $blogid, t.id, $entry FROM {$database['prefix']}Tags as t 
                                         WHERE 
                                             name in ( $tagliststr ) AND  
                                             t.id NOT IN 
                                                 ( SELECT tag FROM {$database['prefix']}TagRelations WHERE 
-                                                    (tag = t.id) AND (entry = $entry) AND (owner = $owner)
+                                                    (tag = t.id) AND (entry = $entry) AND (blogid = $blogid)
                                                 )
                                 )");
@@ -54 +54 @@
         foreach($tagIDs as $tagid)
         {
-            array_push($tagrelations, " ($owner, $tagid, $entry) ");
+            array_push($tagrelations, " ($blogid, $tagid, $entry) ");
         }
         $tagRelationStr = implode(', ', $tagrelations);
@@ -61 +61 @@
 
     /*@static@*/
-    function modifyTagsWithEntryId($owner, $entry, /*string array*/$taglist)
+    function modifyTagsWithEntryId($blogid, $entry, /*string array*/$taglist)
     {
         global $database;
@@ -76 +76 @@
         
         // step 1. Get deleted Tag
-        $toldlist = DBQuery::queryColumn("SELECT tag FROM {$database['prefix']}TagRelations WHERE owner = $owner AND entry = $entry");
+        $toldlist = DBQuery::queryColumn("SELECT tag FROM {$database['prefix']}TagRelations WHERE blogid = $blogid AND entry = $entry");
         $tmpoldtaglist   = null;
         if (count($toldlist) > 0) {
@@ -103 +103 @@
             /*
             DBQuery::execute("INSERT INTO {$database['prefix']}TagRelations
-                                    (SELECT $owner, t.id, $entry FROM {$database['prefix']}Tags as t 
+                                    (SELECT $blogid, t.id, $entry FROM {$database['prefix']}Tags as t 
                                             WHERE 
                                                 name in ( $tagliststr ) AND  
                                                 t.id NOT IN 
                                                     ( SELECT tag FROM {$database['prefix']}TagRelations WHERE 
-                                                        (tag = t.id) AND (entry = $entry) AND (owner = $owner)
+                                                        (tag = t.id) AND (entry = $entry) AND (blogid = $blogid)
                                                     )
                                     )");
@@ -117 +117 @@
             foreach($tagIDs as $tagid)
             {
-                array_push($tagrelations, " ($owner, $tagid, $entry) ");
+                array_push($tagrelations, " ($blogid, $tagid, $entry) ");
             }
             $tagRelationStr = implode(', ', $tagrelations);
@@ -134 +134 @@
             $taglist = DBQuery::queryColumn(
                     "SELECT tag FROM {$database['prefix']}TagRelations 
-                            WHERE owner = $owner AND entry = $entry AND tag in ( $t1liststr )");
+                            WHERE blogid = $blogid AND entry = $entry AND tag in ( $t1liststr )");
             if ($taglist == null) 
                 return; // What?
@@ -142 +142 @@
         
         // step 5. Delete Relation
-            DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE owner = $owner AND entry = $entry AND tag in ( $tagliststr )");
+            DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE blogid = $blogid AND entry = $entry AND tag in ( $tagliststr )");
         
         // step 6. Delete Tag
@@ -157 +157 @@
 
     /*@static@*/
-    function deleteTagsWithEntryId($owner, $entry)
+    function deleteTagsWithEntryId($blogid, $entry)
     {
         global $database;
-        $taglist = DBQuery::queryColumn("SELECT tag FROM {$database['prefix']}TagRelations WHERE owner = $owner AND entry = $entry");
+        $taglist = DBQuery::queryColumn("SELECT tag FROM {$database['prefix']}TagRelations WHERE blogid = $blogid AND entry = $entry");
         if ($taglist != null) {
             $tagliststr = implode(',', $taglist);
             
-            DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE owner = $owner AND entry = $entry");
+            DBQuery::execute("DELETE FROM {$database['prefix']}TagRelations WHERE blogid = $blogid AND entry = $entry");
             $nottargets = DBQuery::queryColumn("SELECT DISTINCT tag FROM {$database['prefix']}TagRelations WHERE tag in ( $tagliststr )");
             if (count($nottargets) > 0) {

trunk/components/Textcube.Data.Trackback.php

@@ -23 +23 @@
     
     function open($filter = '', $fields = '*', $sort = 'written') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -31 +31 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Trackbacks WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Trackbacks WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -55 +55 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -73 +73 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         $this->id = null;
         if (!isset($this->entry))
@@ -93 +93 @@
 
         if ($this->isFiltered == 0) {
-            mysql_query("UPDATE {$database['prefix']}Entries SET trackbacks = trackbacks + 1 WHERE owner = $owner AND id = {$this->entry}");
+            mysql_query("UPDATE {$database['prefix']}Entries SET trackbacks = trackbacks + 1 WHERE blogid = ".getBlogId()." AND id = {$this->entry}");
         }
         return true;
@@ -103 +103 @@
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Trackbacks');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->id)) {
             if (!Validator::number($this->id, 1))

trunk/components/Textcube.Data.TrackbackLog.php

@@ -18 +18 @@
     
     function open($filter = '', $fields = '*', $sort = 'written') {
-        global $database, $owner;
+        global $database;
         if (is_numeric($filter))
             $filter = 'AND id = ' . $filter;
@@ -26 +26 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}TrackbackLogs WHERE owner = $owner $filter $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}TrackbackLogs WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
             if ($this->_count = mysql_num_rows($this->_result))
@@ -50 +50 @@
         if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
             foreach ($row as $name => $value) {
-                if ($name == 'owner')
+                if ($name == 'blogid')
                     continue;
                 switch ($name) {
@@ -88 +88 @@
     
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'TrackbackLogs');
-        $query->setQualifier('owner', $owner);
+        $query->setQualifier('blogid', getBlogId());
         if (isset($this->id)) {
             if (!Validator::number($this->id, 1))

trunk/components/Textcube.Data.User.php

@@ -22 +22 @@
     
     function getUser() {
-        global $database, $owner;
+        global $database;
         if (is_null($this->userid)) {
-            $_result = fetchQueryRow("SELECT * FROM {$database['prefix']}Users WHERE userid = $owner");
+            $_result = fetchQueryRow("SELECT * FROM {$database['prefix']}Users WHERE userid = ".getUserId());
             foreach($_result as $key => $value) {
                 if(!is_numeric($key)) {
@@ -36 +36 @@
     
     function add() {
-        global $database, $owner;
+        global $database;
         if(isset($this->userid))
             return $this->_error('insert');
@@ -60 +60 @@
     
     function update() {
-        global $database, $owner;
+        global $database;
         if(!isset($this->userid))       
             return $this->_error('insert');
@@ -126 +126 @@
 
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'Users');
-        $query->setQualifier('userid', $owner);
+        $query->setQualifier('userid', getUserId());
         
         if (isset($this->userid)) {

trunk/components/Textcube.Data.UserSetting.php

@@ -16 +16 @@
     
     function open($name = '', $fields = '*', $sort = 'name') {
-        global $database, $owner;
+        global $database;
         if (!empty($name))
             $name = 'AND name = \'' . $name . '\'';
@@ -22 +22 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}UserSettings WHERE user = $owner $name $sort");
+        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}UserSettings WHERE userid = ".getUserId()." $name $sort");
         if ($this->_result)
             $this->_count = mysql_num_rows($this->_result);
@@ -74 +74 @@
 
     function _buildQuery() {
-        global $database, $owner;
+        global $database;
         $query = new TableQuery($database['prefix'] . 'UserSettings');
-        $query->setQualifier('user', $owner);
+        $query->setQualifier('userid', getUserId());
         $query->setQualifier('name', $this->name, false);
         if (isset($this->value))

trunk/components/Textcube.Data.php

@@ -6 +6 @@
     /*@static@*/
     function removeAll($removeAttachments = true) {
-        global $database, $owner;
-        mysql_query("UPDATE {$database['prefix']}BlogStatistics SET visits = 0 WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}DailyStatistics WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Categories WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Attachments WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Comments WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Trackbacks WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}TrackbackLogs WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}TagRelations WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Entries WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Links WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Filters WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}RefererLogs WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}RefererStatistics WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}Plugins WHERE owner = $owner");
+        global $database;
+        $blogid = getBlogId();
+        mysql_query("UPDATE {$database['prefix']}BlogStatistics SET visits = 0 WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}DailyStatistics WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Categories WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Attachments WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Comments WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Trackbacks WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}TrackbackLogs WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}TagRelations WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Entries WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Links WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Filters WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}RefererLogs WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}RefererStatistics WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}Plugins WHERE blogid = $blogid");
         
-        mysql_query("DELETE FROM {$database['prefix']}FeedStarred WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}FeedReads WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}FeedGroupRelations WHERE owner = $owner");
-        mysql_query("DELETE FROM {$database['prefix']}FeedGroups WHERE owner = $owner");
+        mysql_query("DELETE FROM {$database['prefix']}FeedStarred WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}FeedReads WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}FeedGroupRelations WHERE blogid = $blogid");
+        mysql_query("DELETE FROM {$database['prefix']}FeedGroups WHERE blogid = $blogid");
         
-        if (file_exists(ROOT . "/cache/rss/$owner.xml"))
-            unlink(ROOT . "/cache/rss/$owner.xml");
+        if (file_exists(ROOT . "/cache/rss/$blogid.xml"))
+            unlink(ROOT . "/cache/rss/$blogid.xml");
         
         if ($removeAttachments)
-            Path::removeFiles(Path::combine(ROOT, 'attach', $owner));
+            Path::removeFiles(Path::combine(ROOT, 'attach', $blogid));
     }
 }

trunk/components/Textcube.Model.PluginCustomConfig.php

@@ -2 +2 @@
 class PluginCustomConfig{
     var $usable = false;
-    function PluginCustomConfig($owner, $pluginName){
-        $this->owner = $owner;
+    function PluginCustomConfig($blogid, $pluginName){
+        $this->blogid = $blogid;
         $this->pluginName = $pluginName;
         $this->reset();
@@ -14 +14 @@
     function load(){
         global $configMappings;
-        if( false == Validator::id( $this->owner ) ){
+        if( false == Validator::id( $this->blogid ) ){
             $this->usable = false;
             return false;
@@ -44 +44 @@
             }
         }
-        $configXml = DBQuery::queryCell("SELECT settings FROM {$database['prefix']}Plugins WHERE owner = {$this->owner} AND name = '{$this->pluginName}'");
+        $configXml = DBQuery::queryCell("SELECT settings FROM {$database['prefix']}Plugins WHERE blogid = {$this->blogid} AND name = '{$this->pluginName}'");
         requireComponent("Textcube.Function.misc");
         $t= misc::fetchConfigVal($configXml);
@@ -66 +66 @@
         if (defined('__TISTORY__')) {
             requireComponent('Eolin.PHP.PageCache');
-            expireGlobalDressing($this->owner);
-            DataCache::expireData('SkinCache', $this->owner);
-            globalCacheExpire($this->owner);
+            expireGlobalDressing($this->blogid);
+            DataCache::expireData('SkinCache', $this->blogid);
+            globalCacheExpire($this->blogid);
         }
 
-        return DBQuery::query("REPLACE INTO {$database['prefix']}Plugins (owner, name, settings) VALUES({$this->owner},'{$this->pluginName}', '$xml')");
+        return DBQuery::query("REPLACE INTO {$database['prefix']}Plugins (blogid, name, settings) VALUES({$this->blogid},'{$this->pluginName}', '$xml')");
     }
     

trunk/components/Textcube.Model.Statistics.php

@@ -4 +4 @@
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
 class Statistics {
-    function getStatistics($owner) {
+    function getStatistics($blogid) {
         global $database;
         $stats = array('total' => 0, 'today' => 0, 'yesterday' => 0);
-        $result = mysql_query("select visits from {$database['prefix']}BlogStatistics where owner = $owner");
+        $result = mysql_query("select visits from {$database['prefix']}BlogStatistics where blogid = $blogid");
         if (mysql_num_rows($result) == 1)
             list($stats['total']) = mysql_fetch_array($result);
-        $result = mysql_query("select visits from {$database['prefix']}DailyStatistics where owner = $owner and `date` = " . Timestamp::getDate());
+        $result = mysql_query("select visits from {$database['prefix']}DailyStatistics where blogid = $blogid and `date` = " . Timestamp::getDate());
         if (mysql_num_rows($result) == 1)
             list($stats['today']) = mysql_fetch_array($result);
-        $result = mysql_query("select visits from {$database['prefix']}DailyStatistics where owner = $owner and `date` = " . Timestamp::getDate(time() - 86400));
+        $result = mysql_query("select visits from {$database['prefix']}DailyStatistics where blogid = $blogid and `date` = " . Timestamp::getDate(time() - 86400));
         if (mysql_num_rows($result) == 1)
             list($stats['yesterday']) = mysql_fetch_array($result);
@@ -20 +20 @@
 
     function getDailyStatistics($period) {
-        global $database, $owner;
-        return DBQuery::queryAll("SELECT date, visits FROM {$database['prefix']}DailyStatistics WHERE owner = $owner AND LEFT(date, 6) = $period ORDER BY date DESC");
+        global $database, $blogid;
+        return DBQuery::queryAll("SELECT date, visits FROM {$database['prefix']}DailyStatistics WHERE blogid = $blogid AND LEFT(date, 6) = $period ORDER BY date DESC");
     }
     
     function getWeeklyStatistics() {
-        global $database, $owner;
+        global $database, $blogid;
         $now_day = date('Ymd', strtotime("now"));
         $old_day = date('Ymd', strtotime("-1 week"));
-        return DBQuery::queryAll("SELECT date, visits FROM {$database['prefix']}DailyStatistics WHERE owner = $owner AND  date BETWEEN $old_day AND $now_day ORDER BY date DESC");
+        return DBQuery::queryAll("SELECT date, visits FROM {$database['prefix']}DailyStatistics WHERE blogid = $blogid AND  date BETWEEN $old_day AND $now_day ORDER BY date DESC");
     }
 
-    function getMonthlyStatistics($owner) {
+    function getMonthlyStatistics($blogid) {
         global $database;
         $statistics = array();
-        if ($result = mysql_query("select left(date, 6) date, sum(visits) visits from {$database['prefix']}DailyStatistics where owner = $owner group by left(date, 6) order by date desc")) {
+        if ($result = mysql_query("select left(date, 6) date, sum(visits) visits from {$database['prefix']}DailyStatistics where blogid = $blogid group by left(date, 6) order by date desc")) {
             while ($record = mysql_fetch_array($result))
                 array_push($statistics, $record);
@@ -41 +41 @@
     }
 
-    function getRefererStatistics($owner) {
+    function getRefererStatistics($blogid) {
         global $database;
         $statistics = array();
-        if ($result = mysql_query("select host, count from {$database['prefix']}RefererStatistics where owner = $owner order by count desc limit 20")) {
+        if ($result = mysql_query("select host, count from {$database['prefix']}RefererStatistics where blogid = $blogid order by count desc limit 20")) {
             while ($record = mysql_fetch_array($result))
                 array_push($statistics, $record);
@@ -52 +52 @@
 
     function getRefererLogsWithPage($page, $count) {  
-        global $database, $owner;
-        return Statistics::fetchWithPaging("SELECT host, url, referred FROM {$database['prefix']}RefererLogs WHERE owner = $owner ORDER BY referred DESC", $page, $count);  
+        global $database, $blogid;
+        return Statistics::fetchWithPaging("SELECT host, url, referred FROM {$database['prefix']}RefererLogs WHERE blogid = $blogid ORDER BY referred DESC", $page, $count);  
     }  
 
     function getRefererLogs() {
-        global $database, $owner;
-        return DBQuery::queryAll("SELECT host, url, referred FROM {$database['prefix']}RefererLogs WHERE owner = $owner ORDER BY referred DESC LIMIT 1500");
+        global $database, $blogid;
+        return DBQuery::queryAll("SELECT host, url, referred FROM {$database['prefix']}RefererLogs WHERE blogid = $blogid ORDER BY referred DESC LIMIT 1500");
     }
 
-    function updateVisitorStatistics($owner) {
+    function updateVisitorStatistics($blogid) {
         global $database, $blogURL;
         if (!fireEvent('UpdatingVisitorStatistics', true))
@@ -68 +68 @@
             return;
         $id = session_id();
-        $result = mysql_query("select blog from {$database['prefix']}SessionVisits where id = '$id' and address = '{$_SERVER['REMOTE_ADDR']}' and blog = $owner");
+        $result = mysql_query("select blog from {$database['prefix']}SessionVisits where id = '$id' and address = '{$_SERVER['REMOTE_ADDR']}' and blog = $blogid");
         if ($result && (mysql_num_rows($result) > 0))
             return;
-        if (mysql_query("insert into {$database['prefix']}SessionVisits values('$id', '{$_SERVER['REMOTE_ADDR']}', $owner)") && (mysql_affected_rows() > 0)) {
-            mysql_query("update {$database['prefix']}BlogStatistics set visits = visits + 1 where owner = $owner");
+        if (mysql_query("insert into {$database['prefix']}SessionVisits values('$id', '{$_SERVER['REMOTE_ADDR']}', $blogid)") && (mysql_affected_rows() > 0)) {
+            mysql_query("update {$database['prefix']}BlogStatistics set visits = visits + 1 where blogid = $blogid");
             if (mysql_affected_rows() == 0) {
-                if (mysql_query("update {$database['prefix']}BlogStatistics set visits = visits + 1 where owner = $owner") || (mysql_affected_rows() == 0))
-                    mysql_query("insert into {$database['prefix']}BlogStatistics values($owner, 1)");
+                if (mysql_query("update {$database['prefix']}BlogStatistics set visits = visits + 1 where blogid = $blogid") || (mysql_affected_rows() == 0))
+                    mysql_query("insert into {$database['prefix']}BlogStatistics values($blogid, 1)");
             }
             $period = Timestamp::getDate();
-            mysql_query("update {$database['prefix']}DailyStatistics set visits = visits + 1 where owner = $owner and `date` = $period");
+            mysql_query("update {$database['prefix']}DailyStatistics set visits = visits + 1 where blogid = $blogid and `date` = $period");
             if (mysql_affected_rows() == 0) {
-                if (!mysql_query("insert into {$database['prefix']}DailyStatistics values($owner, $period, 1)") || (mysql_affected_rows() == 0))
-                    mysql_query("update {$database['prefix']}DailyStatistics set visits = visits + 1 where owner = $owner and `date` = $period");
+                if (!mysql_query("insert into {$database['prefix']}DailyStatistics values($blogid, $period, 1)") || (mysql_affected_rows() == 0))
+                    mysql_query("update {$database['prefix']}DailyStatistics set visits = visits + 1 where blogid = $blogid and `date` = $period");
             }
             if (!empty($_SERVER['HTTP_REFERER'])) {
@@ -93 +93 @@
                     $host = mysql_tt_escape_string(mysql_lessen($referer['host'], 64));
                     $url = mysql_tt_escape_string(mysql_lessen($_SERVER['HTTP_REFERER'], 255));
-                    mysql_query("insert into {$database['prefix']}RefererLogs values($owner, '$host', '$url', UNIX_TIMESTAMP())");
+                    mysql_query("insert into {$database['prefix']}RefererLogs values($blogid, '$host', '$url', UNIX_TIMESTAMP())");
                     mysql_query("delete from {$database['prefix']}RefererLogs where referred < UNIX_TIMESTAMP() - 604800");
-                    if (!mysql_query("update {$database['prefix']}RefererStatistics set count = count + 1 where owner = $owner and host = '$host'") || (mysql_affected_rows() == 0))
-                        mysql_query("insert into {$database['prefix']}RefererStatistics values($owner, '$host', 1)");
+                    if (!mysql_query("update {$database['prefix']}RefererStatistics set count = count + 1 where blogid = $blogid and host = '$host'") || (mysql_affected_rows() == 0))
+                        mysql_query("insert into {$database['prefix']}RefererStatistics values($blogid, '$host', 1)");
                 }
             }
@@ -102 +102 @@
     }
 
-    function setTotalStatistics($owner) {
+    function setTotalStatistics($blogid) {
         global $database;
-        DBQuery::execute("DELETE FROM {$database['prefix']}DailyStatistics WHERE owner = $owner");
-        $prevCount = DBQuery::queryCell("SELECT visits FROM {$database['prefix']}BlogStatistics WHERE owner = $owner");
+        DBQuery::execute("DELETE FROM {$database['prefix']}DailyStatistics WHERE blogid = $blogid");
+        $prevCount = DBQuery::queryCell("SELECT visits FROM {$database['prefix']}BlogStatistics WHERE blogid = $blogid");
         if ((!is_null($prevCount)) && ($prevCount == 0))
             return true;
-        mysql_query("update {$database['prefix']}BlogStatistics set visits = 0 where owner = $owner");
+        mysql_query("update {$database['prefix']}BlogStatistics set visits = 0 where blogid = $blogid");
         if (mysql_affected_rows() == 0)
-            mysql_query("insert into {$database['prefix']}BlogStatistics values($owner, 0)");
+            mysql_query("insert into {$database['prefix']}BlogStatistics values($blogid, 0)");
         return mysql_affected_rows() ? true : false;
     }

trunk/lib/auth.php

@@ -5 +5 @@
 
 function login($loginid, $password, $preKnownPassword = null) {
-    global $service, $owner;
+    global $service;
     $loginid = mysql_tt_escape_string($loginid);
     $blogid = getBlogId();

trunk/lib/model/blog.archive.php

@@ -11 +11 @@
     $result = DBQuery::query("SELECT EXTRACT(year_month FROM FROM_UNIXTIME(e.published)) period, COUNT(*) count 
         FROM {$database['prefix']}Entries e
-        LEFT JOIN {$database['prefix']}Categories c ON e.category = c.id AND e.owner = c.owner
-        WHERE e.owner = $blogid AND e.draft = 0 $visibility AND e.category >= 0 
+        LEFT JOIN {$database['prefix']}Categories c ON e.category = c.id AND e.blogid = c.blogid
+        WHERE e.blogid = $blogid AND e.draft = 0 $visibility AND e.category >= 0 
         GROUP BY period 
         ORDER BY period 
@@ -34 +34 @@
     $result = DBQuery::query("SELECT DISTINCT DAYOFMONTH(FROM_UNIXTIME(e.published)) 
         FROM {$database['prefix']}Entries e
-        LEFT JOIN {$database['prefix']}Categories c ON e.category = c.id AND e.owner = c.owner
-        WHERE e.owner = $blogid AND e.draft = 0 $visibility AND e.category >= 0 AND YEAR(FROM_UNIXTIME(e.published)) = {$calendar['year']} AND MONTH(FROM_UNIXTIME(e.published)) = {$calendar['month']}");
+        LEFT JOIN {$database['prefix']}Categories c ON e.category = c.id AND e.blogid = c.blogid
+        WHERE e.blogid = $blogid AND e.draft = 0 $visibility AND e.category >= 0 AND YEAR(FROM_UNIXTIME(e.published)) = {$calendar['year']} AND MONTH(FROM_UNIXTIME(e.published)) = {$calendar['month']}");
     if ($result) {
         while (list($day) = mysql_fetch_array($result))

trunk/lib/model/blog.attachment.php

@@ -7 +7 @@
     global $database;
     $attachments = array();
-    if ($result = DBQuery::query("select * from {$database['prefix']}Attachments where owner = $blogid and parent = $parent ".( is_null($orderBy ) ? '' : "ORDER BY $orderBy $sort"))) {
+    if ($result = DBQuery::query("select * from {$database['prefix']}Attachments where blogid = $blogid and parent = $parent ".( is_null($orderBy ) ? '' : "ORDER BY $orderBy $sort"))) {
         while ($attachment = mysql_fetch_array($result))
             array_push($attachments, $attachment);
@@ -17 +17 @@
     global $database;
     $name = mysql_tt_escape_string($name);
-    return DBQuery::queryRow("select * from {$database['prefix']}Attachments where owner = $blogid and parent = $parent and name = '$name'");
+    return DBQuery::queryRow("select * from {$database['prefix']}Attachments where blogid = $blogid and parent = $parent and name = '$name'");
 }
 
@@ -23 +23 @@
     global $database;
     $name = mysql_tt_escape_string($name);
-    return DBQuery::queryRow("select * from {$database['prefix']}Attachments where owner = $blogid and name = '$name'");
+    return DBQuery::queryRow("select * from {$database['prefix']}Attachments where blogid = $blogid and name = '$name'");
 }
 
@@ -31 +31 @@
         $parent = 0;
     $label = mysql_tt_escape_string($label);
-    return DBQuery::queryRow("select * from {$database['prefix']}Attachments where owner = $blogid and parent = $parent and label = '$label'");
+    return DBQuery::queryRow("select * from {$database['prefix']}Attachments where blogid = $blogid and parent = $parent and label = '$label'");
 }
 
@@ -40 +40 @@
 
     if (!empty($blogid))
-        $blogidStr = "owner = $blogid ";
+        $blogidStr = "blogid = $blogid ";
     if ($parent == 0 || !empty($parent))
         $parentStr = "and parent = $parent";
@@ -56 +56 @@
         return false;
     $filename = mysql_tt_escape_string($file['name']);
-    if (DBQuery::queryCell("SELECT count(*) FROM {$database['prefix']}Attachments WHERE owner=$blogid AND parent=$parent AND label='$filename'")>0) {
+    if (DBQuery::queryCell("SELECT count(*) FROM {$database['prefix']}Attachments WHERE blogid=$blogid AND parent=$parent AND label='$filename'")>0) {
         return false;
     }
@@ -114 +114 @@
     $origname = $name;
     $name = mysql_tt_escape_string($name);
-    if (DBQuery::execute("delete from {$database['prefix']}Attachments where owner = $blogid and name = '$name'") && (mysql_affected_rows() == 1)) {
+    if (DBQuery::execute("delete from {$database['prefix']}Attachments where blogid = $blogid and name = '$name'") && (mysql_affected_rows() == 1)) {
         @unlink(ROOT . "/attach/$blogid/$origname");
         clearRSS();
@@ -145 +145 @@
         $origname = $name;
         $name = mysql_tt_escape_string($name);
-        if (DBQuery::execute("delete from {$database['prefix']}Attachments where owner = $blogid and parent = $parent and name = '$name'") && (mysql_affected_rows() == 1)) {
+        if (DBQuery::execute("delete from {$database['prefix']}Attachments where blogid = $blogid and parent = $parent and name = '$name'") && (mysql_affected_rows() == 1)) {
             unlink(ROOT . "/attach/$blogid/$origname");
         } else {
@@ -166 +166 @@
     global $database;
     $name = mysql_tt_escape_string($name);
-    DBQuery::query("UPDATE {$database['prefix']}Attachments SET downloads = downloads + 1 WHERE owner = ".getBlogId()." AND name = '$name'");
+    DBQuery::query("UPDATE {$database['prefix']}Attachments SET downloads = downloads + 1 WHERE blogid = ".getBlogId()." AND name = '$name'");
 }
 
@@ -172 +172 @@
     global $database;
     $name = mysql_tt_escape_string($name);
-    if (($parent = DBQuery::queryCell("SELECT parent FROM {$database['prefix']}Attachments WHERE owner = ".getBlogId()." AND name = '$name'")) !== null) {
+    if (($parent = DBQuery::queryCell("SELECT parent FROM {$database['prefix']}Attachments WHERE blogid = ".getBlogId()." AND name = '$name'")) !== null) {
         DBQuery::execute("UPDATE {$database['prefix']}Attachments SET enclosure = 0 WHERE parent = $parent");
         if ($order) {
             clearRSS();
-            return DBQuery::execute("UPDATE {$database['prefix']}Attachments SET enclosure = 1 WHERE owner = ".getBlogId()." AND name = '$name'") ? 1 : 2;
+            return DBQuery::execute("UPDATE {$database['prefix']}Attachments SET enclosure = 1 WHERE blogid = ".getBlogId()." AND name = '$name'") ? 1 : 2;
         } else
             return 0;
@@ -187 +187 @@
     if ($entry < 0)
         return null;
-    return DBQuery::queryCell("SELECT name FROM {$database['prefix']}Attachments WHERE parent = $entry AND enclosure = 1 AND owner = ".getBlogId());
+    return DBQuery::queryCell("SELECT name FROM {$database['prefix']}Attachments WHERE parent = $entry AND enclosure = 1 AND blogid = ".getBlogId());
 }
 

trunk/lib/model/blog.blogSetting.php

@@ -291 +291 @@
         return 13;
     }
-    $result = DBQuery::query("INSERT INTO `{$database['prefix']}FeedSettings` (owner) VALUES ($id)");
+    $result = DBQuery::query("INSERT INTO `{$database['prefix']}FeedSettings` (blogid) VALUES ($id)");
     if (!$result || (mysql_affected_rows() == 0)) {
         DBQuery::query("DELETE FROM `{$database['prefix']}Users` WHERE `userid` = $id");
@@ -298 +298 @@
         return 62;
     }
-    $result = DBQuery::query("INSERT INTO `{$database['prefix']}FeedGroups` (owner, id) VALUES ($id, 0)");
+    $result = DBQuery::query("INSERT INTO `{$database['prefix']}FeedGroups` (blogid, id) VALUES ($id, 0)");
     if (!$result || (mysql_affected_rows() == 0)) {
         DBQuery::query("DELETE FROM `{$database['prefix']}Users` WHERE `userid` = $id");
         DBQuery::query("DELETE FROM `{$database['prefix']}BlogSettings` WHERE `blogid` = $id");
         DBQuery::query("DELETE FROM `{$database['prefix']}SkinSettings` WHERE `blogid` = $id");
-        DBQuery::query("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `owner` = $id");
+        DBQuery::query("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `blogid` = $id");
         return 62;
     }
@@ -313 +313 @@
         DBQuery::query("DELETE FROM `{$database['prefix']}BlogSettings` WHERE `blogid` = $id");
         DBQuery::query("DELETE FROM `{$database['prefix']}SkinSettings` WHERE `blogid` = $id");
-        DBQuery::query("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `owner` = $id");
-        DBQuery::query("DELETE FROM `{$database['prefix']}FeedGroups` WHERE `owner` = $id");        
+        DBQuery::query("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `blogid` = $id");
+        DBQuery::query("DELETE FROM `{$database['prefix']}FeedGroups` WHERE `blogid` = $id");       
         return 20;
     }
@@ -361 +361 @@
         if (DBQuery::execute("DELETE FROM `{$database['prefix']}BlogSettings` WHERE `blogid` = $userid")) {
             if (DBQuery::execute("DELETE FROM `{$database['prefix']}SkinSettings` WHERE `blogid` = $userid")) {
-                if (DBQuery::execute("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `owner` = $userid")) {
+                if (DBQuery::execute("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `blogid` = $userid")) {
                     if(DBQuery::execute("DELETE FROM `{$database['prefix']}Teamblog` WHERE userid='$userid'")) {
                         return true;
@@ -402 +402 @@
     DBQuery::execute("UPDATE `{$database['prefix']}Entries` 
         SET userid = ".getBlogId()." 
-        WHERE owner = ".getBlogId()." AND userid = ".$userid);
+        WHERE blogid = ".getBlogId()." AND userid = ".$userid);
 
     if(DBQuery::execute("DELETE FROM `{$database['prefix']}Teamblog` WHERE blogid = ".getBlogId()." and userid='$userid'")){
@@ -410 +410 @@
             @DBQuery::execute("DELETE FROM `{$database['prefix']}BlogSettings` WHERE `blogid` = $userid");
             @DBQuery::execute("DELETE FROM `{$database['prefix']}SkinSettings` WHERE `blogid` = $userid");
-            @DBQuery::execute("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `owner` = $userid");
+            @DBQuery::execute("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `blogid` = $userid");
         }
         return true;

trunk/lib/model/blog.category.php

@@ -9 +9 @@
     $name = mysql_tt_escape_string($name);
     if ($parentName === false)
-        $sql = "SELECT id FROM {$database['prefix']}Categories WHERE owner = $blogid AND name = '$name'";
+        $sql = "SELECT id FROM {$database['prefix']}Categories WHERE blogid = $blogid AND name = '$name'";
     else {
         $parentName = mysql_tt_escape_string($parentName);
-        $sql = "SELECT c.id FROM {$database['prefix']}Categories c LEFT JOIN {$database['prefix']}Categories c2 ON c.parent = c2.id AND c.owner = c2.owner WHERE c.owner = $blogid AND c.name = '$name' AND c2.name = '$parentName'";
+        $sql = "SELECT c.id FROM {$database['prefix']}Categories c LEFT JOIN {$database['prefix']}Categories c2 ON c.parent = c2.id AND c.blogid = c2.blogid WHERE c.blogid = $blogid AND c.name = '$name' AND c2.name = '$parentName'";
     }
     return DBQuery::queryCell($sql);
@@ -22 +22 @@
         return 0;
     $label = mysql_tt_escape_string($label);
-    return DBQuery::queryCell("SELECT id FROM {$database['prefix']}Categories WHERE owner = $blogid AND label = '$label'");
+    return DBQuery::queryCell("SELECT id FROM {$database['prefix']}Categories WHERE blogid = $blogid AND label = '$label'");
 }
 
 function getCategoryNameById($blogid, $id) {
     global $database;
-    $result = DBQuery::queryCell("SELECT name FROM {$database['prefix']}Categories WHERE owner = $blogid AND id = $id");
+    $result = DBQuery::queryCell("SELECT name FROM {$database['prefix']}Categories WHERE blogid = $blogid AND id = $id");
     if (is_null($result))
         return _text('전체');
@@ -36 +36 @@
 function getCategoryBodyIdById($blogid, $id) {
     global $database;
-    $result = DBQuery::queryCell("SELECT bodyId FROM {$database['prefix']}Categories WHERE owner = $blogid AND id = $id");
+    $result = DBQuery::queryCell("SELECT bodyId FROM {$database['prefix']}Categories WHERE blogid = $blogid AND id = $id");
     if (($id === 0) || ($result == '') || ($id === null))
         return 'tt-body-category';
@@ -48 +48 @@
 //  if ($id === 0)
 //      return _text('분류 전체보기');
-    return DBQuery::queryCell("SELECT label FROM {$database['prefix']}Categories WHERE owner = $blogid AND id = $id");
+    return DBQuery::queryCell("SELECT label FROM {$database['prefix']}Categories WHERE blogid = $blogid AND id = $id");
 }
 
@@ -66 +66 @@
 function getCategories($blogid) {
     global $database;
-    $rows = DBQuery::queryAll("SELECT * FROM {$database['prefix']}Categories WHERE owner = $blogid AND id > 0 ORDER BY parent, priority");
+    $rows = DBQuery::queryAll("SELECT * FROM {$database['prefix']}Categories WHERE blogid = $blogid AND id > 0 ORDER BY parent, priority");
     $categories = array();
     foreach ($rows as $category) {
@@ -95 +95 @@
 function getParentCategoryId($blogid, $id) {
     global $database;
-    return DBQuery::queryCell("SELECT parent FROM {$database['prefix']}Categories WHERE owner = $blogid AND id = $id");
+    return DBQuery::queryCell("SELECT parent FROM {$database['prefix']}Categories WHERE blogid = $blogid AND id = $id");
 }
 
 function getNumberChildCategory($id = null) {
     global $database;
-    $sql = "SELECT * FROM {$database['prefix']}Categories WHERE owner = ".getBlogId()." AND parent " . ($id == null ? 'IS NULL' : "= $id");
+    $sql = "SELECT * FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()." AND parent " . ($id == null ? 'IS NULL' : "= $id");
     $result = DBQuery::queryRow($sql);
     return DBQuery::queryCell($sql);
@@ -107 +107 @@
 function getNumberEntryInCategories($id) {
     global $database;
-    return DBQuery::queryCell("SELECT COUNT(*) FROM {$database['prefix']}Entries WHERE owner = ".getBlogId()." AND draft = 0 AND category " . ($id == null ? 'IS NULL' : "= $id"));
+    return DBQuery::queryCell("SELECT COUNT(*) FROM {$database['prefix']}Entries WHERE blogid = ".getBlogId()." AND draft = 0 AND category " . ($id == null ? 'IS NULL' : "= $id"));
 }
 
@@ -118 +118 @@
         return false;
     if ($parent !== null) {
-        $label = DBQuery::queryCell("SELECT name FROM {$database['prefix']}Categories WHERE owner = $blogid AND id = $parent");
+        $label = DBQuery::queryCell("SELECT name FROM {$database['prefix']}Categories WHERE blogid = $blogid AND id = $parent");
         if ($label === null)
             return false;
@@ -136 +136 @@
     }
 
-    $sql = "SELECT count(*) FROM {$database['prefix']}Categories WHERE owner = $blogid AND name = '$name' $parentStr";
+    $sql = "SELECT count(*) FROM {$database['prefix']}Categories WHERE blogid = $blogid AND name = '$name' $parentStr";
     
     if (DBQuery::queryCell($sql) > 0)
         return false;
 
-    $newPriority = DBQuery::queryCell("SELECT MAX(priority) FROM {$database['prefix']}Categories WHERE owner = $blogid") + 1;
-    $newId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Categories WHERE owner = $blogid") + 1;
-    $result = DBQuery::query("INSERT INTO {$database['prefix']}Categories (owner, id, parent, name, priority, entries, entriesInLogin, label, visibility) VALUES ($blogid, $newId, $parent, '$name', $newPriority, 0, 0, '$label', 2)");
+    $newPriority = DBQuery::queryCell("SELECT MAX(priority) FROM {$database['prefix']}Categories WHERE blogid = $blogid") + 1;
+    $newId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Categories WHERE blogid = $blogid") + 1;
+    $result = DBQuery::query("INSERT INTO {$database['prefix']}Categories (blogid, id, parent, name, priority, entries, entriesInLogin, label, visibility) VALUES ($blogid, $newId, $parent, '$name', $newPriority, 0, 0, '$label', 2)");
     updateEntriesOfCategory($blogid);
     return $result ? true : false;
@@ -153 +153 @@
     if (!is_numeric($id))
         return false;
-    return DBQuery::execute("DELETE FROM {$database['prefix']}Categories WHERE owner = $blogid AND id = $id");
+    return DBQuery::execute("DELETE FROM {$database['prefix']}Categories WHERE blogid = $blogid AND id = $id");
 }
 
@@ -162 +162 @@
     if ((empty($name)) && (empty($bodyid)))
         return false;
-    $row = DBQuery::queryRow("SELECT p.name, p.id FROM {$database['prefix']}Categories c LEFT JOIN {$database['prefix']}Categories p ON c.parent = p.id WHERE c.owner = $blogid AND c.id = $id");
+    $row = DBQuery::queryRow("SELECT p.name, p.id FROM {$database['prefix']}Categories c LEFT JOIN {$database['prefix']}Categories p ON c.parent = p.id WHERE c.blogid = $blogid AND c.id = $id");
     $label = $row['name'];
     $parentId = $row['id']; 
@@ -172 +172 @@
     $label = mysql_tt_escape_string(mysql_lessen(empty($label) ? $name : "$label/$name", 255));
     $name = mysql_tt_escape_string(mysql_lessen($name, 127));
-    $sql = "SELECT count(*) FROM {$database['prefix']}Categories WHERE owner = $blogid AND id=$id";
-    // $sql = "SELECT count(*) FROM {$database['prefix']}Categories WHERE owner = $blogid AND name='$name' $parentStr"; 
+    $sql = "SELECT count(*) FROM {$database['prefix']}Categories WHERE blogid = $blogid AND id=$id";
+    // $sql = "SELECT count(*) FROM {$database['prefix']}Categories WHERE blogid = $blogid AND name='$name' $parentStr";    
     if(DBQuery::queryCell($sql) == false)
         return false;
     $bodyid = mysql_tt_escape_string(mysql_lessen($bodyid, 20));
     
-    $result = DBQuery::query("UPDATE {$database['prefix']}Categories SET name = '$name', label = '$label', bodyId = '$bodyid'  WHERE owner = $blogid AND id = $id");
+    $result = DBQuery::query("UPDATE {$database['prefix']}Categories SET name = '$name', label = '$label', bodyId = '$bodyid'  WHERE blogid = $blogid AND id = $id");
     if ($result && (mysql_affected_rows() > 0))
         clearRSS();