Updates system core, interfaces, and extensions for latest build

Author: Ryan Rentfro

system/core/application.php

@@ -19,6 +19,12 @@
 foreach (glob(Config::$filePath . "system/abstract/*.php") as $abstract) require_once $abstract;
 foreach (glob(Config::$filePath . "system/interface/*.php") as $interface) require_once $interface;
 
+/*
+ * Load the now() function into global space if it exists
+ */
+if (file_exists(Config::$filePath . 'system/ext/now.php')) require_once(Config::$filePath . 'system/ext/now.php');
+if (file_exists(Config::$filePath . 'system/ext/getStatus.php')) require_once(Config::$filePath . 'system/ext/getStatus.php');
+
 /*
  * Setup Debugging
  */
@@ -49,7 +55,7 @@
 /*
  * Load Propel Config if it exists
  */
-if (file_exists(Config::$filePath . 'system/core/propel.php')) require('propel.php');
+if (file_exists(Config::$filePath . 'system/core/propel.php')) require(Config::$filePath . 'system/core/propel.php');
 
 /*
  * Run the Application via the Strider Controller

system/core/controller.php

@@ -66,14 +66,9 @@ public function render($view, Template $template)
  if ($controller == null) $controller = $app;
  $twigLoader = new \Twig_Loader_Filesystem(Config::$filePath . Config::$appStorage . $app . '/' . Config::$viewStorage);
  $twig = new \Twig_Environment($twigLoader, array('debug' => Config::$debugMode));
- if (Config::$debugMode)
- {
- $twig->addExtension(new \Twig_Extension_Debug());
- }
- 
+ if (Config::$debugMode) $twig->addExtension(new \Twig_Extension_Debug());
  $globals = Globals::toArray();
  $templateData = array_merge($templateData, $globals);
- dBug($templateData);
  echo $twig->render($view . '.' . Config::$viewFileType, $templateData); 
  }
 }

system/core/globals.php

@@ -213,7 +213,7 @@ public static function parm()
  */
  public static function getParm($key)
  {
- if (is_numeric($key) && isset(self::$parm[$key])) return self::$parm[$key];
+ if (is_numeric($key)) return self::$parm[$key];
  return null;
  }
 
@@ -256,6 +256,7 @@ public static function setParm($key, $value)
 
  if (is_numeric($key) && $key < 9)
  {
+ dBug('setting value');
  self::$parm[$key] = $value;
  return true; 
  }

system/core/package.php

@@ -40,7 +40,9 @@ public function __construct()
  'public/components/jquery-ui/jquery-ui.min.js'
  ),
  'css' => array(
- 'public/components/jquery-ui/themes/base/theme.css'
+ 'public/components/jquery-ui/themes/base/theme.css',
+ 'public/components/jquery-ui/themes/flick/jquery-ui.min.css',
+ 
  ) 
  ),
  'jquery-file-upload' => array(

system/ext/getStatus.php

@@ -0,0 +1,29 @@
+<?php
+function getStatus($statusId)
+{
+ switch($statusId)
+ {
+ default:
+ return 'Unknown';
+ break;
+ case 0:
+ return 'Pending';
+ break;
+ case 1:
+ return 'Active';
+ break;
+ case 2:
+ return 'Inactive';
+ break;
+ case 3:
+ return 'Deleted';
+ break;
+ case 4:
+ return 'Flagged';
+ break;
+ case 5:
+ return 'Approved';
+ break; 
+ }
+}
+?>

system/ext/now.php

@@ -0,0 +1,6 @@
+<?php
+function now()
+{
+ return date('Y-m-d H:i:s');
+}
+?>

system/interface/crudmodel.php

@@ -11,8 +11,6 @@
  */
 interface CRUDModel
 {
- public function create();
- public function read();
- public function update();
- public function delete();
+ public function read($id);
+ public function delete($id);
 }