Changeset 5766

Timestamp:

04/16/08 20:25:18 (9 months ago)

Author:

inureyes

Message:

#934

• 버그 수정
  
• 통계 관련 컴포넌트 개수
  
• 레거시 함수 추가 및 기존 모델중 일부 제외
  

Location:

trunk

Files:

• components/Textcube.Model.Paging.php (modified) (2 diffs)
• components/Textcube.Model.Statistics.php (modified) (8 diffs)
• lib/includeForBlog.php (modified) (1 diff)
• lib/includeForBlogOwner.php (modified) (1 diff)
• lib/includeForReader.php (modified) (1 diff)
• lib/model/blog.statistics.php (deleted)
• lib/model/common.legacysupport.php (added)
• lib/model/common.paging.php (deleted)

trunk/components/Textcube.Model.Paging.php

@@ -4 +4 @@
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
 class Paging {
+    function initPaging($url, $prefix = '?page=') {
+        return array('url' => rtrim($url,'?'), 'prefix' => $prefix, 'postfix' => '', 'total' => 0, 'pages' => 0, 'page' => 0, 'before' => array(), 'after' => array());
+    }
+    
     function getPagingView( & $paging, & $template, & $itemTemplate) {
         requireComponent('Textcube.Function.misc');
@@ -99 +103 @@
         return $view;
     }
+    
+    function fetchWithPaging($sql, $page, $count, $url = null, $prefix = '?page=', $countItem = null) {
+        global $folderURL, $service;
+        if ($url === null)
+            $url = $folderURL;
+        $paging = array('url' => $url, 'prefix' => $prefix, 'postfix' => '');
+        if (empty($sql))
+            return array(array(), $paging);
+        if (preg_match('/\s(FROM.*)(ORDER BY.*)$/si', $sql, $matches))
+            $from = $matches[1];
+        else
+            return array(array(), $paging);
+        $paging['total'] = POD::queryCell("SELECT COUNT(*) $from");
+        if ($paging['total'] === null)
+            return array(array(), $paging);
+        if (empty($count)) $count = 1;
+        $paging['pages'] = intval(ceil($paging['total'] / $count));
+        $paging['page'] = is_numeric($page) ? $page : 1;
+        if ($paging['page'] > $paging['pages']) {
+            $paging['page'] = $paging['pages'];
+            if ($paging['pages'] > 0)
+                $paging['prev'] = $paging['pages'] - 1;
+            //return array(array(), $paging);
+        }
+        if ($paging['page'] > 1)
+            $paging['prev'] = $paging['page'] - 1;
+        if ($paging['page'] < $paging['pages'])
+            $paging['next'] = $paging['page'] + 1;
+        $offset = ($paging['page'] - 1) * $count;
+        if ($offset < 0) $offset = 0;
+        if ($countItem !== null) $count = $countItem;
+        return array(POD::queryAll("$sql LIMIT $offset, $count"), $paging);
+    }
 }
 ?>

trunk/components/Textcube.Model.Statistics.php

@@ -3 +3 @@
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+
+// Dependency : Textcube.Model.Paging (getRefererLogsWithPage)
+
 class Statistics {
     function getStatistics($blogid) {
         global $database;
         $stats = array('total' => 0, 'today' => 0, 'yesterday' => 0);
-        $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 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 blogid = $blogid and `date` = " . Timestamp::getDate(time() - 86400));
-        if (mysql_num_rows($result) == 1)
-            list($stats['yesterday']) = mysql_fetch_array($result);
+        $result = POD::queryCell("SELECT visits FROM {$database['prefix']}BlogStatistics WHERE blogid = $blogid");
+        if (!empty($result)) $stats['total'] = $result;
+        
+        $result = POD::queryAll("SELECT date, visits FROM {$database['prefix']}DailyStatistics WHERE blogid = $blogid AND `date` in ('" . Timestamp::getDate()."','".Timestamp::getDate(time()-86400)."')");
+        $stat['today'] = $stat['yesterday'] = 0;
+        foreach($result as $data) {
+            if($data['date'] == Timestamp::getDate()) $stats['today'] = $data['visits'];
+            if($data['date'] == Timestamp::getDate(time()-86400)) $stats['yesterday'] = $data['visits'];
+        }
+    
         return $stats;
     }
@@ -21 +25 @@
     function getDailyStatistics($period) {
         global $database, $blogid;
-        return POD::queryAll("SELECT date, visits FROM {$database['prefix']}DailyStatistics WHERE blogid = $blogid AND LEFT(date, 6) = $period ORDER BY date DESC");
+        return POD::queryAll("SELECT date, visits 
+            FROM {$database['prefix']}DailyStatistics 
+            WHERE blogid = $blogid 
+                AND LEFT(date, 6) = $period 
+            ORDER BY date DESC");
     }
     
@@ -34 +42 @@
         global $database;
         $statistics = array();
-        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))
+        if ($result = POD::queryAll("SELECT left(date, 6) date, sum(visits) visits 
+            FROM {$database['prefix']}DailyStatistics 
+            WHERE blogid = $blogid 
+            GROUP BY left(date, 6) 
+            ORDER BY date DESC")) {
+            foreach($result as $record)
                 array_push($statistics, $record);
         }
@@ -44 +56 @@
         global $database;
         $statistics = array();
-        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))
+        if ($result = POD::queryAll("SELECT host, count FROM {$database['prefix']}RefererStatistics WHERE blogid = $blogid ORDER BY COUNT DESC LIMIT 20")) {
+            foreach($result as $record)
                 array_push($statistics, $record);
         }
@@ -53 +65 @@
     function getRefererLogsWithPage($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);  
-    }  
+        requireComponent('Textcube.Model.Paging');
+        return Paging::fetchWithPaging("SELECT host, url, referred FROM {$database['prefix']}RefererLogs WHERE blogid = $blogid ORDER BY referred DESC", $page, $count);  
+    }
 
     function getRefererLogs() {
-        global $database, $blogid;
-        return POD::queryAll("SELECT host, url, referred FROM {$database['prefix']}RefererLogs WHERE blogid = $blogid ORDER BY referred DESC LIMIT 1500");
+        global $database;
+        return POD::queryAll("SELECT host, url, referred FROM {$database['prefix']}RefererLogs WHERE blogid = ".getBlogId()." ORDER BY referred DESC LIMIT 1500");
     }
 
@@ -68 +81 @@
             return;
         $id = session_id();
-        $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))
+        if(POD::queryCount("SELECT blogid FROM {$database['prefix']}SessionVisits WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}' AND blogid = $blogid") > 0)
             return;
-        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 blogid = $blogid") || (mysql_affected_rows() == 0))
-                    mysql_query("insert into {$database['prefix']}BlogStatistics values($blogid, 1)");
+        if (POD::queryCount("INSERT INTO {$database['prefix']}SessionVisits values('$id', '{$_SERVER['REMOTE_ADDR']}', $blogid)") > 0) {
+            if(POD::queryCount("UPDATE {$database['prefix']}BlogStatistics SET visits = visits + 1 WHERE blogid = $blogid LIMIT 1") < 1) {
+                POD::execute("INSERT into {$database['prefix']}BlogStatistics values($blogid, 1)");
             }
+            
             $period = Timestamp::getDate();
-            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($blogid, $period, 1)") || (mysql_affected_rows() == 0))
-                    mysql_query("update {$database['prefix']}DailyStatistics set visits = visits + 1 where blogid = $blogid and `date` = $period");
+            if(POD::queryCount("UPDATE {$database['prefix']}DailyStatistics SET visits = visits + 1 WHERE blogid = $blogid AND `date` = $period LIMIT 1") < 1) {
+                POD::execute("INSERT into {$database['prefix']}DailyStatistics values($blogid, $period, 1)");
             }
             if (!empty($_SERVER['HTTP_REFERER'])) {
@@ -93 +102 @@
                     $host = POD::escapeString(UTF8::lessenAsEncoding($referer['host'], 64));
                     $url = POD::escapeString(UTF8::lessenAsEncoding($_SERVER['HTTP_REFERER'], 255));
-                    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 blogid = $blogid and host = '$host'") || (mysql_affected_rows() == 0))
-                        mysql_query("insert into {$database['prefix']}RefererStatistics values($blogid, '$host', 1)");
+                    POD::query("INSERT INTO {$database['prefix']}RefererLogs values($blogid, '$host', '$url', UNIX_TIMESTAMP())");
+                    POD::query("DELETE FROM {$database['prefix']}RefererLogs WHERE referred < UNIX_TIMESTAMP() - 604800");
+                    if (!POD::queryCount("UPDATE {$database['prefix']}RefererStatistics SET count = count + 1 WHERE blogid = $blogid AND host = '$host' LIMIT 1"))
+                        POD::execute("INSERT into {$database['prefix']}RefererStatistics values($blogid, '$host', 1)");
                 }
             }
@@ -108 +117 @@
         if ((!is_null($prevCount)) && ($prevCount == 0))
             return true;
-        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($blogid, 0)");
-        return mysql_affected_rows() ? true : false;
-    }
-    
-    function fetchWithPaging($sql, $page, $count, $url = null, $prefix = '?page=') {
-        global $folderURL;
-        requireComponent('Eolin.PHP.Core');
-        if (is_null($url))
-            $url = $folderURL;
-        $paging = array('url' => $url, 'prefix' => $prefix, 'postfix' => '');
-        if (empty($sql))
-            return array(array(), $paging);
-        if (preg_match('/\s(FROM.*)$/si', $sql, $matches))
-            $from = $matches[1];
-        else
-            return array(array(), $paging);
-        $paging['total'] = POD::queryCell("SELECT COUNT(*) $from");
-        if (is_null($paging['total']))
-            return array(array(), $paging);
-        $paging['pages'] = intval(ceil($paging['total'] / $count));
-        $paging['page'] = is_numeric($page) ? $page : 1;
-        if ($paging['page'] > $paging['pages']) {
-            $paging['page'] = $paging['pages'];
-            if ($paging['pages'] > 0)
-                $paging['prev'] = $paging['pages'] - 1;
-            //return array(array(), $paging);
+        if(POD::execute("UPDATE {$database['prefix']}BlogStatistics SET visits = 0 WHERE blogid = $blogid")) {
+            return true;
+        } else {
+            $result = POD::execute("INSERT INTO {$database['prefix']}BlogStatistics values($blogid, 0)");
+            return $result;
         }
-        if ($paging['page'] > 1)
-            $paging['prev'] = $paging['page'] - 1;
-        if ($paging['page'] < $paging['pages'])
-            $paging['next'] = $paging['page'] + 1;
-        $offset = ($paging['page'] - 1) * $count;
-        return array(POD::queryAll("$sql LIMIT $offset, $count"), $paging);
     }
 }

trunk/lib/includeForBlog.php

@@ -35 +35 @@
 require ROOT .'/lib/model/blog.locative.php';
 require ROOT .'/lib/model/blog.sidebar.php';
-require ROOT .'/lib/model/blog.statistics.php';
 require ROOT .'/lib/model/blog.trackback.php';
 require ROOT .'/lib/model/blog.tag.php';
 require ROOT .'/lib/model/blog.user.php';
 require ROOT .'/lib/model/common.setting.php';
-require ROOT .'/lib/model/common.paging.php';
 require ROOT .'/lib/model/common.plugin.php';
 require ROOT .'/lib/model/common.module.php';
+require ROOT .'/lib/model/common.legacysupport.php';
 if (defined( 'TCDEBUG')) __tcSqlLogPoint('End of model loading');
 // Views

trunk/lib/includeForBlogOwner.php

@@ -30 +30 @@
 require ROOT .'/lib/model/common.module.php';
 require ROOT .'/lib/model/common.setting.php';
-require ROOT .'/lib/model/common.paging.php';
+require ROOT .'/lib/model/common.legacysupport.php';
 // Views
 require ROOT .'/lib/view/html.php';

trunk/lib/includeForReader.php

@@ -24 +24 @@
 require ROOT .'/lib/model/blog.user.php';
 require ROOT .'/lib/model/blog.fx.php';
-require ROOT .'/lib/model/common.paging.php';
+require ROOT .'/lib/model/common.legacysupport.php';
 require ROOT .'/lib/model/common.setting.php';
 require ROOT .'/lib/model/common.plugin.php';