Changeset 5775

Timestamp:

04/19/08 00:50:05 (9 months ago)

Author:

inureyes

Message:

#759

• POD framework의 기본인 DBQuery에 sql 호환 함수 추가
  
  • num_rows, fetch
    
• 관련하여 전체 코드 정리
  
• mysql_ 계열의 명령을 코드 전체에서 제외
  
• User class의 model dependency 제거
  
• Blog class 추가
  
  • TODO : model dependency 제외및 기능 수정
    
• 사흘정도 네트워크를 못하고 로컬 수정한거라 좀 변경 사항이 많습니다.
  

Location:

trunk

Files:

• components/Needlworks.DBMS.MySQL.php (modified) (6 diffs)
• components/Textcube.Core.php (modified) (10 diffs)
• components/Textcube.Data.Attachment.php (modified) (3 diffs)
• components/Textcube.Data.BlogStatistics.php (modified) (2 diffs)
• components/Textcube.Data.Category.php (modified) (3 diffs)
• components/Textcube.Data.Comment.php (modified) (3 diffs)
• components/Textcube.Data.CommentNotified.php (modified) (3 diffs)
• components/Textcube.Data.CommentNotifiedSiteInfo.php (modified) (3 diffs)
• components/Textcube.Data.DailyStatistics.php (modified) (3 diffs)
• components/Textcube.Data.DataMaintenance.php (modified) (2 diffs)
• components/Textcube.Data.Feed.php (modified) (6 diffs)
• components/Textcube.Data.Filter.php (modified) (3 diffs)
• components/Textcube.Data.GuestComment.php (modified) (3 diffs)
• components/Textcube.Data.Keyword.php (modified) (4 diffs)
• components/Textcube.Data.Link.php (modified) (3 diffs)
• components/Textcube.Data.Notice.php (modified) (4 diffs)
• components/Textcube.Data.PluginSetting.php (modified) (3 diffs)
• components/Textcube.Data.Post.php (modified) (8 diffs)
• components/Textcube.Data.RefererLog.php (modified) (3 diffs)
• components/Textcube.Data.RefererStatistics.php (modified) (3 diffs)
• components/Textcube.Data.ServiceSetting.php (modified) (3 diffs)
• components/Textcube.Data.SkinSetting.php (modified) (2 diffs)
• components/Textcube.Data.SubscriptionLog.php (modified) (3 diffs)
• components/Textcube.Data.SubscriptionStatistics.php (modified) (3 diffs)
• components/Textcube.Data.Trackback.php (modified) (4 diffs)
• components/Textcube.Data.TrackbackLog.php (modified) (3 diffs)
• components/Textcube.Data.User.php (modified) (1 diff)
• components/Textcube.Data.UserSetting.php (modified) (3 diffs)
• components/Textcube.Data.php (modified) (1 diff)
• components/Textcube.Model.PluginCustomConfig.php (modified) (1 diff)
• interface/owner/setting/account/index.php (modified) (6 diffs)
• lib/blog.skin.php (modified) (5 diffs)
• lib/includeForBlog.php (modified) (2 diffs)
• lib/includeForBlogOwner.php (modified) (1 diff)
• lib/model/blog.entry.php (modified) (5 diffs)
• lib/model/blog.skin.php (modified) (1 diff)
• lib/model/blog.tag.php (modified) (1 diff)
• lib/model/blog.teamblog.php (deleted)
• lib/model/blog.trackback.php (modified) (4 diffs)
• lib/model/blog.trash.php (modified) (2 diffs)
• lib/model/common.legacysupport.php (modified) (1 diff)
• lib/model/common.plugin.php (modified) (1 diff)
• lib/model/reader.common.php (modified) (8 diffs)
• lib/view/view.php (modified) (12 diffs)
• plugins/CT_RecentPS_Default/index.php (modified) (3 diffs)
• plugins/CT_RecentRP_Default/index.php (modified) (1 diff)
• plugins/EAS/index.php (modified) (3 diffs)
• plugins/FM_Modern/index.xml (modified) (2 diffs)
• plugins/FM_TTML/index.xml (modified) (2 diffs)
• plugins/MT_Meta_RecentPS_Default/index.php (modified) (1 diff)
• plugins/MT_Meta_RecentPS_Default/index.xml (modified) (2 diffs)
• plugins/PN_Subscription_Default/index.php (modified) (5 diffs)
• plugins/PN_Subscription_Default/index.xml (modified) (2 diffs)
• setup.php (modified) (2 diffs)

trunk/components/Needlworks.DBMS.MySQL.php

@@ -4 +4 @@
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
 
+// DBQuery version 1.7 for MySQL
+
 global $cachedResult;
 global $fileCachedResult;
 global $__gEscapeTag;
 global $__dbProperties;
+global $__gLastQueryType;
 $cachedResult = $__dbProperties = array();
 $__gEscapeTag = null;
@@ -66 +69 @@
     /*@static@*/
     function queryCount($query) {
+        global $__gLastQueryType;
         $count = 0;
         $query = trim($query);
         if ($result = DBQuery::query($query)) {
             $operation = strtolower(substr($query, 0,6));
+            $__gLastQueryType = $operation;
             switch ($operation) {
                 case 'select':
@@ -150 +155 @@
     /*@static@*/
     function queryAll ($query, $type = MYSQL_BOTH, $count = -1) {
+        if($type == 'assoc') $type = MYSQL_ASSOC;
+        else if ($type == 'num') $type = MYSQL_NUM;
         return DBQuery::queryAllWithCache($query, $type, $count);
         //return DBQuery::queryAllWithoutCache($query, $type, $count);  // Your choice. :)
@@ -202 +209 @@
     /*@static@*/
     function query($query) {
+        global $__gLastQueryType;
         if( function_exists( '__tcSqlLogBegin' ) ) {
             __tcSqlLogBegin($query);
@@ -209 +217 @@
             $result = mysql_query($query);
         }
+        $__gLastQueryType = strtolower(substr($query, 0,6));
         if( stristr($query, 'update ') ||
             stristr($query, 'insert ') ||
@@ -253 +262 @@
         global $fileCachedResult;
     }
+    
+    /* Raw functions (to easier adoptation) */
+    /*@static@*/
+    function num_rows($handle = null) {
+        global $__gLastQueryType;
+        switch($__gLastQueryType) {
+            case 'select':
+                return mysql_num_rows($handle);
+                break;
+            default:
+                return mysql_affected_rows($handle);
+                break;
+        }
+        return null;
+    }
+    /*@static@*/
+    function free($handle = null) {
+        mysql_free_result($handle);
+    }
+    
+    /*@static@*/
+    function fetch($handle = null, $type = 'assoc') {
+        if($type == 'array') return mysql_fetch_array($handle); // Can I use mysql_fetch_row instead?
+        else if ($type = 'row') return mysql_fetch_row($handle);
+        else return mysql_fetch_assoc($handle);
+    }
+    
+    /*@static@*/
+    function error($err = null) {
+        return mysql_error($err);
+    }
 }
 

trunk/components/Textcube.Core.php

@@ -4 +4 @@
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
 
-/* This component contains 'User' and 'Transaction' class. */
-
-requireComponent( "Textcube.Control.Auth" );
+/* This component contains 'User', 'Blog' and 'Transaction' class. 
+   NOTE : Classes described below are actually not object. Usually they are static.*/
+
+requireComponent('Textcube.Control.Auth');
 
 // for Global Cache
@@ -181 +182 @@
     }
 
+    /*@static@*/
     function authorName($blogid = null,$entryId){
         if( is_null($blogid) ) {
             $blogid = getBlogId();
         }
-        global $database, $entry;
 
         // Read userId of entry from relation table.
@@ -196 +197 @@
     }
 
+    /*@static@*/
     function changeBlog(){
         global $database, $blogURL, $blog, $service;
@@ -216 +218 @@
         return $changeBlogView;
     }
-    
+
+    /*@static@*/
     function changeSetting($userid, $email, $nickname) {
         global $database;
@@ -232 +235 @@
         }
     }
-    
+
+    /*@static@*/
     function add($email, $name) {
         global $database, $service, $user, $blog;
@@ -244 +248 @@
         $loginid = POD::escapeString(UTF8::lessenAsEncoding($email, 64));   
         $name = POD::escapeString(UTF8::lessenAsEncoding($name, 32));
-        $password = generatePassword();
-        $authtoken = md5(generatePassword());
+        $password = User::__generatePassword();
+        $authtoken = md5(User::__generatePassword());
     
         if (POD::queryExistence("SELECT * FROM `{$database['prefix']}Users` WHERE loginid = '$loginid'")) {
@@ -262 +266 @@
     }
     
-    /* TO DO : library 의존성 없애야 함. 함수를 사용하고 있습니다.  */
+    /*@static@*/
     function remove($userid) {
         global $database;
@@ -273 +277 @@
         POD::execute($sql);
         foreach ($blogs as $ownedBlog) {
-            changeBlogOwner($ownedBlog,1); // 관리자 uid로 변경
+            Blog::changeOwner($ownedBlog,1); // 관리자 uid로 변경
         }
         $blogs = User::getBlogs($userid);
         foreach ($blogs as $joinedBlog) {
-            deleteTeamblogUser($userid,$joinedBlog);
+            Blog::deleteUser($joinedBlog, $userid);
         }
         User::removePermanent($userid);
@@ -283 +287 @@
     }
     
+    /*@static@*/
     function removePermanent($userid) {
         global $database;
@@ -291 +296 @@
         }
     }
+    
+    /* private functions */
+    /*@private static@*/
+    function __generatePassword() {
+        return strtolower(substr(base64_encode(rand(0x10000000, 0x70000000)), 3, 8));
+    }
 }
 
+class Blog {
+    /*@static@*/
+    function changeOwner($blogid,$userid) {
+        global $database;
+        POD::execute("UPDATE `{$database['prefix']}Teamblog` SET acl = 3 WHERE blogid = ".$blogid." and acl = " . BITWISE_OWNER);
+    
+        $acl = POD::queryCell("SELECT acl FROM {$database['prefix']}Teamblog WHERE blogid='$blogid' and userid='$userid'");
+    
+        if( $acl === null ) { // If there is no ACL, add user into the blog.
+            POD::query("INSERT INTO `{$database['prefix']}Teamblog`  
+                VALUES('$blogid', '$userid', '".BITWISE_OWNER."', UNIX_TIMESTAMP(), '0')");
+        } else {
+            POD::execute("UPDATE `{$database['prefix']}Teamblog` SET acl = ".BITWISE_OWNER." 
+                WHERE blogid = ".$blogid." and userid = " . $userid);
+        }
+        return true;
+    }
+    
+    /*@static@*/
+    /* TODO : remove model dependency (addBlog, sendInvitationMail) */
+    function addUser($email, $name, $comment, $senderName, $senderEmail) {
+        requireModel('blog.user');
+        requireModel('blog.blogSetting');
+        global $database,$service,$blogURL,$hostURL,$user,$blog;
+    
+        $blogid = getBlogId();
+        if(empty($email))
+            return 1;
+        if(!preg_match('/^[^@]+@([-a-zA-Z0-9]+\.)+[-a-zA-Z0-9]+$/',$email))
+            return array( 2, _t('이메일이 바르지 않습니다.') );
+        
+        $isUserExists = User::getUserIdByEmail($email);
+        if(empty($isUserExists)) { // If user is not exist
+            User::add($email,$name);
+        }
+        $userid = User::getUserIdByEmail($email);
+        $result = addBlog(getBlogId(), $userid, null);
+        if($result === true) {
+            return sendInvitationMail(getBlogId(), $userid, User::getName($userid), $comment, $senderName, $senderEmail);
+        }
+        return $result;
+    }
+
+    /*@static@*/
+    function deleteUser($blogid = null, $userid, $clean = true) {
+        global $database;
+        if ($blogid == null) {
+            $blogid = getBlogId();
+        }
+        POD::execute("UPDATE `{$database['prefix']}Entries` 
+            SET userid = ".User::getBlogOwner($blogid)." 
+            WHERE blogid = ".$blogid." AND userid = ".$userid);
+    
+        // Delete ACL relation.
+        if(!POD::execute("DELETE FROM `{$database['prefix']}Teamblog` WHERE blogid='$blogid' and userid='$userid'"))
+            return false;
+        // And if there is no blog related to the specific user, delete user.
+        if($clean && !POD::queryAll("SELECT * FROM `{$database['prefix']}Teamblog` WHERE userid = '$userid'")) {
+            User::removePermanent($userid);
+        }
+        return true;
+    }
+    
+    /*@static@*/
+    function changeACLofUser($blogid, $userid, $ACLtype, $switch) {  // Change user priviledge on the blog.
+        global $database;
+        if(empty($ACLtype) || empty($userid))
+            return false;
+        $acl = POD::queryCell("SELECT acl
+                FROM {$database['prefix']}Teamblog 
+                WHERE blogid='$blogid' and userid='$userid'");
+        if( $acl === null ) { // If there is no ACL, add user into the blog.
+            $name = User::getName($userid);
+            POD::query("INSERT INTO `{$database['prefix']}Teamblog`  
+                    VALUES('$blogid', '$userid', '0', UNIX_TIMESTAMP(), '0')");
+            $acl = 0;
+        }
+        $bitwise = null;
+        switch( $ACLtype ) {
+            case 'admin':
+                $bitwise = BITWISE_ADMINISTRATOR;
+                break;
+            case 'editor':
+                $bitwise = BITWISE_EDITOR;
+                break;
+            default:
+                return false;
+        }
+        if( $switch ) {
+            $acl |= $bitwise;
+        } else {
+            $acl &= ~$bitwise;
+        }
+        return POD::execute("UPDATE `{$database['prefix']}Teamblog` 
+            SET acl = ".$acl." 
+            WHERE blogid = ".$blogid." and userid = ".$userid);
+    }
+}
 
 class Transaction {

trunk/components/Textcube.Data.Attachment.php

@@ -31 +31 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Attachments WHERE blogid = $blogid $filter $sort");
+        $this->_result = POD::query("SELECT $fields FROM {$database['prefix']}Attachments WHERE blogid = $blogid $filter $sort");
         if ($this->_result) {
-            if ($this->_count = mysql_num_rows($this->_result))
+            if ($this->_count = POD::num_rows($this->_result))
                 return $this->shift();
             else
-                mysql_free_result($this->_result);
+                POD::free($this->_result);
         }
         unset($this->_result);
@@ -44 +44 @@
     function close() {
         if (isset($this->_result)) {
-            mysql_free_result($this->_result);
+            POD::free($this->_result);
             unset($this->_result);
         }
@@ -53 +53 @@
     function shift() {
         $this->reset();
-        if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
+        if ($this->_result && ($row = POD::fetch($this->_result))) {
             foreach ($row as $name => $value) {
                 if ($name == 'blogid')

trunk/components/Textcube.Data.BlogStatistics.php

@@ -17 +17 @@
         global $database;
         $this->reset();
-        if ($result = mysql_query("SELECT visits FROM {$database['prefix']}BlogStatistics WHERE blogid = ".getBlogId())) {
-            if ($row = mysql_fetch_assoc($result)) {
+        if ($result = POD::query("SELECT visits FROM {$database['prefix']}BlogStatistics WHERE blogid = ".getBlogId())) {
+            if ($row = POD::fetch($result)) {
                 foreach ($row as $name => $value) {
                     if ($name == 'owner')
@@ -24 +24 @@
                     $this->$name = $value;
                 }
-                mysql_free_result($result);
+                POD::free($result);
                 return true;
             }
-            mysql_free_result($result);
+            POD::free($result);
         }
         return false;

trunk/components/Textcube.Data.Category.php

@@ -35 +35 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()." $filter $sort");
+        $this->_result = POD::query("SELECT $fields FROM {$database['prefix']}Categories WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result)
-            $this->_count = mysql_num_rows($this->_result);
+            $this->_count = POD::num_rows($this->_result);
         return $this->shift();
     }
@@ -43 +43 @@
     function close() {
         if (isset($this->_result)) {
-            mysql_free_result($this->_result);
+            POD::free($this->_result);
             unset($this->_result);
         }
@@ -52 +52 @@
     function shift() {
         $this->reset();
-        if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
+        if ($this->_result && ($row = POD::fetch($this->_result))) {
             foreach ($row as $name => $value) {
                 if ($name == 'blogid')

trunk/components/Textcube.Data.Comment.php

@@ -35 +35 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}Comments WHERE blogid = ".getBlogId()." $filter $sort");
+        $this->_result = POD::query("SELECT $fields FROM {$database['prefix']}Comments WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
-            if ($this->_count = mysql_num_rows($this->_result))
+            if ($this->_count = POD::num_rows($this->_result))
                 return $this->shift();
             else
-                mysql_free_result($this->_result);
+                POD::free($this->_result);
         }
         unset($this->_result);
@@ -48 +48 @@
     function close() {
         if (isset($this->_result)) {
-            mysql_free_result($this->_result);
+            POD::free($this->_result);
             unset($this->_result);
         }
@@ -57 +57 @@
     function shift() {
         $this->reset();
-        if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
+        if ($this->_result && ($row = POD::fetch($this->_result))) {
             foreach ($row as $name => $value) {
                 if ($name == 'blogid')

trunk/components/Textcube.Data.CommentNotified.php

@@ -40 +40 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}CommentsNotified WHERE blogid = ".getBlogId()." $filter $sort");
+        $this->_result = POD::query("SELECT $fields FROM {$database['prefix']}CommentsNotified WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
-            if ($this->_count = mysql_num_rows($this->_result))
+            if ($this->_count = POD::num_rows($this->_result))
                 return $this->shift();
             else
-                mysql_free_result($this->_result);
+                POD::free($this->_result);
         }
         unset($this->_result);
@@ -53 +53 @@
     function close() {
         if (isset($this->_result)) {
-            mysql_free_result($this->_result);
+            POD::free($this->_result);
             unset($this->_result);
         }
@@ -62 +62 @@
     function shift() {
         $this->reset();
-        if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
+        if ($this->_result && ($row = POD::fetch($this->_result))) {
             foreach ($row as $name => $value) {
                 if ($name == 'blogid')

trunk/components/Textcube.Data.CommentNotifiedSiteInfo.php

@@ -25 +25 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}CommentsNotifiedSiteInfo WHERE $filter $sort");
+        $this->_result = POD::query("SELECT $fields FROM {$database['prefix']}CommentsNotifiedSiteInfo WHERE $filter $sort");
         if ($this->_result) {
-            if ($this->_count = mysql_num_rows($this->_result))
+            if ($this->_count = POD::num_rows($this->_result))
                 return $this->shift();
             else
-                mysql_free_result($this->_result);
+                POD::free($this->_result);
         }
         unset($this->_result);
@@ -38 +38 @@
     function close() {
         if (isset($this->_result)) {
-            mysql_free_result($this->_result);
+            POD::free($this->_result);
             unset($this->_result);
         }
@@ -47 +47 @@
     function shift() {
         $this->reset();
-        if ($this->_result && ($row = mysql_fetch_assoc($this->_result))) {
+        if ($this->_result && ($row = POD::fetch($this->_result))) {
             foreach ($row as $name => $value) {
                 $this->$name = $value;

trunk/components/Textcube.Data.DailyStatistics.php

@@ -23 +23 @@
             $sort = 'ORDER BY ' . $sort;
         $this->close();
-        $this->_result = mysql_query("SELECT $fields FROM {$database['prefix']}DailyStatistics WHERE blogid = ".getBlogId()." $filter $sort");
+        $this->_result = POD::query("SELECT $fields FROM {$database['prefix']}DailyStatistics WHERE blogid = ".getBlogId()." $filter $sort");
         if ($this->_result) {
-            if ($this->_count = mysql_num_rows($this->_result))
+            if ($this->_count = POD::num_rows($this->_result))
                 return $this->shift();
             else
-                mysql_free_result($this->_result);
+                POD::free($this->_result);
         }
         unset($this->_result);
@@ -36 +36 @@
     function close() {
         if (isset($this->_result)) {
-            mysql_free_result($this->_result);
+            POD::free($this->_result);
             unset($this->_result);
         }
@@ -45 +45 @@
     function shift() {