Removed whitespace.

This commit is contained in:
Josh Sherman 2010-05-15 22:51:17 -04:00
parent a901d73dac
commit a48706da4b
8 changed files with 23 additions and 23 deletions

View file

@ -27,7 +27,7 @@ class Config
/**
* Instance of the Config object
*
* @static
* @static
* @access private
* @var object
*/
@ -70,11 +70,11 @@ class Config
{
$this->data = parse_ini_file($filename, true);
return true;
return true;
}
else
{
Error::fatal('config.ini is either missing or unreadable');
Error::fatal('config.ini is either missing or unreadable');
}
}

View file

@ -42,7 +42,7 @@ class Controller extends Object
{
Error::fatal($_SERVER['SERVER_NAME'] . ' is currently<br />down for maintenance');
}
// Ack, not sure what page to load, throw an error
if (!isset($_REQUEST['request']) && $this->config->module['default'] == null)
{
@ -141,7 +141,7 @@ class Controller extends Object
{
$engine = strtoupper($return_type);
}
unset($return_type);
}
@ -161,7 +161,7 @@ class Controller extends Object
{
header('Location: /', 404);
}
$module_return = null;
// Attempts to execute the default method
@ -173,13 +173,13 @@ class Controller extends Object
}
/**
* Note to Self: When building in caching will need to let the
* 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
*/
$module_return = $module->__default();
}
$display->prepare($css_class, $js_basename, $module_return);
// Renders the content

View file

@ -32,7 +32,7 @@ class Database extends Object
* Database constructor is not private, just in case someone wants to
* create new Database objects.
*
* @static
* @static
* @access private
* @var object
*/
@ -134,7 +134,7 @@ class Database extends Object
* returns the instance.
*
* @static
* @return object self::$instance instance of the Database
* @return object self::$instance instance of the Database
*/
public static function getInstance()
{
@ -212,9 +212,9 @@ class Database extends Object
public function execute($sql, $input_parameters = null)
{
$this->open();
$loggable_query = $sql;
if ($input_parameters != null)
{
$loggable_query .= ' -- ' . (JSON_AVAILABLE ? json_encode($input_parameters) : serialize($input_parameters));

View file

@ -110,7 +110,7 @@ abstract class Display_Common extends Object
{
return count($this->templates);
}
/**
* Preparation Method
*

View file

@ -41,7 +41,7 @@ class Display_RSS extends Display_Common
if (isset($this->data->channel) || is_object($this->data['channel']))
{
$channel = $this->data['channel'];
if (!is_object($this->data['channel']))
{
$channel = $this->config->rss->$channel;

View file

@ -53,7 +53,7 @@ class Error extends Object
exit;
}
}
?>

View file

@ -263,7 +263,7 @@ class Model extends Object
{
$this->record = prev($this->data);
}
/**
* First Record
*

View file

@ -19,9 +19,9 @@
* Module Class
*
* This is a parent class that all PICKLES modules should be extending. Each
* module can specify it's own meta data and whether or not a user must be
* properly authenticated to view the page. Currently any pages without a
* template are treated as pages being requested via AJAX and the return will
* module can specify it's own meta data and whether or not a user must be
* properly authenticated to view the page. Currently any pages without a
* template are treated as pages being requested via AJAX and the return will
* be JSON encoded. In the future this may need to be changed out for logic
* that allows the requested module to specify what display type(s) it can use.
*/
@ -39,7 +39,7 @@ class Module extends Object
* Page title
*
* @access protected
* @var string, null by default
* @var string, null by default
*/
protected $title = null;
@ -163,8 +163,8 @@ class Module extends Object
*
* This function is overloaded by the module. The __default() method is
* where you want to place any code that needs to be executed at runtime.
* The reason the code isn't in the constructor is because the module must
* be instantiated before the code is executed so that the controller
* The reason the code isn't in the constructor is because the module must
* be instantiated before the code is executed so that the controller
* script is aware of the authentication requirements.
*/
public function __default()
@ -221,7 +221,7 @@ class Module extends Object
break;
}
$this->$name = $default;
$this->$name = $default;
}
}