Changeset 3447

Timestamp:

06/18/07 02:54:10 (17 months ago)

Author:

inureyes

Message:

#408

• 팀블로그 출력관련 쿼리 줄이기
  

Location:

trunk

Files:

• components/Textcube.Core.php (modified) (2 diffs)
• lib/config.php (modified) (1 diff)

trunk/components/Textcube.Core.php

@@ -62 +62 @@
 
     function myBlog(){
-        global $database, $owner, $blogURL, $_SERVER, $blog, $service;
+        global $database, $owner, $blogURL, $blog, $service;
         
         if($service['type'] == "path")
@@ -71 +71 @@
         $blogn = "<select id=\"teamblog\" onchange=\"location.href='{$blogURL}/owner/setting/teamblog/changeBlog/?bs='+this.value+'&path={$Path}'\">";
     
-        if( Acl::check('group.administrators') && Acl::check('group.teambloggers') ) {
+        //if( Acl::check('group.administrators') && Acl::check('group.teambloggers') ) {
+        if( Acl::check('group.owners')) {
             if($owner == $_SESSION['admin']) $myblogsel = ' selected="selected"';
             $blogn .= '<option value="'.$owner.'" '. $myblogsel .'>'._t('내 블로그').'</option>';
         }
     
-        $teamblogInfo = DBQuery::queryAll("SELECT * FROM ".$database['prefix']."Teamblog WHERE userid='".$_SESSION['admin']."'");
-        foreach($teamblogInfo as $res){
-            if($res['teams'] == $owner && $owner == $_SESSION['admin'] ){
+        $teamblogInfo = DBQuery::queryAll("SELECT t.teams, b.title, u.name
+                FROM {$database['prefix']}Teamblog t 
+                LEFT JOIN {$database['prefix']}BlogSettings b ON b.owner = t.teams
+                LEFT JOIN {$database['prefix']}Users u ON u.userid = t.teams
+                WHERE t.userid='".$_SESSION['admin']."'");
+        foreach($teamblogInfo as $teamInfo){
+            if($teamInfo['teams'] == $owner && $owner == $_SESSION['admin'] ){
                 continue;
             } else {
-                $title = DBQuery::queryCell("SELECT title FROM ".$database['prefix']."BlogSettings WHERE owner='".$res['teams']."'");
-                if(empty($title)){
-                    $title = _f('%1 님의 블로그',DBQuery::queryCell("SELECT name FROM ".$database['prefix']."Users WHERE userid='".$res['teams']."'"));
+                if(empty($teamInfo['title'])){
+                    $title = _f('%1 님의 블로그',$teamInfo['name']);
                 }
-                $blogn .= '<option value="' . $res['teams'] . '"';
-                if($res['teams'] == $owner) $blogn .= ' selected="selected"';
+                $blogn .= '<option value="' . $teamInfo['teams'] . '"';
+                if($teamInfo['teams'] == $owner) $blogn .= ' selected="selected"';
                 $blogn .= '>' . $title . '</option>';
             }

trunk/lib/config.php

@@ -4 +4 @@
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
 define('TEXTCUBE_NAME', 'Textcube');
-define('TEXTCUBE_VERSION', '1.5 Alpha 6');
+define('TEXTCUBE_VERSION', '1.5 pre-Beta');
 define('TEXTCUBE_COPYRIGHT', 'Copyright © 2004-2007. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
 define('TEXTCUBE_HOMEPAGE', 'http://www.textcube.com/');