From 7674d632f6a696b3e415af16e384f1b7dc731d37 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Mon, 8 Nov 2021 22:03:49 +0200 Subject: [PATCH] Add dedicated variable for protocol check --- Web/Presenters/GroupPresenter.php | 11 ++++++----- Web/Presenters/UserPresenter.php | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Web/Presenters/GroupPresenter.php b/Web/Presenters/GroupPresenter.php index 541c95ed..a29f3e05 100644 --- a/Web/Presenters/GroupPresenter.php +++ b/Web/Presenters/GroupPresenter.php @@ -170,11 +170,12 @@ final class GroupPresenter extends OpenVKPresenter $club->setShortcode(empty($this->postParam("shortcode")) ? NULL : $this->postParam("shortcode")); $club->setWall(empty($this->postParam("wall")) ? 0 : 1); $club->setAdministrators_List_Display(empty($this->postParam("administrators_list_display")) ? 0 : $this->postParam("administrators_list_display")); - if(strpos($this->postParam("website") ?? "", "https://") === 0 || strpos($this->postParam("website") ?? "", "http://") === 0) { - $club->setWebsite(empty($this->postParam("website")) ? NULL : $this->postParam("website")); - } else { - $club->setWebsite(empty($this->postParam("website")) ? NULL : "http://" . $this->postParam("website")); - } + + $website = $this->postParam("website") ?? ""; + if(strpos($website, "https://") === 0 || strpos($website, "http://") === 0) + $user->setWebsite(empty($this->postParam("website")) ? NULL : $this->postParam("website")); + else + $user->setWebsite(empty($this->postParam("website")) ? NULL : "http://" . $this->postParam("website")); if($_FILES["ava"]["error"] === UPLOAD_ERR_OK) { $photo = new Photo; diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php index fe60b3ac..3e3cd53c 100644 --- a/Web/Presenters/UserPresenter.php +++ b/Web/Presenters/UserPresenter.php @@ -125,11 +125,12 @@ final class UserPresenter extends OpenVKPresenter $user->setTelegram(empty($this->postParam("telegram")) ? NULL : $this->postParam("telegram")); $user->setCity(empty($this->postParam("city")) ? NULL : $this->postParam("city")); $user->setAddress(empty($this->postParam("address")) ? NULL : $this->postParam("address")); - if(strpos($this->postParam("website") ?? "", "https://") === 0 || strpos($this->postParam("website") ?? "", "http://") === 0) { + + $website = $this->postParam("website") ?? ""; + if(strpos($website, "https://") === 0 || strpos($website, "http://") === 0) $user->setWebsite(empty($this->postParam("website")) ? NULL : $this->postParam("website")); - } else { + else $user->setWebsite(empty($this->postParam("website")) ? NULL : "http://" . $this->postParam("website")); - } } elseif($_GET['act'] === "interests") { $user->setInterests(empty($this->postParam("interests")) ? NULL : ovk_proc_strtr($this->postParam("interests"), 300)); $user->setFav_Music(empty($this->postParam("fav_music")) ? NULL : ovk_proc_strtr($this->postParam("fav_music"), 300));