From 5a4973a36c9a447d1900eef53a1ce3d7f4b19d40 Mon Sep 17 00:00:00 2001 From: Geoff Doty Date: Fri, 23 Jun 2023 12:11:47 -0500 Subject: [PATCH] code clean up --- src/mite.php | 58 +++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/src/mite.php b/src/mite.php index 15eb0d9..45626d1 100644 --- a/src/mite.php +++ b/src/mite.php @@ -1,5 +1,6 @@ init($config); } - public function init($config = array()) + public function init($name, $config = []) { // always set init (can be used as singleton later?) self::$init = microtime(TRUE); @@ -98,14 +99,14 @@ class Mite { } else { - // $class = get_class($this); //5 + - // $class = get_called_class(); //5.3 + // $class = get_class($this); // 5 + + // $class = get_called_class(); // 5.3 // if(is_callable("{$class}::{$callback}")) - if(is_callable(array($this, $callback))) + if(is_callable([$this, $callback])) { - // return call_user_func("{$class}::{$callback}"); //called staticly 5.2.3+ - // return call_user_func(array($class, $callback)); //called? + // return call_user_func("{$class}::{$callback}"); // called staticly 5.2.3+ + // return call_user_func(array($class, $callback)); // called? return $this->$callback(); } else @@ -143,11 +144,11 @@ class Mite { { if($value === NULL) { - return $option = isset(self::$options[$key]) ? self::$options[$key] : NULL ; + return isset(self::$options[$key]) ? self::$options[$key] : NULL; } else { - return $option = isset(self::$options[$key][$value]) ? self::$options[$key][$value] : NULL ; + return isset(self::$options[$key][$value]) ? self::$options[$key][$value] : NULL; } } } @@ -156,15 +157,15 @@ class Mite { * State Management *****************************************************************/ /** - * Cookie Managment + * Cookie Management * * set/get cookies by call signature */ - public function cookie($name, $value = NULL, $expire = 0, $path = '', $domain = '', $secure = FALSE, $httponly=false) + public function cookie($name, $value = NULL, $expire = 0, $path = '', $domain = '', $secure = FALSE, $httponly = false) { if($value === NULL) { // read cookie - return $cookie = isset($_COOKIE[$name]) ? $_COOKIE[$name] : NULL ; + return isset($_COOKIE[$name]) ? $_COOKIE[$name] : NULL ; } else { // create cookie @@ -179,14 +180,14 @@ class Mite { */ public function flash($name, $value) { - self::cookie($name, $value, $expire = time()+1); + self::cookie($name, $value, time()+1); } public function session($key, $value = NULL) { if($value === NULL) { // read session - return $session = isset($_SESSION[$name]) ? $_SESSION[$name] : NULL ; + return isset($_SESSION[$key]) ? $_SESSION[$key] : NULL ; } else { // create session @@ -205,7 +206,7 @@ class Mite { { $segments = explode('/', trim(self::$request, '/')); - return $segment = isset($segments[($number - 1)]) ? $segments[($number - 1)] : NULL; + return isset($segments[($number - 1)]) ? $segments[($number - 1)] : NULL; } public function input($key, $clean = TRUE) @@ -224,8 +225,7 @@ class Mite { public function xss($value) { - $value = stripslashes($value); - return htmlentities($value); + return htmlentities(stripslashes($value)); } public function style($file = NULL) @@ -310,7 +310,7 @@ class Mite { } $output .= "\n"; - // Request varibles + // Request variables $output .= "
GET DATA
\n"; foreach($_GET as $key => $value) { @@ -405,11 +405,12 @@ abstract class Mite_Model { $sql = "INSERT INTO {$this->_table} "; $columns = array(); - $values = array(); + $values = array(); + foreach($data as $column => $value) { $columns[] = $column; - $values[] = $value; + $values[] = $value; } $sql .= '(' . implode(',', $columns) . ') '; @@ -453,6 +454,7 @@ abstract class Mite_Model { public function find($value) { $sql = "SELECT * FROM {$this->_table} WHERE {$this->_key} = '{$value}'"; + return $this->db->query($sql); }