some psr-12 and clean code style fixes

krysits · Sep 9, 2020 · 7749628 · 7749628
1 parent fe09f5f
commit 7749628
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 80 deletions.
diff --git a/public/front.php b/public/front.php
@@ -81,7 +81,7 @@
 				<ins data-revive-zoneid="3" data-revive-id="0acc88b3a59a820af783b96c26cb2f66"></ins>
 				<?= $_SERVER['SERVER_PORT'] == 443 ? '<script async src="https://node.lv/www/delivery/asyncjs.php"></script>':'';?>
 
-				<p class="text-muted small mt-2 mb-lg-0">&copy; <a href="https://krysits.com/" target="_blank">krysits.com</a> <?php echo date('Y');?></p>
+				<p class="text-muted small mt-2 mb-lg-0">&copy; <a href="https://0k.lv/krysits" target="_blank">krysits.com</a> <?php echo date('Y');?></p>
 			</div>
 		</div>
 	</div>

diff --git a/src/Shortener/App.php b/src/Shortener/App.php
@@ -1,6 +1,7 @@
 <?php
 namespace Shortener;
 
+use Exception;
 use Pecee\Http\Exceptions\MalformedUrlException;
 use Pecee\SimpleRouter\Exceptions\HttpException;
 use Shortener\Models\Url;
@@ -25,37 +26,40 @@ public function checkIP() {}
 
 	public function redirect($uri='')
 	{
-		if(empty($uri)) return;
+		if(empty($uri)) {
+            return;
+        }
 		header("Location: " . $uri);
 	}
 
 	// routes
 	public function setRoutes() {
-
-		Router::get('/{code}', function ($code) {
-			$goUrl = (new Url)->getRecords(['code'=>$code], ['url', 'id'], 1);
-			$aliasUrl = (new Url)->getRecords(['alias'=>$code], ['url', 'id'], 1);
-
-			if($goUrl) {
-				new Hit($goUrl[0]->id);
-				$this->redirect($goUrl[0]->url);
-			}
-			else if($aliasUrl) {
-				new Hit($aliasUrl[0]->id);
-				$this->redirect($aliasUrl[0]->url);
-			}
-			else {
-                $this->redirect('/');
-            }
-
-		})->where(['code'=>'[A-Za-z]+']);
-
-		Router::get('/', static function () {
-			include_once 'front.php';
-			return '';
-		});
-
-	}
+        try {
+            Router::get('/{code}', function ($code) {
+                $goUrl = (new Url)->getRecords(['code' => $code], ['url', 'id'], 1);
+                $aliasUrl = (new Url)->getRecords(['alias' => $code], ['url', 'id'], 1);
+
+                if ($goUrl) {
+                    new Hit($goUrl[0]->id);
+                    $this->redirect($goUrl[0]->url);
+                } elseif ($aliasUrl) {
+                    new Hit($aliasUrl[0]->id);
+                    $this->redirect($aliasUrl[0]->url);
+                } else {
+                    $this->redirect('/');
+                }
+            })->where(['code' => '[A-Za-z]+']);
+        } catch (MalformedUrlException $e) {
+        }
+
+        try {
+            Router::get('/', static function () {
+                include_once 'front.php';
+                return '';
+            });
+        } catch (MalformedUrlException $e) {
+        }
+    }
 
 	public function run()
 	{
@@ -64,7 +68,7 @@ public function run()
             Router::start();
         } catch (MalformedUrlException $e) {
         } catch (HttpException $e) {
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
         }
     }
-};
+}
diff --git a/src/Shortener/Auth.php b/src/Shortener/Auth.php
diff --git a/src/Shortener/CountryCode.php b/src/Shortener/CountryCode.php
@@ -25,12 +25,12 @@ public function getCCbyIP($ip = Null)
 	private function _geo_loc_code($ip){
 		$url = $this->_ip_url . $ip . '/json';
 		$data = file_get_contents($url);
-		$json_data = json_decode($data);
+		$json_data = json_decode($data, false);
 
 		if(!empty($json_data->country)) {
 			return $json_data->country;
 		}
 
 		return $this->country_code;    // old value
 	}
-};
+}
diff --git a/src/Shortener/Models/Hit.php b/src/Shortener/Models/Hit.php
@@ -30,7 +30,7 @@ public function __construct($url_id = 0)
 	// methods
 	public function setTable($table = '')
 	{
-		$this->_table = (empty($table)) ? strtolower($this->getTableNameByNamespace(get_class())) : $table;
+		$this->_table = (empty($table)) ? strtolower($this->getTableNameByNamespace(__CLASS__)) : $table;
 	}
 
 	public function addHit($url_id = 0) {
@@ -53,4 +53,4 @@ public function addHit($url_id = 0) {
 
 		return $this->save((array) $this);
 	}
-};
+}
diff --git a/src/Shortener/Models/Url.php b/src/Shortener/Models/Url.php
@@ -19,15 +19,10 @@ class Url extends Model
 	public $deleted_at; //date('Y-m-d H:i:s');
 
 	// constructor
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	// methods
+    // methods
 	public function setTable($table = '')
 	{
-		$this->_table = (empty($table)) ? strtolower($this->getTableNameByNamespace(get_class())) : $table;
+		$this->_table = (empty($table)) ? strtolower($this->getTableNameByNamespace(__CLASS__)) : $table;
 	}
 
 	public function generate_code($number) {
@@ -81,11 +76,10 @@ public function addNew()
 
 	public function getMaxId()
 	{
-		$sql = "SELECT max(id) as number FROM ";
-		$sql .= $this->_table;
+		$sql = "SELECT max(id) as number FROM " . $this->_table;
 
 		$result = $this->_db->query($sql);
 
 		return $result->fetchColumn() ?: 0;
 	}
-};
+}