-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Started refactoring in blog model classes.
- Loading branch information
Showing
15 changed files
with
432 additions
and
282 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| <?php | ||
| /** | ||
| * @copyright 2024 Roman Parpalak | ||
| * @license MIT | ||
| * @package S2 | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace s2_extensions\s2_blog; | ||
|
|
||
| use S2\Cms\Model\UrlBuilder; | ||
|
|
||
| class BlogUrlBuilder | ||
| { | ||
| protected ?string $blogPath = null; | ||
| protected ?string $blogTagsPath = null; | ||
|
|
||
| public function __construct( | ||
| private readonly UrlBuilder $urlBuilder, | ||
| private readonly string $tagsUrl, | ||
| private readonly string $favoriteUrl, | ||
| private readonly string $blogUrl, | ||
| ) { | ||
| } | ||
|
|
||
| public function main(): string | ||
| { | ||
| return $this->blogPath ?? $this->blogPath = $this->urlBuilder->link(str_replace(urlencode('/'), '/', urlencode($this->blogUrl)) . '/'); | ||
| } | ||
|
|
||
| public function favorite(): string | ||
| { | ||
| return $this->main() . urlencode($this->favoriteUrl) . '/'; | ||
| } | ||
|
|
||
| public function tags(): string | ||
| { | ||
| return $this->blogTagsPath ?? $this->blogTagsPath = $this->main() . urlencode($this->tagsUrl) . '/'; | ||
| } | ||
|
|
||
| public function tag(string $tagUrl): string | ||
| { | ||
| return $this->tags() . urlencode($tagUrl) . '/'; | ||
| } | ||
|
|
||
| public function year(int $year): string | ||
| { | ||
| return $this->main() . $year . '/'; | ||
| } | ||
|
|
||
| public function month(int $year, int $month): string | ||
| { | ||
| return $this->main() . $year . '/' . self::extendNumber($month) . '/'; | ||
| } | ||
|
|
||
| public function monthFromTimestamp(int $timestamp): string | ||
| { | ||
| return $this->main() . date('Y/m/', $timestamp); | ||
| } | ||
|
|
||
| public function day(int $year, int $month, int $day): string | ||
| { | ||
| return $this->main() . $year . '/' . self::extendNumber($month) . '/' . self::extendNumber($day) . '/'; | ||
| } | ||
|
|
||
| public function post(int $year, int $month, int $day, string $url): string | ||
| { | ||
| return $this->main() . $year . '/' . self::extendNumber($month) . '/' . self::extendNumber($day) . '/' . urlencode($url); | ||
| } | ||
|
|
||
| public function postFromTimestamp(int $create_time, string $url): string | ||
| { | ||
| return $this->main() . date('Y/m/d/', $create_time) . urlencode($url); | ||
| } | ||
|
|
||
| public function blogIsOnTheSiteRoot(): bool | ||
| { | ||
| return $this->blogUrl === ''; | ||
| } | ||
|
|
||
| private static function extendNumber(int $month): string | ||
| { | ||
| return str_pad((string)$month, 2, '0', STR_PAD_LEFT); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| <?php | ||
| /** | ||
| * @copyright 2024 Roman Parpalak | ||
| * @license MIT | ||
| * @package S2 | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace s2_extensions\s2_blog; | ||
|
|
||
| use S2\Cms\Pdo\DbLayer; | ||
|
|
||
| readonly class CalendarBuilder | ||
| { | ||
| public function __construct( | ||
| private DbLayer $dbLayer, | ||
| private BlogUrlBuilder $blogUrlBuilder, | ||
| private int $startYear, | ||
| ) { | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @param ?int $day 0 for skipping highlight, null for skipping header | ||
| * @throws \S2\Cms\Pdo\DbLayerException | ||
| */ | ||
| public function calendar(?int $year = null, ?int $month = null, ?int $day = 0, string $url = '', array $dayUrls = null): string | ||
| { | ||
| if ($year === null) { | ||
| $year = (int)date('Y'); | ||
| } | ||
|
|
||
| if ($month === null) { | ||
| $month = (int)date('m'); | ||
| } | ||
|
|
||
| $startTime = mktime(0, 0, 0, $month, 1, $year); | ||
| $endTime = mktime(0, 0, 0, $month + 1, 1, $year); | ||
|
|
||
| // Dealing with week days | ||
| $currentColumnIndex = (int)date('w', $startTime); | ||
| if (\Lang::get('Sunday starts week', 's2_blog') !== '1') { | ||
| --$currentColumnIndex; | ||
| if ($currentColumnIndex === -1) { | ||
| $currentColumnIndex = 6; | ||
| } | ||
| } | ||
|
|
||
| // How many days have the month? | ||
| $daysInThisMonth = (int)date('j', mktime(0, 0, 0, $month + 1, 0, $year)); // day = 0 | ||
|
|
||
| // Flags for the days when posts have been written | ||
| if ($dayUrls === null) { | ||
| $dayUrls = []; | ||
| $query = [ | ||
| 'SELECT' => 'create_time, url', | ||
| 'FROM' => 's2_blog_posts', | ||
| 'WHERE' => 'create_time < ' . $endTime . ' AND create_time >= ' . $startTime . ' AND published = 1' | ||
| ]; | ||
| $result = $this->dbLayer->buildAndQuery($query); | ||
| while ($row = $this->dbLayer->fetchRow($result)) { | ||
| $dayUrls[1 + (int)(($row[0] - $startTime) / 86400)][] = $row[1]; | ||
| } | ||
| } | ||
|
|
||
| // Header | ||
| $monthName = \Lang::month($month); | ||
| if ($day === null) { | ||
| // One of 12 year tables | ||
| if ($startTime < time()) { | ||
| $monthName = '<a href="' . $this->blogUrlBuilder->monthFromTimestamp($startTime) . '">' . $monthName . '</a>'; | ||
| } | ||
| $header = '<tr class="nav"><th colspan="7">' . $monthName . '</th></tr>'; | ||
| } else { | ||
| if ($day !== 0) { | ||
| $monthName = '<a href="' . $this->blogUrlBuilder->monthFromTimestamp($startTime) . '">' . $monthName . '</a>'; | ||
| } | ||
|
|
||
| // Links in the header | ||
| $next_month = $endTime < time() ? '<a class="nav_mon" href="' . $this->blogUrlBuilder->monthFromTimestamp($endTime) . '" title="' . \Lang::month(date('m', $endTime)) . date(', Y', $endTime) . '">→</a>' : '→'; | ||
|
|
||
| $prevTime = mktime(0, 0, 0, $month - 1, 1, $year); | ||
| $prevMonth = $prevTime >= mktime(0, 0, 0, 1, 1, $this->startYear) ? '<a class="nav_mon" href="' . $this->blogUrlBuilder->monthFromTimestamp($prevTime) . '" title="' . \Lang::month(date('m', $prevTime)) . date(', Y', $prevTime) . '">←</a>' : '←'; | ||
|
|
||
| $header = '<tr class="nav"><th>' . $prevMonth . '</th><th align="center" colspan="5">' | ||
| . $monthName . ', <a href="' . $this->blogUrlBuilder->year($year) . '">' . $year . '</a></th><th>' . $next_month . '</th></tr>'; | ||
| } | ||
|
|
||
| // Titles | ||
| $output = '<table class="cal">' . $header . '<tr>'; | ||
|
|
||
| // Empty cells before | ||
| for ($i = 0; $i < $currentColumnIndex; $i++) { | ||
| $output .= '<td' . ($this->isWeekend($i) ? ' class="sun"' : '') . '></td>'; | ||
| } | ||
|
|
||
| // Days | ||
| for ($currentDayInMonth = 1; $currentDayInMonth <= $daysInThisMonth; $currentDayInMonth++) { | ||
| $currentColumnIndex++; | ||
| $cellContent = $currentDayInMonth; // Simple text content | ||
| if (isset($dayUrls[$currentDayInMonth])) { | ||
| if (\count($dayUrls[$currentDayInMonth]) !== 1 && ($currentDayInMonth !== $day || $url !== '')) { | ||
| // Several posts, link to the day page (if this is not the day selected) | ||
| $cellContent = '<a href="' . $this->blogUrlBuilder->day($year, $month, $currentDayInMonth) . '">' . $currentDayInMonth . '</a>'; | ||
| } | ||
| if (\count($dayUrls[$currentDayInMonth]) === 1 && ($currentDayInMonth !== $day || $url === '')) { | ||
| // One post, link to it (if this is not the post selected) | ||
| $cellContent = '<a href="' . $this->blogUrlBuilder->post($year, $month, $currentDayInMonth, $dayUrls[$currentDayInMonth][0]) . '">' . $currentDayInMonth . '</a>'; | ||
| } | ||
| } | ||
|
|
||
| $classes = []; | ||
| if ($currentDayInMonth === $day) { | ||
| // Current day | ||
| $classes[] = 'cur'; | ||
| } | ||
|
|
||
| if ($this->isWeekend($currentColumnIndex)) { | ||
| // Weekend | ||
| $classes[] = 'sun'; | ||
| } | ||
|
|
||
| $output .= '<td' . (!empty($classes) ? ' class="' . implode(' ', $classes) . '"' : '') . '>' | ||
| . $cellContent | ||
| . '</td>'; | ||
|
|
||
| if (!($currentColumnIndex % 7) && ($currentDayInMonth !== $daysInThisMonth)) { | ||
| $output .= '</tr><tr>'; | ||
| } | ||
| } | ||
|
|
||
| // Empty cells in the end | ||
| while ($currentColumnIndex % 7) { | ||
| $currentColumnIndex++; | ||
| $output .= '<td' . ($this->isWeekend($currentColumnIndex) ? ' class="sun"' : '') . '></td>'; | ||
| } | ||
|
|
||
| $output .= '</tr></table>'; | ||
| return $output; | ||
| } | ||
|
|
||
|
|
||
| private function isWeekend(int $n): bool | ||
| { | ||
| if ($n % 7 === 0) { | ||
| return true; | ||
| } | ||
| if ($n % 7 === 6 && \Lang::get('Sunday starts week', 's2_blog') != '1') { | ||
| return true; | ||
| } | ||
| if ($n % 7 === 1 && \Lang::get('Sunday starts week', 's2_blog') == '1') { | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.