0.0.0-rc.17

.gitignore

@@ -31,11 +31,20 @@ apps/*
 !apps/Core/
 .ff/*
 .sql/*
-system/Base/Providers/BasepackagesServiceProvider/Packages/Geo/Data/*
-!system/Base/Providers/BasepackagesServiceProvider/Packages/Geo/Data/AllCountries.json
-!system/Base/Providers/BasepackagesServiceProvider/Packages/Geo/Data/TimeZones.json
+system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/*
+!system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/vendor
+!system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/Geo
+system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/Geo/*
+!system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/Geo/AllCountries.json
+!system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/Geo/TimeZones.json
+!system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/Ip2location
+system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/Ip2location/*
+!system/Base/Providers/BasepackagesServiceProvider/Packages/DataExtractors/Ip2location/AllCountries.json
 .api/
 phpstan.neon
 psalm.xml
 docker*
-phpunit*
+phpunit*
+.phpdoc*
+docs*
+devdocs*

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "apps/Core/Packages/Devtools/GeoExtractData/Data"]
 	path = apps/Core/Packages/Devtools/GeoExtractData/Data
 	url = https://github.com/sp-framework/geodata.git
+[submodule "docs"]
+	path = docs
+	url = https://github.com/sp-framework/docs.git
+[submodule "devdocs"]
+	path = devdocs
+	url = https://github.com/sp-framework/devdocs.git

apps/Core/Components/Apps/AppsComponent.php

@@ -199,6 +199,8 @@ public function viewAction()
 
                 //Middlewares
                 $middlewaresArr = $this->modules->middlewares->getMiddlewaresForAppType($app['app_type'], $app['id'], true);
+                $ip2locationCountries = [];
+                $ip2locationInfo = [];
                 foreach ($middlewaresArr as $key => &$middlewareValue) {
                     if ($middlewareValue['apps']) {
                         if (is_string($middlewareValue['apps'])) {
@@ -221,7 +223,16 @@ public function viewAction()
                         }
                     }
                     $middlewares[$key] = $middlewareValue;
+
+                    if ($middlewareValue['name'] === 'IpFilter') {
+                        if (isset($middlewareValue['apps'][$app['id']]) && $middlewareValue['apps'][$app['id']]['enabled']) {
+                            $ip2locationCountries = $this->access->ipFilter->ip2location->getAllCountries();
+                            $ip2locationInfo = $this->access->ipFilter->ip2location->getIp2locationInfo();
+                        }
+                    }
                 }
+                $this->view->ip2locationCountries = $ip2locationCountries;
+                $this->view->ip2locationInfo = $ip2locationInfo;
 
                 //Views
                 $viewsArr = $this->modules->views->getViewsForAppType($app['app_type'], false, true);
@@ -447,41 +458,51 @@ public function removeAction()
         }
     }
 
-    public function getFiltersAction()
+    public function saveMiddlewareSettingsAction()
     {
         $this->requestIsPost();
 
-        $filters = $this->access->ipFilter->getFilters($this->postData());
+        $this->modules->middlewares->saveMiddlewareSettings($this->postData());
 
-        foreach ($filters as $key => &$filter) {
-            unset ($filter['app_id']);
-            if ($filter['address_type'] == '1') {
-                $filter['address_type'] = 'host';
-            } else if ($filter['address_type'] == '2') {
-                $filter['address_type'] = 'network';
-            }
+        $this->addResponse(
+            $this->modules->middlewares->packagesData->responseMessage,
+            $this->modules->middlewares->packagesData->responseCode,
+            $this->modules->middlewares->packagesData->responseData ?? []
+        );
+    }
 
-            if ($filter['filter_type'] == '1') {
-                $filter['filter_type'] = "allow";
-            } else if ($filter['filter_type'] == '2') {
-                $filter['filter_type'] = "block";
-            } else if ($filter['filter_type'] == '3') {
-                $filter['filter_type'] = "monitor";
-            }
+    public function getFiltersAction()
+    {
+        $this->requestIsPost();
 
-            if ($filter['added_by'] == '0') {
-                $filter['added_by'] = "System";
-            } else {
-                $user = $this->basepackages->accounts->getAccountById($filter['added_by']);
+        $filters = $this->access->ipFilter->filters->getFilters($this->postData());
 
-                if ($user && isset($user['profile']['full_name'])) {
-                    $filter['added_by'] = $user['profile']['full_name'];
+        if ($filters && count($filters) > 0) {
+            foreach ($filters as $key => &$filter) {
+                unset ($filter['app_id']);
+                unset ($filter['decimal']);
+                unset ($filter['parent_id']);
+
+                if ($filter['updated_by'] == '0') {
+                    $filter['updated_by'] = "System";
                 } else {
-                    $filter['added_by'] = "System";
+                    $user = $this->basepackages->accounts->getAccountById($filter['updated_by']);
+
+                    if ($user && isset($user['contact']['full_name'])) {
+                        $filter['updated_by'] = $user['contact']['full_name'];
+                    } else {
+                        $filter['updated_by'] = "System";
+                    }
+                }
+
+                try {
+                    $filter['updated_at'] = (\Carbon\Carbon::parse($filter['updated_at']))->toDateTimeString();
+                } catch (\throwable $e) {
+                    $filter['updated_at'] = '-';
                 }
-            }
 
-            $filter['actions'] = '';
+                $filter['actions'] = '';
+            }
         }
 
         $this->view->data = $filters;
@@ -491,59 +512,62 @@ public function addFilterAction()
     {
         $this->requestIsPost();
 
-        $this->access->ipFilter->addFilter($this->postData());
+        $this->access->ipFilter->init($this->postData()['app_id'])->filters->addFilter($this->postData());
 
         $this->addResponse(
-            $this->access->ipFilter->packagesData->responseMessage,
-            $this->access->ipFilter->packagesData->responseCode
+            $this->access->ipFilter->filters->packagesData->responseMessage,
+            $this->access->ipFilter->filters->packagesData->responseCode,
+            $this->access->ipFilter->filters->packagesData->responseData ?? []
         );
     }
 
-    public function removeFilterAction()
+    public function updateFilterAction()
     {
         $this->requestIsPost();
 
-        $this->access->ipFilter->removeFilter($this->postData());
+        $this->access->ipFilter->init($this->postData()['app_id'])->filters->updateFilter($this->postData());
 
         $this->addResponse(
-            $this->access->ipFilter->packagesData->responseMessage,
-            $this->access->ipFilter->packagesData->responseCode
+            $this->access->ipFilter->filters->packagesData->responseMessage,
+            $this->access->ipFilter->filters->packagesData->responseCode,
+            $this->access->ipFilter->filters->packagesData->responseData ?? []
         );
     }
 
-    public function allowFilterAction()
+    public function removeFilterAction()
     {
         $this->requestIsPost();
 
-        $this->access->ipFilter->allowFilter($this->postData());
+        $this->access->ipFilter->init($this->postData()['app_id'])->filters->removeFilter($this->postData());
 
         $this->addResponse(
-            $this->access->ipFilter->packagesData->responseMessage,
-            $this->access->ipFilter->packagesData->responseCode
+            $this->access->ipFilter->filters->packagesData->responseMessage,
+            $this->access->ipFilter->filters->packagesData->responseCode
         );
     }
 
-    public function blockFilterAction()
+    public function resetAppFiltersAction()
     {
         $this->requestIsPost();
 
-        $this->access->ipFilter->blockFilter($this->postData());
+        $this->access->ipFilter->init($this->postData()['app_id'])->filters->resetAppFilters($this->postData());
 
         $this->addResponse(
-            $this->access->ipFilter->packagesData->responseMessage,
-            $this->access->ipFilter->packagesData->responseCode
+            $this->access->ipFilter->filters->packagesData->responseMessage,
+            $this->access->ipFilter->filters->packagesData->responseCode
         );
     }
 
-    public function resetAppFiltersAction()
+    public function checkIpAction()
     {
         $this->requestIsPost();
 
-        $this->access->ipFilter->resetAppFilters($this->postData());
+        $this->access->ipFilter->init($this->postData()['app_id'])->checkIp($this->postData()['ip'], null, true);
 
         $this->addResponse(
             $this->access->ipFilter->packagesData->responseMessage,
-            $this->access->ipFilter->packagesData->responseCode
+            $this->access->ipFilter->packagesData->responseCode,
+            $this->access->ipFilter->packagesData->responseData ?? []
         );
     }
 
@@ -584,4 +608,81 @@ public function getViewsForAppTypeAction()
             $this->addResponse('No Views Installed', 1);
         }
     }
+
+    public function searchCountryAction()
+    {
+        $this->requestIsPost();
+
+        if (isset($this->postData()['search'])) {
+            $searchQuery = $this->postData()['search'];
+
+            if (strlen($searchQuery) < 3) {
+                return;
+            }
+
+            $countries = $this->access->ipFilter->ip2location->searchCountries($searchQuery);
+
+            $countries = msort($countries, 'id');
+
+            $this->addResponse(
+                $this->access->ipFilter->packagesData->responseMessage,
+                $this->access->ipFilter->packagesData->responseCode,
+                ['countries' => $countries] ?? []
+            );
+        } else {
+            $this->addResponse('Search Query Missing', 1);
+        }
+    }
+
+    public function searchStateAction()
+    {
+        $this->requestIsPost();
+
+        if (isset($this->postData()['country_id']) && isset($this->postData()['search'])) {
+            $countryId = $this->postData()['country_id'];
+            $searchQuery = $this->postData()['search'];
+
+            if (strlen($searchQuery) < 3) {
+                return;
+            }
+
+            $states = $this->access->ipFilter->ip2location->searchStates($countryId, $searchQuery);
+
+            $states = msort($states, 'id');
+
+            $this->addResponse(
+                $this->access->ipFilter->packagesData->responseMessage,
+                $this->access->ipFilter->packagesData->responseCode,
+                ['states' => $states] ?? []
+            );
+        } else {
+            $this->addResponse('Search Query Missing', 1);
+        }
+    }
+
+    public function searchCityAction()
+    {
+        $this->requestIsPost();
+
+        if (isset($this->postData()['country_id']) && isset($this->postData()['search'])) {
+            $countryId = $this->postData()['country_id'];
+            $searchQuery = $this->postData()['search'];
+
+            if (strlen($searchQuery) < 3) {
+                return;
+            }
+
+            $cities = $this->access->ipFilter->ip2location->searchCities($countryId, $searchQuery);
+
+            $cities = msort($cities, 'id');
+
+            $this->addResponse(
+                $this->access->ipFilter->packagesData->responseMessage,
+                $this->access->ipFilter->packagesData->responseCode,
+                ['cities' => $cities] ?? []
+            );
+        } else {
+            $this->addResponse('Search Query Missing', 1);
+        }
+    }
 }

apps/Core/Components/Auth/AuthComponent.php

@@ -8,6 +8,12 @@ class AuthComponent extends BaseComponent
 {
     public function viewAction()
     {
+        if (isset($this->getData()['blocked']) && $this->getData()['blocked'] === 'true') {
+            echo 'Blocked!';
+
+            return false;
+        }
+
         $this->view->setLayout('auth');
 
         $this->view->canRegister = false;

apps/Core/Components/Devtools/Modules/ModulesComponent.php

@@ -956,6 +956,19 @@ public function getDefaultDependenciesAction()
 		}
 	}
 
+	public function getLatestModuleVersionAction()
+	{
+		$this->requestIsPost();
+
+		$this->modulesPackage->getLatestModuleVersion($this->postData());
+
+		$this->addResponse(
+			$this->modulesPackage->packagesData->responseMessage,
+			$this->modulesPackage->packagesData->responseCode,
+			$this->modulesPackage->packagesData->responseData ?? []
+		);
+	}
+
 	public function checkVersionAction()
 	{
 		$this->requestIsPost();