Changeset 3321
- Timestamp:
- 05/24/07 16:21:52 (18 months ago)
- Location:
- sandbox
- Files:
-
- 4 modified
-
blog/search/index.php (modified) (1 diff)
-
lib/model/blog.entry.php (modified) (4 diffs)
-
lib/piece/blog/end.php (modified) (1 diff)
-
lib/piece/blog/list.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
sandbox/blog/search/index.php
r3106 r3321 17 17 if ($suri['page'] === true || $suri['page'] === '1') 18 18 $commentList = getCommentList($owner, $search); 19 $paging = $listWithPaging[1]; 19 20 } 20 21 -
sandbox/lib/model/blog.entry.php
r3300 r3321 100 100 $tag = mysql_tt_escape_string($tag); 101 101 $visibility = doesHaveOwnership() ? '' : 'AND e.visibility > 0 AND (c.visibility > 1 OR e.category = 0)'; 102 $sql = "SELECT e. *102 $sql = "SELECT e.owner, e.id, e.title, e.comments, e.slogan, e.published 103 103 FROM {$database['prefix']}Entries e 104 104 LEFT JOIN {$database['prefix']}TagRelations t ON e.id = t.entry AND e.owner = t.owner … … 113 113 $cond = "AND e.published >= " . getTimeFromPeriod($period) . " AND e.published < " . getTimeFromPeriod(addPeriod($period)); 114 114 $visibility = doesHaveOwnership() ? '' : 'AND e.visibility > 0 AND (c.visibility > 1 OR e.category = 0)'; 115 $sql = "SELECT e. *115 $sql = "SELECT e.owner, e.id, e.title, e.comments, e.slogan, e.published 116 116 FROM {$database['prefix']}Entries e 117 117 LEFT JOIN {$database['prefix']}Categories c ON e.category = c.id AND e.owner = c.owner … … 126 126 $cond = empty($search) ? '' : "AND (title LIKE '%$search%' OR content LIKE '%$search%')"; 127 127 $visibility = doesHaveOwnership() ? '' : 'AND e.visibility > 1 AND (c.visibility > 1 OR e.category = 0)'; 128 $sql = "SELECT e. *128 $sql = "SELECT e.owner, e.id, e.title, e.comments, e.slogan, e.published 129 129 FROM {$database['prefix']}Entries e 130 130 LEFT JOIN {$database['prefix']}Categories c ON e.category = c.id AND e.owner = c.owner … … 182 182 } 183 183 184 function getEntriesWithPagingByNotice($owner, $page, $count ) {184 function getEntriesWithPagingByNotice($owner, $page, $count, $countItem = null) { 185 185 global $database, $folderURL, $suri; 186 186 $visibility = doesHaveOwnership() ? '' : 'AND visibility = 2'; 187 $sql = "SELECT *, '" . _text('공지') . "' categoryLabel FROM {$database['prefix']}Entries WHERE owner = $owner $visibility AND category = -2 ORDER BY published DESC"; 188 return fetchWithPaging($sql, $page, $count, "$folderURL/{$suri['value']}"); 187 $sql = "SELECT * 188 FROM {$database['prefix']}Entries 189 WHERE owner = $owner $visibility AND category = -2 190 ORDER BY published DESC"; 191 return fetchWithPaging($sql, $page, $count, "$folderURL/{$suri['value']}","?page=", $countItem); 189 192 } 190 193 -
sandbox/lib/piece/blog/end.php
r3294 r3321 56 56 dress('textcube_name', TEXTCUBE_NAME, $view); 57 57 dress('textcube_version', TEXTCUBE_VERSION, $view); 58 dress('tattertools_name', TEXTCUBE_NAME, $view); 59 dress('tattertools_version', TEXTCUBE_VERSION, $view); 58 60 if (isset($paging)) 59 61 dress('paging', getPagingView($paging, $skin->paging, $skin->pagingItem), $view); -
sandbox/lib/piece/blog/list.php
r3300 r3321 10 10 $teamblog_name = DBQuery::queryCell("SELECT b.name 11 11 FROM {$database['prefix']}TeamEntryRelations a, {$database['prefix']}Users b 12 WHERE a. Owner=".$item['owner']." AND a.Id=".$item['id']." AND a.Team=b.userid");12 WHERE a.owner=".$item['owner']." AND a.id=".$item['id']." AND a.team=b.userid"); 13 13 $itemsView .= str_replace( 14 14 array( 15 15 '[##_list_rep_regdate_##]', 16 '[##_list_rep_name_##]', 16 17 '[##_list_rep_link_##]', 17 18 '[##_list_rep_title_##]', … … 20 21 array( 21 22 fireEvent('ViewListDate', Timestamp::format3($item['published'])), 23 fireEvent('ViewListName', htmlspecialchars($teamblog_name)), 22 24 "$blogURL/" . ($blog['useSlogan'] ? 'entry/' . encodeURL($item['slogan']) : $item['id']), 23 htmlspecialchars('['.$teamblog_name.'] '. fireEvent('ViewListTitle', $item['title'])),25 fireEvent('ViewListTitle', $item['title']), 24 26 ($item['comments'] > 0) ? "({$item['comments']})" : '' 25 27 ),
