Changeset 3425

Timestamp:

06/10/07 18:09:50 (18 months ago)

Author:

inureyes

Message:

#408

• 헤더 메뉴에 acl 도입
  
• 팀블로그 메뉴를 acl 기반으로 새로 짤 준비 및 테스트.
  
• acl component 관련 변수명 오타들 수정
  

Location:

trunk

Files:

• blog/checkup/index.php (modified) (3 diffs)
• blog/owner/setting/account/index.php (modified) (1 diff)
• blog/owner/setting/teamblog/index.php (modified) (4 diffs)
• components/Textcube.Core.php (modified) (3 diffs)
• lib/auth.php (modified) (2 diffs)
• lib/piece/owner/contentMenu.php (modified) (7 diffs)
• lib/piece/owner/header.php (modified) (1 diff)
• setup.php (modified) (2 diffs)

trunk/blog/checkup/index.php

@@ -482 +482 @@
             teams int(11) NOT NULL default 0,
             userid int(11) NOT NULL default 1,
-            enduser int(11) NOT NULL default 0,
-            admin int(11) NOT NULL default 0,
-            posting int(11) NOT NULL default 0,
+            acl int(11) NOT NULL default 0,
             profile text NULL default '',
-            logo varchar(15) default '',
-            font_style int(11) NOT NULL default 0,
-            font_color varchar(10) NOT NULL default '#000000',
-            font_size int(11) NOT NULL default 10,
-            font_bold int(11) NOT NULL default 0,
             created int(11) NOT NULL default 0,
             lastLogin int(11) NOT NULL default 0,
@@ -502 +495 @@
             if ($users = $query->getAll('userid, name, created')) {
                 foreach($users as $user) {
-                    DBQuery::execute("INSERT INTO `{$database['prefix']}Teamblog` VALUES('".$user['userid']."', '".$user['userid']."','0','1','1', '".$user['name']."', '', '0', '#000000', '10', '0', '".$user['created']."', '0')");
+                    DBQuery::execute("INSERT INTO `{$database['prefix']}Teamblog` VALUES('".$user['userid']."', '".$user['userid']."','9', '".$user['name']."','".$user['created']."', '0')");
                 }
             }
@@ -558 +551 @@
 }
 
-if (DBQuery::queryExistence("DESC {$database['prefix']}Teamblog font_color")) {
+if (DBQuery::queryExistence("DESC {$database['prefix']}Teamblog enduser")) {
     $changed = true;
     echo '<li>', _text('팀블로그 테이블의 유저 출력 설정 필드를 삭제합니다.'), ': ';
     if(DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP logo") &&
+    DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP enduser") &&
+    DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP admin") &&
+    DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP posting") &&
     DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP font_style") &&
     DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP font_color") &&
     DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP font_size") &&
-    DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP font_bold"))
+    DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog DROP font_bold") &&
+    DBQuery::execute("ALTER TABLE {$database['prefix']}Teamblog ADD acl int(11) not null AFTER userid"))
         echo '<span style="color:#33CC33;">', _text('성공'), '</span></li>';
     else

trunk/blog/owner/setting/account/index.php

@@ -240 +240 @@
 
                         <div id="part-setting-account" class="part">
-                            <h2 class="caption"><span class="main-text"><?php echo _t('회원정보를 관리합니다');?></span></h2>
+                            <h2 class="caption"><span class="main-text"><?php echo _t('팀블로그 구성원 목록');?></span></h2>
                             
                             <div class="data-inbox">

trunk/blog/owner/setting/teamblog/index.php

@@ -28 +28 @@
                                     sInString = sInString.replace( /^\s+/g, "" );// strip leading
                                     return sInString.replace( /\s+$/g, "" );// strip trailing
-                                }
-                                
-                                function Trim(sInString) {
-                                    sInString = sInString.replace( /^\s+/g, "" );// strip leading
-                                    return sInString.replace( /\s+$/g, "" );// strip trailing
-                                }
-                                
-                                function saveName() {
-                                    try{
-                                        var Astyle = document.getElementById('admin_style');
-                                        var Apos = document.getElementById('stylePos');
-                                        var Ais_style = document.getElementById('is_style');
-                                        
-                                        var Sbold = document.getElementById('font_bold');
-                                        var Sitalic = document.getElementById('font_i');
-                                        var Ssize = document.getElementById('font_size');
-                                        var Scolor = document.getElementById('font_color');
-
-                                        var request = new HTTPRequest("POST", "<?php echo $blogURL;?>/owner/setting/teamblog/nameStyle/");
-                                        request.onSuccess = function() {
-                                            PM.showMessage("<?php echo _t('저장되었습니다.');?>", "center", "bottom");
-                                        }
-                                        request.onError = function() {
-                                            alert("<?php echo _t('저장하지 못했습니다.');?>");
-                                        }
-                                        
-                                        var SendValue;
-                                        SendValue = "&bold=" + encodeURIComponent(Sbold.checked);
-                                        SendValue += "&italic=" + encodeURIComponent(Sitalic.checked);
-                                        SendValue += "&size=" + encodeURIComponent(Ssize.value);
-                                        SendValue += "&color=" + encodeURIComponent(Scolor.value);
-                                        
-                                        if(Astyle){
-                                            SendValue += "&style=" + encodeURIComponent(Astyle.checked);
-                                        }
-                                        if(Apos){
-                                            SendValue += "&pos=" + encodeURIComponent(Apos.value);
-                                        }
-                                        if(Ais_style){
-                                            SendValue += "&is_style=" + encodeURIComponent(Ais_style.checked);
-                                        }
-                                        
-                                        request.send(SendValue);
-                                    }catch(e){
-                                    }
                                 }
 
@@ -298 +253 @@
                                     if(mycheck == 0) alert("선택된 사용자가 없습니다.");
                                 }
-<?php
-}?>                         //]]>
+
+                                function buttonchange(){
+                                    if( document.getElementById('target-role').value == 'delete'){
+                                        document.getElementById('apply-button').value = '<?php echo _t('탈퇴');?>';
+                                    } else {
+                                        document.getElementById('apply-button').value = '<?php echo _t('적용');?>';
+                                    }
+                                }
+<?php
+}
+?>
+                        //]]>
                         </script>
 
-
+                        <div id="part-setting-account" class="part">
+                            <h2 class="caption"><span class="main-text"><?php echo _t('팀블로그를 관리합니다');?></span></h2>
+                            <div id="list-section" class="section">
+                                <table cellspacing="0" cellpadding="0">
+                                    <thead>
+                                        <tr>
+                                            <th class="status"><input type="checkbox" name="Aclick" onclick="Check_rev()"></th>
+                                            <th class="acl"><span class="text"><?php echo _t('권한 ');?></span></th>
+                                            <th class="name"><span class="text"><?php echo _t('이름 ');?></span></th>
+                                            <th class="blog"><span class="text"><?php echo _t('대표 블로그');?></span></th>                                          
+                                            <th class="email"><span class="text"><?php echo _t('이메일');?></span></th>
+                                            <th class="date"><span class="text"><?php echo _t('가입일');?></span></th>
+                                            <th class="date"><span class="text"><?php echo _t('작성한 글 수');?></span></th>
+                                            <th class="cancel"><span class="text"><?php echo _t('초대취소');?></span></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
 <?php
     $teamblog_owner = DBQuery::queryRow("SELECT * FROM {$database['prefix']}Teamblog 
@@ -308 +289 @@
                 AND teams='".$owner."'");
     $teamblog_user = DBQuery::queryRow("SELECT a.*, b.name 
-            FROM {$database['prefix']}Teamblog a, {$database['prefix']}Users b  
+            FROM {$database['prefix']}Teamblog a, 
+                {$database['prefix']}Users b  
             WHERE a.userid = '".$_SESSION['admin']."' 
                 AND a.teams = '".$_SESSION['userid']."' 
                 AND b.userid = a.userid");
-    $invited_user = DBQuery::queryAll("SELECT a.*, b.* 
-        FROM {$database['prefix']}Teamblog a, 
-            {$database['prefix']}Users b 
-        WHERE teams = '$owner' 
-            AND b.userid = a.userid 
-            AND a.userid != '$owner'
-        ORDER BY b.created DESC"); 
-?>
-                        <div id="part-setting-account" class="part">
-                            <h2 class="caption"><span class="main-text"><?php echo _t('팀블로그를 관리합니다');?></span></h2>
-                            <div id="list-section" class="section">
-                                <dl>
-                                    <dt class="title"><span class="label"><?php echo _t('팀원 명단');?></span></dt>
-                                    <dd>
-                                        <table cellspacing="0" cellpadding="0">
-                                            <thead>
-                                                <tr>
-                                                    <th class="status"><input type="checkbox" name="Aclick" onclick="Check_rev()"></th>
-                                                    <th class="email"><span class="text"><?php echo _t('이름 (e-mail)');?></span></th>
-                                                    <th class="date"><span class="text"><?php echo _t('초대일');?></span></th>
-                                                    <th class="status"><span class="text"><?php echo _t('경과');?></span></th>
-                                                    <th class="password"><span class="text"><?php echo _t('비밀번호');?> / <?php echo _t('권한 관리');?></span></th>
-                                                    <th class="cancel"><span class="text"><?php echo _t('초대취소');?></span></th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-<?php
+    $invited_user = DBQuery::queryAll("SELECT t.*, u.* 
+        FROM {$database['prefix']}Teamblog t, 
+            {$database['prefix']}Users u 
+        WHERE t.teams = '$owner' 
+            AND u.userid = t.userid 
+            AND t.userid != '$owner'
+        ORDER BY u.created DESC"); 
+
     $count=0;
+
     if(isset($invited_user)) {
         foreach($invited_user as $value) {
-            $className=($count%2)==1?'even-line':'odd-line';
-            $className.=($count==sizeof($invited_user)-1)?' last-line':'';
+            $className= ($count%2)==1 ? 'even-line' : 'odd-line';
+            $className.=($count==sizeof($invited_user)-1) ? ' last-line':'';
 ?>
                                                 <tr class="<?php echo $className;?> inactive-class">
                                                     <td class="status"><input type="checkbox" id="check_<?php echo $count; ?>"><input type="hidden" name="chh<?php echo $count; ?>" value="<?php echo $value['userid']; ?>"><input type="hidden" name="cht<?php echo $count; ?>" value="<?php if($value['last'] == '0' && $value['lastLogin'] =='0') echo "0"; else echo "1"; ?>"></td>
-                                                    <td class="email"><?php     echo htmlspecialchars($value['name']);?>(<?php echo htmlspecialchars($value['loginid']);?>)</td>
-                                                    <td class="date"><?php echo Timestamp::format5($value['create']);?></td>
+                                                    <td class="acl">test</td>
+                                                    <td class="name"><?php echo $value['name'];?></td>
+                                                    <td class="blog">test</td>
+                                                    <td class="email"><?php     echo  htmlspecialchars($value['loginid']);?></td>
+                                                    <td class="date"><?php echo Timestamp::format5($value['created']);?></td>
+                                                    <td class="posting"><?php echo $value['posting'];?></td>
 <?php
             if($value['lastLogin'] == 0) {
-?>
-                                                    <td class="status"><?php echo _f('%1 전',timeInterval($value['created'],time()));?></td>
-                                                    <td class="password"><?php echo DBQuery::queryCell("SELECT password FROM {$database['prefix']}Users WHERE userid = {$value['userid']} AND host = $owner AND lastLogin = 0");?></td>
-                                                    <?php if($value['lastLogin'] == 0){ ?><td class="cancel"><a class="cancel-button button" href="#void" onclick="cancelInvite(<?php   echo $value['userid'];?>);return false;" title="<?php echo _t('초대에 응하지 않은 사용자의 계정을 삭제합니다.');?>"><span class="text"><?php echo _t('초대취소');?></span></a></td>
-                                                    <?php } else{ ?><td class="cancel"><a class="cancel-button button" href="#void" onclick="deleteUser(<?php   echo $value['userid'];?>,0);return false;" title="<?php echo _t('초대에 응하지 않은 사용자의 계정을 삭제합니다.');?>"><span class="text"><?php echo _t('초대 취소');?></span></a></td>
-                                                        <?php } ?>
-<?php
+                if($value['lastLogin'] == 0) { 
+?>
+                                                    <td class="cancel"><a class="cancel-button button" href="#void" onclick="cancelInvite(<?php echo $value['userid'];?>);return false;" title="<?php echo _t('초대에 응하지 않은 사용자의 계정을 삭제합니다.');?>"><span class="text"><?php echo _t('초대취소');?></span></a></td>
+<?php
+                } else {
+?>
+                                                    <td class="cancel"><a class="cancel-button button" href="#void" onclick="deleteUser(<?php   echo $value['userid'];?>,0);return false;" title="<?php echo _t('초대에 응하지 않은 사용자의 계정을 삭제합니다.');?>"><span class="text"><?php echo _t('초대 취소');?></span></a></td>
+<?php
+                } 
             } else {
                 $pblog = $value['enduser'] - $value['userid'];
@@ -397 +367 @@
 ?>
                                             </tbody>
-<?php 
-    if($count) {
-?>
-                                            <tr>
-                                                <td colspan="6"><input type="button" value="<?php echo _t('선택된 사용자 삭제');?>" onclick="deleteSelectedUsers(<?php echo $count;?>)";></td>
-                                            </tr>
-<?php
-    }
-?>
                                         </table>
-                                    </dd>
-                                </dl>
+                            </div>
+                            
+                            <div id="role-action" class="part" >
+                                <span class="text" >선택한 구성원을 </span>
+                                <select name="t-role" id="target-role" onchange="buttonchange();" >
+                                    <option value=''>행동을 지정합니다</option>
+                                    <optgroup label="다음 권한으로 변경합니다">
+                                        <option value='manager'>관리자</option>
+                                        <option value='editor'>편집자</option>
+                                        <option value='writer'>필자</option>
+                                    </optgroup>
+                                    <optgroup label="탈퇴 처리 합니다">
+                                        <option value='delete'>탈퇴</option>
+                                    </optgroup>
+                                </select>
+                                <input type="submit" id="apply-button" class="apply-button input-button" value="적용"  />
                             </div>
                         </div>
+
+                        
+                        
+                        
+                        
 <?php
 if($owner == $_SESSION['admin'] && empty($enduser)) {

trunk/components/Textcube.Core.php

@@ -51 +51 @@
 /* Access Control Object: i.e. uri, components, functions */
 class Aco {
-    var $predefiend;
+    var $predefined;
 
     function Aco( $predefined = null ) {
@@ -74 +74 @@
         }
 
-        /* Adujsting access controll object from plugins */
+        /* Adjusting access control object from plugins */
         $aco = Aco::adjust($aco, $aco_action);
 
-        /* Adujsting required object from plugins by aco*/
+        /* Adjusting required object from plugins by aco*/
         $aro = Aro::adjust($aco, $aco_action);
 
@@ -166 +166 @@
                 WHERE teams='$owner' AND userid='$owner' " );
     
-        $is_style = $res['font_style'] & 1; 
-        $is_admin = $res['font_style'] & 2; 
-        $font_style = $res['font_style'] & 4;
-        $isname = $res['font_style'] & 8;
-        $is_ch = $res['font_style'] & 16;
         $name = array(4);
         $name[0] = '';

trunk/lib/auth.php

@@ -40 +40 @@
             
             // 팀블로그 :: 로그인 성공시 로그인한 시간을 DB 에 기록한다.
-            DBQuery::execute("UPDATE  {$database['prefix']}Teamblog SET last = unix_timestamp() WHERE teams='$owner' AND userid='$session[userid]'");
+            DBQuery::execute("UPDATE  {$database['prefix']}Teamblog SET last = unix_timestamp() WHERE teams='$owner' AND userid='".$session['userid']);
             // End TeamBlog
             
@@ -120 +120 @@
     
     // 팀블로그 :: 팀원 확인
-    $result=DBQuery::query("select a.userid from {$database['prefix']}Users a, {$database['prefix']}Teamblog b where b.teams = $userid and a.loginid = '$loginid' and b.userid=a.userid");
+    $result=DBQuery::query("select a.userid 
+            from {$database['prefix']}Users a, 
+                {$database['prefix']}Teamblog b 
+            where b.teams = $userid 
+                and a.loginid = '$loginid' 
+                and b.userid=a.userid");
     // End TeamBlog
     

trunk/lib/piece/owner/contentMenu.php

@@ -3 +3 @@
     switch($blogMenu['topMenu']) {
         case 'center':
-            if(!empty($ac)){
+            if(Acl::Check('group.administrators')){
                 $blogContentMenuItem = array(
                     array('menu'=>'dashboard','title'=>_t('조각보'),'link'=>'/owner/center/dashboard'),
@@ -20 +20 @@
         break;
         case 'entry':
-            if(!empty($pc)){
+            if(Acl::Check('group.blogwriters')){
                 $blogContentMenuItem = array(
                     array('menu'=>'post','title'=>_t('글쓰기'),'link'=>'/owner/entry/post'),
@@ -30 +30 @@
                     array('menu'=>'trash','title'=>_t('휴지통'),'link'=>'/owner/entry/trash')
                 );
-            }
-            else{
+            } else {
                 $blogContentMenuItem = array(
                     array('menu'=>'post','title'=>_t('글쓰기'),'link'=>'/owner/entry/post'),
@@ -39 +38 @@
         break;
         case 'link':
-        if(!empty($ac)){
+        if(Acl::Check('group.administrators')){
             $blogContentMenuItem = array(
                 array('menu'=>'add','title'=>_t('링크 추가'),'link'=>'/owner/link/add'),
@@ -47 +46 @@
         break;
         case 'skin':
-        if(!empty($ac)){
+        if(Acl::Check('group.administrators')){
             $blogContentMenuItem = array(
                 array('menu'=>'skin','title'=>_t('스킨 선택'),'link'=>'/owner/skin'),
@@ -57 +56 @@
         break;
         case 'plugin':
-        if(!empty($ac)){
+        if(Acl::Check('group.administrators')){
             $blogContentMenuItem = array(
                 array('menu'=>'plugin','title'=>_t('플러그인 목록'),'link'=>'/owner/plugin'),
@@ -66 +65 @@
         case 'setting':
         case 'data':
-        if(!empty($ac)){
+        if($service['type']=='single'){
+            $blogContentMenuItem = array(
+                array('menu'=>'blog','title'=>_t('블로그'),'link'=>'/owner/setting/blog'),
+                array('menu'=>'entry','title'=>_t('글 작성'),'link'=>'/owner/setting/entry'),
+                array('menu'=>'account','title'=>_t('계정 정보'),'link'=>'/owner/setting/account'),
+                array('menu'=>'filter','title'=>_t('스팸 필터'),'link'=>'/owner/setting/filter'),
+                array('menu'=>'data','title'=>_t('데이터 관리'),'link'=>'/owner/data')
+            );
+        } else if(Acl::Check('group.administrators')){
             $blogContentMenuItem = array(
                 array('menu'=>'blog','title'=>_t('블로그'),'link'=>'/owner/setting/blog'),

trunk/lib/piece/owner/header.php

@@ -14 +14 @@
 }
 
-if(!empty($ac)){
+if(Acl::Check('group.administrators')){
     $blogTopMenuItem = array(
         array('menu'=>'center','title'=>_t('센터'),'link'=>'/owner/center/dashboard'),

trunk/setup.php

@@ -1345 +1345 @@
   teams int(11) NOT NULL default 0,
   userid int(11) NOT NULL default 1,
-  enduser int(11) NOT NULL default 0,
-  admin int(11) NOT NULL default 0,
-  posting int(11) NOT NULL default 0,
-  profile text NULL default '',
-  logo varchar(15) default '',
-  font_style int(11) NOT NULL default 0,
-  font_color varchar(10) NOT NULL default '#000000',
-  font_size int(11) NOT NULL default 10,
-  font_bold int(11) NOT NULL default 0,
+  acl int(11) NOT NULL default 0,
   created int(11) NOT NULL default 0,
   lastLogin int(11) NOT NULL default 0,
@@ -1367 +1359 @@
 INSERT INTO {$_POST['dbPrefix']}Users VALUES (1, '$loginid', '$password', '$name', UNIX_TIMESTAMP(), 0, 0);
 INSERT INTO {$_POST['dbPrefix']}UserSettings VALUES (1, 'defaultEditor', 'modern'), (1, 'defaultFormatter', 'ttml');
-INSERT INTO {$_POST['dbPrefix']}Teamblog VALUES (1, 1, 1, 1, 1, '', '', 0, '#000000', 10, 0, UNIX_TIMESTAMP(), 0);
+INSERT INTO {$_POST['dbPrefix']}Teamblog VALUES (1, 1, 9, UNIX_TIMESTAMP(), 0);
 INSERT INTO {$_POST['dbPrefix']}ServiceSettings (name, value) VALUES ('newlineStyle', '1.1'); 
 INSERT INTO {$_POST['dbPrefix']}BlogSettings (owner, name, language, blogLanguage, timezone) VALUES (1, '$blog', '$baseLanguage', '$baseLanguage', '$baseTimezone');