Changeset 3300

Timestamp:

05/21/07 02:25:54 (18 months ago)

Author:

inureyes

Message:

#408

• r3299의 수정사항.
  

Location:

sandbox

Files:

• blog/owner/entry/add/index.php (modified) (1 diff)
• blog/owner/entry/delete/index.php (modified) (2 diffs)
• blog/owner/entry/delete/item.php (modified) (1 diff)
• blog/owner/entry/edit/item.php (modified) (1 diff)
• blog/owner/entry/visibility/item.php (modified) (1 diff)
• blog/owner/setting/account/cancelInvite/index.php (modified) (1 diff)
• blog/owner/setting/account/index.php (modified) (2 diffs)
• blog/owner/setting/account/invite/index.php (modified) (1 diff)
• components/Textcube.Data.User.php (modified) (1 diff)
• lib/model/blog.blogSetting.php (modified) (2 diffs)
• lib/model/blog.entry.php (modified) (2 diffs)
• lib/piece/blog/list.php (modified) (2 diffs)
• lib/piece/owner/header.php (modified) (1 diff)
• lib/session.php (modified) (1 diff)

sandbox/blog/owner/entry/add/index.php

@@ -39 +39 @@
     fireEvent('AddPost', $id, $entry);
     setUserSetting('LatestEditedEntry',$id);
-    
-    // �����:: �۾�� ����� �����DB �� �ִ´�
-    DBQuery::query("INSERT INTO `{$database['prefix']}TeamEntryRelations` VALUES('$owner', '$id', '$_SESSION[admin]')");
-    // End TeamBlog
 }
 $result = array();

sandbox/blog/owner/entry/delete/index.php

@@ -12 +12 @@
 requireStrictRoute();
 foreach(explode(',', $_POST['targets']) as $target) {
-    
-    // �����:: �� ���Ʈ�� ���� ��� ������Ȯ�
+    // TeamBlog check
     if(empty($pc)){
-        $isPosting = DBQuery::queryCell("SELECT Team FROM {$database['prefix']}TeamEntryRelations WHERE Owner='$owner' and Team='$_SESSION[admin]' and Id='$suri[id]' " );
-        if(empty($isPosting)) { respondResultPage(-1); exit; }
+        $isPosting = DBQuery::queryCell("SELECT team FROM {$database['prefix']}TeamEntryRelations WHERE owner='$owner' and team='".$_SESSION['admin']."' and id='".$suri['id']."'" );
+        if(empty($isPosting)) {
+            respondResultPage(-1);
+            exit;
+        }
     }
     // End TeamBlog
@@ -22 +24 @@
     if (!deleteEntry($owner, $target))
         respondResultPage(-1);
-
 }
 respondResultPage(0);

sandbox/blog/owner/entry/delete/item.php

@@ -9 +9 @@
 $isAjaxRequest = checkAjaxRequest();
 
-// �����:: �� ���Ʈ�� ���� ��� ������Ȯ�
+// TeamBlog check.
 if(empty($pc)){
-    $isPosting = DBQuery::queryCell("SELECT Team FROM {$database['prefix']}TeamEntryRelations WHERE Owner='$owner' and Team='$_SESSION[admin]' and Id='$suri[id]' " );
-    if(empty($isPosting)) { respondResultPage(-1); exit; }
+    $isPosting = DBQuery::queryCell("SELECT team FROM {$database['prefix']}TeamEntryRelations WHERE owner='".$owner."' and team='".$_SESSION['admin']."' and id='".$suri['id']."'" );
+    if(empty($isPosting)) {
+        respondResultPage(-1);
+        exit;
+    }
 }
 // End TeamBlog

sandbox/blog/owner/entry/edit/item.php

@@ -667 +667 @@
                                                     <div id="status-protected" class="status-protected"<?php if($isKeyword) echo _t('style="display: none"');?>><input type="radio" id="visibility_protected" class="radio" name="visibility" value="1"<?php echo (abs($entry['visibility']) == 1 ? ' checked="checked"' : '');?> /><label for="visibility_protected"><?php echo _t('보호');?></label></div>
                                                     <div id="status-public" class="status-public"><input type="radio" id="visibility_public" class="radio" name="visibility" value="2"<?php echo (abs($entry['visibility']) == 2 ? ' checked="checked"' : '');?> /><label for="visibility_public"><?php echo _t('공개');?></label></div>
-                                                    <div id="status-syndicated" class="status-syndicated"<?php if($isKeyword) echo _t('style="display: none"');?>><input type="radio" id="visibility_syndicated" class="radio" name="visibility" value="3"<?php echo $countResult == false ? ' onclick="viewWhatIsEolin()"' : NULL; echo (abs($entry['visibility']) == 3 ? ' checked="checked"' : '');?> /><label for="visibility_syndicated"><?php echo _t('발행');?><?php echo $countResult == true ? ' (<a href="#void" onclick="viewWhatIsEolin()">'._t('설명').'</a>)' : NULL;?></label></div>
+                                                    <div id="status-syndicated" class="status-syndicated"<?php if($isKeyword) echo _t('style="display: none"');?>><input type="radio" id="visibility_syndicated" class="radio" name="visibility" value="3"<?php echo $countResult == false ? ' onclick="viewWhatIsEolin();return false;"' : NULL; echo (abs($entry['visibility']) == 3 ? ' checked="checked"' : '');?> /><label for="visibility_syndicated"><?php echo _t('발행');?><?php echo $countResult == true ? ' (<a href="#void" onclick="viewWhatIsEolin()">'._t('설명').'</a>)' : NULL;?></label></div>
                                                 </dd>
                                             </dl>

sandbox/blog/owner/entry/visibility/item.php

@@ -15 +15 @@
 requireStrictRoute();
 
-// �����:: �� ���Ʈ�� ���� ��� ������Ȯ�
+// TeamBlog ACL check whether or not current user can edit this post.
 if(empty($pc) && !empty($suri['id'])){
-    $isPosting = DBQuery::queryCell("SELECT Team FROM {$database['prefix']}TeamEntryRelations WHERE Owner='$owner' and Team='$_SESSION[admin]' and Id='$suri[id]' " );
-    if(empty($isPosting)) { exit; }
+    $isPosting = DBQuery::queryCell("SELECT team FROM {$database['prefix']}TeamEntryRelations WHERE owner='".$owner."' and team='".$_SESSION['admin']."' and id='".$suri['id']."'" );
+    if(empty($isPosting)) {
+        exit;
+    }
 }
 // End TeamBlog

sandbox/blog/owner/setting/account/cancelInvite/index.php

@@ -13 +13 @@
 $result = cancelInvite($_POST['userid']);
 if ($result) {
-    DBQuery::execute("DELETE FROM `{$database['prefix']}Teamblog` WHERE teams='$owner' and userid='$_POST[userid]'");
     respondResultPage(0);
 } else {

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

@@ -231 +231 @@
 
 <?php
-// 팀블로그 :: 사용자 이름 받아오기
- $CH_user = DBQuery::queryRow("SELECT name, loginid FROM {$database['prefix']}Users WHERE userid='$_SESSION[admin]'");
+// Teamblog :: Get username.
+ $teamblog_user = DBQuery::queryRow("SELECT name, loginid 
+     FROM {$database['prefix']}Users 
+     WHERE userid='".$_SESSION['admin']."'");
 // End TeamBlog
 ?>
@@ -247 +249 @@
                                         <dl id="blogger-name-line" class="line">
                                             <dt><label for="nickname"><?php echo _t('필명');?></label></dt>
-                                            <dd><input type="text" id="nickname" class="input-text" value="<?php echo htmlspecialchars($CH_user['name']);?>" onkeydown="if(event.keyCode == 13) save();" /></dd>
+                                            <dd><input type="text" id="nickname" class="input-text" value="<?php echo htmlspecialchars($teamblog_user['name']);?>" onkeydown="if(event.keyCode == 13) save();" /></dd>
                                         </dl>
                                         <dl id="blogger-email-line" class="line">
                                             <dt><label for="email"><?php echo _t('e-mail');?></label></dt>
                                             <dd>
-                                                <input type="text" id="email" class="input-text" value="<?php echo htmlspecialchars($CH_user['loginid']);?>" />
+                                                <input type="text" id="email" class="input-text" value="<?php echo htmlspecialchars($teamblog_user['loginid']);?>" />
                                                 <em><?php echo _t('(로그인시 ID로 사용됩니다)');?></em>
                                             </dd>

sandbox/blog/owner/setting/account/invite/index.php

@@ -20 +20 @@
 $result = addUser($_POST['email'], $_POST['name'], $_POST['identify'], $_POST['comment'], $_POST['senderName'], $_POST['senderEmail']);
 
-    // �����:: DB �� ��� ��� ���
-if($result == 15){
-    $my = DBQuery::queryRow("SELECT userid, name FROM {$database['prefix']}Users WHERE loginid='$_POST[email]'");
-    $profile = $my['name'] . "�����Դϴ�";
-    $teams=DBQuery::query("INSERT INTO `{$database['prefix']}Teamblog`  VALUES('$my[userid]', '$my[userid]', '0', '1', '1', '$profile', '', '0', '#000000', '10', '0', UNIX_TIMESTAMP(), '0')");
-    if(!$teams||(mysql_affected_rows()==0)){
-        respondResultPage(20);
-    }
-}
 respondResultPage($result);
 ?>

sandbox/components/Textcube.Data.User.php

@@ -73 +73 @@
     }
     
-    function getuserid() {
+    function getUserid() {
         if (is_null($this->userid)) 
             $this->getUser();

sandbox/lib/model/blog.blogSetting.php

@@ -292 +292 @@
         return 62;
     }
+    
+    $result = DBQuery::query("INSERT INTO `{$database['prefix']}Teamblog`  VALUES('".$id."', '".$id."', '0', '1', '1', '"._f("%1 님의 글입니다",$name)."', '', '0', '#000000', '10', '0', UNIX_TIMESTAMP(), '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 `owner` = $id");
+        DBQuery::query("DELETE FROM `{$database['prefix']}SkinSettings` WHERE `owner` = $id");
+        DBQuery::query("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `owner` = $id");
+        DBQuery::query("DELETE FROM `{$database['prefix']}FeedGroups` WHERE `owner` = $id");        
+        return 20;
+    }
+    
     $headers = 'From: ' . encodeMail($senderName) . '<' . $senderEmail . ">\n" . 'X-Mailer: ' . TEXTCUBE_NAME . "\n" . "MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n";
     if (empty($name))
@@ -332 +343 @@
             if (DBQuery::execute("DELETE FROM `{$database['prefix']}SkinSettings` WHERE `owner` = $userid")) {
                 if (DBQuery::execute("DELETE FROM `{$database['prefix']}FeedSettings` WHERE `owner` = $userid")) {
-                    return true;
+                    if(DBQuery::execute("DELETE FROM `{$database['prefix']}Teamblog` WHERE teams='".$owner."' and userid='."$_POST['userid']."'")) {
+                        return true;
+                    } else {
+                        return false;
                 } else {
                     return false;

sandbox/lib/model/blog.entry.php

@@ -218 +218 @@
     requireComponent('Eolin.PHP.Core');
     
-    // 팀블로그
+    // Teamblog
     $chT_SQL1 = $chT_SQL2 = "";
-    $posting = DBQuery::queryCell("SELECT Posting FROM {$database['prefix']}Teamblog WHERE teams='$owner' and userid='$_SESSION[admin]' " );
+    $posting = DBQuery::queryCell("SELECT Posting FROM {$database['prefix']}Teamblog WHERE teams='$owner' and userid='".$_SESSION['admin']."'" );
     if(empty($posting)){
         $chT_SQL1 = ", {$database['prefix']}TeamEntryRelations z";
-        $chT_SQL2 = " AND z.Owner=$owner AND z.Id=e.id AND z.Team=".$_SESSION['admin'];
+        $chT_SQL2 = " AND z.Owner=".$owner." AND z.Id=e.id AND z.Team=".$_SESSION['admin'];
     }
     // End TeamBlog
@@ -454 +454 @@
     DBQuery::query("DELETE FROM {$database['prefix']}Entries WHERE owner = $owner AND id = $id AND draft = 1");
     DBQuery::query("UPDATE {$database['prefix']}Attachments SET parent = $id WHERE owner = $owner AND parent = 0");
+    DBQuery::query("INSERT INTO `{$database['prefix']}TeamEntryRelations` VALUES('$owner', '$id', '".$_SESSION['admin']."')");  
     updateEntriesOfCategory($owner, $entry['category']);
     if ($entry['visibility'] == 3)

sandbox/lib/piece/blog/list.php

@@ -8 +8 @@
     $itemsView = '';
     foreach ($list['items'] as $item) { 
-        $CHT_name = DBQuery::queryCell("SELECT b.name FROM {$database['prefix']}TeamEntryRelations a, {$database['prefix']}Users b  WHERE a.Owner=$item[owner] AND a.Id=$item[id] AND a.Team=b.userid " );
+        $teamblog_name = DBQuery::queryCell("SELECT b.name 
+            FROM {$database['prefix']}TeamEntryRelations a, {$database['prefix']}Users b  
+            WHERE a.Owner=".$item['owner']." AND a.Id=".$item['id']." AND a.Team=b.userid");
         $itemsView .= str_replace(
             array(
@@ -19 +21 @@
                 fireEvent('ViewListDate', Timestamp::format3($item['published'])),
                 "$blogURL/" . ($blog['useSlogan'] ? 'entry/' . encodeURL($item['slogan']) : $item['id']),
-                htmlspecialchars('['.$CHT_name.'] '. fireEvent('ViewListTitle', $item['title'])),
+                htmlspecialchars('['.$teamblog_name.'] '. fireEvent('ViewListTitle', $item['title'])),
                 ($item['comments'] > 0) ? "({$item['comments']})" : ''
             ),

sandbox/lib/piece/owner/header.php

@@ -172 +172 @@
                     <ul id="main-description">
 <?php
-$writer=DBQuery::queryCell("SELECT name FROM {$database['prefix']}Users WHERE userid = $_SESSION[admin]");
+$writer = DBQuery::queryCell("SELECT name FROM {$database['prefix']}Users WHERE userid = ".$_SESSION['admin']);
 ?>
                         <li id="description-blogger"><span class="text"><?php echo _f('환영합니다. <em>%1</em>님.', htmlspecialchars($writer));?></span></li>

sandbox/lib/session.php

@@ -128 +128 @@
 }
 
-// �����:: ����ν����serid �� admin �����ִ´�
+// Teamblog : insert userid to variable admin when member logins.
 function authorizeSession($userid, $admin) {
     global $database, $service;