)');
+ }
- // Loops through the environments and tries to match on IP or name
- foreach ($config['environments'] as $name => $hosts)
- {
- if (!is_array($hosts))
- {
- $hosts = [$hosts];
- }
+ // Loops through the environments and tries to match on IP or name
+ foreach ($config['environments'] as $name => $hosts)
+ {
+ if (!is_array($hosts))
+ {
+ $hosts = [$hosts];
+ }
- // Tries to determine the environment name
- foreach ($hosts as $host)
- {
- if ($is_cli)
- {
- // Checks the first argument on the command line
- if ($_SERVER['argv'][1] == $name)
- {
- $environment = $name;
- break;
- }
- }
- else
- {
- // Exact match
- if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $host)
- && $_SERVER['SERVER_ADDR'] == $host)
- || (isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] == $host))
- {
- $environment = $name;
- break;
- }
- // Fuzzy match
- elseif (substr($host,0,1) == '/' && (preg_match($host, $_SERVER['SERVER_NAME'], $matches) > 0 || preg_match($host, $_SERVER['HTTP_HOST'], $matches) > 0))
- {
- $environments[$name] = $matches[0];
- $environment = $name;
- $config['environments'][$name] = $matches[0];
- break;
- }
- }
- }
- }
- }
- }
+ // Tries to determine the environment name
+ foreach ($hosts as $host)
+ {
+ if ($is_cli)
+ {
+ // Checks the first argument on the command line
+ if ($_SERVER['argv'][1] == $name)
+ {
+ $environment = $name;
+ break;
+ }
+ }
+ else
+ {
+ // Exact match
+ if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $host)
+ && $_SERVER['SERVER_ADDR'] == $host)
+ || (isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] == $host))
+ {
+ $environment = $name;
+ break;
+ }
+ // Fuzzy match
+ elseif (substr($host,0,1) == '/' && (preg_match($host, $_SERVER['SERVER_NAME'], $matches) > 0 || preg_match($host, $_SERVER['HTTP_HOST'], $matches) > 0))
+ {
+ $environments[$name] = $matches[0];
+ $environment = $name;
+ $config['environments'][$name] = $matches[0];
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
- // Flattens the array based on the environment
- $this->data = $this->flatten($environment, $config);
+ // Flattens the array based on the environment
+ $this->data = $this->flatten($environment, $config);
- // Restore environments value
- if ($environments != false)
- {
- $this->data['environments'] = $environments;
- }
+ // Restore environments value
+ if ($environments != false)
+ {
+ $this->data['environments'] = $environments;
+ }
- // Sets the environment if it's not set already
- if (!isset($this->data['environment']))
- {
- $this->data['environment'] = $environment;
- }
+ // Sets the environment if it's not set already
+ if (!isset($this->data['environment']))
+ {
+ $this->data['environment'] = $environment;
+ }
- // Defaults profiler to true if it doesn't match an option exactly
- if (isset($this->data['pickles']['profiler']))
- {
- // If we have an array convert to a string
- if (is_array($this->data['pickles']['profiler']))
- {
- $this->data['pickles']['profiler'] = implode(',', $this->data['pickles']['profiler']);
- }
- }
- else
- {
- $this->data['pickles']['profiler'] = false;
- }
+ // Defaults profiler to true if it doesn't match an option exactly
+ if (isset($this->data['pickles']['profiler']))
+ {
+ // If we have an array convert to a string
+ if (is_array($this->data['pickles']['profiler']))
+ {
+ $this->data['pickles']['profiler'] = implode(',', $this->data['pickles']['profiler']);
+ }
+ }
+ else
+ {
+ $this->data['pickles']['profiler'] = false;
+ }
- // Defaults expected PICKLES options to false
- foreach (['cache', 'logging', 'minify'] as $variable)
- {
- if (!isset($this->data['pickles'][$variable]))
- {
- $this->data['pickles'][$variable] = false;
- }
- }
+ // Defaults expected PICKLES options to false
+ foreach (['cache', 'logging', 'minify'] as $variable)
+ {
+ if (!isset($this->data['pickles'][$variable]))
+ {
+ $this->data['pickles'][$variable] = false;
+ }
+ }
- // Creates constants for the security levels
- if (isset($this->data['security']['levels']) && is_array($this->data['security']['levels']))
- {
- foreach ($this->data['security']['levels'] as $value => $name)
- {
- $constant = 'SECURITY_LEVEL_' . strtoupper($name);
+ // Creates constants for the security levels
+ if (isset($this->data['security']['levels']) && is_array($this->data['security']['levels']))
+ {
+ foreach ($this->data['security']['levels'] as $value => $name)
+ {
+ $constant = 'SECURITY_LEVEL_' . strtoupper($name);
- // Checks if constant is already defined, and throws an error
- if (defined($constant))
- {
- throw new Exception('The constant ' . $constant . ' is already defined');
- }
- else
- {
- define($constant, $value);
- }
- }
- }
+ // Checks if constant is already defined, and throws an error
+ if (defined($constant))
+ {
+ throw new Exception('The constant ' . $constant . ' is already defined');
+ }
+ else
+ {
+ define($constant, $value);
+ }
+ }
+ }
- return true;
- }
+ return true;
+ }
- return false;
- }
+ return false;
+ }
- /**
- * Flatten
- *
- * Flattens the configuration array around the specified environment.
- *
- * @param string $environment selected environment
- * @param array $array configuration error to flatten
- * @return array flattened configuration array
- */
- public function flatten($environment, $array)
- {
- if (is_array($array))
- {
- foreach ($array as $key => $value)
- {
- if (is_array($value))
- {
- if (isset($value[$environment]))
- {
- $value = $value[$environment];
- }
- else
- {
- $value = $this->flatten($environment, $value);
- }
- }
+ /**
+ * Flatten
+ *
+ * Flattens the configuration array around the specified environment.
+ *
+ * @param string $environment selected environment
+ * @param array $array configuration error to flatten
+ * @return array flattened configuration array
+ */
+ public function flatten($environment, $array)
+ {
+ if (is_array($array))
+ {
+ foreach ($array as $key => $value)
+ {
+ if (is_array($value))
+ {
+ if (isset($value[$environment]))
+ {
+ $value = $value[$environment];
+ }
+ else
+ {
+ $value = $this->flatten($environment, $value);
+ }
+ }
- $array[$key] = $value;
- }
- }
+ $array[$key] = $value;
+ }
+ }
- return $array;
- }
+ return $array;
+ }
- /**
- * Get instance of the object
- *
- * Let's the parent class do all the work
- *
- * @static
- * @param string $class name of the class to instantiate
- * @return object self::$instance instance of the Config class
- */
- public static function getInstance($class = 'Config')
- {
- return parent::getInstance($class);
- }
+ /**
+ * Get instance of the object
+ *
+ * Let's the parent class do all the work
+ *
+ * @static
+ * @param string $class name of the class to instantiate
+ * @return object self::$instance instance of the Config class
+ */
+ public static function getInstance($class = 'Config')
+ {
+ return parent::getInstance($class);
+ }
- /**
- * Magic Getter Method
- *
- * Attempts to load the config variable. If it's not set, will override
- * the variable with boolean false.
- *
- * @param string $name name of the variable requested
- * @return mixed value of the variable or boolean false
- */
- public function __get($name)
- {
- if (!isset($this->data[$name]))
- {
- $this->data[$name] = false;
- }
+ /**
+ * Magic Getter Method
+ *
+ * Attempts to load the config variable. If it's not set, will override
+ * the variable with boolean false.
+ *
+ * @param string $name name of the variable requested
+ * @return mixed value of the variable or boolean false
+ */
+ public function __get($name)
+ {
+ if (!isset($this->data[$name]))
+ {
+ $this->data[$name] = false;
+ }
- return $this->data[$name];
- }
+ return $this->data[$name];
+ }
}
-?>
diff --git a/src/classes/Controller.php b/src/classes/Controller.php
index 9ad0c2e..38b4084 100644
--- a/src/classes/Controller.php
+++ b/src/classes/Controller.php
@@ -27,392 +27,394 @@
*/
class Controller extends Object
{
- /**
- * Constructor
- *
- * To save a few keystrokes, the Controller is executed as part of the
- * constructor instead of via a method. You either want the Controller or
- * you don't.
- */
- public function __construct()
- {
- parent::__construct();
+ /**
+ * Constructor
+ *
+ * To save a few keystrokes, the Controller is executed as part of the
+ * constructor instead of via a method. You either want the Controller or
+ * you don't.
+ */
+ public function __construct()
+ {
+ parent::__construct();
- // Generate a generic "site down" message if the site is set to be disabled
- try
- {
- // @todo Clean this up to be just a single sanity check
- if (isset($this->config->pickles['disabled']) && $this->config->pickles['disabled'])
- {
- $custom_template = SITE_TEMPLATE_PATH . '__shared/maintenance.phtml';
+ // Generate a generic "site down" message if the site is set to be disabled
+ try
+ {
+ // @todo Clean this up to be just a single sanity check
+ if (isset($this->config->pickles['disabled']) && $this->config->pickles['disabled'])
+ {
+ $custom_template = SITE_TEMPLATE_PATH . '__shared/maintenance.phtml';
- if (file_exists($custom_template))
- {
- require_once $custom_template;
- }
- else
- {
- echo '
- Down for Maintenance
- ' . $_SERVER['SERVER_NAME'] . ' is currently down for maintenance. Please check back in a few minutes.
- Additionally, a custom maintenance template was not found.
- Powered by PICKLES
- ';
- }
+ if (file_exists($custom_template))
+ {
+ require_once $custom_template;
+ }
+ else
+ {
+ echo '
+ Down for Maintenance
+
+ ' . $_SERVER['SERVER_NAME'] . ' is currently down for maintenance.
+ Please check back in a few minutes.
+
+ Additionally, a custom maintenance template was not found.
+ Powered by PICKLES
+ ';
+ }
- throw new Exception();
- }
+ throw new Exception();
+ }
- // Checks for attributes passed in the URI
- if (strstr($_REQUEST['request'], ':'))
- {
- $parts = explode('/', $_REQUEST['request']);
- $_REQUEST['request'] = '';
+ // Checks for attributes passed in the URI
+ if (strstr($_REQUEST['request'], ':'))
+ {
+ $parts = explode('/', $_REQUEST['request']);
+ $_REQUEST['request'] = '';
- foreach ($parts as $part)
- {
- if (strstr($part, ':'))
- {
- list($variable, $value) = explode(':', $part);
- Browser::set($variable, $value);
- }
- else
- {
- $_REQUEST['request'] .= ($_REQUEST['request'] ? '/' : '') . $part;
- }
- }
- }
+ foreach ($parts as $part)
+ {
+ if (strstr($part, ':'))
+ {
+ list($variable, $value) = explode(':', $part);
+ Browser::set($variable, $value);
+ }
+ else
+ {
+ $_REQUEST['request'] .= ($_REQUEST['request'] ? '/' : '') . $part;
+ }
+ }
+ }
- // Catches requests that aren't lowercase
- $lowercase_request = strtolower($_REQUEST['request']);
+ // Catches requests that aren't lowercase
+ $lowercase_request = strtolower($_REQUEST['request']);
- if ($_REQUEST['request'] != $lowercase_request)
- {
- // @todo Rework the Browser class to handle the 301 (perhaps redirect301()) to not break other code
- header('Location: ' . substr_replace($_SERVER['REQUEST_URI'], $lowercase_request, 1, strlen($lowercase_request)), true, 301);
- throw new Exception();
- }
+ if ($_REQUEST['request'] != $lowercase_request)
+ {
+ // @todo Rework the Browser class to handle the 301 (perhaps redirect301()) to not break other code
+ header('Location: ' . substr_replace($_SERVER['REQUEST_URI'], $lowercase_request, 1, strlen($lowercase_request)), true, 301);
+ throw new Exception();
+ }
- // Grabs the requested page
- $request = $_REQUEST['request'];
+ // Grabs the requested page
+ $request = $_REQUEST['request'];
- // Loads the module's information
- $module_class = strtr($request, '/', '_');
- $module_filename = SITE_MODULE_PATH . $request . '.php';
- $module_exists = file_exists($module_filename);
+ // Loads the module's information
+ $module_class = strtr($request, '/', '_');
+ $module_filename = SITE_MODULE_PATH . $request . '.php';
+ $module_exists = file_exists($module_filename);
- // Attempts to instantiate the requested module
- if ($module_exists)
- {
- if (class_exists($module_class))
- {
- $module = new $module_class;
- }
- }
+ // Attempts to instantiate the requested module
+ if ($module_exists)
+ {
+ if (class_exists($module_class))
+ {
+ $module = new $module_class;
+ }
+ }
- // No module instantiated, load up a generic Module
- if (!isset($module))
- {
- $module = new Module();
- }
+ // No module instantiated, load up a generic Module
+ if (!isset($module))
+ {
+ $module = new Module();
+ }
- // Determines if we need to serve over HTTP or HTTPS
- if ($module->secure == false && isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])
- {
- header('Location: http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
- throw new Exception();
- }
- elseif ($module->secure == true && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == false))
- {
- header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
- throw new Exception();
- }
+ // Determines if we need to serve over HTTP or HTTPS
+ if ($module->secure == false && isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])
+ {
+ header('Location: http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
+ throw new Exception();
+ }
+ elseif ($module->secure == true && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == false))
+ {
+ header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
+ throw new Exception();
+ }
- // Validates security level
- if ($module->security)
- {
- $is_authenticated = false;
+ // Validates security level
+ if ($module->security)
+ {
+ $is_authenticated = false;
- if (is_array($module->security))
- {
- $module_security = $module->security;
- $security_check_class = 'isLevel';
+ if (is_array($module->security))
+ {
+ $module_security = $module->security;
+ $security_check_class = 'isLevel';
- // Checks the type and validates it
- if (isset($module_security['type']))
- {
- $security_check_type = strtoupper($module_security['type']);
+ // Checks the type and validates it
+ if (isset($module_security['type']))
+ {
+ $security_check_type = strtoupper($module_security['type']);
- if (in_array($security_check_type, ['IS', 'HAS', 'BETWEEN']))
- {
- $security_check_class = $security_check_type;
- }
+ if (in_array($security_check_type, ['IS', 'HAS', 'BETWEEN']))
+ {
+ $security_check_class = $security_check_type;
+ }
- unset($module_security['type']);
- }
+ unset($module_security['type']);
+ }
- $module_security_levels = [];
+ $module_security_levels = [];
- // If there's a level(s) key use it
- foreach (['level', 'levels'] as $security_level_key)
- {
- if (isset($module_security[$security_level_key]))
- {
- if (is_array($module_security[$security_level_key]))
- {
- $module_security_levels = array_merge($module_security_levels, $module_security[$security_level_key]);
- }
- else
- {
- $module_security_levels[] = $module_security[$security_level_key];
- }
+ // If there's a level(s) key use it
+ foreach (['level', 'levels'] as $security_level_key)
+ {
+ if (isset($module_security[$security_level_key]))
+ {
+ if (is_array($module_security[$security_level_key]))
+ {
+ $module_security_levels = array_merge($module_security_levels, $module_security[$security_level_key]);
+ }
+ else
+ {
+ $module_security_levels[] = $module_security[$security_level_key];
+ }
- unset($module_security[$security_level_key]);
- }
- }
+ unset($module_security[$security_level_key]);
+ }
+ }
- // Assume everything left in the array is a level and add it to the array
- array_merge($module_security_levels, $module_security);
- $security_level_count = count($module_security_levels);
+ // Assume everything left in the array is a level and add it to the array
+ array_merge($module_security_levels, $module_security);
+ $security_level_count = count($module_security_levels);
- switch ($security_check_class)
- {
- // @todo Thinking of removing this?
- case 'BETWEEN':
- if ($security_level_count == 2)
- {
- $is_authenticated = Security::betweenLevel($module_security_levels[0], array_pop($module_security_levels));
- }
- break;
+ switch ($security_check_class)
+ {
+ // @todo Thinking of removing this?
+ case 'BETWEEN':
+ if ($security_level_count == 2)
+ {
+ $is_authenticated = Security::betweenLevel($module_security_levels[0], array_pop($module_security_levels));
+ }
+ break;
- case 'HAS':
- if ($security_level_count)
- {
- $is_authenticated = Security::hasLevel($module_security_levels);
- }
- break;
+ case 'HAS':
+ if ($security_level_count)
+ {
+ $is_authenticated = Security::hasLevel($module_security_levels);
+ }
+ break;
- case 'IS':
- if ($security_level_count)
- {
- $is_authenticated = Security::isLevel($module_security_levels);
- }
- break;
- }
- }
- else
- {
- $is_authenticated = Security::isLevel($module->security);
- }
+ case 'IS':
+ if ($security_level_count)
+ {
+ $is_authenticated = Security::isLevel($module_security_levels);
+ }
+ break;
+ }
+ }
+ else
+ {
+ $is_authenticated = Security::isLevel($module->security);
+ }
- if (!$is_authenticated)
- {
- if ($_SERVER['REQUEST_METHOD'] == 'POST')
- {
- // @todo Perhaps I could force a logout / redirect to the login page
- throw new Exception('{"status": "error", "message": "You are not properly authenticated, try logging out and back in."}');
- }
- else
- {
- // Sets variable for the destination
- $_SESSION['__pickles']['login']['destination'] = $_REQUEST['request'] ? $_REQUEST['request'] : '/';
+ if (!$is_authenticated)
+ {
+ if ($_SERVER['REQUEST_METHOD'] == 'POST')
+ {
+ // @todo Perhaps I could force a logout / redirect to the login page
+ throw new Exception('{"status": "error", "message": "You are not properly authenticated, try logging out and back in."}');
+ }
+ else
+ {
+ // Sets variable for the destination
+ $_SESSION['__pickles']['login']['destination'] = $_REQUEST['request'] ? $_REQUEST['request'] : '/';
- // Redirect to login page
- Browser::redirect('/login');
+ // Redirect to login page
+ Browser::redirect('/login');
- // Resolves testing error due to undefined $output
- $output = '';
- }
- }
- }
+ // Resolves testing error due to undefined $output
+ $output = '';
+ }
+ }
+ }
- // Gets the profiler status
- $profiler = $this->config->pickles['profiler'];
- $profiler = $profiler === true || stripos($profiler, 'timers') !== false;
+ // Gets the profiler status
+ $profiler = $this->config->pickles['profiler'];
+ $profiler = $profiler === true || stripos($profiler, 'timers') !== false;
- $default_method = '__default';
- $role_method = null;
+ $default_method = '__default';
+ $role_method = null;
- if (isset($_SESSION['__pickles']['security']['role']) && !String::isEmpty($_SESSION['__pickles']['security']['role']))
- {
- $role_method = '__default_' . $_SESSION['__pickles']['security']['role'];
+ if (isset($_SESSION['__pickles']['security']['role']) && !String::isEmpty($_SESSION['__pickles']['security']['role']))
+ {
+ $role_method = '__default_' . $_SESSION['__pickles']['security']['role'];
- if (method_exists($module, $role_method))
- {
- $default_method = $role_method;
- }
- }
+ if (method_exists($module, $role_method))
+ {
+ $default_method = $role_method;
+ }
+ }
- // Attempts to execute the default method
- // @todo Seems a bit redundant, refactor
- if ($default_method == $role_method || method_exists($module, $default_method))
- {
- // Starts a timer before the module is executed
- if ($profiler)
- {
- Profiler::timer('module ' . $default_method);
- }
+ // Attempts to execute the default method
+ // @todo Seems a bit redundant, refactor
+ if ($default_method == $role_method || method_exists($module, $default_method))
+ {
+ // Starts a timer before the module is executed
+ if ($profiler)
+ {
+ Profiler::timer('module ' . $default_method);
+ }
- $valid_request = false;
- $error_message = 'An unexpected error has occurred.';
+ $valid_request = false;
+ $error_message = 'An unexpected error has occurred.';
- // Determines if the request method is valid for this request
- if ($module->method)
- {
- if (!is_array($module->method))
- {
- $module->method = [$module->method];
- }
+ // Determines if the request method is valid for this request
+ if ($module->method)
+ {
+ if (!is_array($module->method))
+ {
+ $module->method = [$module->method];
+ }
- foreach ($module->method as $method)
- {
- if ($_SERVER['REQUEST_METHOD'] == $method)
- {
- $valid_request = true;
- break;
- }
- }
+ foreach ($module->method as $method)
+ {
+ if ($_SERVER['REQUEST_METHOD'] == $method)
+ {
+ $valid_request = true;
+ break;
+ }
+ }
- if (!$valid_request)
- {
- // @todo Should probably utilize that AJAX flag to determine the type of return
- $error_message = 'There was a problem with your request method.';
- }
- }
- else
- {
- $valid_request = true;
- }
+ if (!$valid_request)
+ {
+ // @todo Should probably utilize that AJAX flag to determine the type of return
+ $error_message = 'There was a problem with your request method.';
+ }
+ }
+ else
+ {
+ $valid_request = true;
+ }
- $valid_form_input = true;
+ $valid_form_input = true;
- if ($valid_request && $module->validate)
- {
- $validation_errors = $module->__validate();
+ if ($valid_request && $module->validate)
+ {
+ $validation_errors = $module->__validate();
- if ($validation_errors)
- {
- $error_message = implode(' ', $validation_errors);
- $valid_form_input = false;
- }
- }
+ if ($validation_errors)
+ {
+ $error_message = implode(' ', $validation_errors);
+ $valid_form_input = false;
+ }
+ }
- /**
- * Note to Self: When building in caching will need to let the
- * module know to use the cache, either passing in a variable
- * or setting it on the object
- */
- if ($valid_request && $valid_form_input)
- {
- $module_return = $module->$default_method();
+ /**
+ * Note to Self: When building in caching will need to let the
+ * module know to use the cache, either passing in a variable
+ * or setting it on the object
+ */
+ if ($valid_request && $valid_form_input)
+ {
+ $module_return = $module->$default_method();
- if (!is_array($module_return))
- {
- $module_return = $module->return;
- }
- else
- {
- $module_return = array_merge($module_return, $module->return);
- }
- }
+ if (!is_array($module_return))
+ {
+ $module_return = $module->return;
+ }
+ else
+ {
+ $module_return = array_merge($module_return, $module->return);
+ }
+ }
- // Stops the module timer
- if ($profiler)
- {
- Profiler::timer('module ' . $default_method);
- }
+ // Stops the module timer
+ if ($profiler)
+ {
+ Profiler::timer('module ' . $default_method);
+ }
- // Checks if we have any templates
- $parent_template = $module->template;
- $template_exists = $this->validateTemplates($module, $parent_template);
+ // Checks if we have any templates
+ $parent_template = $module->template;
+ $template_exists = $this->validateTemplates($module, $parent_template);
- // No templates? 404 that shit
- if (!$module_exists && !$template_exists)
- {
- Browser::status(404);
- $_REQUEST['request'] = '__shared/404';
+ // No templates? 404 that shit
+ if (!$module_exists && !$template_exists)
+ {
+ Browser::status(404);
+ $_REQUEST['request'] = '__shared/404';
- if (!$this->validateTemplates($module, $parent_template))
- {
- throw new Exception('
- Not Found
- The requested URL /' . $request . ' was not found on this server.
- Additionally, a custom error template was not found.
- Powered by PICKLES
- ');
- }
- }
+ if (!$this->validateTemplates($module, $parent_template))
+ {
+ throw new Exception('
+ Not Found
+ The requested URL /' . $request . ' was not found on this server.
+ Additionally, a custom error template was not found.
+ Powered by PICKLES
+ ');
+ }
+ }
- // @todo Should simplify this, give Display direct acess to
- // $module instead of all these variable assignment
- $display = new Display();
- $display->output = $module->output;
- $display->templates = $module->template;
- $display->module = isset($module_return) ? $module_return : ['status' => 'error', 'message' => $error_message];
+ // @todo Should simplify this, give Display direct acess to
+ // $module instead of all these variable assignment
+ $display = new Display();
+ $display->output = $module->output;
+ $display->templates = $module->template;
+ $display->module = isset($module_return) ? $module_return : ['status' => 'error', 'message' => $error_message];
- // @todo Check for $module->meta variable first, then remove entirely when sites are updated
- $display->meta = [
- 'title' => $module->title,
- 'description' => $module->description,
- 'keywords' => $module->keywords
- ];
- }
+ // @todo Check for $module->meta variable first, then remove entirely when sites are updated
+ $display->meta = [
+ 'title' => $module->title,
+ 'description' => $module->description,
+ 'keywords' => $module->keywords
+ ];
+ }
- // Starts a timer for the display rendering
- if ($profiler)
- {
- Profiler::timer('display render');
- }
+ // Starts a timer for the display rendering
+ if ($profiler)
+ {
+ Profiler::timer('display render');
+ }
- // Renders the content
- $output = $display->render();
+ // Renders the content
+ $output = $display->render();
- // Stops the display timer
- if ($profiler)
- {
- Profiler::timer('display render');
- }
- }
- catch (Exception $e)
- {
- $output = $e->getMessage();
- }
+ // Stops the display timer
+ if ($profiler)
+ {
+ Profiler::timer('display render');
+ }
+ }
+ catch (Exception $e)
+ {
+ $output = $e->getMessage();
+ }
- echo $output;
+ echo $output;
- // Display the Profiler's report if the stars are aligned
- if ($this->config->pickles['profiler'])
- {
- Profiler::report();
- }
- }
+ // Display the Profiler's report if the stars are aligned
+ if ($this->config->pickles['profiler'])
+ {
+ Profiler::report();
+ }
+ }
- // @todo Document me
- private function validateTemplates(&$module, $parent_template)
- {
- $templates = [
- SITE_TEMPLATE_PATH . '__shared/' . $parent_template . '.phtml',
- SITE_TEMPLATE_PATH . $_REQUEST['request'] . '.phtml',
- ];
+ // @todo Document me
+ private function validateTemplates(&$module, $parent_template)
+ {
+ $templates = [
+ SITE_TEMPLATE_PATH . '__shared/' . $parent_template . '.phtml',
+ SITE_TEMPLATE_PATH . $_REQUEST['request'] . '.phtml',
+ ];
- $module->template = [];
- $child_exists = file_exists($templates[1]);
+ $module->template = [];
+ $child_exists = file_exists($templates[1]);
- if (file_exists($templates[0]) && $child_exists)
- {
- $module->template = $templates;
- return true;
- }
- elseif ($child_exists)
- {
- $module->template = [$templates[1]];
- return true;
- }
+ if (file_exists($templates[0]) && $child_exists)
+ {
+ $module->template = $templates;
+ return true;
+ }
+ elseif ($child_exists)
+ {
+ $module->template = [$templates[1]];
+ return true;
+ }
- return false;
- }
+ return false;
+ }
}
-?>
diff --git a/src/classes/Convert.php b/src/classes/Convert.php
index b556905..4261c03 100644
--- a/src/classes/Convert.php
+++ b/src/classes/Convert.php
@@ -23,101 +23,100 @@
*/
class Convert
{
- // {{{ Array to XML
+ // {{{ Array to XML
- /**
- * Array to XML
- *
- * Converts an array into XML tags (recursive). This method expects the
- * passed array to be formatted very specifically to accomodate the fact
- * that an array's format isn't quite the same as well-formed XML.
- *
- * Input Array =
- * ['children' => [
- * 'child' => [
- * ['name' => 'Wendy Darling'],
- * ['name' => 'John Darling'],
- * ['name' => 'Michael Darling'],
- * ],
- * ]]
- *
- * Output XML =
- *
- * Wendy Darling John Darling Michael Darling
- *
- * @static
- * @param array $array array to convert into XML
- * @return string generated XML
- */
- public static function arrayToXML($array, $format = false, $level = 0)
- {
- $xml = '';
+ /**
+ * Array to XML
+ *
+ * Converts an array into XML tags (recursive). This method expects the
+ * passed array to be formatted very specifically to accomodate the fact
+ * that an array's format isn't quite the same as well-formed XML.
+ *
+ * Input Array =
+ * ['children' => [
+ * 'child' => [
+ * ['name' => 'Wendy Darling'],
+ * ['name' => 'John Darling'],
+ * ['name' => 'Michael Darling'],
+ * ],
+ * ]]
+ *
+ * Output XML =
+ *
+ * Wendy Darling John Darling Michael Darling
+ *
+ * @static
+ * @param array $array array to convert into XML
+ * @return string generated XML
+ */
+ public static function arrayToXML($array, $format = false, $level = 0)
+ {
+ $xml = '';
- if (is_array($array))
- {
- foreach ($array as $node => $value)
- {
- // Checks if the value is an array
- if (is_array($value))
- {
- foreach ($value as $node2 => $value2)
- {
- if (is_array($value2))
- {
- // Nest the value if the node is an integer
- $new_value = (is_int($node2) ? $value2 : [$node2 => $value2]);
+ if (is_array($array))
+ {
+ foreach ($array as $node => $value)
+ {
+ // Checks if the value is an array
+ if (is_array($value))
+ {
+ foreach ($value as $node2 => $value2)
+ {
+ if (is_array($value2))
+ {
+ // Nest the value if the node is an integer
+ $new_value = (is_int($node2) ? $value2 : [$node2 => $value2]);
- $xml .= ($format ? str_repeat("\t", $level) : '');
- $xml .= '<' . $node . '>' . ($format ? "\n" : '');
- $xml .= self::arrayToXML($new_value, $format, $level + 1);
- $xml .= ($format ? str_repeat("\t", $level) : '');
- $xml .= '' . ($format ? "\n" : '');
- }
- else
- {
- if (is_int($node2))
- {
- $node2 = $node;
- }
+ $xml .= ($format ? str_repeat("\t", $level) : '');
+ $xml .= '<' . $node . '>' . ($format ? "\n" : '');
+ $xml .= self::arrayToXML($new_value, $format, $level + 1);
+ $xml .= ($format ? str_repeat("\t", $level) : '');
+ $xml .= '' . ($format ? "\n" : '');
+ }
+ else
+ {
+ if (is_int($node2))
+ {
+ $node2 = $node;
+ }
- // Checks for special characters
- if (htmlspecialchars($value2) != $value2)
- {
- $xml .= ($format ? str_repeat("\t", $level) : '');
- $xml .= '<' . $node2 . '>' . ($format ? "\n" : '');
- }
- else
- {
- $xml .= ($format ? str_repeat("\t", $level) : '');
- $xml .= '<' . $node2 . '>' . $value2 . '' . ($format ? "\n" : '');
- }
- }
- }
- }
- else
- {
- // Checks for special characters
- if (htmlspecialchars($value) != $value)
- {
- $xml .= ($format ? str_repeat("\t", $level) : '');
- $xml .= '<' . $node . '>' . ($format ? "\n" : '');
- }
- else
- {
- $xml .= ($format ? str_repeat("\t", $level) : '');
- $xml .= '<' . $node . '>' . $value . '' . ($format ? "\n" : '');
- }
- }
- }
- }
+ // Checks for special characters
+ if (htmlspecialchars($value2) != $value2)
+ {
+ $xml .= ($format ? str_repeat("\t", $level) : '');
+ $xml .= '<' . $node2 . '>' . ($format ? "\n" : '');
+ }
+ else
+ {
+ $xml .= ($format ? str_repeat("\t", $level) : '');
+ $xml .= '<' . $node2 . '>' . $value2 . '' . ($format ? "\n" : '');
+ }
+ }
+ }
+ }
+ else
+ {
+ // Checks for special characters
+ if (htmlspecialchars($value) != $value)
+ {
+ $xml .= ($format ? str_repeat("\t", $level) : '');
+ $xml .= '<' . $node . '>' . ($format ? "\n" : '');
+ }
+ else
+ {
+ $xml .= ($format ? str_repeat("\t", $level) : '');
+ $xml .= '<' . $node . '>' . $value . '' . ($format ? "\n" : '');
+ }
+ }
+ }
+ }
- return $xml;
- }
+ return $xml;
+ }
- // }}}
+ // }}}
}
-?>
diff --git a/src/classes/Database.php b/src/classes/Database.php
index 91ea33e..82028fa 100644
--- a/src/classes/Database.php
+++ b/src/classes/Database.php
@@ -26,396 +26,395 @@
*/
class Database extends Object
{
- /**
- * DSN format
- *
- * @access protected
- * @var string
- */
- protected $dsn;
+ /**
+ * DSN format
+ *
+ * @access protected
+ * @var string
+ */
+ protected $dsn;
- /**
- * PDO Attributes
- *
- * @access protected
- * @var string
- */
- protected $attributes = [
- PDO::ATTR_PERSISTENT => true,
- PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
- PDO::NULL_EMPTY_STRING => true,
- ];
+ /**
+ * PDO Attributes
+ *
+ * @access protected
+ * @var string
+ */
+ protected $attributes = [
+ PDO::ATTR_PERSISTENT => true,
+ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+ PDO::NULL_EMPTY_STRING => true,
+ ];
- /**
- * Driver
- *
- * @var string
- */
- public $driver = null;
+ /**
+ * Driver
+ *
+ * @var string
+ */
+ public $driver = null;
- /**
- * Hostname for the server
- *
- * @var string
- */
- public $hostname = 'localhost';
+ /**
+ * Hostname for the server
+ *
+ * @var string
+ */
+ public $hostname = 'localhost';
- /**
- * Port number for the server
- *
- * @var integer
- */
- public $port = null;
+ /**
+ * Port number for the server
+ *
+ * @var integer
+ */
+ public $port = null;
- /**
- * UNIX socket for the server
- *
- * @var integer
- */
- public $socket = null;
+ /**
+ * UNIX socket for the server
+ *
+ * @var integer
+ */
+ public $socket = null;
- /**
- * Username for the server
- *
- * @var string
- */
- public $username = null;
+ /**
+ * Username for the server
+ *
+ * @var string
+ */
+ public $username = null;
- /**
- * Password for the server
- *
- * @var string
- */
- public $password = null;
+ /**
+ * Password for the server
+ *
+ * @var string
+ */
+ public $password = null;
- /**
- * Database name for the server
- *
- * @var string
- */
- public $database = null;
+ /**
+ * Database name for the server
+ *
+ * @var string
+ */
+ public $database = null;
- /**
- * Whether or not to use caching
- *
- * @var boolean
- */
- public $cache = false;
+ /**
+ * Whether or not to use caching
+ *
+ * @var boolean
+ */
+ public $cache = false;
- /**
- * Connection resource
- *
- * @var object
- */
- public $connection = null;
+ /**
+ * Connection resource
+ *
+ * @var object
+ */
+ public $connection = null;
- /**
- * Results object for the executed statement
- *
- * @var object
- */
- public $results = null;
+ /**
+ * Results object for the executed statement
+ *
+ * @var object
+ */
+ public $results = null;
- /**
- * Get Instance
- *
- * Instantiates a new instance of the Database class or returns the
- * previously instantiated copy.
- *
- * @static
- * @param string $datasource_name name of the datasource
- * @return object instance of the class
- */
- public static function getInstance($datasource_name = false)
- {
- $config = Config::getInstance();
+ /**
+ * Get Instance
+ *
+ * Instantiates a new instance of the Database class or returns the
+ * previously instantiated copy.
+ *
+ * @static
+ * @param string $datasource_name name of the datasource
+ * @return object instance of the class
+ */
+ public static function getInstance($datasource_name = false)
+ {
+ $config = Config::getInstance();
- // Tries to load a datasource if one wasn't specified
- if (!$datasource_name)
- {
- if (isset($config->pickles['datasource']))
- {
- $datasource_name = $config->pickles['datasource'];
- }
- elseif (is_array($config->datasources))
- {
- $datasources = $config->datasources;
+ // Tries to load a datasource if one wasn't specified
+ if (!$datasource_name)
+ {
+ if (isset($config->pickles['datasource']))
+ {
+ $datasource_name = $config->pickles['datasource'];
+ }
+ elseif (is_array($config->datasources))
+ {
+ $datasources = $config->datasources;
- foreach ($datasources as $name => $datasource)
- {
- if (isset($datasource['driver']))
- {
- $datasource_name = $name;
- }
- }
- }
- }
+ foreach ($datasources as $name => $datasource)
+ {
+ if (isset($datasource['driver']))
+ {
+ $datasource_name = $name;
+ }
+ }
+ }
+ }
- // Attempts to validate the datasource
- if ($datasource_name)
- {
- if (!isset(self::$instances['Database'][$datasource_name]))
- {
- if (!isset($config->datasources[$datasource_name]))
- {
- throw new Exception('The specified datasource is not defined in the config.');
- }
+ // Attempts to validate the datasource
+ if ($datasource_name)
+ {
+ if (!isset(self::$instances['Database'][$datasource_name]))
+ {
+ if (!isset($config->datasources[$datasource_name]))
+ {
+ throw new Exception('The specified datasource is not defined in the config.');
+ }
- $datasource = $config->datasources[$datasource_name];
+ $datasource = $config->datasources[$datasource_name];
- if (!isset($datasource['driver']))
- {
- throw new Exception('The specified datasource lacks a driver.');
- }
+ if (!isset($datasource['driver']))
+ {
+ throw new Exception('The specified datasource lacks a driver.');
+ }
- $datasource['driver'] = strtolower($datasource['driver']);
+ $datasource['driver'] = strtolower($datasource['driver']);
- // Checks the driver is legit and scrubs the name
- switch ($datasource['driver'])
- {
- case 'pdo_mysql':
- $attributes = [
- 'dsn' => 'mysql:host=[[hostname]];port=[[port]];unix_socket=[[socket]];dbname=[[database]]',
- 'port' => 3306,
- ];
- break;
+ // Checks the driver is legit and scrubs the name
+ switch ($datasource['driver'])
+ {
+ case 'pdo_mysql':
+ $attributes = [
+ 'dsn' => 'mysql:host=[[hostname]];port=[[port]];unix_socket=[[socket]];dbname=[[database]]',
+ 'port' => 3306,
+ ];
+ break;
- case 'pdo_pgsql':
- $attributes = [
- 'dsn' => 'pgsql:host=[[hostname]];port=[[port]];dbname=[[database]];user=[[username]];password=[[password]]',
- 'port' => 5432,
- ];
- break;
+ case 'pdo_pgsql':
+ $attributes = [
+ 'dsn' => 'pgsql:host=[[hostname]];port=[[port]];dbname=[[database]];user=[[username]];password=[[password]]',
+ 'port' => 5432,
+ ];
+ break;
- case 'pdo_sqlite':
- $attributes = ['dsn' => 'sqlite:[[hostname]]'];
- break;
+ case 'pdo_sqlite':
+ $attributes = ['dsn' => 'sqlite:[[hostname]]'];
+ break;
- default:
- throw new Exception('Datasource driver "' . $datasource['driver'] . '" is invalid');
- break;
- }
+ default:
+ throw new Exception('Datasource driver "' . $datasource['driver'] . '" is invalid');
+ break;
+ }
- // Instantiates our database class
- $instance = new Database();
+ // Instantiates our database class
+ $instance = new Database();
- // Sets our database parameters
- if (is_array($datasource))
- {
- $datasource = array_merge($attributes, $datasource);
+ // Sets our database parameters
+ if (is_array($datasource))
+ {
+ $datasource = array_merge($attributes, $datasource);
- foreach ($datasource as $variable => $value)
- {
- $instance->$variable = $value;
- }
- }
+ foreach ($datasource as $variable => $value)
+ {
+ $instance->$variable = $value;
+ }
+ }
- // Caches the instance for possible reuse later
- self::$instances['Database'][$datasource_name] = $instance;
- }
+ // Caches the instance for possible reuse later
+ self::$instances['Database'][$datasource_name] = $instance;
+ }
- // Returns the instance
- return self::$instances['Database'][$datasource_name];
- }
+ // Returns the instance
+ return self::$instances['Database'][$datasource_name];
+ }
- return false;
- }
+ return false;
+ }
- /**
- * Opens database connection
- *
- * Establishes a connection to the database based on the set configuration
- * options.
- *
- * @return boolean true on success, throws an exception overwise
- */
- public function open()
- {
- if ($this->connection === null)
- {
- switch ($this->driver)
- {
- case 'pdo_mysql':
- // Resolves "Invalid UTF-8 sequence" issues when encoding as JSON
- // @todo Didn't resolve that issue, borked some other characters though
- //$this->attributes[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8';
- break;
+ /**
+ * Opens database connection
+ *
+ * Establishes a connection to the database based on the set configuration
+ * options.
+ *
+ * @return boolean true on success, throws an exception overwise
+ */
+ public function open()
+ {
+ if ($this->connection === null)
+ {
+ switch ($this->driver)
+ {
+ case 'pdo_mysql':
+ // Resolves "Invalid UTF-8 sequence" issues when encoding as JSON
+ // @todo Didn't resolve that issue, borked some other characters though
+ //$this->attributes[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8';
+ break;
- case 'pdo_pgsql':
- // This combats a bug: https://bugs.php.net/bug.php?id=62571&edit=1
- $this->attributes[PDO::ATTR_PERSISTENT] = false;
+ case 'pdo_pgsql':
+ // This combats a bug: https://bugs.php.net/bug.php?id=62571&edit=1
+ $this->attributes[PDO::ATTR_PERSISTENT] = false;
- // This allows for multiple prepared queries
- $this->attributes[PDO::ATTR_EMULATE_PREPARES] = true;
- break;
- }
+ // This allows for multiple prepared queries
+ $this->attributes[PDO::ATTR_EMULATE_PREPARES] = true;
+ break;
+ }
- if (isset($this->username, $this->password, $this->database))
- {
- // Swaps out any variables with values in the DSN
- $this->dsn = str_replace(
- ['[[hostname]]', '[[port]]', '[[socket]]', '[[username]]', '[[password]]', '[[database]]'],
- [$this->hostname, $this->port, $this->socket, $this->username, $this->password, $this->database],
- $this->dsn
- );
+ if (isset($this->username, $this->password, $this->database))
+ {
+ // Swaps out any variables with values in the DSN
+ $this->dsn = str_replace(
+ ['[[hostname]]', '[[port]]', '[[socket]]', '[[username]]', '[[password]]', '[[database]]'],
+ [$this->hostname, $this->port, $this->socket, $this->username, $this->password, $this->database],
+ $this->dsn
+ );
- // Strips any empty parameters in the DSN
- $this->dsn = str_replace(['host=;', 'port=;', 'unix_socket=;'], '', $this->dsn);
+ // Strips any empty parameters in the DSN
+ $this->dsn = str_replace(['host=;', 'port=;', 'unix_socket=;'], '', $this->dsn);
- // Attempts to establish a connection
- $this->connection = new PDO($this->dsn, $this->username, $this->password, $this->attributes);
- }
- else
- {
- throw new Exception('There was an error loading the database configuration.');
- }
- }
+ // Attempts to establish a connection
+ $this->connection = new PDO($this->dsn, $this->username, $this->password, $this->attributes);
+ }
+ else
+ {
+ throw new Exception('There was an error loading the database configuration.');
+ }
+ }
- return true;
- }
+ return true;
+ }
- /**
- * Closes database connection
- *
- * Sets the connection to null regardless of state.
- *
- * @return boolean always true
- */
- public function close()
- {
- $this->connection = null;
- return true;
- }
+ /**
+ * Closes database connection
+ *
+ * Sets the connection to null regardless of state.
+ *
+ * @return boolean always true
+ */
+ public function close()
+ {
+ $this->connection = null;
+ return true;
+ }
- /**
- * Executes an SQL Statement
- *
- * Executes a standard or prepared query based on passed parameters. All
- * queries are logged to a file as well as timed and logged in the
- * execution time is over 1 second.
- *
- * @param string $sql statement to execute
- * @param array $input_parameters optional key/values to be bound
- * @param boolean $force_slow optional, force slow query logging
- * @return integer ID of the last inserted row or sequence number
- */
- public function execute($sql, $input_parameters = null, $force_slow = false)
- {
- $this->open();
+ /**
+ * Executes an SQL Statement
+ *
+ * Executes a standard or prepared query based on passed parameters. All
+ * queries are logged to a file as well as timed and logged in the
+ * execution time is over 1 second.
+ *
+ * @param string $sql statement to execute
+ * @param array $input_parameters optional key/values to be bound
+ * @param boolean $force_slow optional, force slow query logging
+ * @return integer ID of the last inserted row or sequence number
+ */
+ public function execute($sql, $input_parameters = null, $force_slow = false)
+ {
+ $this->open();
- if (isset($this->config->pickles['logging']) && $this->config->pickles['logging'])
- {
- $loggable_query = $sql;
+ if (isset($this->config->pickles['logging']) && $this->config->pickles['logging'])
+ {
+ $loggable_query = $sql;
- if ($input_parameters != null)
- {
- $loggable_query .= ' -- ' . json_encode($input_parameters);
- }
+ if ($input_parameters != null)
+ {
+ $loggable_query .= ' -- ' . json_encode($input_parameters);
+ }
- Log::query($loggable_query);
- }
+ Log::query($loggable_query);
+ }
- $sql = trim($sql);
+ $sql = trim($sql);
- // Checks if the query is blank
- if ($sql != '')
- {
- // Builds out stack trace for queries
- $files = [];
+ // Checks if the query is blank
+ if ($sql != '')
+ {
+ // Builds out stack trace for queries
+ $files = [];
- $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
- krsort($backtrace);
+ $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+ krsort($backtrace);
- foreach ($backtrace as $file)
- {
- if (isset($file['class'], $file['line']))
- {
- $files[] = $file['class'] . ':' . $file['line'];
- }
- }
+ foreach ($backtrace as $file)
+ {
+ if (isset($file['class'], $file['line']))
+ {
+ $files[] = $file['class'] . ':' . $file['line'];
+ }
+ }
- $sql .= "\n" . '/* [' . implode('|', $files) . '] */';
+ $sql .= "\n" . '/* [' . implode('|', $files) . '] */';
- // Establishes if we're working on an EXPLAIN
- if (Profiler::enabled('explains'))
- {
- $explain = preg_match('/^SELECT /i', $sql);
- }
- else
- {
- $explain = null;
- }
+ // Establishes if we're working on an EXPLAIN
+ if (Profiler::enabled('explains'))
+ {
+ $explain = preg_match('/^SELECT /i', $sql);
+ }
+ else
+ {
+ $explain = null;
+ }
- // Executes a standard query
- if ($input_parameters === null)
- {
- // Explains the query
- if ($explain)
- {
- $explain = $this->fetch('EXPLAIN ' . $sql);
- }
+ // Executes a standard query
+ if ($input_parameters === null)
+ {
+ // Explains the query
+ if ($explain)
+ {
+ $explain = $this->fetch('EXPLAIN ' . $sql);
+ }
- $start_time = microtime(true);
- $this->results = $this->connection->query($sql);
- }
- // Executes a prepared statement
- else
- {
- // Explains the query
- if ($explain)
- {
- $explain = $this->fetch('EXPLAIN ' . $sql, $input_parameters);
- }
+ $start_time = microtime(true);
+ $this->results = $this->connection->query($sql);
+ }
+ // Executes a prepared statement
+ else
+ {
+ // Explains the query
+ if ($explain)
+ {
+ $explain = $this->fetch('EXPLAIN ' . $sql, $input_parameters);
+ }
- $start_time = microtime(true);
- $this->results = $this->connection->prepare($sql);
- $this->results->execute($input_parameters);
- }
+ $start_time = microtime(true);
+ $this->results = $this->connection->prepare($sql);
+ $this->results->execute($input_parameters);
+ }
- $end_time = microtime(true);
- $duration = $end_time - $start_time;
+ $end_time = microtime(true);
+ $duration = $end_time - $start_time;
- if ($duration >= 1 || $force_slow)
- {
- Log::slowQuery($duration . ' seconds: ' . $loggable_query);
- }
+ if ($duration >= 1 || $force_slow)
+ {
+ Log::slowQuery($duration . ' seconds: ' . $loggable_query);
+ }
- // Logs the information to the profiler
- if (Profiler::enabled('explains', 'queries'))
- {
- Profiler::logQuery($sql, $input_parameters, (isset($explain) ? $explain : false), $duration);
- }
- }
- else
- {
- throw new Exception('No query to execute.');
- }
+ // Logs the information to the profiler
+ if (Profiler::enabled('explains', 'queries'))
+ {
+ Profiler::logQuery($sql, $input_parameters, (isset($explain) ? $explain : false), $duration);
+ }
+ }
+ else
+ {
+ throw new Exception('No query to execute.');
+ }
- return $this->connection->lastInsertId();
- }
+ return $this->connection->lastInsertId();
+ }
- /**
- * Fetch records from the database
- *
- * @param string $sql statement to be executed
- * @param array $input_parameters optional key/values to be bound
- * @param string $return_type optional type of return set
- * @return mixed based on return type
- */
- public function fetch($sql = null, $input_parameters = null)
- {
- $this->open();
+ /**
+ * Fetch records from the database
+ *
+ * @param string $sql statement to be executed
+ * @param array $input_parameters optional key/values to be bound
+ * @param string $return_type optional type of return set
+ * @return mixed based on return type
+ */
+ public function fetch($sql = null, $input_parameters = null)
+ {
+ $this->open();
- if ($sql !== null)
- {
- $this->execute($sql, $input_parameters);
- }
+ if ($sql !== null)
+ {
+ $this->execute($sql, $input_parameters);
+ }
- // Pulls the results based on the type
- $results = $this->results->fetchAll(PDO::FETCH_ASSOC);
+ // Pulls the results based on the type
+ $results = $this->results->fetchAll(PDO::FETCH_ASSOC);
- return $results;
- }
+ return $results;
+ }
}
-?>
diff --git a/src/classes/Date.php b/src/classes/Date.php
index be07c3b..6168a26 100644
--- a/src/classes/Date.php
+++ b/src/classes/Date.php
@@ -23,19 +23,18 @@
*/
class Date
{
- /**
- * Age
- *
- * Calculates age based on the passed date.
- *
- * @static
- * @param string $date birth / inception date
- * @return integer $age number of years old
- */
- public static function age($date)
- {
- return Time::age($date);
- }
+ /**
+ * Age
+ *
+ * Calculates age based on the passed date.
+ *
+ * @static
+ * @param string $date birth / inception date
+ * @return integer $age number of years old
+ */
+ public static function age($date)
+ {
+ return Time::age($date);
+ }
}
-?>
diff --git a/src/classes/Display.php b/src/classes/Display.php
index e2c693c..eca2628 100644
--- a/src/classes/Display.php
+++ b/src/classes/Display.php
@@ -22,183 +22,183 @@
*/
class Display extends Object
{
- /**
- * Return Type
- *
- * This class supports loading a PHP template, displaying JSON, XML and an
- * RSS flavored XML. Inside your modules you can specify either a string or
- * array. Possible values include "template", "json", "xml" and "rss".
- * Default behavior is to try to load a template and fallback to displaying
- * JSON. The "template" option always takes precedence when used with the
- * other types.
- *
- * @var mixed string or array to determine how to return
- */
- public $return = ['template', 'json'];
+ /**
+ * Return Type
+ *
+ * This class supports loading a PHP template, displaying JSON, XML and an
+ * RSS flavored XML. Inside your modules you can specify either a string or
+ * array. Possible values include "template", "json", "xml" and "rss".
+ * Default behavior is to try to load a template and fallback to displaying
+ * JSON. The "template" option always takes precedence when used with the
+ * other types.
+ *
+ * @var mixed string or array to determine how to return
+ */
+ public $return = ['template', 'json'];
- /**
- * Templates
- *
- * Templates are found in the ./templates directory of your site. The
- * template workflow is to load ./templates/__shared/index.phtml and you
- * would set that template up to require $this->template, the path and
- * filename for the module template (named based on the structure of the
- * requested URI. Inside your module you can specify the basename of the
- * parent template you would like to use or false to not use a parent
- * template.
- *
- * @var string or boolean false the basename of the parent template
- */
- public $templates = false;
+ /**
+ * Templates
+ *
+ * Templates are found in the ./templates directory of your site. The
+ * template workflow is to load ./templates/__shared/index.phtml and you
+ * would set that template up to require $this->template, the path and
+ * filename for the module template (named based on the structure of the
+ * requested URI. Inside your module you can specify the basename of the
+ * parent template you would like to use or false to not use a parent
+ * template.
+ *
+ * @var string or boolean false the basename of the parent template
+ */
+ public $templates = false;
- /**
- * Meta Data
- *
- * An array of meta data that you want exposed to the template. Currently
- * you set the meta data from inside your module using the class variables
- * title, description and keywords. The newer [preferred] method is to
- * set an array in your module using the meta variable using title,
- * description and keywords as the keys. You can also specify any other
- * meta keys in the array that you would like to be exposed to your
- * templates. The meta data is only used by TEMPLATE and RSS return types.
- */
- public $meta = [];
+ /**
+ * Meta Data
+ *
+ * An array of meta data that you want exposed to the template. Currently
+ * you set the meta data from inside your module using the class variables
+ * title, description and keywords. The newer [preferred] method is to
+ * set an array in your module using the meta variable using title,
+ * description and keywords as the keys. You can also specify any other
+ * meta keys in the array that you would like to be exposed to your
+ * templates. The meta data is only used by TEMPLATE and RSS return types.
+ */
+ public $meta = [];
- /**
- * Module Data
- *
- * Any data the module returns or is assigned inside of the module will
- * be available here and exposed to the template.
- */
- public $module = null;
+ /**
+ * Module Data
+ *
+ * Any data the module returns or is assigned inside of the module will
+ * be available here and exposed to the template.
+ */
+ public $module = null;
- public function render()
- {
- try
- {
- // Starts up the buffer so we can capture it
- ob_start();
+ public function render()
+ {
+ try
+ {
+ // Starts up the buffer so we can capture it
+ ob_start();
- if (!is_array($this->return))
- {
- $this->return = [$this->return];
- }
+ if (!is_array($this->return))
+ {
+ $this->return = [$this->return];
+ }
- $return_json = $return_rss = $return_template = $return_xml = false;
+ $return_json = $return_rss = $return_template = $return_xml = false;
- foreach ($this->return as $return)
- {
- $variable = 'return_' . $return;
- $$variable = true;
- }
+ foreach ($this->return as $return)
+ {
+ $variable = 'return_' . $return;
+ $$variable = true;
+ }
- // Makes sure the return type is valid
- if (!$return_json && !$return_rss && !$return_template && !$return_xml)
- {
- throw new Exception('Invalid return type.');
- }
+ // Makes sure the return type is valid
+ if (!$return_json && !$return_rss && !$return_template && !$return_xml)
+ {
+ throw new Exception('Invalid return type.');
+ }
- // Checks for the PHPSESSID in the query string
- if (stripos($_SERVER['REQUEST_URI'], '?PHPSESSID=') === false)
- {
- // XHTML compliancy stuff
- // @todo Wonder if this could be yanked now that we're in HTML5 land
- ini_set('arg_separator.output', '&');
- ini_set('url_rewriter.tags', 'a=href,area=href,frame=src,input=src,fieldset=');
+ // Checks for the PHPSESSID in the query string
+ if (stripos($_SERVER['REQUEST_URI'], '?PHPSESSID=') === false)
+ {
+ // XHTML compliancy stuff
+ // @todo Wonder if this could be yanked now that we're in HTML5 land
+ ini_set('arg_separator.output', '&');
+ ini_set('url_rewriter.tags', 'a=href,area=href,frame=src,input=src,fieldset=');
- header('Content-type: text/html; charset=UTF-8');
- }
- else
- {
- // Redirect so Google knows to index the page without the session ID
- list($request_uri, $phpsessid) = explode('?PHPSESSID=', $_SERVER['REQUEST_URI'], 2);
- header('HTTP/1.1 301 Moved Permanently');
- header('Location: ' . $request_uri);
+ header('Content-type: text/html; charset=UTF-8');
+ }
+ else
+ {
+ // Redirect so Google knows to index the page without the session ID
+ list($request_uri, $phpsessid) = explode('?PHPSESSID=', $_SERVER['REQUEST_URI'], 2);
+ header('HTTP/1.1 301 Moved Permanently');
+ header('Location: ' . $request_uri);
- throw new Exception('Requested URI contains PHPSESSID, redirecting.');
- }
+ throw new Exception('Requested URI contains PHPSESSID, redirecting.');
+ }
- // @todo Derrive CSS and JS from _REQUEST['request'] no need to pass around
+ // @todo Derrive CSS and JS from _REQUEST['request'] no need to pass around
- $loaded = false;
+ $loaded = false;
- if ($return_template)
- {
- // Determines if we're using a custom class or not
- $dynamic_class = (class_exists('CustomDynamic') ? 'CustomDynamic' : 'Dynamic');
- $form_class = (class_exists('CustomForm') ? 'CustomForm' : 'Form');
- $html_class = (class_exists('CustomHTML') ? 'CustomHTML' : 'HTML');
+ if ($return_template)
+ {
+ // Determines if we're using a custom class or not
+ $dynamic_class = (class_exists('CustomDynamic') ? 'CustomDynamic' : 'Dynamic');
+ $form_class = (class_exists('CustomForm') ? 'CustomForm' : 'Form');
+ $html_class = (class_exists('CustomHTML') ? 'CustomHTML' : 'HTML');
- // Exposes some objects and variables to the local scope of the template
- $this->request = $this->js_file = $_REQUEST['request'];
- // @todo replace _ with - as it's more appropriate for CSS naming
- $this->css_class = strtr($this->request, '/', '_');
+ // Exposes some objects and variables to the local scope of the template
+ $this->request = $this->js_file = $_REQUEST['request'];
+ // @todo replace _ with - as it's more appropriate for CSS naming
+ $this->css_class = strtr($this->request, '/', '_');
- // @todo Remove the magic $__variable when all sites are ported
- $__config = $this->config;
- $__css_class = $this->css_class;
- $__js_file = $this->js_file;
- $__meta = $this->meta;
- $__module = $this->module;
+ // @todo Remove the magic $__variable when all sites are ported
+ $__config = $this->config;
+ $__css_class = $this->css_class;
+ $__js_file = $this->js_file;
+ $__meta = $this->meta;
+ $__module = $this->module;
- $__dynamic = $this->dynamic = new $dynamic_class();
- $__form = $this->form = new $form_class();
- $__html = $this->html = new $html_class();
+ $__dynamic = $this->dynamic = new $dynamic_class();
+ $__form = $this->form = new $form_class();
+ $__html = $this->html = new $html_class();
- // Checks for the parent template and tries to load it
- if ($this->templates)
- {
- $profiler = $this->config->pickles['profiler'];
- $profiler = $profiler === true || stripos($profiler, 'timers') !== false;
+ // Checks for the parent template and tries to load it
+ if ($this->templates)
+ {
+ $profiler = $this->config->pickles['profiler'];
+ $profiler = $profiler === true || stripos($profiler, 'timers') !== false;
- // Starts a timer for the loading of the template
- if ($profiler)
- {
- Profiler::timer('loading template');
- }
+ // Starts a timer for the loading of the template
+ if ($profiler)
+ {
+ Profiler::timer('loading template');
+ }
- // Assigns old variable
- $required_template = $this->templates[0];
- $__template = $this->template = end($this->templates);
- $loaded = require_once $required_template;
+ // Assigns old variable
+ $required_template = $this->templates[0];
+ $__template = $this->template = end($this->templates);
+ $loaded = require_once $required_template;
- // Stops the template loading timer
- if ($profiler)
- {
- Profiler::timer('loading template');
- }
- }
- }
+ // Stops the template loading timer
+ if ($profiler)
+ {
+ Profiler::timer('loading template');
+ }
+ }
+ }
- if (!$loaded)
- {
- if ($return_json)
- {
- echo json_encode($this->module, isset($_REQUEST['pretty']) ? JSON_PRETTY_PRINT : false);
- }
- elseif ($return_xml)
- {
- echo Convert::arrayToXML($this->module, isset($_REQUEST['pretty']));
- }
- }
+ if (!$loaded)
+ {
+ if ($return_json)
+ {
+ $pretty = isset($_REQUEST['pretty']) ? JSON_PRETTY_PRINT : false;
+ echo json_encode($this->module, $pretty);
+ }
+ elseif ($return_xml)
+ {
+ echo Convert::arrayToXML($this->module, isset($_REQUEST['pretty']));
+ }
+ }
- // Grabs the buffer so we can massage it a bit
- $buffer = ob_get_clean();
+ // Grabs the buffer so we can massage it a bit
+ $buffer = ob_get_clean();
- // Kills any whitespace and HTML comments in templates
- if ($loaded)
- {
- // The BSA exception is because their system sucks and demands there be comments present
- $buffer = preg_replace(['/^[\s]+/m', '//U'], '', $buffer);
- }
+ // Kills any whitespace and HTML comments in templates
+ if ($loaded)
+ {
+ // The BSA exception is because their system sucks and demands there be comments present
+ $buffer = preg_replace(['/^[\s]+/m', '//U'], '', $buffer);
+ }
- return $buffer;
- }
- catch (Exception $e)
- {
- return $e->getMessage();
- }
- }
+ return $buffer;
+ }
+ catch (Exception $e)
+ {
+ return $e->getMessage();
+ }
+ }
}
-?>
diff --git a/src/classes/Distance.php b/src/classes/Distance.php
index 550a931..d079228 100644
--- a/src/classes/Distance.php
+++ b/src/classes/Distance.php
@@ -23,122 +23,121 @@
*/
class Distance
{
- // {{{ Call Static
+ // {{{ Call Static
- /**
- * Call Static
- *
- * Magic method to power the unit conversion without much code.
- *
- * @static
- * @param string $method name of the static method being called
- * @param array $arguments array of the passed arguments
- * @return mixed converted units or false
- */
- public static function __callStatic($method, $arguments)
- {
- $pieces = explode('to', strtolower($method));
+ /**
+ * Call Static
+ *
+ * Magic method to power the unit conversion without much code.
+ *
+ * @static
+ * @param string $method name of the static method being called
+ * @param array $arguments array of the passed arguments
+ * @return mixed converted units or false
+ */
+ public static function __callStatic($method, $arguments)
+ {
+ $pieces = explode('to', strtolower($method));
- if (count($pieces) == 2 && $pieces[1])
- {
- return Distance::convertUnit($arguments[0], $pieces[0], $pieces[1]);
- }
+ if (count($pieces) == 2 && $pieces[1])
+ {
+ return Distance::convertUnit($arguments[0], $pieces[0], $pieces[1]);
+ }
- return false;
- }
+ return false;
+ }
- // }}}
- // {{{ Convert Unit
+ // }}}
+ // {{{ Convert Unit
- /**
- * Convert Unit
- *
- * Converts a distance from one unit to another.
- *
- * @static
- * @param mixed $distance starting distance
- * @param string $from starting unit
- * @param string $to ending unit
- * @return mixed
- */
- private static function convertUnit($distance, $from, $to)
- {
- $multiplier = 1;
+ /**
+ * Convert Unit
+ *
+ * Converts a distance from one unit to another.
+ *
+ * @static
+ * @param mixed $distance starting distance
+ * @param string $from starting unit
+ * @param string $to ending unit
+ * @return mixed
+ */
+ private static function convertUnit($distance, $from, $to)
+ {
+ $multiplier = 1;
- switch ($from)
- {
- case 'kilometers':
- switch ($to)
- {
- case 'miles': $multiplier = 0.621371; break;
- case 'meters': $multiplier = 1000; break;
- case 'yards': $multiplier = 1093.61; break;
- }
- break;
+ switch ($from)
+ {
+ case 'kilometers':
+ switch ($to)
+ {
+ case 'miles': $multiplier = 0.621371; break;
+ case 'meters': $multiplier = 1000; break;
+ case 'yards': $multiplier = 1093.61; break;
+ }
+ break;
- case 'miles':
- switch ($to)
- {
- case 'kilometers': $multiplier = 1.60934; break;
- case 'meters': $multiplier = 1609.34; break;
- case 'yards': $multiplier = 1760; break;
- }
- break;
+ case 'miles':
+ switch ($to)
+ {
+ case 'kilometers': $multiplier = 1.60934; break;
+ case 'meters': $multiplier = 1609.34; break;
+ case 'yards': $multiplier = 1760; break;
+ }
+ break;
- case 'meters':
- switch ($to)
- {
- case 'kilometers': $multiplier = 0.001; break;
- case 'miles': $multiplier = 0.000621371; break;
- case 'yards': $multiplier = 1.09361; break;
- }
- break;
- }
+ case 'meters':
+ switch ($to)
+ {
+ case 'kilometers': $multiplier = 0.001; break;
+ case 'miles': $multiplier = 0.000621371; break;
+ case 'yards': $multiplier = 1.09361; break;
+ }
+ break;
+ }
- return $distance * $multiplier;
- }
+ return $distance * $multiplier;
+ }
- // }}}
- // {{{ Calculate Distance
+ // }}}
+ // {{{ Calculate Distance
- /**
- * Calculate Distance
- *
- * Calculates the distance between two sets of coordinates and returns the
- * requested units. I really wanted to call this distance() but it seems
- * you can't do that in PHP due to the backwards compatibility of the
- * PHP4 constructors that were named the same as the class.
- *
- * @static
- * @param mixed $latitude_from starting latitude
- * @param mixed $longitude_from starting longitude
- * @param mixed $latitude_to ending latitude
- * @param mixed $longitude_to ending longitude
- * @param string $unit optional units to return, miles by default
- * @return mixed distance between the points in the desired unit
- */
- public static function calculateDistance($latitude_from, $longitude_from, $latitude_to, $longitude_to, $unit = 'miles')
- {
- $unit = ucwords(strtolower($unit));
- $theta = $longitude_from - $longitude_to;
+ /**
+ * Calculate Distance
+ *
+ * Calculates the distance between two sets of coordinates and returns the
+ * requested units. I really wanted to call this distance() but it seems
+ * you can't do that in PHP due to the backwards compatibility of the
+ * PHP4 constructors that were named the same as the class.
+ *
+ * @static
+ * @param mixed $latitude_from starting latitude
+ * @param mixed $longitude_from starting longitude
+ * @param mixed $latitude_to ending latitude
+ * @param mixed $longitude_to ending longitude
+ * @param string $unit optional units to return, miles by default
+ * @return mixed distance between the points in the desired unit
+ */
+ public static function calculateDistance($latitude_from, $longitude_from, $latitude_to, $longitude_to, $unit = 'miles')
+ {
+ $unit = ucwords(strtolower($unit));
+ $theta = $longitude_from - $longitude_to;
- $distance =
- sin(deg2rad($latitude_from))
- * sin(deg2rad($latitude_to))
- + cos(deg2rad($latitude_from))
- * cos(deg2rad($latitude_to))
- * cos(deg2rad($theta));
+ $distance =
+ sin(deg2rad($latitude_from))
+ * sin(deg2rad($latitude_to))
+ + cos(deg2rad($latitude_from))
+ * cos(deg2rad($latitude_to))
+ * cos(deg2rad($theta));
- $distance = acos($distance);
- $distance = rad2deg($distance);
- $miles = $distance * 60 * 1.1515;
+ $distance = acos($distance);
+ $distance = rad2deg($distance);
+ $miles = $distance * 60 * 1.1515;
- $method = 'milesTo' . $unit;
+ $method = 'milesTo' . $unit;
- return Distance::$method($miles);
- }
+ return Distance::$method($miles);
+ }
- // }}}
+ // }}}
}
-?>
diff --git a/src/classes/Dynamic.php b/src/classes/Dynamic.php
index a4de036..fa974d6 100644
--- a/src/classes/Dynamic.php
+++ b/src/classes/Dynamic.php
@@ -28,240 +28,239 @@
*/
class Dynamic extends Object
{
- /**
- * Generate Reference
- *
- * Appends a dynamic piece of information to the passed reference in the
- * form of a UNIX timestamp added to the query string.
- *
- * @param string $reference URI reference of the file
- * @param string $failover URI reference to use if the reference can't be found
- * @return string URI reference reference with dynamic content
- */
- public function reference($reference, $failover = false)
- {
- // Checks if the URI reference is absolute, and not relative
- if (substr($reference, 0, 1) == '/')
- {
- $query_string = '';
+ /**
+ * Generate Reference
+ *
+ * Appends a dynamic piece of information to the passed reference in the
+ * form of a UNIX timestamp added to the query string.
+ *
+ * @param string $reference URI reference of the file
+ * @param string $failover URI reference to use if the reference can't be found
+ * @return string URI reference reference with dynamic content
+ */
+ public function reference($reference, $failover = false)
+ {
+ // Checks if the URI reference is absolute, and not relative
+ if (substr($reference, 0, 1) == '/')
+ {
+ $query_string = '';
- // Checks for ? and extracts query string
- if (strstr($reference, '?'))
- {
- list($reference, $query_string) = explode('?', $reference);
- }
+ // Checks for ? and extracts query string
+ if (strstr($reference, '?'))
+ {
+ list($reference, $query_string) = explode('?', $reference);
+ }
- // Adds the dot so the file functions can find the file
- $file = '.' . $reference;
+ // Adds the dot so the file functions can find the file
+ $file = '.' . $reference;
- if (file_exists($file))
- {
- // Replaces the extension with time().extension
- $parts = explode('.', $reference);
+ if (file_exists($file))
+ {
+ // Replaces the extension with time().extension
+ $parts = explode('.', $reference);
- if (count($parts) == 1)
- {
- throw new Exception('Filename must have an extension (e.g. /path/to/file.png)');
- }
- else
- {
- end($parts);
- $parts[key($parts)] = filemtime($file) . '.' . current($parts);
- $reference = implode('.', $parts);
- }
+ if (count($parts) == 1)
+ {
+ throw new Exception('Filename must have an extension (e.g. /path/to/file.png)');
+ }
+ else
+ {
+ end($parts);
+ $parts[key($parts)] = filemtime($file) . '.' . current($parts);
+ $reference = implode('.', $parts);
+ }
- // Adds the query string back
- if ($query_string != '')
- {
- $reference .= '?' . $query_string;
- }
- }
- else
- {
- if ($failover != false)
- {
- $reference = $failover;
- }
- else
- {
- throw new Exception('Supplied reference does not exist (' . $reference . ')');
- }
- }
- }
- else
- {
- throw new Exception('Reference value must be absolute (e.g. /path/to/file.png)');
- }
+ // Adds the query string back
+ if ($query_string != '')
+ {
+ $reference .= '?' . $query_string;
+ }
+ }
+ else
+ {
+ if ($failover != false)
+ {
+ $reference = $failover;
+ }
+ else
+ {
+ throw new Exception('Supplied reference does not exist (' . $reference . ')');
+ }
+ }
+ }
+ else
+ {
+ throw new Exception('Reference value must be absolute (e.g. /path/to/file.png)');
+ }
- return $reference;
- }
+ return $reference;
+ }
- /**
- * Generate Stylesheet Reference
- *
- * Attempts to minify the stylesheet and then returns the reference URI for
- * the file, minified or not. Supports LESS and SASS, pass it a .less file
- * or a .scss file instead and it will be compiled before minification.
- *
- * @param string $reference URI reference of the Stylesheet
- * @return string URI reference reference with dynamic content
- * @url http://lesscss.org
- * @url http://sass-lang.com
- */
- public function css($original_reference)
- {
- $less = false;
- $sass = false;
+ /**
+ * Generate Stylesheet Reference
+ *
+ * Attempts to minify the stylesheet and then returns the reference URI for
+ * the file, minified or not. Supports LESS and SASS, pass it a .less file
+ * or a .scss file instead and it will be compiled before minification.
+ *
+ * @param string $reference URI reference of the Stylesheet
+ * @return string URI reference reference with dynamic content
+ * @url http://lesscss.org
+ * @url http://sass-lang.com
+ */
+ public function css($original_reference)
+ {
+ $less = false;
+ $sass = false;
- // Injects .min into the filename
- $parts = explode('.', $original_reference);
+ // Injects .min into the filename
+ $parts = explode('.', $original_reference);
- if (count($parts) == 1)
- {
- throw new Exception('Filename must have an extension (e.g. /path/to/file.css)');
- }
- else
- {
- end($parts);
+ if (count($parts) == 1)
+ {
+ throw new Exception('Filename must have an extension (e.g. /path/to/file.css)');
+ }
+ else
+ {
+ end($parts);
- switch (current($parts))
- {
- case 'less':
- $less = true;
- $parts[key($parts)] = 'css';
- break;
+ switch (current($parts))
+ {
+ case 'less':
+ $less = true;
+ $parts[key($parts)] = 'css';
+ break;
- case 'scss':
- $sass = true;
- $parts[key($parts)] = 'css';
- break;
- }
+ case 'scss':
+ $sass = true;
+ $parts[key($parts)] = 'css';
+ break;
+ }
- $parts[key($parts)] = 'min.' . current($parts);
- $minified_reference = implode('.', $parts);
- }
+ $parts[key($parts)] = 'min.' . current($parts);
+ $minified_reference = implode('.', $parts);
+ }
- $original_filename = '.' . $original_reference;
- $minified_filename = '.' . $minified_reference;
+ $original_filename = '.' . $original_reference;
+ $minified_filename = '.' . $minified_reference;
- $path = dirname($original_filename);
+ $path = dirname($original_filename);
- if (file_exists($original_filename))
- {
- $reference = $original_reference;
+ if (file_exists($original_filename))
+ {
+ $reference = $original_reference;
- if ($this->config->pickles['minify'] === true)
- {
- // Compiles LESS & SASS to CSS before minifying
- if ($less || $sass)
- {
- $compiled_filename = str_replace('.min', '', $minified_filename);
+ if ($this->config->pickles['minify'] === true)
+ {
+ // Compiles LESS & SASS to CSS before minifying
+ if ($less || $sass)
+ {
+ $compiled_filename = str_replace('.min', '', $minified_filename);
- if ($less)
- {
- $less = new lessc();
- $less->compileFile($original_filename, $compiled_filename);
- }
- elseif ($sass)
- {
- $scss = new Leafo\ScssPhp\Compiler();
+ if ($less)
+ {
+ $less = new lessc();
+ $less->compileFile($original_filename, $compiled_filename);
+ }
+ elseif ($sass)
+ {
+ $scss = new Leafo\ScssPhp\Compiler();
- file_put_contents(
- $compiled_filename,
- $scss->compile(file_get_contents($original_filename))
- );
- }
+ file_put_contents(
+ $compiled_filename,
+ $scss->compile(file_get_contents($original_filename))
+ );
+ }
- $original_filename = $compiled_filename;
- }
+ $original_filename = $compiled_filename;
+ }
- // Minifies CSS with a few basic character replacements.
- $stylesheet = file_get_contents($original_filename);
- $stylesheet = str_replace(
- ["\t", "\n", ', ', ' {', ': ', ';}', '{ ', '; '],
- ['', '', ',', '{', ':', '}', '{', ';'],
- $stylesheet
- );
- $stylesheet = preg_replace('/\/\*.+?\*\//', '', $stylesheet);
- file_put_contents($minified_filename, $stylesheet);
+ // Minifies CSS with a few basic character replacements.
+ $stylesheet = file_get_contents($original_filename);
+ $stylesheet = str_replace(
+ ["\t", "\n", ', ', ' {', ': ', ';}', '{ ', '; '],
+ ['', '', ',', '{', ':', '}', '{', ';'],
+ $stylesheet
+ );
+ $stylesheet = preg_replace('/\/\*.+?\*\//', '', $stylesheet);
+ file_put_contents($minified_filename, $stylesheet);
- $reference = $minified_reference;
- }
- elseif (file_exists($minified_filename))
- {
- $reference = $minified_reference;
- }
+ $reference = $minified_reference;
+ }
+ elseif (file_exists($minified_filename))
+ {
+ $reference = $minified_reference;
+ }
- $reference = $this->reference($reference);
- }
- else
- {
- throw new Exception('Supplied reference does not exist');
- }
+ $reference = $this->reference($reference);
+ }
+ else
+ {
+ throw new Exception('Supplied reference does not exist');
+ }
- return $reference;
- }
+ return $reference;
+ }
- /**
- * Generate Javascript Reference
- *
- * Attempts to minify the source with Google's Closure compiler, and then
- * returns the reference URI for the file, minified or not.
- *
- * @link http://code.google.com/closure/compiler/
- * @param string $reference URI reference of the Javascript file
- * @return string URI reference reference with dynamic content
- */
- public function js($original_reference)
- {
- // Injects .min into the filename
- $parts = explode('.', $original_reference);
+ /**
+ * Generate Javascript Reference
+ *
+ * Attempts to minify the source with Google's Closure compiler, and then
+ * returns the reference URI for the file, minified or not.
+ *
+ * @link http://code.google.com/closure/compiler/
+ * @param string $reference URI reference of the Javascript file
+ * @return string URI reference reference with dynamic content
+ */
+ public function js($original_reference)
+ {
+ // Injects .min into the filename
+ $parts = explode('.', $original_reference);
- if (count($parts) == 1)
- {
- throw new Exception('Filename must have an extension (e.g. /path/to/file.js)');
- }
- else
- {
- end($parts);
- $parts[key($parts)] = 'min.' . current($parts);
- $minified_reference = implode('.', $parts);
- }
+ if (count($parts) == 1)
+ {
+ throw new Exception('Filename must have an extension (e.g. /path/to/file.js)');
+ }
+ else
+ {
+ end($parts);
+ $parts[key($parts)] = 'min.' . current($parts);
+ $minified_reference = implode('.', $parts);
+ }
- $original_filename = '.' . $original_reference;
- $minified_filename = '.' . $minified_reference;
+ $original_filename = '.' . $original_reference;
+ $minified_filename = '.' . $minified_reference;
- $path = dirname($original_filename);
+ $path = dirname($original_filename);
- if (file_exists($original_filename))
- {
- $reference = $original_reference;
+ if (file_exists($original_filename))
+ {
+ $reference = $original_reference;
- if ($this->config->pickles['minify'] === true)
- {
- $compiler = new Devize\ClosureCompiler\ClosureCompiler();
- $compiler->setSourceBaseDir(dirname($original_filename));
- $compiler->setTargetBaseDir(dirname($minified_filename));
- $compiler->addSourceFile(basename($original_filename));
- $compiler->setTargetFile(basename($minified_filename));
- $compiler->compile();
+ if ($this->config->pickles['minify'] === true)
+ {
+ $compiler = new Devize\ClosureCompiler\ClosureCompiler();
+ $compiler->setSourceBaseDir(dirname($original_filename));
+ $compiler->setTargetBaseDir(dirname($minified_filename));
+ $compiler->addSourceFile(basename($original_filename));
+ $compiler->setTargetFile(basename($minified_filename));
+ $compiler->compile();
- $reference = $minified_reference;
- }
- elseif (file_exists($minified_filename))
- {
- $reference = $minified_reference;
- }
+ $reference = $minified_reference;
+ }
+ elseif (file_exists($minified_filename))
+ {
+ $reference = $minified_reference;
+ }
- $reference = $this->reference($reference);
- }
- else
- {
- throw new Exception('Supplied reference does not exist');
- }
+ $reference = $this->reference($reference);
+ }
+ else
+ {
+ throw new Exception('Supplied reference does not exist');
+ }
- return $reference;
- }
+ return $reference;
+ }
}
-?>
diff --git a/src/classes/File.php b/src/classes/File.php
index 82e8970..585303f 100644
--- a/src/classes/File.php
+++ b/src/classes/File.php
@@ -23,52 +23,51 @@
*/
class File
{
- /**
- * Remove a Directory, Recursively
- *
- * Removes a directory by emptying all of the contents recursively and then
- * removing the directory, as PHP will not let you rmdir() on ain non-empty
- * directory. Use with caution, seriously.
- *
- * @static
- * @param string $directory directory to remove
- * @return boolean status of the final rmdir();
- */
- public static function removeDirectory($directory)
- {
- if (substr($directory, -1) != '/')
- {
- $directory .= '/';
- }
+ /**
+ * Remove a Directory, Recursively
+ *
+ * Removes a directory by emptying all of the contents recursively and then
+ * removing the directory, as PHP will not let you rmdir() on ain non-empty
+ * directory. Use with caution, seriously.
+ *
+ * @static
+ * @param string $directory directory to remove
+ * @return boolean status of the final rmdir();
+ */
+ public static function removeDirectory($directory)
+ {
+ if (substr($directory, -1) != '/')
+ {
+ $directory .= '/';
+ }
- // If directory is a directory, read in all the files
- if (is_dir($directory))
- {
- $files = scandir($directory);
+ // If directory is a directory, read in all the files
+ if (is_dir($directory))
+ {
+ $files = scandir($directory);
- // Loop through said files, check for directories, and unlink files
- foreach ($files as $file)
- {
- if (!in_array($file, ['.', '..']))
- {
- if (is_dir($directory . $file))
- {
- File::removeDirectory($directory . $file);
- }
- else
- {
- unlink($directory . $file);
- }
- }
- }
+ // Loop through said files, check for directories, and unlink files
+ foreach ($files as $file)
+ {
+ if (!in_array($file, ['.', '..']))
+ {
+ if (is_dir($directory . $file))
+ {
+ File::removeDirectory($directory . $file);
+ }
+ else
+ {
+ unlink($directory . $file);
+ }
+ }
+ }
- rmdir($directory);
- }
- else
- {
- unlink($directory);
- }
- }
+ rmdir($directory);
+ }
+ else
+ {
+ unlink($directory);
+ }
+ }
}
-?>
diff --git a/src/classes/Form.php b/src/classes/Form.php
index 3fc9f3d..100a162 100644
--- a/src/classes/Form.php
+++ b/src/classes/Form.php
@@ -25,649 +25,648 @@
*/
class Form extends Object
{
- // {{{ Get Instance
-
- /**
- * Get Instance
- *
- * Gets an instance of the Form class
- *
- * @static
- * @param string $class name of the class to get an instance of
- * @return object instance of the class
- */
- public static function getInstance($class = 'Form')
- {
- return parent::getInstance($class);
- }
-
- // }}}
- // {{{ Input
-
- /**
- * Input
- *
- * Generates an input with the passed data.
- *
- * @param string $name name (and ID) for the element
- * @param string $value optional preset value
- * @param string $classes optional class names
- * @param string $additional optional additional parameters
- * @param string $type optional type of input
- * @param boolean $checked optional whether the input is checked
- * @return string HTML for the input
- */
- public function input($name, $value = null, $classes = null, $additional = null, $type = 'text', $checked = false)
- {
- if ($additional)
- {
- $additional = ' ' . $additional;
- }
-
- if (in_array($type, ['checkbox', 'radio']) && $checked == true)
- {
- $additional .= ' checked="checked"';
- }
-
- if ($value)
- {
- $additional .= ' value="' . $value . '"';
- }
-
- if ($classes)
- {
- $additional .= ' class="' . $classes . '"';
- }
-
- return '' . $this->options($options, $selected) . ' ';
- }
-
- // }}}
- // {{{ Options
-
- /**
- * Options
- *
- * Generates the option elements from the passed array
- *
- * @param array $options key/values for the options
- * @param string $selected optional default option
- * @return string HTML for the options
- */
- public function options($options, $selected = null)
- {
- $found_selected = false;
- $options_html = '';
-
- if (is_array($options))
- {
- foreach ($options as $main_key => $main_label)
- {
- if (is_array($main_label))
- {
- $options_html .= '';
-
- foreach ($main_label as $sub_key => $sub_label)
- {
- $selected_attribute = false;
- if ($selected !== null && $found_selected === false)
- {
- if ($selected == $sub_key)
- {
- $selected_attribute = ' selected="selected"';
- $found_selected = true;
- }
- }
-
- $options_html .= '' . $sub_label . ' ';
- }
-
- $options_html .= ' ';
- }
- else
- {
- $selected_attribute = false;
- if ($selected !== null && $found_selected === false)
- {
- if ($selected == $main_key)
- {
- $selected_attribute = ' selected="selected"';
- $found_selected = true;
- }
- }
-
- $options_html .= '' . $main_label . ' ';
- }
- }
- }
-
- if ($selected !== null && $found_selected === false)
- {
- $options_html .= '' . $selected . ' ';
- }
-
- return $options_html;
- }
-
- // }}}
- // {{{ State Select
-
- /**
- * State Select
- *
- * Generates a select box with the United States, Puerto Rico and miliary
- * options
- *
- * @param string $name optional name (and ID) for the select element
- * @param string $selected optional selected option
- * @param string $classes optional class names
- * @param string $additional optional additional parameters
- * @return string HTML for the select box
- */
- public function stateSelect($name = 'state', $selected = null, $classes = null, $additional = null)
- {
- $options = [
- null => '-- Select State --',
- 'AK' => 'Alaska',
- 'AL' => 'Alabama',
- 'AS' => 'American Samoa',
- 'AZ' => 'Arizona',
- 'AR' => 'Arkansas',
- 'CA' => 'California',
- 'CO' => 'Colorado',
- 'CT' => 'Connecticut',
- 'DE' => 'Delaware',
- 'DC' => 'District of Columbia',
- 'FL' => 'Florida',
- 'GA' => 'Georgia',
- 'GU' => 'Guam',
- 'HI' => 'Hawaii',
- 'ID' => 'Idaho',
- 'IL' => 'Illinois',
- 'IN' => 'Indiana',
- 'IA' => 'Iowa',
- 'KS' => 'Kansas',
- 'KY' => 'Kentucky',
- 'LA' => 'Louisiana',
- 'ME' => 'Maine',
- 'MH' => 'Marshall Islands',
- 'MD' => 'Maryland',
- 'MA' => 'Massachusetts',
- 'MI' => 'Michigan',
- 'MN' => 'Minnesota',
- 'MS' => 'Mississippi',
- 'MO' => 'Missouri',
- 'MT' => 'Montana',
- 'NE' => 'Nebraska',
- 'NV' => 'Nevada',
- 'NH' => 'New Hampshire',
- 'NJ' => 'New Jersey',
- 'NM' => 'New Mexico',
- 'NY' => 'New York',
- 'NC' => 'North Carolina',
- 'ND' => 'North Dakota',
- 'MP' => 'Northern Mariana Islands',
- 'OH' => 'Ohio',
- 'OK' => 'Oklahoma',
- 'OR' => 'Oregon',
- 'PW' => 'Palau',
- 'PA' => 'Pennsylvania',
- 'PR' => 'Puerto Rico',
- 'RI' => 'Rhode Island',
- 'SC' => 'South Carolina',
- 'SD' => 'South Dakota',
- 'TN' => 'Tennessee',
- 'TX' => 'Texas',
- 'UT' => 'Utah',
- 'VT' => 'Vermont',
- 'VI' => 'Virgin Islands',
- 'VA' => 'Virginia',
- 'WA' => 'Washington',
- 'WV' => 'West Virginia',
- 'WI' => 'Wisconsin',
- 'WY' => 'Wyoming',
- 'AE' => 'Armed Forces Africa',
- 'AA' => 'Armed Forces Americas (except Canada)',
- 'AE' => 'Armed Forces Canada',
- 'AE' => 'Armed Forces Europe',
- 'AE' => 'Armed Forces Middle East',
- 'AP' => 'Armed Forces Pacific'
- ];
-
- return $this->select($name, $options, $selected, $classes, $additional);
- }
-
- // }}}
- // {{{ Date Select
-
- /**
- * Date Select
- *
- * Generates 3 select boxes (month, day, year)
- *
- * @param string $name optional name (and ID) for the select element
- * @param string $selected optional selected option
- * @param string $classes optional class names
- * @param string $additional optional additional parameters
- * @param integer $start_year optional first year to display
- * @param integer $end_year optional last year to display
- * @return string HTML for the select boxes
- */
- public function dateSelect($name = 'date', $selected = null, $classes = null, $additional = null, $start_year = null, $end_year = null)
- {
- $html = '';
-
- // Breaks apart the selected value if present
- if ($selected == null || $selected == '0000-00-00')
- {
- $selected_month = null;
- $selected_day = null;
- $selected_year = null;
- }
- else
- {
- list($selected_year, $selected_month, $selected_day) = explode('-', $selected);
- }
-
- $month_options = [
- null => 'Month',
- '01' => 'January',
- '02' => 'February',
- '03' => 'March',
- '04' => 'April',
- '05' => 'May',
- '06' => 'June',
- '07' => 'July',
- '08' => 'August',
- '09' => 'September',
- '10' => 'October',
- '11' => 'November',
- '12' => 'December',
- ];
-
- $day_options = [null => 'Day'];
- $year_options = [null => 'Year'];
-
- // Generates the list of days
- for ($i = 1; $i <= 31; ++$i)
- {
- $day_options[str_pad($i, 2, '0', STR_PAD_LEFT)] = $i;
- }
-
- // Generates the list of years
- $current_year = date('Y');
- $start_year = $start_year == null ? $current_year - 10 : $start_year;
- $end_year = $end_year == null ? $current_year + 10 : $end_year;
-
- for ($i = $start_year; $i >= $end_year; --$i)
- {
- $year_options[$i] = $i;
- }
-
- // Loops through and generates the selects
- foreach (['month', 'day', 'year'] as $part)
- {
- $options = $part . '_options';
- $selected = 'selected_' . $part;
- $html .= ($html == '' ? '' : ' ') . $this->select($name . '[' . $part . ']', $$options, $$selected, $classes, $additional);
- }
-
- return $html;
- }
-
- // }}}
- // {{{ Date of Birth Select
-
- /**
- * Date of Birth Select
- *
- * Generates 3 select boxes (month, day, year)
- *
- * @param string $name optional name (and ID) for the select element
- * @param string $selected optional selected option
- * @param string $classes optional class names
- * @param string $additional optional additional parameters
- * @return string HTML for the select boxes
- */
- public function dobSelect($name = 'dob', $selected = null, $classes = null, $additional = null)
- {
- // Note: Start year based on oldest living person: http://en.wikipedia.org/wiki/Oldest_people as of November 2010
- // Note: Start and end year may seem backwards, but we want them in descending order when rendered
- return $this->dateSelect($name, $selected, $classes, $additional, date('Y'), 1896);
- }
-
- // }}}
- // {{{ Polar Select
-
- /**
- * Polar Select
- *
- * Generates a polar (yes / no) select box.
- *
- * @param string $name optional name (and ID) for the select element
- * @param string $selected optional selected option
- * @param string $classes optional class names
- * @param string $additional optional additional parameters
- */
- public function polarSelect($name = 'decision', $selected = 0, $classes = null, $additional = null)
- {
- $options = [1 => 'Yes', 0 => 'No'];
-
- return $this->select($name, $options, $selected, $classes, $additional);
- }
-
- // }}}
- // {{{ Phone Input
-
- /**
- * Phone Input
- *
- * Generates 3 inputs for a phone number from the passed values.
- *
- * @param string $name optional name (and ID) for the input elements
- * @param string $value optional existing value
- * @param string $classes optional class names
- * @param string $additional optional additional parameters
- */
- public function phoneInput($name = 'phone', $value = null, $classes = null, $additional = null)
- {
- if ($value == null)
- {
- $value = [
- 'area_code' => '',
- 'prefix' => '',
- 'line_number' => ''
- ];
- }
- else
- {
- $value = str_replace('-', '', $value);
- $value = [
- 'area_code' => substr($value, 0, 3),
- 'prefix' => substr($value, 3, 3),
- 'line_number' => substr($value, 6)
- ];
- }
-
- $parts = [
- 'area_code' => 3,
- 'prefix' => 3,
- 'line_number' => 4
- ];
-
- if ($additional)
- {
- $additional = ' ' . $additional;
- }
-
- $additional .= ' class="digits';
-
- if ($classes)
- {
- $additional .= ' ' . $classes;
- }
-
- $additional .= '"';
-
- $html = '';
- foreach ($parts as $part => $size)
- {
- $html .= ($html != '' ? ' ' : '');
- $html .= '' . $this->options($options, $selected) . ' ';
+ }
+
+ // }}}
+ // {{{ Options
+
+ /**
+ * Options
+ *
+ * Generates the option elements from the passed array
+ *
+ * @param array $options key/values for the options
+ * @param string $selected optional default option
+ * @return string HTML for the options
+ */
+ public function options($options, $selected = null)
+ {
+ $found_selected = false;
+ $options_html = '';
+
+ if (is_array($options))
+ {
+ foreach ($options as $main_key => $main_label)
+ {
+ if (is_array($main_label))
+ {
+ $options_html .= '';
+
+ foreach ($main_label as $sub_key => $sub_label)
+ {
+ $selected_attribute = false;
+ if ($selected !== null && $found_selected === false)
+ {
+ if ($selected == $sub_key)
+ {
+ $selected_attribute = ' selected="selected"';
+ $found_selected = true;
+ }
+ }
+
+ $options_html .= '' . $sub_label . ' ';
+ }
+
+ $options_html .= ' ';
+ }
+ else
+ {
+ $selected_attribute = false;
+ if ($selected !== null && $found_selected === false)
+ {
+ if ($selected == $main_key)
+ {
+ $selected_attribute = ' selected="selected"';
+ $found_selected = true;
+ }
+ }
+
+ $options_html .= '' . $main_label . ' ';
+ }
+ }
+ }
+
+ if ($selected !== null && $found_selected === false)
+ {
+ $options_html .= '' . $selected . ' ';
+ }
+
+ return $options_html;
+ }
+
+ // }}}
+ // {{{ State Select
+
+ /**
+ * State Select
+ *
+ * Generates a select box with the United States, Puerto Rico and miliary
+ * options
+ *
+ * @param string $name optional name (and ID) for the select element
+ * @param string $selected optional selected option
+ * @param string $classes optional class names
+ * @param string $additional optional additional parameters
+ * @return string HTML for the select box
+ */
+ public function stateSelect($name = 'state', $selected = null, $classes = null, $additional = null)
+ {
+ $options = [
+ null => '-- Select State --',
+ 'AK' => 'Alaska',
+ 'AL' => 'Alabama',
+ 'AS' => 'American Samoa',
+ 'AZ' => 'Arizona',
+ 'AR' => 'Arkansas',
+ 'CA' => 'California',
+ 'CO' => 'Colorado',
+ 'CT' => 'Connecticut',
+ 'DE' => 'Delaware',
+ 'DC' => 'District of Columbia',
+ 'FL' => 'Florida',
+ 'GA' => 'Georgia',
+ 'GU' => 'Guam',
+ 'HI' => 'Hawaii',
+ 'ID' => 'Idaho',
+ 'IL' => 'Illinois',
+ 'IN' => 'Indiana',
+ 'IA' => 'Iowa',
+ 'KS' => 'Kansas',
+ 'KY' => 'Kentucky',
+ 'LA' => 'Louisiana',
+ 'ME' => 'Maine',
+ 'MH' => 'Marshall Islands',
+ 'MD' => 'Maryland',
+ 'MA' => 'Massachusetts',
+ 'MI' => 'Michigan',
+ 'MN' => 'Minnesota',
+ 'MS' => 'Mississippi',
+ 'MO' => 'Missouri',
+ 'MT' => 'Montana',
+ 'NE' => 'Nebraska',
+ 'NV' => 'Nevada',
+ 'NH' => 'New Hampshire',
+ 'NJ' => 'New Jersey',
+ 'NM' => 'New Mexico',
+ 'NY' => 'New York',
+ 'NC' => 'North Carolina',
+ 'ND' => 'North Dakota',
+ 'MP' => 'Northern Mariana Islands',
+ 'OH' => 'Ohio',
+ 'OK' => 'Oklahoma',
+ 'OR' => 'Oregon',
+ 'PW' => 'Palau',
+ 'PA' => 'Pennsylvania',
+ 'PR' => 'Puerto Rico',
+ 'RI' => 'Rhode Island',
+ 'SC' => 'South Carolina',
+ 'SD' => 'South Dakota',
+ 'TN' => 'Tennessee',
+ 'TX' => 'Texas',
+ 'UT' => 'Utah',
+ 'VT' => 'Vermont',
+ 'VI' => 'Virgin Islands',
+ 'VA' => 'Virginia',
+ 'WA' => 'Washington',
+ 'WV' => 'West Virginia',
+ 'WI' => 'Wisconsin',
+ 'WY' => 'Wyoming',
+ 'AE' => 'Armed Forces Africa',
+ 'AA' => 'Armed Forces Americas (except Canada)',
+ 'AE' => 'Armed Forces Canada',
+ 'AE' => 'Armed Forces Europe',
+ 'AE' => 'Armed Forces Middle East',
+ 'AP' => 'Armed Forces Pacific'
+ ];
+
+ return $this->select($name, $options, $selected, $classes, $additional);
+ }
+
+ // }}}
+ // {{{ Date Select
+
+ /**
+ * Date Select
+ *
+ * Generates 3 select boxes (month, day, year)
+ *
+ * @param string $name optional name (and ID) for the select element
+ * @param string $selected optional selected option
+ * @param string $classes optional class names
+ * @param string $additional optional additional parameters
+ * @param integer $start_year optional first year to display
+ * @param integer $end_year optional last year to display
+ * @return string HTML for the select boxes
+ */
+ public function dateSelect($name = 'date', $selected = null, $classes = null, $additional = null, $start_year = null, $end_year = null)
+ {
+ $html = '';
+
+ // Breaks apart the selected value if present
+ if ($selected == null || $selected == '0000-00-00')
+ {
+ $selected_month = null;
+ $selected_day = null;
+ $selected_year = null;
+ }
+ else
+ {
+ list($selected_year, $selected_month, $selected_day) = explode('-', $selected);
+ }
+
+ $month_options = [
+ null => 'Month',
+ '01' => 'January',
+ '02' => 'February',
+ '03' => 'March',
+ '04' => 'April',
+ '05' => 'May',
+ '06' => 'June',
+ '07' => 'July',
+ '08' => 'August',
+ '09' => 'September',
+ '10' => 'October',
+ '11' => 'November',
+ '12' => 'December',
+ ];
+
+ $day_options = [null => 'Day'];
+ $year_options = [null => 'Year'];
+
+ // Generates the list of days
+ for ($i = 1; $i <= 31; ++$i)
+ {
+ $day_options[str_pad($i, 2, '0', STR_PAD_LEFT)] = $i;
+ }
+
+ // Generates the list of years
+ $current_year = date('Y');
+ $start_year = $start_year == null ? $current_year - 10 : $start_year;
+ $end_year = $end_year == null ? $current_year + 10 : $end_year;
+
+ for ($i = $start_year; $i >= $end_year; --$i)
+ {
+ $year_options[$i] = $i;
+ }
+
+ // Loops through and generates the selects
+ foreach (['month', 'day', 'year'] as $part)
+ {
+ $options = $part . '_options';
+ $selected = 'selected_' . $part;
+ $html .= ($html == '' ? '' : ' ') . $this->select($name . '[' . $part . ']', $$options, $$selected, $classes, $additional);
+ }
+
+ return $html;
+ }
+
+ // }}}
+ // {{{ Date of Birth Select
+
+ /**
+ * Date of Birth Select
+ *
+ * Generates 3 select boxes (month, day, year)
+ *
+ * @param string $name optional name (and ID) for the select element
+ * @param string $selected optional selected option
+ * @param string $classes optional class names
+ * @param string $additional optional additional parameters
+ * @return string HTML for the select boxes
+ */
+ public function dobSelect($name = 'dob', $selected = null, $classes = null, $additional = null)
+ {
+ // Note: Start year based on oldest living person: http://en.wikipedia.org/wiki/Oldest_people as of November 2010
+ // Note: Start and end year may seem backwards, but we want them in descending order when rendered
+ return $this->dateSelect($name, $selected, $classes, $additional, date('Y'), 1896);
+ }
+
+ // }}}
+ // {{{ Polar Select
+
+ /**
+ * Polar Select
+ *
+ * Generates a polar (yes / no) select box.
+ *
+ * @param string $name optional name (and ID) for the select element
+ * @param string $selected optional selected option
+ * @param string $classes optional class names
+ * @param string $additional optional additional parameters
+ */
+ public function polarSelect($name = 'decision', $selected = 0, $classes = null, $additional = null)
+ {
+ $options = [1 => 'Yes', 0 => 'No'];
+
+ return $this->select($name, $options, $selected, $classes, $additional);
+ }
+
+ // }}}
+ // {{{ Phone Input
+
+ /**
+ * Phone Input
+ *
+ * Generates 3 inputs for a phone number from the passed values.
+ *
+ * @param string $name optional name (and ID) for the input elements
+ * @param string $value optional existing value
+ * @param string $classes optional class names
+ * @param string $additional optional additional parameters
+ */
+ public function phoneInput($name = 'phone', $value = null, $classes = null, $additional = null)
+ {
+ if ($value == null)
+ {
+ $value = [
+ 'area_code' => '',
+ 'prefix' => '',
+ 'line_number' => ''
+ ];
+ }
+ else
+ {
+ $value = str_replace('-', '', $value);
+ $value = [
+ 'area_code' => substr($value, 0, 3),
+ 'prefix' => substr($value, 3, 3),
+ 'line_number' => substr($value, 6)
+ ];
+ }
+
+ $parts = [
+ 'area_code' => 3,
+ 'prefix' => 3,
+ 'line_number' => 4
+ ];
+
+ if ($additional)
+ {
+ $additional = ' ' . $additional;
+ }
+
+ $additional .= ' class="digits';
+
+ if ($classes)
+ {
+ $additional .= ' ' . $classes;
+ }
+
+ $additional .= '"';
+
+ $html = '';
+ foreach ($parts as $part => $size)
+ {
+ $html .= ($html != '' ? ' ' : '');
+ $html .= ' tags
- * @return string formatted number
- */
- public static function ordinalIndicator($number, $superscript = false)
- {
- if (!in_array(($number % 100), [11, 12, 13]))
- {
- switch ($number % 10)
- {
- case 1:
- $suffix = 'st';
- break;
+ /**
+ * Ordinal Indiciator
+ *
+ * Formats a number by appending an ordinal indicator.
+ *
+ * @static
+ * @link http://en.wikipedia.org/wiki/Ordinal_indicator
+ * @link http://en.wikipedia.org/wiki/English_numerals#Ordinal_numbers
+ * @param string $number number to format
+ * @param boolean $superscript include tags
+ * @return string formatted number
+ */
+ public static function ordinalIndicator($number, $superscript = false)
+ {
+ if (!in_array(($number % 100), [11, 12, 13]))
+ {
+ switch ($number % 10)
+ {
+ case 1:
+ $suffix = 'st';
+ break;
- case 2:
- $suffix = 'nd';
- break;
+ case 2:
+ $suffix = 'nd';
+ break;
- case 3:
- $suffix = 'rd';
- break;
+ case 3:
+ $suffix = 'rd';
+ break;
- default:
- $suffix = 'th';
- break;
- }
- }
+ default:
+ $suffix = 'th';
+ break;
+ }
+ }
- if ($superscript)
- {
- $suffix = '' . $suffix . ' ';
- }
+ if ($superscript)
+ {
+ $suffix = '' . $suffix . ' ';
+ }
- return $number . $suffix;
- }
+ return $number . $suffix;
+ }
}
-?>
diff --git a/src/classes/Object.php b/src/classes/Object.php
index a04f560..4847d45 100644
--- a/src/classes/Object.php
+++ b/src/classes/Object.php
@@ -24,127 +24,126 @@
*/
class Object
{
- /**
- * Object Instances
- *
- * @static
- * @var array
- */
- public static $instances = [];
+ /**
+ * Object Instances
+ *
+ * @static
+ * @var array
+ */
+ public static $instances = [];
- /**
- * Instance of the Config object
- *
- * @var object
- */
- public $config = null;
+ /**
+ * Instance of the Config object
+ *
+ * @var object
+ */
+ public $config = null;
- /**
- * Instance of the Cache object
- *
- * @var object
- */
- public $cache = null;
+ /**
+ * Instance of the Cache object
+ *
+ * @var object
+ */
+ public $cache = null;
- /**
- * Instance of the Database object
- *
- * @var object
- */
- public $db = null;
+ /**
+ * Instance of the Database object
+ *
+ * @var object
+ */
+ public $db = null;
- /**
- * Profiler flag
- *
- * @var mixed
- */
- public $profiler = false;
+ /**
+ * Profiler flag
+ *
+ * @var mixed
+ */
+ public $profiler = false;
- /**
- * Constructor
- *
- * Establishes a Config instance for all children to enjoy
- */
- public function __construct($objects = null)
- {
- // Gets an instance of the config, unless we ARE the config
- if (get_class($this) == 'Config')
- {
- $this->config = true;
- }
- else
- {
- $this->config = Config::getInstance();
- }
+ /**
+ * Constructor
+ *
+ * Establishes a Config instance for all children to enjoy
+ */
+ public function __construct($objects = null)
+ {
+ // Gets an instance of the config, unless we ARE the config
+ if (get_class($this) == 'Config')
+ {
+ $this->config = true;
+ }
+ else
+ {
+ $this->config = Config::getInstance();
+ }
- if ($objects)
- {
- if (!is_array($objects))
- {
- $objects = [$objects];
- }
+ if ($objects)
+ {
+ if (!is_array($objects))
+ {
+ $objects = [$objects];
+ }
- foreach ($objects as $object)
- {
- switch ($object)
- {
- case 'cache': $this->cache = Cache::getInstance(); break;
- case 'db': $this->db = Database::getInstance(); break;
- }
- }
- }
+ foreach ($objects as $object)
+ {
+ switch ($object)
+ {
+ case 'cache': $this->cache = Cache::getInstance(); break;
+ case 'db': $this->db = Database::getInstance(); break;
+ }
+ }
+ }
- // Assigns the profiler flag
- $this->profiler = (isset($this->config->pickles['profiler']) && $this->config->pickles['profiler'] != '' ? $this->config->pickles['profiler'] : false);
+ // Assigns the profiler flag
+ $this->profiler = (isset($this->config->pickles['profiler']) && $this->config->pickles['profiler'] != '' ? $this->config->pickles['profiler'] : false);
- // Optionally logs the constructor to the profiler
- if ($this->profiler === true || ((is_array($this->profiler) && in_array('objects', $this->profiler)) || stripos($this->profiler, 'objects') !== false))
- {
- Profiler::log($this, '__construct');
- }
- }
+ // Optionally logs the constructor to the profiler
+ if ($this->profiler === true || ((is_array($this->profiler) && in_array('objects', $this->profiler)) || stripos($this->profiler, 'objects') !== false))
+ {
+ Profiler::log($this, '__construct');
+ }
+ }
- /**
- * Get Instance
- *
- * Gets an instance of the passed class. Allows for easy sharing of certain
- * classes within the system to avoid the extra overhead of creating new
- * objects each time. Also avoids the hassle of passing around variables.
- *
- * @static
- * @param string $class name of the class
- * @return object instance of the class
- */
- public static function getInstance($class = false)
- {
- // In < 5.3 arguments must match in child, hence defaulting $class
- // @todo Remove this, as we're no longer supporting 5.3
- if ($class == false)
- {
- return false;
- }
- else
- {
- if (!isset(self::$instances[$class]))
- {
- self::$instances[$class] = new $class();
- }
+ /**
+ * Get Instance
+ *
+ * Gets an instance of the passed class. Allows for easy sharing of certain
+ * classes within the system to avoid the extra overhead of creating new
+ * objects each time. Also avoids the hassle of passing around variables.
+ *
+ * @static
+ * @param string $class name of the class
+ * @return object instance of the class
+ */
+ public static function getInstance($class = false)
+ {
+ // In < 5.3 arguments must match in child, hence defaulting $class
+ // @todo Remove this, as we're no longer supporting 5.3
+ if ($class == false)
+ {
+ return false;
+ }
+ else
+ {
+ if (!isset(self::$instances[$class]))
+ {
+ self::$instances[$class] = new $class();
+ }
- return self::$instances[$class];
- }
- }
+ return self::$instances[$class];
+ }
+ }
- /**
- * Destructor
- */
- public function __destruct()
- {
- // Optionally logs the destructor to the profiler
- if ($this->profiler === true || ((is_array($this->profiler) && in_array('objects', $this->profiler)) || stripos($this->profiler, 'objects') !== false))
- {
- Profiler::log($this, '__destruct');
- }
- }
+ /**
+ * Destructor
+ */
+ public function __destruct()
+ {
+ // Optionally logs the destructor to the profiler
+ if ($this->profiler === true || ((is_array($this->profiler) && in_array('objects', $this->profiler)) || stripos($this->profiler, 'objects') !== false))
+ {
+ Profiler::log($this, '__destruct');
+ }
+ }
}
-?>
diff --git a/src/classes/Profiler.php b/src/classes/Profiler.php
index fff7aaa..c5a8e88 100644
--- a/src/classes/Profiler.php
+++ b/src/classes/Profiler.php
@@ -33,358 +33,357 @@
*/
class Profiler
{
- /**
- * Profile
- *
- * Array of logged events
- *
- * @static
- * @access private
- * @var array
- */
- private static $profile = [];
+ /**
+ * Profile
+ *
+ * Array of logged events
+ *
+ * @static
+ * @access private
+ * @var array
+ */
+ private static $profile = [];
- /**
- * Queries
- *
- * Number of queries that have been logged
- *
- * @static
- * @access private
- * @var integer
- */
- private static $queries = 0;
+ /**
+ * Queries
+ *
+ * Number of queries that have been logged
+ *
+ * @static
+ * @access private
+ * @var integer
+ */
+ private static $queries = 0;
- /**
- * Timers
- *
- * Array of active timers
- *
- * @static
- * @access private
- * @var array
- */
- private static $timers = [];
+ /**
+ * Timers
+ *
+ * Array of active timers
+ *
+ * @static
+ * @access private
+ * @var array
+ */
+ private static $timers = [];
- /**
- * Enabled
- *
- * Checks if the profiler is set to boolean true or if the passed type is
- * specified in the profiler configuration value.
- *
- * @param array $type type(s) to check
- * @return boolean whether or not the type is enabled
- */
- public static function enabled(/* polymorphic */)
- {
- $config = Config::getInstance();
- $config = isset($config->pickles['profiler']) ? $config->pickles['profiler'] : false;
+ /**
+ * Enabled
+ *
+ * Checks if the profiler is set to boolean true or if the passed type is
+ * specified in the profiler configuration value.
+ *
+ * @param array $type type(s) to check
+ * @return boolean whether or not the type is enabled
+ */
+ public static function enabled(/* polymorphic */)
+ {
+ $config = Config::getInstance();
+ $config = isset($config->pickles['profiler']) ? $config->pickles['profiler'] : false;
- // Checks if we're set to boolean true
- if ($config === true)
- {
- return true;
- }
- else
- {
- $types = func_get_args();
+ // Checks if we're set to boolean true
+ if ($config === true)
+ {
+ return true;
+ }
+ else
+ {
+ $types = func_get_args();
- foreach ($types as $type)
- {
- if (stripos($config, $type) !== false)
- {
- return true;
- }
- }
- }
+ foreach ($types as $type)
+ {
+ if (stripos($config, $type) !== false)
+ {
+ return true;
+ }
+ }
+ }
- return false;
- }
+ return false;
+ }
- /**
- * Log
- *
- * Logs the event to be displayed later on. Due to the nature of how much
- * of a pain it is to determine which class method called this method I
- * opted to make the method a passable argument for ease of use. Perhaps
- * I'll revisit in the future. Handles all elapsed time calculations and
- * memory usage.
- *
- * @static
- * @param mixed $data data to log
- * @param string $method name of the class method being logged
- */
- public static function log($data, $method = false, $type = false)
- {
- $time = microtime(true);
- $data_type = ($data == 'timer' ? $data : gettype($data));
+ /**
+ * Log
+ *
+ * Logs the event to be displayed later on. Due to the nature of how much
+ * of a pain it is to determine which class method called this method I
+ * opted to make the method a passable argument for ease of use. Perhaps
+ * I'll revisit in the future. Handles all elapsed time calculations and
+ * memory usage.
+ *
+ * @static
+ * @param mixed $data data to log
+ * @param string $method name of the class method being logged
+ */
+ public static function log($data, $method = false, $type = false)
+ {
+ $time = microtime(true);
+ $data_type = ($data == 'timer' ? $data : gettype($data));
- // Tidys the data by type
- switch ($data_type)
- {
- case 'array':
- $log = '' . print_r($data, true) . ' ';
- break;
+ // Tidys the data by type
+ switch ($data_type)
+ {
+ case 'array':
+ $log = '' . print_r($data, true) . ' ';
+ break;
- case 'object':
- $log = '[ ' . get_parent_class($data) . ' ] '
- . '' . get_class($data) . ' '
- . ($method != '' ? '-> ' . $method . ' () ' : '');
+ case 'object':
+ $log = '[ ' . get_parent_class($data) . ' ] '
+ . '' . get_class($data) . ' '
+ . ($method != '' ? '-> ' . $method . ' () ' : '');
- $data_type = '' . $data_type . ' ';
- break;
+ $data_type = '' . $data_type . ' ';
+ break;
- case 'timer':
- $log = $method;
+ case 'timer':
+ $log = $method;
- $data_type = '' . $data_type . ' ';
- break;
+ $data_type = '' . $data_type . ' ';
+ break;
- case 'string':
- default:
- if ($type != false)
- {
- $data_type = $type;
- }
+ case 'string':
+ default:
+ if ($type != false)
+ {
+ $data_type = $type;
+ }
- $log = $data;
- break;
- }
+ $log = $data;
+ break;
+ }
- self::$profile[] = [
- 'log' => $log,
- 'type' => $data_type,
- 'time' => $time,
- 'elapsed' => $time - $_SERVER['REQUEST_TIME_FLOAT'],
- 'memory' => memory_get_usage(),
- ];
- }
+ self::$profile[] = [
+ 'log' => $log,
+ 'type' => $data_type,
+ 'time' => $time,
+ 'elapsed' => $time - $_SERVER['REQUEST_TIME_FLOAT'],
+ 'memory' => memory_get_usage(),
+ ];
+ }
- /**
- * Log Query
- *
- * Serves as a wrapper to get query data to the log function
- *
- * @static
- * @param string $query the query being executed
- * @param array $input_parameters optional prepared statement data
- * @param array $explain EXPLAIN data for the query
- * @param float $duration the speed of the query
- */
- public static function logQuery($query, $input_parameters = false, $explain = false, $duration = false)
- {
- self::$queries++;
+ /**
+ * Log Query
+ *
+ * Serves as a wrapper to get query data to the log function
+ *
+ * @static
+ * @param string $query the query being executed
+ * @param array $input_parameters optional prepared statement data
+ * @param array $explain EXPLAIN data for the query
+ * @param float $duration the speed of the query
+ */
+ public static function logQuery($query, $input_parameters = false, $explain = false, $duration = false)
+ {
+ self::$queries++;
- $log = '';
+ $log = '';
- if ($input_parameters != 'false' && is_array($input_parameters))
- {
- $log .= '' . $key . ' => ' . $value . ' ';
+ foreach ($input_parameters as $key => $value)
+ {
+ $log .= '' . $key . ' => ' . $value . ' ';
- $query = str_replace($key, '' . $key . ' ', $query);
- }
- }
+ $query = str_replace($key, '' . $key . ' ', $query);
+ }
+ }
- $log = '' . $query . ' ' . $log;
+ $log = '' . $query . ' ' . $log;
- if (is_array($explain))
- {
- $log .= 'Possible Keys => ' . ($table['possible_keys'] == '' ? 'NONE ' : $table['possible_keys']) . ' '
- . 'Key => ' . ($table['key'] == '' ? 'NONE ' : $table['key']) . ' '
- . 'Type => ' . $table['type'] . ' '
- . 'Rows => ' . $table['rows'] . ' '
- . ($table['Extra'] != '' ? 'Extra => ' . $table['Extra'] . ' ' : '');
- }
- }
+ foreach ($explain as $table)
+ {
+ $log .= 'Possible Keys => ' . ($table['possible_keys'] == '' ? 'NONE ' : $table['possible_keys']) . ' '
+ . 'Key => ' . ($table['key'] == '' ? 'NONE ' : $table['key']) . ' '
+ . 'Type => ' . $table['type'] . ' '
+ . 'Rows => ' . $table['rows'] . ' '
+ . ($table['Extra'] != '' ? 'Extra => ' . $table['Extra'] . ' ' : '');
+ }
+ }
- $log .= 'Speed: ' . number_format($duration * 100, 3) . ' ms';
+ $log .= 'Speed: ' . number_format($duration * 100, 3) . ' ms';
- self::log($log, false, 'database ');
- }
+ self::log($log, false, 'database ');
+ }
- /**
- * Timer
- *
- * Logs the start and end of a timer.
- *
- * @param string $timer name of the timer
- * @return boolean whether or not timer profiling is enabled
- */
- public static function timer($timer)
- {
- if (self::enabled('timers'))
- {
- // Starts the timer
- if (!isset(self::$timers[$timer]))
- {
- self::$timers[$timer] = microtime(true);
- self::Log('timer', 'Started timer ' . $timer . ' ');
- }
- // Ends the timer
- else
- {
- self::Log('timer', 'Stopped timer ' . $timer . ' => Time Elapsed: ' . number_format((microtime(true) - self::$timers[$timer]) * 100, 3) . ' ms');
+ /**
+ * Timer
+ *
+ * Logs the start and end of a timer.
+ *
+ * @param string $timer name of the timer
+ * @return boolean whether or not timer profiling is enabled
+ */
+ public static function timer($timer)
+ {
+ if (self::enabled('timers'))
+ {
+ // Starts the timer
+ if (!isset(self::$timers[$timer]))
+ {
+ self::$timers[$timer] = microtime(true);
+ self::Log('timer', 'Started timer ' . $timer . ' ');
+ }
+ // Ends the timer
+ else
+ {
+ self::Log('timer', 'Stopped timer ' . $timer . ' => Time Elapsed: ' . number_format((microtime(true) - self::$timers[$timer]) * 100, 3) . ' ms');
- unset(self::$timers[$timer]);
- }
+ unset(self::$timers[$timer]);
+ }
- return true;
- }
+ return true;
+ }
- return false;
- }
+ return false;
+ }
- /**
- * Report
- *
- * Generates the Profiler report that is displayed by the Controller.
- * Contains all the HTML needed to display the data properly inline on the
- * page. Will generally be displayed after the closing HTML tag.
- *
- * @todo Thinking this should return the report and not necessarily echo it
- */
- public static function report()
- {
- ?>
-
-
-
PICKLES Profiler
- There is nothing to profile. This often happens when the profiler configuration is set to either "queries" or "explains" and there are no database queries on the page (common on pages that only have a template). You may want to set the profiler to boolean true to ensure you get a profile of the page.';
- }
- else
- {
- $start_time = $_SERVER['REQUEST_TIME_FLOAT'];
- $peak_usage = self::formatSize(memory_get_peak_usage());
- $end_time = self::$profile[count(self::$profile) - 1]['time']; // @todo No idea what though?
- $duration = ($end_time - $start_time);
+ /**
+ * Report
+ *
+ * Generates the Profiler report that is displayed by the Controller.
+ * Contains all the HTML needed to display the data properly inline on the
+ * page. Will generally be displayed after the closing HTML tag.
+ *
+ * @todo Thinking this should return the report and not necessarily echo it
+ */
+ public static function report()
+ {
+ ?>
+
+
+
PICKLES Profiler
+ There is nothing to profile. This often happens when the profiler configuration is set to either "queries" or "explains" and there are no database queries on the page (common on pages that only have a template). You may want to set the profiler to boolean true to ensure you get a profile of the page.';
+ }
+ else
+ {
+ $start_time = $_SERVER['REQUEST_TIME_FLOAT'];
+ $peak_usage = self::formatSize(memory_get_peak_usage());
+ $end_time = self::$profile[count(self::$profile) - 1]['time']; // @todo No idea what though?
+ $duration = ($end_time - $start_time);
- $logs = count(self::$profile);
- $logs .= ' Log' . ($logs == 1 ? '' : 's');
+ $logs = count(self::$profile);
+ $logs .= ' Log' . ($logs == 1 ? '' : 's');
- $files = count(get_included_files());
- $files .= ' File' . ($files == 1 ? '' : 's');
+ $files = count(get_included_files());
+ $files .= ' File' . ($files == 1 ? '' : 's');
- $queries = self::$queries . ' Quer'. (self::$queries == 1 ? 'y' : 'ies');
- ?>
-
-
-
- Console
-
-
-
- Load Time
-
-
-
- Memory Usage
-
-
-
- Database
-
-
-
- Includes
-
-
-
-
-
-
- Console
- Memory
- Time
-
- $entry)
- {
- ?>
-
- ms
-
-
-
-
-
-
-
+
+
+
+ Console
+
+
+
+ Load Time
+
+
+
+ Memory Usage
+
+
+
+ Database
+
+
+
+ Includes
+
+
+
+
+
+
+ Console
+ Memory
+ Time
+
+ $entry)
+ {
+ ?>
+
+ ms
+
+
+
+
+
' . mb_strcut($string, 0, $length, 'UTF-8') . '… ';
- }
- else
- {
- $string = mb_strcut($string, 0, $length, 'UTF-8') . '…';
- }
- }
+ /**
+ * Truncate
+ *
+ * Truncates a string to a specified length and (optionally) adds a
+ * span to provide a rollover to see the expanded text.
+ *
+ * @static
+ * @param string $string string to truncate
+ * @param integer $length length to truncate to
+ * @param boolean $hover (optional) whether or not to add the rollover
+ * @return string truncate string
+ */
+ public static function truncate($string, $length, $hover = true)
+ {
+ if (strlen($string) > $length)
+ {
+ if ($hover == true)
+ {
+ $string = '' . mb_strcut($string, 0, $length, 'UTF-8') . '… ';
+ }
+ else
+ {
+ $string = mb_strcut($string, 0, $length, 'UTF-8') . '…';
+ }
+ }
- return $string;
- }
+ return $string;
+ }
- // }}}
- // {{{ Upper Words
+ // }}}
+ // {{{ Upper Words
- /**
- * Upper Words
- *
- * Applies strtolower() and ucwords() to the passed string. The
- * exception being email addresses which are not formatted at all.
- *
- * @static
- * @param string $string string to format
- * @return string formatted string
- */
- public static function upperWords($string)
- {
- // Only formats non-email addresses
- if (filter_var($string, FILTER_VALIDATE_EMAIL) == false)
- {
- $string = ucwords(strtolower($string));
- }
+ /**
+ * Upper Words
+ *
+ * Applies strtolower() and ucwords() to the passed string. The
+ * exception being email addresses which are not formatted at all.
+ *
+ * @static
+ * @param string $string string to format
+ * @return string formatted string
+ */
+ public static function upperWords($string)
+ {
+ // Only formats non-email addresses
+ if (filter_var($string, FILTER_VALIDATE_EMAIL) == false)
+ {
+ $string = ucwords(strtolower($string));
+ }
- return $string;
- }
+ return $string;
+ }
- // }}}
+ // }}}
}
-?>
diff --git a/src/classes/Time.php b/src/classes/Time.php
index e8ba3b6..1f7ca66 100644
--- a/src/classes/Time.php
+++ b/src/classes/Time.php
@@ -23,254 +23,253 @@
*/
class Time
{
- // {{{ Intervals (in seconds)
+ // {{{ Intervals (in seconds)
- /**
- * Minute
- *
- * Seconds in a minute
- *
- * @var integer
- */
- const MINUTE = 60;
+ /**
+ * Minute
+ *
+ * Seconds in a minute
+ *
+ * @var integer
+ */
+ const MINUTE = 60;
- /**
- * Hour
- *
- * Seconds in an hour (minute * 60)
- *
- * @var integer
- */
- const HOUR = 3600;
+ /**
+ * Hour
+ *
+ * Seconds in an hour (minute * 60)
+ *
+ * @var integer
+ */
+ const HOUR = 3600;
- /**
- * Day
- *
- * Seconds in a day (hour * 24)
- *
- * @var integer
- */
- const DAY = 86400;
+ /**
+ * Day
+ *
+ * Seconds in a day (hour * 24)
+ *
+ * @var integer
+ */
+ const DAY = 86400;
- /**
- * Week
- *
- * Seconds in a week (day * 7)
- *
- * @var integer
- */
- const WEEK = 604800;
+ /**
+ * Week
+ *
+ * Seconds in a week (day * 7)
+ *
+ * @var integer
+ */
+ const WEEK = 604800;
- /**
- * Month
- *
- * Seconds in a month (day * 30)
- *
- * @var integer
- */
- const MONTH = 2592000;
+ /**
+ * Month
+ *
+ * Seconds in a month (day * 30)
+ *
+ * @var integer
+ */
+ const MONTH = 2592000;
- /**
- * Quarter
- *
- * Seconds in a quarter (day * 90)
- *
- * @var integer
- */
- const QUARTER = 7776000;
+ /**
+ * Quarter
+ *
+ * Seconds in a quarter (day * 90)
+ *
+ * @var integer
+ */
+ const QUARTER = 7776000;
- /**
- * Year
- *
- * Seconds in a year (day * 365)
- *
- * @var integer
- */
- const YEAR = 31536000;
+ /**
+ * Year
+ *
+ * Seconds in a year (day * 365)
+ *
+ * @var integer
+ */
+ const YEAR = 31536000;
- /**
- * Decade
- *
- * Seconds in a decade (year * 10)
- *
- * @var integer
- */
- const DECADE = 315360000;
+ /**
+ * Decade
+ *
+ * Seconds in a decade (year * 10)
+ *
+ * @var integer
+ */
+ const DECADE = 315360000;
- /**
- * Century
- *
- * Seconds in a decade (decade * 10)
- *
- * @var integer
- */
- const CENTURY = 3153600000;
+ /**
+ * Century
+ *
+ * Seconds in a decade (decade * 10)
+ *
+ * @var integer
+ */
+ const CENTURY = 3153600000;
- // }}}
+ // }}}
- /**
- * Age
- *
- * Calculates age based on the passed date.
- *
- * @static
- * @param string $date birth / inception date
- * @return integer $age number of years old
- * @todo Wondering if this really should live in the Date class since
- * it's a Date function. Could flip the aliasing to preserve any
- * older code.
- */
- public static function age($date)
- {
- if (!preg_match('/\d{4}-\d{2}-\d{2}/', $date))
- {
- $date = date('Y-m-d', strtotime($date));
- }
+ /**
+ * Age
+ *
+ * Calculates age based on the passed date.
+ *
+ * @static
+ * @param string $date birth / inception date
+ * @return integer $age number of years old
+ * @todo Wondering if this really should live in the Date class since
+ * it's a Date function. Could flip the aliasing to preserve any
+ * older code.
+ */
+ public static function age($date)
+ {
+ if (!preg_match('/\d{4}-\d{2}-\d{2}/', $date))
+ {
+ $date = date('Y-m-d', strtotime($date));
+ }
- list($year, $month, $day) = explode('-', $date, 3);
+ list($year, $month, $day) = explode('-', $date, 3);
- $age = date('Y') - $year;
+ $age = date('Y') - $year;
- if (date('md') < $month . $day)
- {
- $age--;
- }
+ if (date('md') < $month . $day)
+ {
+ $age--;
+ }
- return $age;
- }
+ return $age;
+ }
- /**
- * Ago
- *
- * Generates a relative time (e.g. X minutes ago).
- *
- * @static
- * @param mixed $time timestamp to calculate from
- * @return string relative time
- */
- public static function ago($time)
- {
- $current = strtotime(Time::timestamp());
- $time = preg_match('/^\d+$/', $time) ? $time : strtotime($time);
+ /**
+ * Ago
+ *
+ * Generates a relative time (e.g. X minutes ago).
+ *
+ * @static
+ * @param mixed $time timestamp to calculate from
+ * @return string relative time
+ */
+ public static function ago($time)
+ {
+ $current = strtotime(Time::timestamp());
+ $time = preg_match('/^\d+$/', $time) ? $time : strtotime($time);
- if ($current == $time)
- {
- $time_ago = 'just now';
- }
- else
- {
- if ($current > $time)
- {
- $difference = $current - $time;
- $suffix = ' ago';
- }
- else
- {
- $difference = $time - $current;
- $suffix = ' from now';
- }
+ if ($current == $time)
+ {
+ $time_ago = 'just now';
+ }
+ else
+ {
+ if ($current > $time)
+ {
+ $difference = $current - $time;
+ $suffix = ' ago';
+ }
+ else
+ {
+ $difference = $time - $current;
+ $suffix = ' from now';
+ }
- // Less than 1 minute ago (seconds ago)
- if ($difference < 60)
- {
- $time_ago = 'seconds';
- }
- // Less than 1 hour ago (minutes ago)
- elseif ($difference < Time::HOUR)
- {
- $minutes = round($difference / 60);
+ // Less than 1 minute ago (seconds ago)
+ if ($difference < 60)
+ {
+ $time_ago = 'seconds';
+ }
+ // Less than 1 hour ago (minutes ago)
+ elseif ($difference < Time::HOUR)
+ {
+ $minutes = round($difference / 60);
- if ($minutes == 60)
- {
- $time_ago = 'an hour';
- }
- else
- {
- $time_ago = ($minutes == 1 ? 'a' : $minutes) . ' minute' . ($minutes != 1 ? 's' : '');
- }
- }
- // Less than 1 day ago (hours ago)
- elseif ($difference < Time::DAY)
- {
- $hours = round($difference / Time::HOUR);
+ if ($minutes == 60)
+ {
+ $time_ago = 'an hour';
+ }
+ else
+ {
+ $time_ago = ($minutes == 1 ? 'a' : $minutes) . ' minute' . ($minutes != 1 ? 's' : '');
+ }
+ }
+ // Less than 1 day ago (hours ago)
+ elseif ($difference < Time::DAY)
+ {
+ $hours = round($difference / Time::HOUR);
- if ($hours == 24)
- {
- $time_ago = 'a day';
- }
- else
- {
- $time_ago = ($hours == 1 ? 'an' : $hours) . ' hour' . ($hours != 1 ? 's' : '');
- }
- }
- // Less than 1 week ago (days ago)
- elseif ($difference < Time::WEEK)
- {
- $days = round($difference / Time::DAY);
+ if ($hours == 24)
+ {
+ $time_ago = 'a day';
+ }
+ else
+ {
+ $time_ago = ($hours == 1 ? 'an' : $hours) . ' hour' . ($hours != 1 ? 's' : '');
+ }
+ }
+ // Less than 1 week ago (days ago)
+ elseif ($difference < Time::WEEK)
+ {
+ $days = round($difference / Time::DAY);
- if ($days == 7)
- {
- $time_ago = 'a week';
- }
- else
- {
- $time_ago = ($days == 1 ? 'a' : $days) . ' day' . ($days != 1 ? 's' : '');
- }
- }
- // Less than 1 month ago (weeks ago)
- elseif ($difference < Time::MONTH)
- {
- $weeks = round($difference / Time::WEEK);
+ if ($days == 7)
+ {
+ $time_ago = 'a week';
+ }
+ else
+ {
+ $time_ago = ($days == 1 ? 'a' : $days) . ' day' . ($days != 1 ? 's' : '');
+ }
+ }
+ // Less than 1 month ago (weeks ago)
+ elseif ($difference < Time::MONTH)
+ {
+ $weeks = round($difference / Time::WEEK);
- if ($weeks == 4)
- {
- $time_ago = 'a month';
- }
- else
- {
- $time_ago = ($weeks == 1 ? 'a' : $weeks) . ' week' . ($weeks != 1 ? 's' : '');
- }
- }
- // Less than 1 year ago (months ago)
- elseif ($difference < Time::YEAR)
- {
- $months = round($difference / Time::MONTH);
+ if ($weeks == 4)
+ {
+ $time_ago = 'a month';
+ }
+ else
+ {
+ $time_ago = ($weeks == 1 ? 'a' : $weeks) . ' week' . ($weeks != 1 ? 's' : '');
+ }
+ }
+ // Less than 1 year ago (months ago)
+ elseif ($difference < Time::YEAR)
+ {
+ $months = round($difference / Time::MONTH);
- if ($months == 12)
- {
- $time_ago = 'a year';
- }
- else
- {
- $time_ago = ($months == 1 ? 'a' : $months) . ' month' . ($months != 1 ? 's' : '');
- }
- }
- // Over 1 year ago (years ago)
- else
- {
- $years = round($difference / Time::YEAR);
- $time_ago = ($years == 1 ? 'a' : $years) . ' year' . ($years != 1 ? 's' : '');
- }
+ if ($months == 12)
+ {
+ $time_ago = 'a year';
+ }
+ else
+ {
+ $time_ago = ($months == 1 ? 'a' : $months) . ' month' . ($months != 1 ? 's' : '');
+ }
+ }
+ // Over 1 year ago (years ago)
+ else
+ {
+ $years = round($difference / Time::YEAR);
+ $time_ago = ($years == 1 ? 'a' : $years) . ' year' . ($years != 1 ? 's' : '');
+ }
- $time_ago .= $suffix;
- }
+ $time_ago .= $suffix;
+ }
- return $time_ago;
- }
+ return $time_ago;
+ }
- /**
- * Timestamp
- *
- * Current Universal Time in the specified format.
- *
- * @static
- * @param string $format format of the timestamp
- * @return string $timestamp formatted timestamp
- */
- public static function timestamp($format = 'Y-m-d H:i:s')
- {
- return gmdate($format);
- }
+ /**
+ * Timestamp
+ *
+ * Current Universal Time in the specified format.
+ *
+ * @static
+ * @param string $format format of the timestamp
+ * @return string $timestamp formatted timestamp
+ */
+ public static function timestamp($format = 'Y-m-d H:i:s')
+ {
+ return gmdate($format);
+ }
}
-?>
diff --git a/src/classes/Validate.php b/src/classes/Validate.php
index 7567be8..2f613a3 100644
--- a/src/classes/Validate.php
+++ b/src/classes/Validate.php
@@ -24,153 +24,152 @@
*/
class Validate
{
- /**
- * Is Valid?
- *
- * Checks if a variable is valid based on the passed rules.
- *
- * @param mixed $value the value to be validated
- * @param array $rules an array of rules (and messages) to validate with
- * @return mixed boolean true if valid, array of errors if invalid
- */
- public static function isValid($value, $rules)
- {
- $errors = [];
+ /**
+ * Is Valid?
+ *
+ * Checks if a variable is valid based on the passed rules.
+ *
+ * @param mixed $value the value to be validated
+ * @param array $rules an array of rules (and messages) to validate with
+ * @return mixed boolean true if valid, array of errors if invalid
+ */
+ public static function isValid($value, $rules)
+ {
+ $errors = [];
- if (is_array($rules))
- {
- foreach ($rules as $rule => $message)
- {
- $rule = explode(':', $rule);
+ if (is_array($rules))
+ {
+ foreach ($rules as $rule => $message)
+ {
+ $rule = explode(':', $rule);
- switch (strtolower($rule[0]))
- {
- // @todo case 'alpha':
- // @todo case 'alphanumeric':
- // @todo case 'date':
+ switch (strtolower($rule[0]))
+ {
+ // @todo case 'alpha':
+ // @todo case 'alphanumeric':
+ // @todo case 'date':
- // {{{ Checks using filter_var()
+ // {{{ Checks using filter_var()
- case 'filter':
- if (count($rule) < 2)
- {
- throw new Exception('Invalid validation rule, expected: "validate:boolean|email|float|int|ip|url".');
- }
- else
- {
- switch (strtolower($rule[1]))
- {
- case 'boolean':
- case 'email':
- case 'float':
- case 'int':
- case 'ip':
- case 'url':
- $filter = constant('FILTER_VALIDATE_' . strtoupper($rule[1]));
- break;
+ case 'filter':
+ if (count($rule) < 2)
+ {
+ throw new Exception('Invalid validation rule, expected: "validate:boolean|email|float|int|ip|url".');
+ }
+ else
+ {
+ switch (strtolower($rule[1]))
+ {
+ case 'boolean':
+ case 'email':
+ case 'float':
+ case 'int':
+ case 'ip':
+ case 'url':
+ $filter = constant('FILTER_VALIDATE_' . strtoupper($rule[1]));
+ break;
- default:
- throw new Exception('Invalid filter, expecting boolean, email, float, int, ip or url.');
- break;
- }
+ default:
+ throw new Exception('Invalid filter, expecting boolean, email, float, int, ip or url.');
+ break;
+ }
- if (!filter_var($value, $filter))
- {
- $errors[] = $message;
- }
- }
+ if (!filter_var($value, $filter))
+ {
+ $errors[] = $message;
+ }
+ }
- break;
+ break;
- // }}}
- // {{{ Checks using strlen()
+ // }}}
+ // {{{ Checks using strlen()
- case 'length':
- if (count($rule) < 3)
- {
- throw new Exception('Invalid validation rule, expected: "length:<|<=|==|!=|>=|>:integer".');
- }
- else
- {
- if (!filter_var($rule[2], FILTER_VALIDATE_INT))
- {
- throw new Exception('Invalid length value, expecting an integer.');
- }
- else
- {
- $length = strlen($value);
+ case 'length':
+ if (count($rule) < 3)
+ {
+ throw new Exception('Invalid validation rule, expected: "length:<|<=|==|!=|>=|>:integer".');
+ }
+ else
+ {
+ if (!filter_var($rule[2], FILTER_VALIDATE_INT))
+ {
+ throw new Exception('Invalid length value, expecting an integer.');
+ }
+ else
+ {
+ $length = strlen($value);
- switch ($rule[1])
- {
- case '<':
- $valid = $length < $rule[2];
- break;
+ switch ($rule[1])
+ {
+ case '<':
+ $valid = $length < $rule[2];
+ break;
- case '<=':
- $valid = $length <= $rule[2];
- break;
+ case '<=':
+ $valid = $length <= $rule[2];
+ break;
- case '==':
- $valid = $length == $rule[2];
- break;
+ case '==':
+ $valid = $length == $rule[2];
+ break;
- case '!=':
- $valid = $length != $rule[2];
- break;
+ case '!=':
+ $valid = $length != $rule[2];
+ break;
- case '>=':
- $valid = $length >= $rule[2];
- break;
+ case '>=':
+ $valid = $length >= $rule[2];
+ break;
- case '>':
- $valid = $length > $rule[2];
- break;
+ case '>':
+ $valid = $length > $rule[2];
+ break;
- default:
- throw new Exception('Invalid operator, expecting <, <=, ==, !=, >= or >.');
- break;
- }
+ default:
+ throw new Exception('Invalid operator, expecting <, <=, ==, !=, >= or >.');
+ break;
+ }
- if (!$valid)
- {
- $errors[] = $message;
- }
- }
- }
+ if (!$valid)
+ {
+ $errors[] = $message;
+ }
+ }
+ }
- break;
+ break;
- // }}}
+ // }}}
- // @todo case 'range':
+ // @todo case 'range':
- // {{{ Checks using preg_match()
+ // {{{ Checks using preg_match()
- case 'regex':
- if (count($rule) < 3)
- {
- throw new Exception('Invalid validation rule, expected: "regex:is|not:string".');
- }
- else
- {
- $rule[1] = strtolower($rule[1]);
+ case 'regex':
+ if (count($rule) < 3)
+ {
+ throw new Exception('Invalid validation rule, expected: "regex:is|not:string".');
+ }
+ else
+ {
+ $rule[1] = strtolower($rule[1]);
- if (($rule[1] == 'is' && preg_match($rule[2], $value))
- || ($rule[1] == 'not' && !preg_match($rule[2], $value)))
- {
- $errors[] = $message;
- }
- }
- break;
+ if (($rule[1] == 'is' && preg_match($rule[2], $value))
+ || ($rule[1] == 'not' && !preg_match($rule[2], $value)))
+ {
+ $errors[] = $message;
+ }
+ }
+ break;
- // }}}
- }
+ // }}}
+ }
- }
- }
+ }
+ }
- return count($errors) ? $errors : true;
- }
+ return count($errors) ? $errors : true;
+ }
}
-?>
diff --git a/src/pickles.php b/src/pickles.php
index a77769a..52a8b73 100644
--- a/src/pickles.php
+++ b/src/pickles.php
@@ -26,20 +26,20 @@
// @todo Finish reworking constants to be part of the Config object
if (!defined('SITE_PATH'))
{
- // Establishes our site paths, sanity check is to allow vfsStream in our tests
- define('SITE_PATH', getcwd() . '/../');
+ // Establishes our site paths, sanity check is to allow vfsStream in our tests
+ define('SITE_PATH', getcwd() . '/../');
}
if (!defined('SITE_CLASS_PATH'))
{
- define('SITE_CLASS_PATH', SITE_PATH . 'classes/');
- define('SITE_MODEL_PATH', SITE_PATH . 'models/');
- // @todo The following 2 constants are being used in sites will need to update them before removing
- define('SITE_MODULE_PATH', SITE_PATH . 'modules/');
- define('SITE_TEMPLATE_PATH', SITE_PATH . 'templates/');
+ define('SITE_CLASS_PATH', SITE_PATH . 'classes/');
+ define('SITE_MODEL_PATH', SITE_PATH . 'models/');
+ // @todo The following 2 constants are being used in sites will need to update them before removing
+ define('SITE_MODULE_PATH', SITE_PATH . 'modules/');
+ define('SITE_TEMPLATE_PATH', SITE_PATH . 'templates/');
- define('PRIVATE_PATH', SITE_PATH . 'private/');
- define('LOG_PATH', PRIVATE_PATH . 'logs/');
+ define('PRIVATE_PATH', SITE_PATH . 'private/');
+ define('LOG_PATH', PRIVATE_PATH . 'logs/');
}
// }}}
@@ -52,7 +52,7 @@ error_reporting(-1);
// Defaults timezone to UTC if not set
if (ini_get('date.timezone') == '')
{
- ini_set('date.timezone', 'Etc/UTC');
+ ini_set('date.timezone', 'Etc/UTC');
}
// Sets the session variables
@@ -78,38 +78,38 @@ ini_set('session.hash_function', 1);
*/
function __autoload($class)
{
- $loaded = false;
- $filename = preg_replace('/_/', '/', $class) . '.php';
+ $loaded = false;
+ $filename = preg_replace('/_/', '/', $class) . '.php';
- $pickles_path = dirname(__FILE__) . '/';
- $pickles_paths = [
- 'class' => $pickles_path . 'classes/',
- ];
+ $pickles_path = dirname(__FILE__) . '/';
+ $pickles_paths = [
+ 'class' => $pickles_path . 'classes/',
+ ];
- // Path as the key, boolean value is whether ot not to convert back to hyphenated
- $paths = [
- $pickles_paths['class'] => false,
- SITE_CLASS_PATH => false,
- SITE_MODEL_PATH => false,
- SITE_MODULE_PATH => true,
- ];
+ // Path as the key, boolean value is whether ot not to convert back to hyphenated
+ $paths = [
+ $pickles_paths['class'] => false,
+ SITE_CLASS_PATH => false,
+ SITE_MODEL_PATH => false,
+ SITE_MODULE_PATH => true,
+ ];
- foreach ($paths as $path => $hyphenated)
- {
- // Converts the filename back to hypenated
- if ($hyphenated == true)
- {
- $filename = strtolower(preg_replace('/([A-Z]{1})/', '-$1', $filename));;
- }
+ foreach ($paths as $path => $hyphenated)
+ {
+ // Converts the filename back to hypenated
+ if ($hyphenated == true)
+ {
+ $filename = strtolower(preg_replace('/([A-Z]{1})/', '-$1', $filename));;
+ }
- if (file_exists($path . $filename))
- {
- $loaded = require_once $path . $filename;
- break;
- }
- }
+ if (file_exists($path . $filename))
+ {
+ $loaded = require_once $path . $filename;
+ break;
+ }
+ }
- return $loaded;
+ return $loaded;
}
spl_autoload_register('__autoload');
@@ -129,28 +129,28 @@ require_once $config->pickles['path'] . '../vendor/autoload.php';
// Configures any available PHP configuration options
if (is_array($config->php) && count($config->php))
{
- foreach ($config->php as $variable => $value)
- {
- ini_set($variable, $value);
- }
+ foreach ($config->php as $variable => $value)
+ {
+ ini_set($variable, $value);
+ }
}
// Starts session handling (old)
if (isset($config->pickles['session']))
{
- if (session_id() == '' && $config->pickles['session'] !== false)
- {
- new Session();
- }
+ if (session_id() == '' && $config->pickles['session'] !== false)
+ {
+ new Session();
+ }
}
// Starts session handling (new)
if (isset($config->pickles['sessions']))
{
- if (session_id() == '' && $config->pickles['sessions'] !== false)
- {
- new Session();
- }
+ if (session_id() == '' && $config->pickles['sessions'] !== false)
+ {
+ new Session();
+ }
}
// }}}
@@ -158,9 +158,8 @@ if (isset($config->pickles['sessions']))
if (!isset($_REQUEST['request']))
{
- $_REQUEST['request'] = 'home';
+ $_REQUEST['request'] = 'home';
}
// }}}
-?>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b9d94c5..4f614a2 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -11,26 +11,26 @@ $root = org\bovigo\vfs\vfsStream::setup('site');
if (!defined('SITE_PATH'))
{
- define('SECURITY_LEVEL_USER', 10);
- define('SECURITY_LEVEL_ADMIN', 20);
- define('SITE_PATH', org\bovigo\vfs\vfsStream::url('site/'));
+ define('SECURITY_LEVEL_USER', 10);
+ define('SECURITY_LEVEL_ADMIN', 20);
+ define('SITE_PATH', org\bovigo\vfs\vfsStream::url('site/'));
}
require_once 'src/pickles.php';
if (!file_exists(SITE_MODULE_PATH))
{
- mkdir(SITE_MODULE_PATH, 0644);
+ mkdir(SITE_MODULE_PATH, 0644);
}
if (!file_exists(SITE_TEMPLATE_PATH))
{
- mkdir(SITE_TEMPLATE_PATH, 0644);
+ mkdir(SITE_TEMPLATE_PATH, 0644);
}
if (!file_exists(SITE_TEMPLATE_PATH . '__shared/'))
{
- mkdir(SITE_TEMPLATE_PATH . '__shared/', 0644);
+ mkdir(SITE_TEMPLATE_PATH . '__shared/', 0644);
}
$_SERVER['HTTP_HOST'] = 'testsite.com';
@@ -39,17 +39,17 @@ $_SERVER['SERVER_ADDR'] = '127.0.0.1';
function setUpRequest($request, $method = 'GET')
{
- $_SERVER['REQUEST_URI'] = '/' . $request;
- $_SERVER['REQUEST_METHOD'] = $method;
- $_REQUEST['request'] = $request;
+ $_SERVER['REQUEST_URI'] = '/' . $request;
+ $_SERVER['REQUEST_METHOD'] = $method;
+ $_REQUEST['request'] = $request;
}
function setUpConfig($config)
{
- file_put_contents(
- SITE_PATH . 'config.php',
- ''
- );
+ file_put_contents(
+ SITE_PATH . 'config.php',
+ ''
+ );
}
`mysql -e 'TRUNCATE TABLE test.pickles;'`;
@@ -57,4 +57,3 @@ function setUpConfig($config)
`mysql -e 'TRUNCATE TABLE test.users;'`;
`echo 'flush_all' | nc localhost 11211`;
-?>
diff --git a/tests/classes/API/AYAHTest.php b/tests/classes/API/AYAHTest.php
index 7502337..8fd1ac6 100644
--- a/tests/classes/API/AYAHTest.php
+++ b/tests/classes/API/AYAHTest.php
@@ -2,40 +2,39 @@
class API_AYAHTest extends PHPUnit_Framework_TestCase
{
- /**
- * @expectedException Exception
- * @expectedExceptionMessage Missing API configuration
- */
- public function testGetHTMLMissingConfig()
- {
- API_AYAH::getHTML();
- }
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Missing API configuration
+ */
+ public function testGetHTMLMissingConfig()
+ {
+ API_AYAH::getHTML();
+ }
- /**
- * @expectedException Exception
- * @expectedExceptionMessage Missing API configuration
- */
- public function testIsHumanMissingConfig()
- {
- API_AYAH::isHuman();
- }
+ /**
+ * @expectedException Exception
+ * @expectedExceptionMessage Missing API configuration
+ */
+ public function testIsHumanMissingConfig()
+ {
+ API_AYAH::isHuman();
+ }
- public function testGetHTML()
- {
- $config = Config::getInstance();
- $config->data['api']['ayah'] = [
- 'publisher_key' => '01f70454bada303692be5f36a8fd104eba8b00dd',
- 'scoring_key' => '80cc3f9c6e1da29369c238d55bd8528a968473ad',
- ];
+ public function testGetHTML()
+ {
+ $config = Config::getInstance();
+ $config->data['api']['ayah'] = [
+ 'publisher_key' => '01f70454bada303692be5f36a8fd104eba8b00dd',
+ 'scoring_key' => '80cc3f9c6e1da29369c238d55bd8528a968473ad',
+ ];
- $this->assertRegExp('/<\/div>
 . '.gravatar.com/avatar/' . self::hash($email)
- . sprintf('?s=%s&d=%s&r=%s', $size, urlencode($default), $rating, $force)
- . ($force ? '&f=y' : '') . ')
$value)
- {
- $html .= sprintf(' %s="%s"', $attribute, $value);
- }
- }
+ if (is_array($attributes))
+ {
+ foreach ($attributes as $attribute => $value)
+ {
+ $html .= sprintf(' %s="%s"', $attribute, $value);
+ }
+ }
- $html .= '>';
+ $html .= '>';
- return $html;
- }
- }
+ return $html;
+ }
+ }
}
-?>
diff --git a/src/classes/API/PlaceholdIt.php b/src/classes/API/PlaceholdIt.php
index 5b7bd08..6acc079 100644
--- a/src/classes/API/PlaceholdIt.php
+++ b/src/classes/API/PlaceholdIt.php
@@ -22,86 +22,85 @@
*/
class API_PlaceholdIt extends Object
{
- /**
- * URL
- *
- * Generates a Placehold.it URL based on the passed parameters.
- *
- * @param integer $width width of the image
- * @param integer $height optional height of the image
- * @param string $format optional format of the image
- * @param string $background optional background color of the image
- * @param string $foreground optional foreground color of the image
- * @param string $text optional text to display in the image
- * @return string Placehold.it URL
- */
- public function url($width, $height = null, $format = 'gif', $background = null, $foreground = null, $text = null)
- {
- // Checks if the format is valid
- if (!in_array($format, ['gif', 'jpeg', 'jpg', 'png']))
- {
- throw new Exception('Invalid format. Valid formats: gif, jpeg, jpg and png.');
- }
- // Checks if foreground is present without background
- elseif ($foreground && !$background)
- {
- throw new Exception('You must specify a background color if you wish to specify a foreground color.');
- }
- // Checks the background color's length
- elseif ($background && strlen($background) < 6)
- {
- throw new Exception('The background color must be a 6 character hex code.');
- }
- // Checks the foreground color's length
- elseif ($foreground && strlen($foreground) < 6)
- {
- throw new Exception('The foreground color must be a 6 character hex code.');
- }
+ /**
+ * URL
+ *
+ * Generates a Placehold.it URL based on the passed parameters.
+ *
+ * @param integer $width width of the image
+ * @param integer $height optional height of the image
+ * @param string $format optional format of the image
+ * @param string $background optional background color of the image
+ * @param string $foreground optional foreground color of the image
+ * @param string $text optional text to display in the image
+ * @return string Placehold.it URL
+ */
+ public function url($width, $height = null, $format = 'gif', $background = null, $foreground = null, $text = null)
+ {
+ // Checks if the format is valid
+ if (!in_array($format, ['gif', 'jpeg', 'jpg', 'png']))
+ {
+ throw new Exception('Invalid format. Valid formats: gif, jpeg, jpg and png.');
+ }
+ // Checks if foreground is present without background
+ elseif ($foreground && !$background)
+ {
+ throw new Exception('You must specify a background color if you wish to specify a foreground color.');
+ }
+ // Checks the background color's length
+ elseif ($background && strlen($background) < 6)
+ {
+ throw new Exception('The background color must be a 6 character hex code.');
+ }
+ // Checks the foreground color's length
+ elseif ($foreground && strlen($foreground) < 6)
+ {
+ throw new Exception('The foreground color must be a 6 character hex code.');
+ }
- $url = 'http://placehold.it/' . $width;
+ $url = 'http://placehold.it/' . $width;
- if ($height)
- {
- $url .= 'x' . $height;
- }
+ if ($height)
+ {
+ $url .= 'x' . $height;
+ }
- $url .= '.' . $format;
+ $url .= '.' . $format;
- if ($background)
- {
- $url .= '/' . $background;
- }
+ if ($background)
+ {
+ $url .= '/' . $background;
+ }
- if ($foreground)
- {
- $url .= '/' . $foreground;
- }
+ if ($foreground)
+ {
+ $url .= '/' . $foreground;
+ }
- if ($text)
- {
- $url .= '&text=' . urlencode($text);
- }
+ if ($text)
+ {
+ $url .= '&text=' . urlencode($text);
+ }
- return $url;
- }
+ return $url;
+ }
- /**
- * URL
- *
- * Generates a Placehold.it