diff --git a/VKAPI/Handlers/Account.php b/VKAPI/Handlers/Account.php index 7e707cf3..d1722b29 100644 --- a/VKAPI/Handlers/Account.php +++ b/VKAPI/Handlers/Account.php @@ -13,9 +13,9 @@ final class Account extends VKAPIRequestHandler "last_name" => $this->getUser()->getLastName(), "home_town" => $this->getUser()->getHometown(), "status" => $this->getUser()->getStatus(), - "bdate" => "1.1.1970", // TODO - "bdate_visibility" => 0, // TODO - "phone" => "+420 ** *** 228", // TODO + "bdate" => "1.1.1970", # TODO + "bdate_visibility" => 0, # TODO + "phone" => "+420 ** *** 228", # TODO "relation" => $this->getUser()->getMaritalStatus(), "sex" => $this->getUser()->isFemale() ? 1 : 2 ]; @@ -25,12 +25,12 @@ final class Account extends VKAPIRequestHandler { $this->requireUser(); - // Цiй метод є заглушка + # Цiй метод є заглушка return (object) [ "2fa_required" => 0, - "country" => "CZ", // TODO - "eu_user" => false, // TODO + "country" => "CZ", # TODO + "eu_user" => false, # TODO "https_required" => 1, "intro" => 0, "community_comments" => false, @@ -55,7 +55,7 @@ final class Account extends VKAPIRequestHandler { $this->requireUser(); - // Цiй метод є заглушка + # Цiй метод є заглушка return 1; } @@ -73,6 +73,6 @@ final class Account extends VKAPIRequestHandler "messages" => $this->getUser()->getUnreadMessagesCount() ]; - // TODO: Filter + # TODO: Filter } } diff --git a/VKAPI/Handlers/Friends.php b/VKAPI/Handlers/Friends.php index 2e917f2d..760cef21 100644 --- a/VKAPI/Handlers/Friends.php +++ b/VKAPI/Handlers/Friends.php @@ -25,7 +25,7 @@ final class Friends extends VKAPIRequestHandler $usersApi = new Users($this->getUser()); if (!is_null($fields)) { - $response = $usersApi->get(implode(',', $friends), $fields, 0, $count); // FIXME + $response = $usersApi->get(implode(',', $friends), $fields, 0, $count); # FIXME } return (object) [ diff --git a/VKAPI/Handlers/Groups.php b/VKAPI/Handlers/Groups.php index eb5d3230..ff34d562 100644 --- a/VKAPI/Handlers/Groups.php +++ b/VKAPI/Handlers/Groups.php @@ -48,7 +48,7 @@ final class Groups extends VKAPIRequestHandler "name" => "DELETED", "deactivated" => "deleted" ]; - }else if($clbs[$i] == null){ + }else if($clbs[$i] == NULL){ }else{ $rClubs[$i] = (object)[ @@ -95,10 +95,10 @@ final class Groups extends VKAPIRequestHandler $clubs = new ClubsRepo; - if ($group_ids == null && $group_id != null) + if ($group_ids == NULL && $group_id != NULL) $group_ids = $group_id; - if ($group_ids == null && $group_id == null) + if ($group_ids == NULL && $group_id == NULL) $this->fail(100, "One of the parameters specified was missing or invalid: group_ids is undefined"); $clbs = explode(',', $group_ids); @@ -123,7 +123,7 @@ final class Groups extends VKAPIRequestHandler "type" => "group", "description" => "This group was deleted or it doesn't exist" ]; - }else if($clbs[$i] == null){ + }else if($clbs[$i] == NULL){ }else{ $response[$i] = (object)[ diff --git a/VKAPI/Handlers/Likes.php b/VKAPI/Handlers/Likes.php index b002075b..a9f184b6 100644 --- a/VKAPI/Handlers/Likes.php +++ b/VKAPI/Handlers/Likes.php @@ -63,7 +63,7 @@ final class Likes extends VKAPIRequestHandler return (object)[ "liked" => (int) $post->hasLikeFrom($user), - "copied" => 0 // TODO: handle this + "copied" => 0 # TODO: handle this ]; break; default: diff --git a/VKAPI/Handlers/Users.php b/VKAPI/Handlers/Users.php index 3664903f..8aa25b69 100644 --- a/VKAPI/Handlers/Users.php +++ b/VKAPI/Handlers/Users.php @@ -7,9 +7,9 @@ final class Users extends VKAPIRequestHandler { function get(string $user_ids = "0", string $fields = "", int $offset = 0, int $count = 100, User $authuser = null /* костыль(( */): array { - // $this->requireUser(); + # $this->requireUser(); - if($authuser == null) $authuser = $this->getUser(); + if($authuser == NULL) $authuser = $this->getUser(); $users = new UsersRepo; if($user_ids == "0") @@ -34,7 +34,7 @@ final class Users extends VKAPIRequestHandler "last_name" => "", "deactivated" => "deleted" ]; - }else if($usrs[$i] == null){ + }else if($usrs[$i] == NULL){ }else{ $response[$i] = (object)[ @@ -73,21 +73,21 @@ final class Users extends VKAPIRequestHandler case 'photo_200': $response[$i]->photo_50 = $usr->getAvatarURL("normal"); break; - case 'photo_200_orig': // вообще не ебу к чему эта строка ну пусть будет кек + case 'photo_200_orig': # вообще не ебу к чему эта строка ну пусть будет кек $response[$i]->photo_50 = $usr->getAvatarURL("normal"); break; case 'photo_400_orig': $response[$i]->photo_50 = $usr->getAvatarURL("normal"); break; - // Она хочет быть выебанной видя матан - // Покайфу когда ты Виет а вокруг лишь дискриминант + # Она хочет быть выебанной видя матан + # Покайфу когда ты Виет а вокруг лишь дискриминант case 'status': - if($usr->getStatus() != null) + if($usr->getStatus() != NULL) $response[$i]->status = $usr->getStatus(); break; case 'screen_name': - if($usr->getShortCode() != null) + if($usr->getShortCode() != NULL) $response[$i]->screen_name = $usr->getShortCode(); break; case 'friend_status': diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php index f678c4ff..50677435 100644 --- a/VKAPI/Handlers/Wall.php +++ b/VKAPI/Handlers/Wall.php @@ -32,7 +32,7 @@ final class Wall extends VKAPIRequestHandler $attachments[] = [ "type" => "photo", "photo" => [ - "album_id" => $attachment->getAlbum() ? $attachment->getAlbum()->getId() : null, + "album_id" => $attachment->getAlbum() ? $attachment->getAlbum()->getId() : NULL, "date" => $attachment->getPublicationTime()->timestamp(), "id" => $attachment->getVirtualId(), "owner_id" => $attachment->getOwner()->getId(), @@ -51,10 +51,10 @@ final class Wall extends VKAPIRequestHandler "date" => $post->getPublicationTime()->timestamp(), "post_type" => "post", "text" => $post->getText(), - "can_edit" => 0, // TODO + "can_edit" => 0, # TODO "can_delete" => $post->canBeDeletedBy($this->getUser()), "can_pin" => $post->canBePinnedBy($this->getUser()), - "can_archive" => false, // TODO MAYBE + "can_archive" => false, # TODO MAYBE "is_archived" => false, "is_pinned" => $post->isPinned(), "attachments" => $attachments, @@ -80,7 +80,7 @@ final class Wall extends VKAPIRequestHandler else $groups[] = $from_id * -1; - $attachments = null; // free attachments so it will not clone everythingg + $attachments = NULL; # free attachments so it will not clone everythingg } if($extended == 1) @@ -135,9 +135,9 @@ final class Wall extends VKAPIRequestHandler ]; } - function getById(string $posts, int $extended = 0, string $fields = "", User $user = null) + function getById(string $posts, int $extended = 0, string $fields = "", User $user = NULL) { - if($user == null) $user = $this->getUser(); // костыли костыли крылышки + if($user == NULL) $user = $this->getUser(); # костыли костыли крылышки $items = []; $profiles = []; @@ -160,7 +160,7 @@ final class Wall extends VKAPIRequestHandler $attachments[] = [ "type" => "photo", "photo" => [ - "album_id" => $attachment->getAlbum() ? $attachment->getAlbum()->getId() : null, + "album_id" => $attachment->getAlbum() ? $attachment->getAlbum()->getId() : NULL, "date" => $attachment->getPublicationTime()->timestamp(), "id" => $attachment->getVirtualId(), "owner_id" => $attachment->getOwner()->getId(), @@ -196,7 +196,7 @@ final class Wall extends VKAPIRequestHandler "width" => 1280, ], [ - "height" => 75, // Для временного компросима оставляю статическое число. Если каждый раз обращаться к файлу за количеством пикселов, то наступает пuпuська полная с производительностью, так что пока так + "height" => 75, # Для временного компросима оставляю статическое число. Если каждый раз обращаться к файлу за количеством пикселов, то наступает пuпuська полная с производительностью, так что пока так "url" => $attachment->getURLBySizeId("miniscule"), "type" => "s", "width" => 75, @@ -215,10 +215,10 @@ final class Wall extends VKAPIRequestHandler "date" => $post->getPublicationTime()->timestamp(), "post_type" => "post", "text" => $post->getText(), - "can_edit" => 0, // TODO + "can_edit" => 0, # TODO "can_delete" => $post->canBeDeletedBy($user), "can_pin" => $post->canBePinnedBy($user), - "can_archive" => false, // TODO MAYBE + "can_archive" => false, # TODO MAYBE "is_archived" => false, "is_pinned" => $post->isPinned(), "post_source" => (object)["type" => "vk"], @@ -244,7 +244,7 @@ final class Wall extends VKAPIRequestHandler else $groups[] = $from_id * -1; - $attachments = null; // free attachments so it will not clone everythingg + $attachments = NULL; # free attachments so it will not clone everythingg } } @@ -335,12 +335,12 @@ final class Wall extends VKAPIRequestHandler if($signed == 1) $flags |= 0b01000000; - // TODO: Compatible implementation of this + # TODO: Compatible implementation of this try { - $photo = null; - $video = null; + $photo = NULL; + $video = NULL; if($_FILES["photo"]["error"] === UPLOAD_ERR_OK) { - $album = null; + $album = NULL; if(!$anon && $owner_id > 0 && $owner_id === $this->getUser()->getId()) $album = (new AlbumsRepo)->getUserWallAlbum($wallOwner); diff --git a/Web/Models/Entities/Club.php b/Web/Models/Entities/Club.php index f306a8e6..7097ca15 100644 --- a/Web/Models/Entities/Club.php +++ b/Web/Models/Entities/Club.php @@ -302,8 +302,8 @@ class Club extends RowModel { $manager = (new Managers)->getByUserAndClub($user->getId(), $this->getId()); - if ($ignoreHidden && $manager !== null && $manager->isHidden()) - return null; + if ($ignoreHidden && $manager !== NULL && $manager->isHidden()) + return NULL; return $manager; } diff --git a/Web/Models/Entities/Correspondence.php b/Web/Models/Entities/Correspondence.php index 031b905e..e4b7d96e 100644 --- a/Web/Models/Entities/Correspondence.php +++ b/Web/Models/Entities/Correspondence.php @@ -131,7 +131,7 @@ class Correspondence */ function getPreviewMessage(): ?Message { - $messages = $this->getMessages(1, null, 1); + $messages = $this->getMessages(1, NULL, 1); return $messages[0] ?? NULL; } diff --git a/Web/Models/Entities/Message.php b/Web/Models/Entities/Message.php index f4fcc9af..de840606 100644 --- a/Web/Models/Entities/Message.php +++ b/Web/Models/Entities/Message.php @@ -126,7 +126,7 @@ class Message extends RowModel ], "timing" => [ "sent" => (string) $this->getSendTime()->format("%e %B %G" . tr("time_at_sp") . "%X"), - "edited" => is_null($this->getEditTime()) ? null : (string) $this->getEditTime(), + "edited" => is_null($this->getEditTime()) ? NULL : (string) $this->getEditTime(), ], "text" => $this->getText(), "read" => !$this->isUnread(), diff --git a/Web/Models/Entities/Postable.php b/Web/Models/Entities/Postable.php index c3585dc3..b4f8b4c6 100644 --- a/Web/Models/Entities/Postable.php +++ b/Web/Models/Entities/Postable.php @@ -87,7 +87,7 @@ abstract class Postable extends Attachable ])); } - // TODO add pagination + # TODO add pagination function getLikers(): \Traversable { $sel = DB::i()->getContext()->table("likes")->where([ diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index db7cb584..c93b1820 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -939,7 +939,7 @@ class User extends RowModel return $this->getRecord()->website; } - // ты устрица + # ты устрица function isActivated(): bool { return (bool) $this->getRecord()->activated; diff --git a/Web/Models/Entities/Video.php b/Web/Models/Entities/Video.php index 7bf1b010..b45072b9 100644 --- a/Web/Models/Entities/Video.php +++ b/Web/Models/Entities/Video.php @@ -63,7 +63,7 @@ class Video extends Media if(!file_exists($this->getFileName())) { if((time() - $this->getRecord()->last_checked) > 3600) { - // TODO notify that video processor is probably dead + # TODO notify that video processor is probably dead } return false; diff --git a/Web/Models/Repositories/Notes.php b/Web/Models/Repositories/Notes.php index a41c6914..7d95f975 100644 --- a/Web/Models/Repositories/Notes.php +++ b/Web/Models/Repositories/Notes.php @@ -39,7 +39,7 @@ class Notes if(!is_null($note)) return new Note($note); else - return null; + return NULL; } function getUserNotesCount(User $user): int diff --git a/Web/Models/Repositories/Posts.php b/Web/Models/Repositories/Posts.php index 94ce6482..6dde27c8 100644 --- a/Web/Models/Repositories/Posts.php +++ b/Web/Models/Repositories/Posts.php @@ -96,7 +96,7 @@ class Posts if(!is_null($post)) return new Post($post); else - return null; + return NULL; } diff --git a/Web/Models/Repositories/TicketComments.php b/Web/Models/Repositories/TicketComments.php index 4d3c5316..10f7f912 100644 --- a/Web/Models/Repositories/TicketComments.php +++ b/Web/Models/Repositories/TicketComments.php @@ -1,8 +1,8 @@ comments->where(['ticket_id' => $ticket_id, 'deleted' => 0]) as $comment) yield new TicketComment($comment); } - // private function toTicket(?ActiveRow $ar): ?Ticket - // { - // return is_null($ar) ? NULL : new Ticket($ar); - // } + # private function toTicket(?ActiveRow $ar): ?Ticket + # { + # return is_null($ar) ? NULL : new Ticket($ar); + # } - // function getTicketsByuId(int $user_id): \Traversable - // { - // foreach($this->tickets->where(['user_id' => $user_id, 'deleted' => 0]) as $ticket) yield new Ticket($ticket); - // } + # function getTicketsByuId(int $user_id): \Traversable + # { + # foreach($this->tickets->where(['user_id' => $user_id, 'deleted' => 0]) as $ticket) yield new Ticket($ticket); + # } - // function getRequestById(int $req_id): ?Ticket - // { - // $requests = $this->tickets->where(['id' => $req_id])->fetch(); - // if(!is_null($requests)) + # function getRequestById(int $req_id): ?Ticket + # { + # $requests = $this->tickets->where(['id' => $req_id])->fetch(); + # if(!is_null($requests)) - // return new Req($requests); - // else - // return null; + # return new Req($requests); + # else + # return null; - // } + # } - // function get(int $id): ?Ticket - // { - // return $this->toTicket($this->tickets->get($id)); - // } + # function get(int $id): ?Ticket + # { + # return $this->toTicket($this->tickets->get($id)); + # } function get(int $id): ?TicketComment { diff --git a/Web/Models/Repositories/Tickets.php b/Web/Models/Repositories/Tickets.php index 7f00e62b..1e84ebd8 100644 --- a/Web/Models/Repositories/Tickets.php +++ b/Web/Models/Repositories/Tickets.php @@ -50,7 +50,7 @@ class Tickets if(!is_null($requests)) return new Req($requests); else - return null; + return NULL; } diff --git a/Web/Models/Repositories/Topics.php b/Web/Models/Repositories/Topics.php index 23b854d4..1c176310 100644 --- a/Web/Models/Repositories/Topics.php +++ b/Web/Models/Repositories/Topics.php @@ -35,7 +35,7 @@ class Topics { $perPage = $perPage ?? OPENVK_DEFAULT_PER_PAGE; - // Get pinned topics first + # Get pinned topics first $query = "SELECT `id` FROM `topics` WHERE `pinned` = 1 AND `group` = ? AND `deleted` = 0 UNION SELECT `id` FROM `topics` WHERE `pinned` = 0 AND `group` = ? AND `deleted` = 0"; $query .= " LIMIT " . $perPage . " OFFSET " . ($page - 1) * $perPage; diff --git a/Web/Presenters/AboutPresenter.php b/Web/Presenters/AboutPresenter.php index cf4572b8..9ec6c770 100644 --- a/Web/Presenters/AboutPresenter.php +++ b/Web/Presenters/AboutPresenter.php @@ -85,7 +85,7 @@ final class AboutPresenter extends OpenVKPresenter if(is_null($lg)) $this->throwError(404, "Not found", "Language is not found"); header("Content-Type: application/javascript"); - echo "window.lang = " . json_encode($localizer->export($lang)) . ";"; // привет хардкод :DDD + echo "window.lang = " . json_encode($localizer->export($lang)) . ";"; # привет хардкод :DDD exit; } @@ -120,7 +120,7 @@ final class AboutPresenter extends OpenVKPresenter function renderHumansTxt(): void { - // :D + # :D header("HTTP/1.1 302 Found"); header("Location: https://github.com/openvk/openvk#readme"); diff --git a/Web/Presenters/CommentPresenter.php b/Web/Presenters/CommentPresenter.php index 41f0bc79..81783a2f 100644 --- a/Web/Presenters/CommentPresenter.php +++ b/Web/Presenters/CommentPresenter.php @@ -60,7 +60,7 @@ final class CommentPresenter extends OpenVKPresenter } } - // TODO move to trait + # TODO move to trait try { $photo = NULL; $video = NULL; diff --git a/Web/Presenters/GroupPresenter.php b/Web/Presenters/GroupPresenter.php index 65d3640f..c239ff22 100644 --- a/Web/Presenters/GroupPresenter.php +++ b/Web/Presenters/GroupPresenter.php @@ -89,7 +89,7 @@ final class GroupPresenter extends OpenVKPresenter $this->template->club = $this->clubs->get($id); $this->template->onlyShowManagers = $this->queryParam("onlyAdmins") == "1"; if($this->template->onlyShowManagers) { - $this->template->followers = null; + $this->template->followers = NULL; $this->template->managers = $this->template->club->getManagers((int) ($this->queryParam("p") ?? 1), !$this->template->club->canBeModifiedBy($this->user->identity)); if($this->template->club->canBeModifiedBy($this->user->identity) || !$this->template->club->isOwnerHidden()) { @@ -99,7 +99,7 @@ final class GroupPresenter extends OpenVKPresenter $this->template->count = $this->template->club->getManagersCount(); } else { $this->template->followers = $this->template->club->getFollowers((int) ($this->queryParam("p") ?? 1)); - $this->template->managers = null; + $this->template->managers = NULL; $this->template->count = $this->template->club->getFollowersCount(); } @@ -116,7 +116,7 @@ final class GroupPresenter extends OpenVKPresenter $user = is_null($this->queryParam("user")) ? $this->postParam("user") : $this->queryParam("user"); $comment = $this->postParam("comment"); $removeComment = $this->postParam("removeComment") === "1"; - $hidden = ["0" => false, "1" => true][$this->queryParam("hidden")] ?? null; + $hidden = ["0" => false, "1" => true][$this->queryParam("hidden")] ?? NULL; //$index = $this->queryParam("index"); if(!$user) $this->badRequest(); diff --git a/Web/Presenters/InternalAPIPresenter.php b/Web/Presenters/InternalAPIPresenter.php index f0551b7f..60c0b550 100644 --- a/Web/Presenters/InternalAPIPresenter.php +++ b/Web/Presenters/InternalAPIPresenter.php @@ -80,11 +80,11 @@ final class InternalAPIPresenter extends OpenVKPresenter if ($postTZ != $sessionOffset || $sessionOffset == null) { Session::i()->set("_timezoneOffset", $postTZ ? $postTZ : 3 * MINUTE ); $this->returnJson([ - "success" => 1 // If it's new value + "success" => 1 # If it's new value ]); } else { $this->returnJson([ - "success" => 2 // If it's the same value (if for some reason server will call this func) + "success" => 2 # If it's the same value (if for some reason server will call this func) ]); } } else { diff --git a/Web/Presenters/MessengerPresenter.php b/Web/Presenters/MessengerPresenter.php index fdcb934e..968c1936 100644 --- a/Web/Presenters/MessengerPresenter.php +++ b/Web/Presenters/MessengerPresenter.php @@ -106,7 +106,7 @@ final class MessengerPresenter extends OpenVKPresenter $messages = []; $correspondence = new Correspondence($this->user->identity, $correspondent); - foreach($correspondence->getMessages(1, $lastMsg === 0 ? null : $lastMsg) as $message) + foreach($correspondence->getMessages(1, $lastMsg === 0 ? NULL : $lastMsg) as $message) $messages[] = $message->simplify(); header("Content-Type: application/json"); diff --git a/Web/Presenters/OpenVKPresenter.php b/Web/Presenters/OpenVKPresenter.php index 410f4d5d..5c7f95c3 100755 --- a/Web/Presenters/OpenVKPresenter.php +++ b/Web/Presenters/OpenVKPresenter.php @@ -118,7 +118,7 @@ abstract class OpenVKPresenter extends SimplePresenter return ($action === "register" || $action === "login"); } - return (bool) $this->user->raw->can($action)->model($model)->whichBelongsTo($context === -1 ? null : $context); + return (bool) $this->user->raw->can($action)->model($model)->whichBelongsTo($context === -1 ? NULL : $context); } protected function assertPermission(string $model, string $action, int $context, bool $throw = false): void @@ -252,7 +252,7 @@ abstract class OpenVKPresenter extends SimplePresenter exit; } - // ето для емейл уже надо (и по хорошему надо бы избавится от повторяющегося кода мда) + # ето для емейл уже надо (и по хорошему надо бы избавится от повторяющегося кода мда) if(!$this->user->identity->isActivated() && !$this->activationTolerant) { header("HTTP/1.1 403 Forbidden"); $this->getTemplatingEngine()->render(__DIR__ . "/templates/@email.xml", [ @@ -288,7 +288,7 @@ abstract class OpenVKPresenter extends SimplePresenter $whichbrowser = new WhichBrowser\Parser(getallheaders()); $mobiletheme = OPENVK_ROOT_CONF["openvk"]["preferences"]["defaultMobileTheme"]; - if($mobiletheme && $whichbrowser->isType('mobile') && Session::i()->get("_tempTheme") == null) + if($mobiletheme && $whichbrowser->isType('mobile') && Session::i()->get("_tempTheme") == NULL) $this->setSessionTheme($mobiletheme); $theme = NULL; @@ -299,7 +299,7 @@ abstract class OpenVKPresenter extends SimplePresenter $theme = Themepacks::i()[Session::i()->get("_sessionTheme", "ovk")]; } else if($this->requestParam("themePreview")) { $theme = Themepacks::i()[$this->requestParam("themePreview")]; - } else if($this->user->identity !== null && $this->user->identity->getTheme()) { + } else if($this->user->identity !== NULL && $this->user->identity->getTheme()) { $theme = $this->user->identity->getTheme(); } diff --git a/Web/Presenters/SearchPresenter.php b/Web/Presenters/SearchPresenter.php index 0fc4611f..a5eaedc7 100644 --- a/Web/Presenters/SearchPresenter.php +++ b/Web/Presenters/SearchPresenter.php @@ -29,7 +29,7 @@ final class SearchPresenter extends OpenVKPresenter if($query != "") $this->assertUserLoggedIn(); - // https://youtu.be/pSAWM5YuXx8 + # https://youtu.be/pSAWM5YuXx8 $repos = [ "groups" => "clubs", "users" => "users" ]; $repo = $repos[$type] or $this->throwError(400, "Bad Request", "Invalid search entity $type."); diff --git a/Web/Presenters/TopicsPresenter.php b/Web/Presenters/TopicsPresenter.php index f29c7979..16dd1795 100644 --- a/Web/Presenters/TopicsPresenter.php +++ b/Web/Presenters/TopicsPresenter.php @@ -91,7 +91,7 @@ final class TopicsPresenter extends OpenVKPresenter $topic->setFlags($flags); $topic->save(); - // TODO move to trait + # TODO move to trait try { $photo = NULL; $video = NULL; diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php index 76e3716b..7cdfe397 100644 --- a/Web/Presenters/UserPresenter.php +++ b/Web/Presenters/UserPresenter.php @@ -495,7 +495,7 @@ final class UserPresenter extends OpenVKPresenter $this->template->secret = $secret; } - // Why are these crutch? For some reason, the QR code is not displayed if you just pass the render output to the view + # Why are these crutch? For some reason, the QR code is not displayed if you just pass the render output to the view $issuer = OPENVK_ROOT_CONF["openvk"]["appearance"]["name"]; $email = $this->user->identity->getEmail(); diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php index 9da0311c..5bdac066 100644 --- a/Web/Presenters/WallPresenter.php +++ b/Web/Presenters/WallPresenter.php @@ -414,7 +414,7 @@ final class WallPresenter extends OpenVKPresenter $post->unpin(); } - // TODO localize message based on language and ?act=(un)pin + # TODO localize message based on language and ?act=(un)pin $this->flashFail("succ", tr("information_-1"), tr("changes_saved_comment")); } } diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 1869c038..e7130511 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -17,7 +17,7 @@ {script "js/l10n.js"} {script "js/openvk.cls.js"} - {if $isTimezoned == null} + {if $isTimezoned == NULL} {script "js/timezone.js"} {/if} @@ -26,7 +26,7 @@ {css "css/nsfw-posts.css"} {/if} - {if $theme !== null} + {if $theme !== NULL} {if $theme->inheritDefault()} {css "css/style.css"} {css "css/dialog.css"} diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml index 60cc9e6d..37dfb5da 100644 --- a/Web/Presenters/templates/components/post/microblogpost.xml +++ b/Web/Presenters/templates/components/post/microblogpost.xml @@ -2,7 +2,7 @@ {var $comments = $post->getLastComments(3)} {var $commentsCount = $post->getCommentsCount()} -{var $commentTextAreaId = $post === null ? rand(1,300) : $post->getId()} +{var $commentTextAreaId = $post === NULL ? rand(1,300) : $post->getId()} diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml index 9d81ac6d..8c4c7f86 100644 --- a/Web/Presenters/templates/components/textArea.xml +++ b/Web/Presenters/templates/components/textArea.xml @@ -1,5 +1,5 @@ {php if(!isset($GLOBALS["textAreaCtr"])) $GLOBALS["textAreaCtr"] = 10;} -{var $textAreaId = ($post ?? NULL) === null ? (++$GLOBALS["textAreaCtr"]) : $post->getId()} +{var $textAreaId = ($post ?? NULL) === NULL ? (++$GLOBALS["textAreaCtr"]) : $post->getId()}
diff --git a/bootstrap.php b/bootstrap.php index 70b52244..baaece8d 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -136,7 +136,7 @@ function isLanguageAvailable($lg): bool function getBrowsersLanguage(): array { - if ($_SERVER['HTTP_ACCEPT_LANGUAGE'] != null) return mb_split(",", mb_split(";", $_SERVER['HTTP_ACCEPT_LANGUAGE'])[0]); + if ($_SERVER['HTTP_ACCEPT_LANGUAGE'] != NULL) return mb_split(",", mb_split(";", $_SERVER['HTTP_ACCEPT_LANGUAGE'])[0]); else return array(); } @@ -144,7 +144,7 @@ function eventdb(): ?DatabaseConnection { $conf = OPENVK_ROOT_CONF["openvk"]["credentials"]["eventDB"]; if(!$conf["enable"]) - return null; + return NULL; $db = (object) $conf["database"]; return DatabaseConnection::connect([ @@ -216,8 +216,8 @@ return (function() { setlocale(LC_TIME, "POSIX"); - // TODO: Default language in config - if(Session::i()->get("lang") == null) { + # TODO: Default language in config + if(Session::i()->get("lang") == NULL) { $languages = array_reverse(getBrowsersLanguage()); foreach($languages as $lg) { if(isLanguageAvailable($lg)) setLanguage($lg); @@ -233,7 +233,7 @@ return (function() { else $ver = "Public Technical Preview 3"; - // Unix time constants + # Unix time constants define('MINUTE', 60); define('HOUR', 60 * MINUTE); define('DAY', 24 * HOUR);