Skip to content

Исправлено не корректное отоброжение дней недели #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mesolaries wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Исправлено не корректное отоброжение дней недели #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions date/calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
// данная клетка календаря пуста).
function makeCal($year, $month) {
// Получаем номер дня недели для 1 числа месяца.
$wday = date('N');
$getdate = getdate(mktime(0, 0, 0, $month, 1, $year));
$wday = $getdate["wday"];
// Начинаем с этого числа в месяце (если меньше нуля
// или больше длины месяца, тогда в календаре будет пропуск).
$n = - ($wday - 2);
$n = - ($wday != 0 ? $wday - 2 : 5);
$cal = [];
// Цикл по строкам.
for ($y = 0; $y < 6; $y++) {
Expand Down Expand Up @@ -40,7 +41,7 @@ function makeCal($year, $month) {

// Формируем календарь на текущий месяц.
$now = getdate();
$cal = makeCal($now['year'], $now['mon'] - 1);
$cal = makeCal($now['year'], $now['mon']);
?>
<!DOCTYPE html>
<html lang="ru">
Expand Down Expand Up @@ -73,4 +74,4 @@ function makeCal($year, $month) {
<?php } ?>
</table>
</body>
</html>
</html>