From 02bf13be32606e24e09da19d523e872d833ae520 Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 00:17:09 +0000 Subject: [PATCH 01/14] dev: round2 --- app/Config/Smarty.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/Smarty.php b/app/Config/Smarty.php index 6892c14..13accb7 100644 --- a/app/Config/Smarty.php +++ b/app/Config/Smarty.php @@ -8,7 +8,7 @@ class Smarty extends BaseConfig { public $smarty_name = 'SmartyURL'; public $smarty_online_repo = 'https://smartyurl.extendy.net'; - public $smarty_version = '0.0.0-dev-DND-1'; + public $smarty_version = '0.0.0-dev-DND-2'; /** * @var string contain the file name of jquery supported version eg jquery-3.7.1 without js From 1274baa8c3063583e57336356188af4efc80779c Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 01:05:23 +0000 Subject: [PATCH 02/14] adding .github/release.yml --- .github/release.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 0000000..871c647 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,20 @@ +changelog: + exclude: + authors: + - dependabot + categories: + - title: Breaking Changes + labels: + - 'breaking change' + - title: Fixed Bugs + labels: + - bug + - title: Enhancements + labels: + - enhancement + - title: Translations + labels: + - lang + - title: New Features + labels: + - 'new feature' From 43232b6834dd7521c01b1ef263f6efc205fe45b8 Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 01:11:45 +0000 Subject: [PATCH 03/14] dev: round2 --- app/Config/Smarty.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/Smarty.php b/app/Config/Smarty.php index 13accb7..60143fc 100644 --- a/app/Config/Smarty.php +++ b/app/Config/Smarty.php @@ -8,7 +8,7 @@ class Smarty extends BaseConfig { public $smarty_name = 'SmartyURL'; public $smarty_online_repo = 'https://smartyurl.extendy.net'; - public $smarty_version = '0.0.0-dev-DND-2'; + public $smarty_version = 'v0.0.0-dev-dnd.2'; /** * @var string contain the file name of jquery supported version eg jquery-3.7.1 without js From 327e9c534615ad6ec142c823f8b00cd53fd5d181 Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 01:25:48 +0000 Subject: [PATCH 04/14] dev: ChangeLog.md --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index e5e3a85..870a4e4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1 +1 @@ -# SmartyL \ No newline at end of file +# SmartyURL ChangeLog From d9c0c4a074ac64b400c1d762106f7898e8dce467 Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 02:08:08 +0000 Subject: [PATCH 05/14] cleaning --- ChangeLog.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ChangeLog.md diff --git a/ChangeLog.md b/ChangeLog.md deleted file mode 100644 index 870a4e4..0000000 --- a/ChangeLog.md +++ /dev/null @@ -1 +0,0 @@ -# SmartyURL ChangeLog From d8bf47a5128f38b54a2dd0a8e7eba270e8162d0f Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 02:18:43 +0000 Subject: [PATCH 06/14] Updating CR Project to 4.4.3 https://codeigniter4.github.io/userguide/installation/upgrade_443.html#upgrading-from-4-4-2-to-4-4-3 --- app/Config/Boot/development.php | 2 ++ app/Config/Boot/production.php | 2 ++ app/Config/Boot/testing.php | 6 ++++++ app/Views/errors/html/error_404.php | 2 +- app/Views/errors/html/error_exception.php | 7 +++++-- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php index 05a8612..aa8099a 100644 --- a/app/Config/Boot/development.php +++ b/app/Config/Boot/development.php @@ -7,6 +7,8 @@ | In development, we want to show as many errors as possible to help | make sure they don't make it to production. And save us hours of | painful debugging. + | + | If you set 'display_errors' to '1', CI4's detailed error report will show. */ error_reporting(-1); ini_set('display_errors', '1'); diff --git a/app/Config/Boot/production.php b/app/Config/Boot/production.php index 21d2580..73c7c60 100644 --- a/app/Config/Boot/production.php +++ b/app/Config/Boot/production.php @@ -6,6 +6,8 @@ |-------------------------------------------------------------------------- | Don't show ANY in production environments. Instead, let the system catch | it and display a generic error message. + | + | If you set 'display_errors' to '1', CI4's detailed error report will show. */ ini_set('display_errors', '0'); error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php index e07a1d4..e84670e 100644 --- a/app/Config/Boot/testing.php +++ b/app/Config/Boot/testing.php @@ -1,5 +1,11 @@ - +

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php index 45e1b9e..83fd15f 100644 --- a/app/Views/errors/html/error_exception.php +++ b/app/Views/errors/html/error_exception.php @@ -44,6 +44,7 @@ +
    @@ -66,7 +67,7 @@

  • - +

+
@@ -382,7 +384,8 @@

Displayed at — PHP: — - CodeIgniter: + CodeIgniter: -- + Environment:

From 3eddcd050e724ad75805eae595eac08d7aaa04af Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 03:44:29 +0000 Subject: [PATCH 07/14] dev: round2 --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 69dc3a5..3f4fafa 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -12,6 +12,6 @@ nav: - Legal Notice: legalnotice.md theme: readthedocs extra: - version: 0.0.0-dev-DND + version: v0.0.0-dev-dnd.2 markdown_extensions: - admonition From d55c068dee2d8b276f80cd1986df21ed52ebb4fa Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 04:00:16 +0000 Subject: [PATCH 08/14] docs: update docs --- docs/developers.md | 2 +- docs/index.md | 8 +++++++- docs/ip2location.md | 7 ++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docs/developers.md b/docs/developers.md index e5585d7..5e70719 100644 --- a/docs/developers.md +++ b/docs/developers.md @@ -2,7 +2,7 @@ ## Server Requirements -- You need a web hosting account (for a domain or sub-domain) with PHP 7.4 or higher support and the following PHP extensions (typically supported by most PHP hosting providers): +- You need a web hosting account (for a domain or sub-domain) with PHP 8.1 or higher support and the following PHP extensions (typically supported by most PHP hosting providers): - [mysqlnd](http://php.net/manual/en/mysqlnd.install.php) , [intl](http://php.net/manual/en/intl.requirements.php) , [mbstring](http://php.net/manual/en/mbstring.installation.php) , [libcurl](https://www.php.net/manual/en/curl.setup.php) , [gmp](https://www.php.net/manual/en/gmp.installation.php) , [json](https://www.php.net/manual/en/json.installation.php), [bcmath](https://www.php.net/manual/en/bc.setup.php) diff --git a/docs/index.md b/docs/index.md index ca14157..9980b2c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -24,7 +24,7 @@ In addition to shortening URLs (based on domain that you use), SmartyURL also of ## Server Requirements -- You need a web hosting account (for a domain or sub-domain) with PHP 7.4 or higher support and the following PHP extensions (typically supported by most PHP hosting providers): +- You need a web hosting account (for a domain or sub-domain) with PHP 8.1 or higher support and the following PHP extensions (typically supported by most PHP hosting providers): - [mysqlnd](http://php.net/manual/en/mysqlnd.install.php) , [intl](http://php.net/manual/en/intl.requirements.php) , [mbstring](http://php.net/manual/en/mbstring.installation.php) , [libcurl](https://www.php.net/manual/en/curl.setup.php) , [gmp](https://www.php.net/manual/en/gmp.installation.php) , [json](https://www.php.net/manual/en/json.installation.php), [bcmath](https://www.php.net/manual/en/bc.setup.php) @@ -34,6 +34,12 @@ In addition to shortening URLs (based on domain that you use), SmartyURL also of Since SmartyURL is still in its early stages, you can find installation instructions in the [Developer's Guide](developers.md). Once we release the first version of SmartyURL, we will provide detailed installation instructions. +## Documentation + +- [Developer's Guide](developers.md) +- [Accuracy of Geographical Location of IPs](ip2location.md) +- [License](license.md) +- [Legal Notice](legalnotice.md) ## Acknowledgments diff --git a/docs/ip2location.md b/docs/ip2location.md index 564304a..129a537 100644 --- a/docs/ip2location.md +++ b/docs/ip2location.md @@ -18,12 +18,13 @@ public $ip2location_bin_file = APPPATH . "../datastore/". 'IP2Location/IP2LOCAT The uploaded BIN file should be the standard version provided by IP2Location. -> [!IMPORTANT] -> When uploading your custom IP2Location BIN file, please refrain from overwriting the default 'IP2LOCATION-LITE-DB1.BIN' file. Instead, upload it with a new filename and adjust the `ip2location_bin_file` setting accordingly. This will ensures that your file won't be overwritten when SmartyURL is updated to a new version in the future. +!!! warning + When uploading your custom IP2Location BIN file, please do not overwrite the default 'IP2LOCATION-LITE-DB1.BIN' file. Instead, upload it with a new filename and adjust the `ip2location_bin_file` setting accordingly. This will ensures that your file won't be overwritten when SmartyURL is updated to a new version in the future. This setup ensures that SmartyURL uses the paid, more accurate, and regularly updated IP2Location database for enhanced country detection. -**Please note that:** When using the paid version of IP2Location, please remember to manually update the database (.BIN) file regularly whenever IP2Location announces a database update. This process is not handled automaticlly by SmartyURL, so it's important to stay informed about IP2Location announcements. +!!! note + When using the paid version of IP2Location, please remember to manually update the database (.BIN) file regularly whenever IP2Location announces a database update. This process is not handled automaticlly by SmartyURL, so it's important to stay informed about IP2Location announcements. From 0eff950858dedc805d02e929ad666256c369309b Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 04:25:46 +0000 Subject: [PATCH 09/14] docs: use material on docs --- docs/developers.md | 2 +- mkdocs.yml | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/docs/developers.md b/docs/developers.md index 5e70719..34784c1 100644 --- a/docs/developers.md +++ b/docs/developers.md @@ -1,4 +1,4 @@ -# SmartyURL Developer Guide +# SmartyURL Developer's Guide ## Server Requirements diff --git a/mkdocs.yml b/mkdocs.yml index 3f4fafa..6e62ac4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -5,13 +5,23 @@ repo_url: https://github.com/Extendy/SmartyURL site_description: 'SmartyURL Documentation' site_author: 'Extendy Team' copyright: 'Copyrights © 2023 Extendy Team' -edit_uri: 'blob/main/_docs' nav: - Home: index.md + - Developer's Guide: developers.md - License: license.md - Legal Notice: legalnotice.md -theme: readthedocs +theme: + name: material + language: en + direction: ltr extra: version: v0.0.0-dev-dnd.2 + alternate: + - name: English + link: ./ + lang: en + - name: عربي + link: /ar/ + lang: ar markdown_extensions: - admonition From 57b366417fa2ce84aa8bf4c061c65ad8fff87d12 Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 18:07:24 +0000 Subject: [PATCH 10/14] dev: round2 --- app/Config/Smarty.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/Smarty.php b/app/Config/Smarty.php index 60143fc..94c6fc6 100644 --- a/app/Config/Smarty.php +++ b/app/Config/Smarty.php @@ -8,7 +8,7 @@ class Smarty extends BaseConfig { public $smarty_name = 'SmartyURL'; public $smarty_online_repo = 'https://smartyurl.extendy.net'; - public $smarty_version = 'v0.0.0-dev-dnd.2'; + public $smarty_version = '0.0.0-dev-dnd.2'; /** * @var string contain the file name of jquery supported version eg jquery-3.7.1 without js From dfaf609376bcb7234f89c06b1c9de07b6fd492f2 Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 18:08:12 +0000 Subject: [PATCH 11/14] docs: deocs --- mkdocs.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 6e62ac4..cc6fb67 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -17,11 +17,8 @@ theme: extra: version: v0.0.0-dev-dnd.2 alternate: - - name: English - link: ./ - lang: en - name: عربي - link: /ar/ + link: ar/ lang: ar markdown_extensions: - admonition From f808b8db0013a9c81e6f0c5ed6df5d1bf19bbf9d Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 21:27:48 +0000 Subject: [PATCH 12/14] lang: change language string --- app/Language/ar/Url.php | 3 ++- app/Language/en/Url.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Language/ar/Url.php b/app/Language/ar/Url.php index a888706..6bf700e 100644 --- a/app/Language/ar/Url.php +++ b/app/Language/ar/Url.php @@ -74,8 +74,9 @@ 'urlInfoNoRecdirectCondition' => 'لم يتم تعريف شروط اعادة توجيه', 'urlInfoLast25Hits' => 'اخر 25 زيارة للرابط', 'urlInfoSeeAllHits' => 'استعراض جميع الزيارات', + 'urlInfoSeeAllHitsforURL' => 'استعراض جميع زيارات الرابط', 'urlInfoVisitDate' => 'التاريخ', - 'urlInfoVisitorIP' => 'عنوان الاي بي', + 'urlInfoVisitorIP' => 'الاي بي', 'urlInfoVisitorCountry' => 'الدولة', 'urlInfoVisitorDevice' => 'الجهاز', 'urlInfoVisitorUserAgent' => 'الوكيل', diff --git a/app/Language/en/Url.php b/app/Language/en/Url.php index 4dde5d1..4b13a12 100644 --- a/app/Language/en/Url.php +++ b/app/Language/en/Url.php @@ -74,6 +74,7 @@ 'urlInfoNoRecdirectCondition' => 'No redirect conditions defined', 'urlInfoLast25Hits' => 'URl Last 25 visits', 'urlInfoSeeAllHits' => 'Show all visits', + 'urlInfoSeeAllHitsforURL' => 'Show URL visits', 'urlInfoVisitDate' => 'Date', 'urlInfoVisitorIP' => 'IP', 'urlInfoVisitorCountry' => 'Country', From 3aa160031d8a7d886410be363930eeb20371645f Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 21:30:37 +0000 Subject: [PATCH 13/14] refactor: change html --- app/Views/basic/url/list.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Views/basic/url/list.php b/app/Views/basic/url/list.php index f560d8c..eaf2bb6 100644 --- a/app/Views/basic/url/list.php +++ b/app/Views/basic/url/list.php @@ -86,15 +86,15 @@
-
-
-

-
-
+
+
+

+
+
- + +
-
From 055dc6cf5fb5d024052f0162e5a2b4dd518f618c Mon Sep 17 00:00:00 2001 From: Mohammed AlShannaq Date: Thu, 9 Nov 2023 21:54:47 +0000 Subject: [PATCH 14/14] feat: list url visits --- app/Config/Routes.php | 1 + app/Controllers/Url.php | 133 ++++++++++++++- app/Models/UrlHitsModel.php | 33 +++- app/Views/basic/url/hitslist.php | 279 +++++++++++++++++++++++++++++++ 4 files changed, 442 insertions(+), 4 deletions(-) create mode 100644 app/Views/basic/url/hitslist.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 3cd3ae6..f7ea19e 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -27,6 +27,7 @@ $routes->get('edit/(:num)', 'Url::edit/$1', ['filter' => 'session']); $routes->post('edit/(:num)', 'Url::editAction/$1', ['filter' => 'session']); $routes->get('hits/(:num)', 'Url::hitslist/$1', ['filter' => 'session']); + $routes->get('hitslistdata/(:num)', 'Url::hitslistData/$1', ['filter' => 'session']); // json hits list for url $routes->get('qrcode/(:num)', 'Url::generateQRCode/$1', ['filter' => 'session']); }); diff --git a/app/Controllers/Url.php b/app/Controllers/Url.php index 3c432f1..a2e91e8 100644 --- a/app/Controllers/Url.php +++ b/app/Controllers/Url.php @@ -680,7 +680,6 @@ public function editAction($UrlId) // updated ok // i will check tags and update any changes - // samsam // first of all i will delete all url tags $delresult = $this->urltagsdatamodel->delUrlTags($url_id); // now i will enter the tags again @@ -736,10 +735,138 @@ public function editAction($UrlId) public function hitslist($UrlId) { - echo 'URL HITS OF.' . $UrlId; + if (! auth()->user()->can('url.access', 'admin.manageotherurls', 'super.admin')) { + return smarty_permission_error(); + } + + $url_id = (int) esc(smarty_remove_whitespace_from_url_identifier($UrlId)); + if ($url_id === 0) { + // url_id given is not valid id + return redirect()->to('dashboard')->with('notice', lang('Url.urlError')); + } + $urlData = $this->urlmodel->where('url_id', $url_id)->first(); + + if ($urlData === null) { + // url not exsists in dataase + return redirect()->to('dashboard')->with('error', lang('Url.urlNotFoundShort')); + } + + // i will check the user permission , does he allowed to access this url info + $userCanAccessUrl = $this->smartyurl->userCanAccessUrlInfo($url_id, (int) $urlData['url_user_id']); + if (! $userCanAccessUrl) { + return smarty_permission_error('It not your URL 😉😉😉'); + } + $Go_Url = esc(smarty_detect_site_shortlinker() . $urlData['url_identifier']); + + $data = []; + + $data['lang'] = session('lang'); + $data['url_id'] = (int) $urlData['url_id']; + $data['url_identifier'] = esc($urlData['url_identifier']); + $data['url_hitscounter'] = $urlData['url_hitscounter']; + $data['go_url'] = $Go_Url; + + return view(smarty_view('url/hitslist'), $data); + } + + public function hitslistData($urlId) + { + if (! auth()->user()->can('url.access', 'admin.manageotherurls', 'super.admin')) { + return smarty_permission_error(lang('Common.permissionsNoenoughpermissions'), true); + } + + $url_id = (int) $urlId; + $userCanAccessUrl = $this->smartyurl->userCanAccessUrlInfo($url_id); + if (! $userCanAccessUrl) { + return smarty_permission_error('It is not your URL 😉😉😉', true); + } + + $draw = $this->request->getGet('draw'); + $start = $this->request->getGet('start'); + $length = $this->request->getGet('length'); + + // Do not think that the data that comes from the client is always correct + // so set force max length it maxUrlListPerPage + $system_forcemax_length = setting('Smartyurl.maxUrlListPerPage'); + if ($length > setting('Smartyurl.maxUrlListPerPage')) { + $length = $system_forcemax_length; + } + + $columnOrder = $this->request->getGet('order'); + if ($columnOrder !== null) { + $ajax_column_index = $columnOrder['0']['column']; + $order_by_dir = $columnOrder['0']['dir']; + + // Do not think that the data that comes from the client is always correct + // so switch it to use defaults + switch ($order_by_dir) { + case 'asc': + $order_by_rule = 'asc'; + break; + + case 'desc': + $order_by_rule = 'desc'; + break; + + default: + $order_by_rule = 'desc'; + break; + } + + // i will know the column name from get + $ajax_columns = $this->request->getGet('columns'); + $order_by_ajax_column_name = $ajax_columns[$ajax_column_index]['name']; + + // echo $order_by_ajax_column_name; + // echo $order_by_rule; + + switch ($order_by_ajax_column_name) { + case 'hit_date': + $order_by = 'urlhit_at'; + break; + + default: + $order_by = 'urlhit_urlid'; + break; + } + } else { + $order_by = 'urlhit_id'; + $order_by_rule = 'desc'; + } + + $urlAllCount = $this->urlhitsmodel->getHitsByUrlId($url_id, null, null, 'urlhit_urlid', 'desc', false); + $filterAllnumRows = $urlAllCount; + $results = $this->urlhitsmodel->getHitsByUrlId($url_id, $start, $length, $order_by, $order_by_rule, true); + $records = []; + if ($results !== null) { + foreach ($results as $result) { + $records[] = [ + 'hit_date_col' => $result->urlhit_at, + 'hit_ip_col' => $result->urlhit_ip, + 'hit_country_col' => $result->urlhit_country, + 'hit_device_col' => $result->urlhit_visitordevice, + 'hit_useragent_col' => esc($result->urlhit_useragent), + 'hit_finalurl_col' => esc($result->urlhit_finaltarget), + ]; + } + } + + $data = [ + 'draw' => $draw, + 'recordsTotal' => $urlAllCount, // $urlAllCount + 'recordsFiltered' => $filterAllnumRows, // $filterAllnumRows + 'data' => $records, + ]; + + return $this->response->setJSON($data); } - public function generateQRCode($UrlId) + /** + * This function generates QR Code for tge given URL id + * + * @return mixed + */ + public function generateQRCode(int $UrlId) { // set response type $response = service('response'); diff --git a/app/Models/UrlHitsModel.php b/app/Models/UrlHitsModel.php index e103513..762da9d 100644 --- a/app/Models/UrlHitsModel.php +++ b/app/Models/UrlHitsModel.php @@ -5,7 +5,7 @@ class UrlHitsModel extends BaseModel { protected $DBGroup = 'default'; - protected $primaryKey = 'id'; + protected $primaryKey = 'urlhit_id'; protected $useAutoIncrement = true; protected $returnType = 'array'; protected $useSoftDeletes = false; @@ -55,6 +55,8 @@ protected function initialize(): void /** * get the last 25 hits for URL * + * @param mixed $UrlId + * * @return mixed */ public function getLast25Hits($UrlId) @@ -66,4 +68,33 @@ public function getLast25Hits($UrlId) ->get() ->getResult(); } + + /** + * This function gets the URL visit list for a given $urlId which can be a single Url ID or an array of Url IDs. + * $returnType can be: + * - true to return data as an array + * - false to return the row count as an integer without the start and limit + */ + public function getHitsByUrlId(int|array $urlId, int|null $start = null, int|null $length = null, string $orderBy = 'urlhit_urlid', string $orderDirection = 'DESC', bool $returnData = true) + { + $builder = $this->builder(); + + $builder->orderBy($orderBy, $orderDirection); + + if (is_array($urlId)) { + $builder->whereIn('urlhit_urlid', $urlId); + } else { + $builder->where('urlhit_urlid', $urlId); + } + + if ($start !== null && $length !== null) { + $builder->limit($length, $start); + } + + if ($returnData) { + return $builder->get()->getResult(); + } + + return $builder->countAllResults(); + } } diff --git a/app/Views/basic/url/hitslist.php b/app/Views/basic/url/hitslist.php new file mode 100644 index 0000000..fb1d907 --- /dev/null +++ b/app/Views/basic/url/hitslist.php @@ -0,0 +1,279 @@ +extend(smarty_view('layout')); ?> + +section('title') ?> endSection() ?> + +section('cssheaderarea') ?> + +endSection() ?> + + + +section('main') ?> + + +
+ + +
+ +
+ +
+
+

+
+
+
    +
  1. + +
    2. +
  2. + + + +
    3. +
  3. + "> + + +
    4. + + + +
+
+
+ +
+ +
+ + +
+ + +
+
+
+ +
+ +
+ +
+
+

+ + + ' class='bi bi-clipboard copy-button' + data-content='' data-target='link2'> + +

+
+
+ + ' + href='' class='link-dark edit-link'> + + +
+
+ + +
+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
+ + +
+ + +
+ + +endSection() ?> + + + + +section('jsfooterarea') ?> + + + +endSection() ?>