From 5a2ba9c2e7605bb788bc406184547d22c6436867 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Mon, 23 Dec 2024 11:13:27 -0500 Subject: v2.1.0, refactor w/ crimson --- src/web/_model/apps/auth.php | 13 ------ src/web/_model/apps/error.php | 31 -------------- src/web/_model/apps/home.php | 22 ---------- src/web/_model/apps/people.php | 90 ---------------------------------------- src/web/_model/apps/profile.php | 65 ----------------------------- src/web/_model/apps/settings.php | 16 ------- 6 files changed, 237 deletions(-) delete mode 100644 src/web/_model/apps/auth.php delete mode 100644 src/web/_model/apps/error.php delete mode 100644 src/web/_model/apps/home.php delete mode 100644 src/web/_model/apps/people.php delete mode 100644 src/web/_model/apps/profile.php delete mode 100644 src/web/_model/apps/settings.php (limited to 'src/web/_model/apps') diff --git a/src/web/_model/apps/auth.php b/src/web/_model/apps/auth.php deleted file mode 100644 index c528601..0000000 --- a/src/web/_model/apps/auth.php +++ /dev/null @@ -1,13 +0,0 @@ -get_msg($data); - return $data; - } -} -?> diff --git a/src/web/_model/apps/home.php b/src/web/_model/apps/home.php deleted file mode 100644 index 634bc67..0000000 --- a/src/web/_model/apps/home.php +++ /dev/null @@ -1,22 +0,0 @@ -db - ->select('*') - ->from('xssbook.post') - ->limit(20) - ->rows(); - } - - public function get_data(): ?array { - $data = parent::get_data(); - $data['title'] = ucfirst(lang('title')); - $data['posts'] = $this->get_posts(); - return $data; - } -} diff --git a/src/web/_model/apps/people.php b/src/web/_model/apps/people.php deleted file mode 100644 index 08366a7..0000000 --- a/src/web/_model/apps/people.php +++ /dev/null @@ -1,90 +0,0 @@ -request_model = $this->load->model('request'); - } - /** - * @param mixed $select - */ - private function get_filted_query($select): DatabaseQuery { - $filter_type = $this->request_model->get_str('filter', FALSE); - $filter_uid = $this->request_model->get_int('uid', FALSE); - $max = $this->request_model->get_int('max', FALSE); - - $query = $this->db - ->select($select) - ->from('api.user u'); - - if ($filter_type && $filter_uid) { - switch ($filter_type) { - case 'follower': { - $query = $query - ->join('xssbook.follow f', 'f.follower_id = u.id AND f.followee_id', 'INNER') - ->eq($filter_uid) - ->where('f.value = TRUE'); - } break; - - case 'followee': { - $query = $query - ->join('xssbook.follow f', 'f.followee_id = u.id AND f.follower_id', 'INNER') - ->eq($filter_uid) - ->where('f.value = TRUE'); - } break; - } - } - - if ($max) { - $query = $query - ->where('u.id') - ->le($max); - } - - return $query; - } - - /** - * @return array - */ - public function get_users(): array { - $page = $this->request_model->get_int('page', 0); - $page_size = 24; - $offset = $page_size * $page; - - $users = $this->get_filted_query('u.*') - ->order_by('u.id', 'DESC') - ->offset($offset) - ->limit($page_size) - ->rows(); - - $count = $this->get_filted_query('COUNT(u.id) AS count') - ->row()['count']; - - $max = 0; - - foreach ($users as $user) { - $max = max($max, $user['id']); - } - - $filter_type = $this->request_model->get_str('filter', FALSE); - $filter_uid = $this->request_model->get_int('uid', FALSE); - - return array( - 'users' => $users, - 'count' => $count, - 'page_size' => $page_size, - 'max_id' => $max, - 'filter_type' => $filter_type || '', - 'filter_uid' => $filter_uid || '' - ); - } - - public function get_data(): ?array { - $data = parent::get_data(); - $data['title'] = ucfirst(lang('title')); - return $data; - } -} diff --git a/src/web/_model/apps/profile.php b/src/web/_model/apps/profile.php deleted file mode 100644 index acec9c0..0000000 --- a/src/web/_model/apps/profile.php +++ /dev/null @@ -1,65 +0,0 @@ -request_model = $this->load->model('request'); - } - - public function get_data(): ?array { - $uid = $this->request_model->get_int('id', FALSE); - if ($uid === FALSE) { - if ($this->main->session) { - $uid = $this->main->user()['id']; - } else { - return NULL; - } - } - - $user = $this->db - ->select('*') - ->from('api.user u') - ->where('u.id') - ->eq($uid) - ->row(); - - if (!$user) { - return NULL; - } - - $following = FALSE; - $followed = FALSE; - $follow_id = NULL; - - if ($this->main->session) { - $sid = $this->main->user()['id']; - $res = $this->db->select('f.value, f.id') - ->from('xssbook.follow f') - ->where('f.follower_id') - ->eq($sid) - ->where('f.followee_id') - ->eq($uid) - ->row(); - $following = $res ? $res['value'] : FALSE; - $follow_id = $res ? $res['id'] : NULL; - $res = $this->db->select('f.value') - ->from('xssbook.follow f') - ->where('f.follower_id') - ->eq($uid) - ->where('f.followee_id') - ->eq($sid) - ->row(); - $followed = $res ? $res['value'] : FALSE; - } - - $data = parent::get_data(); - $data['user'] = $user; - $data['following'] = $following; - $data['followed'] = $followed; - $data['follow_id'] = $follow_id; - $data['title'] = ucfirst(lang('title', sub: [$user['first_name']])); - return $data; - } -} diff --git a/src/web/_model/apps/settings.php b/src/web/_model/apps/settings.php deleted file mode 100644 index 1f1e3f9..0000000 --- a/src/web/_model/apps/settings.php +++ /dev/null @@ -1,16 +0,0 @@ -request_model = $this->load->model('request'); - } - - public function get_data(): ?array { - $data = parent::get_data(); - $data['title'] = ucfirst(lang('title')); - return $data; - } -} -- cgit v1.2.3-freya