@@ -132,7 +132,7 @@ function load_class($class = NULL, $path = NULL, $params = NULL, $instantiate = return TRUE; } - return $objects[$class] = new $class(($params ? $params : '')); + return $objects[$class] = new $class($params); } @@ -177,14 +177,11 @@ function _error_handler($level='', $message='', $file='', $line='', $variables=' //Get Human-safe error title $error = $error_levels[$level]; - //If we only show simple error data - if(DEBUG_MODE == FALSE) { + if(DEBUG_MODE) { //Create sentence $line_info = 'On line '. $line. ' in '. $file; - } else { - //If the database class is loaded - get the queries run (if any) if(class_exists('db')) { $db = db::get_instance(); @@ -551,7 +548,7 @@ function pagination($options=null) { */ function log_message($message = '') { - $filepath = LOG_PATH. 'log-'. date('Y-m-d'). '.php'; + $filepath = LOG_PATH. DOMAIN. '_log-'. date('Y-m-d'). '.php'; //Add a exit header to the file if ( ! file_exists($filepath)) { @@ -573,3 +570,75 @@ function log_message($message = '') { return TRUE; } + +/** + * Header redirection for both location and refresh types. + * + * @param string the URL + * @param string the method: location or redirect + * @return void + */ +function redirect($uri = '', $method = 'location', $http_response_code = 302) { + + //Do we need to add the site URL prefix? + $uri = strpos($uri, '://') !== FALSE ? $uri : 'http://'. DOMAIN. SITE_URL . $uri; + + if($method == 'refresh') { + header("Refresh:0;url=". $uri); + } else { + header("Location: ". $uri, TRUE, $http_response_code); + } + exit; +} + + +/** + * Return the site url prefixed to the uri path + * @param $uri + * @return unknown_type + */ +function site_url($uri = '') { + return SITE_URL. trim($uri, '/'). '/'; +} + + +/** + * Fetch a $_POST value (or the default if not found) + * @param string $key + * @param mixed $value + * @return mixed + */ +function post($key, $value = NULL) { + return isset($_POST[$key]) ? $_POST[$key] : $value; +} + + +/** + * Fetch the $_SESSION value (or default if not found) + * @param string $key + * @param mixed $value + * @return mixed + */ +function session($key, $value = NULL) { + return isset($_SESSION[$key]) ? $_SESSION[$key] : $value; +} + + +/** + * Encode a string so it is safe to pass through the URI + * @param string $string + * @return string + */ +function base64_url_encode($string=null){ + return strtr(base64_encode($string), '+/=', '-_~'); +} + + +/** + * Decode a string passed through the URI + * @param string $string + * @return string + */ +function base64_url_decode($string=null) { + return base64_decode(strtr($string, '-_~','+/=')); +} \ No newline at end of file functions/common.php @@ -280,18 +280,37 @@ function mime_type($type = NULL) { * @param string $ext * @return void */ -function download_document($content = '', $ext = ''){ +function download_file($content = '', $ext = '', $filename = NULL){ //Try to get the mime type if( ! $mime = mime_type($ext)) { $mime = 'application/octet-stream'; } - //Send header data - header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); - header('Content-Disposition: attachment; filename='.time(). $ext); - header("Content-Length: " . mb_strlen($content)); - header("Content-Type: $mime"); + //Create a random filename + if( ! $filename) { + $filename = time(). '.'. $ext; + } + + // Generate the server headers + if (strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) { + header('Content-Type: "'.$mime.'"'); + header('Content-Disposition: attachment; filename="'.$filename.'"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); + header("Content-Transfer-Encoding: binary"); + header('Pragma: public'); + header("Content-Length: ".strlen($data)); + + } else { + header('Content-Type: "'.$mime.'"'); + header('Content-Disposition: attachment; filename="'.$filename.'"'); + header("Content-Transfer-Encoding: binary"); + header('Expires: 0'); + header('Pragma: no-cache'); + header("Content-Length: ".strlen($data)); + } + //Send file exit($content); functions/mimes.php @@ -17,20 +17,22 @@ class controller { //Data for final site layout - public $views = array(); + public $views = array(); //Name of final site layout file - public $layout = 'layout'; + public $layout = 'layout'; //Singleton instance object private static $instance; //Config array - public $config = array(); + public $config = array(); + //Language array + public $lang = array(); /** * Setup some basic controller items on load * @param array $config */ - public function __construct($config=null) { + public function __construct($config = null) { //Set singleton instance self::$instance =& $this; @@ -142,7 +144,9 @@ class controller { /** * Load a config file - * @param string $config + * @param string $name + * @param string $module + * @return array */ public function load_config($name=null, $module = FALSE) { @@ -167,6 +171,33 @@ class controller { /** + * Load a language file + * @param string $name + * @param string $module + * @return array + */ + public function load_lang($name=null, $module = FALSE) { + + //If this lang file was already loaded + if( ! empty($this->lang[$name])) { + return $this->lang[$name]; + } + + //Is this a module's config -or a site config? + $path = $module ? MODULE_PATH. $module. DS : SITE_PATH; + + //Add the rest of the path + $path .= 'lang'. DS. $this->config['config']['language']. DS. $name. '.php'; + + //include the config + require($path); + + //Set the values in our config array and return a copy too + return $this->lang[$name] = $lang; + } + + + /** * Load and initialize the database connection * @param array $config */ libraries/controller.php @@ -17,7 +17,7 @@ class validation { //The Parent Controller Instance - public $instance = NULL; + public $mvc = NULL; //An array of error messages public $error_messages = array(); //The array to hold form errors (if any) @@ -25,14 +25,20 @@ class validation { //The text to put before an error public $error_prefix = '<p>'; //The text to put after an error - public $error_sufix = '</p>'; + public $error_suffix = '</p>'; /* - * Get the Controller instance on load + * Get the Controller mvc on load */ - public function __construct() { - $this->instance = get_instance(); + public function __construct($config = NULL) { + + //Get the instance + $this->mvc = get_instance(); + + if($config) { + $this->setup($config); + } //Set error messages $this->error_messages = array( @@ -52,6 +58,27 @@ class validation { } + /** + * Set the config for the validation run + * @param array $config + * @return void + */ + public function setup($config) { + $this->config = $config; + } + + + /** + * Add a field and the matching rules to our config + * @param string $field + * @param string $rules + * @return void + */ + public function set_rule($field = NULL, $rules = '') { + $this->config[$field] = $rules; + } + + /* * Check and Filter the $_POST data submited to us. * @@ -60,13 +87,18 @@ class validation { * first in the controller, then in this class, and * finally as just a function. */ - public function run($config=null) { + public function run($config = NULL) { //Reset error array $this->errors = array(); + //If the rules were not passed, then see if they are pre-set + if( ! $config) { + $config = $this->config; + } + //No rules? - if(! $config) { + if( ! $config) { $this->errors['no_rules'] = $this->error_messages['no_rules']; return FALSE; } @@ -131,8 +163,8 @@ class validation { } //Look for it in the current controller - if(method_exists($this->instance, $rule)) { - $result = $this->instance->$rule($field, $data, $params); + if(method_exists($this->mvc, $rule)) { + $result = $this->mvc->$rule($field, $data, $params); //Look for it in this class } elseif(method_exists($this, $rule)) { @@ -193,7 +225,7 @@ class validation { $output = ''; //Format each error foreach($this->errors as $error) { - $output .= $this->error_prefix. $error. $this->error_sufix. "\n\n"; + $output .= $this->error_prefix. $error. $this->error_suffix. "\n\n"; } //Return the full errors string libraries/validation.php @@ -8,6 +8,8 @@ $config['default_controller'] = 'welcome'; $config['default_method'] = 'index'; //Characters to allow in the URI string ($_GET data) $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-'; +//Language +$config['language'] = 'english'; //Enable error reporting? //error_reporting(E_ALL|E_STRICT); localhost/config/config.php @@ -3,7 +3,7 @@ /* PDO MySQL Database Config */ $database= array( 'type' => 'mysql', - 'dns' => 'host=127.0.0.1;dbname=pdo_test', + 'dns' => 'host=127.0.0.1;dbname=micromvc', 'port' => '3306', 'name' => '', 'user' => 'root', localhost/config/database.php 785f5828f655d09cb23c6bf17ed97c877eb2262b Xeoncross david@xeoncross.com http://github.com/Xeoncross/micromvc/commit/0ddb2b69fdbf11e515b7335a12343d11d5d88406 0ddb2b69fdbf11e515b7335a12343d11d5d88406 2009-07-16T12:04:01-07:00 2009-07-16T12:04:01-07:00 Added the redirect(), post(), session(), site_url(), base64_url_(en/de)code() helper functions. Fixed the file name of log files. Added line & file infomation to errors. Added language support to system. Added more config options for validation class. bd43b85d7732b62cdd170f27a770046cddbd3576 Xeoncross david@xeoncross.com