diff --git a/recess/recess/apps/tools/controllers/RecessToolsCodeController.class.php b/recess/recess/apps/tools/controllers/RecessToolsCodeController.class.php index a0ad6dc..343ea39 100644 --- a/recess/recess/apps/tools/controllers/RecessToolsCodeController.class.php +++ b/recess/recess/apps/tools/controllers/RecessToolsCodeController.class.php @@ -110,10 +110,11 @@ public function classInfo($class) { } } - /** !Route GET, package/$package */ - function packageInfo ($package) { + /** !Route GET, package/$packageName */ + function packageInfo ($packageName) { Library::import('recess.apps.tools.models.RecessReflectorPackage'); - $package = new RecessReflectorPackage($package); + $package = new RecessReflectorPackage(); + $package->name = $packageName; $this->package = $package->find()->first(); } diff --git a/recess/recess/apps/tools/models/RecessReflectorPackage.class.php b/recess/recess/apps/tools/models/RecessReflectorPackage.class.php index 85cad7b..c72524e 100644 --- a/recess/recess/apps/tools/models/RecessReflectorPackage.class.php +++ b/recess/recess/apps/tools/models/RecessReflectorPackage.class.php @@ -22,12 +22,6 @@ function childrenAlphabetically() { return $this->children()->orderBy('name ASC'); } - function __construct($name = '') { - if($name != '') { - $this->name = $name; - } - } - function insert() { parent::insert(); $dotPosition = strrpos($this->name, Library::dotSeparator); @@ -35,7 +29,8 @@ function insert() { if($dotPosition !== false) { $parentName = substr($this->name, 0, $dotPosition); - $parent = new RecessReflectorPackage($parentName); + $parent = new RecessReflectorPackage(); + $parent->name = $parentName; if(!$parent->exists()) { $parent->insert(); diff --git a/recess/recess/apps/tools/views/code/packageInfo.php b/recess/recess/apps/tools/views/code/packageInfo.php index 7edd66c..855f2cf 100644 --- a/recess/recess/apps/tools/views/code/packageInfo.php +++ b/recess/recess/apps/tools/views/code/packageInfo.php @@ -3,7 +3,6 @@ Layout::blockAssign('title', $package->name); ?>

name); ?>

@@ -36,8 +34,4 @@ function linkedPackagePath($package, $linkPrefix = "") { echo '
  • '. $class->name .'
  • '; } ?> - - - \ No newline at end of file + \ No newline at end of file diff --git a/recess/recess/apps/tools/views/common/footer.php b/recess/recess/apps/tools/views/common/footer.php deleted file mode 100644 index a1be1f4..0000000 --- a/recess/recess/apps/tools/views/common/footer.php +++ /dev/null @@ -1,18 +0,0 @@ - -
    -

    Recess Resources

    - -
    - - - - \ No newline at end of file diff --git a/recess/recess/apps/tools/views/common/header.php b/recess/recess/apps/tools/views/common/header.php deleted file mode 100644 index b6b87c2..0000000 --- a/recess/recess/apps/tools/views/common/header.php +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - <?php if(isset($title)) echo $title; else echo 'Recess Tools!'; ?> - - -
    -
    -

    Recess Tools

    -
    -
    -

    "Give us the tools, and we'll finish the job." ~Churchill

    -
    -
    - \ No newline at end of file diff --git a/recess/recess/apps/tools/views/common/navbar.php b/recess/recess/apps/tools/views/common/navbar.php deleted file mode 100644 index c6cd361..0000000 --- a/recess/recess/apps/tools/views/common/navbar.php +++ /dev/null @@ -1,18 +0,0 @@ -' . $displayName . ''; - } -?> - \ No newline at end of file diff --git a/recess/recess/apps/tools/views/common/printRoutes.php b/recess/recess/apps/tools/views/common/printRoutes.php deleted file mode 100644 index 36e3330..0000000 --- a/recess/recess/apps/tools/views/common/printRoutes.php +++ /dev/null @@ -1,50 +0,0 @@ -'; - echo 'HTTPRouteControllerMethod'; - echo ''; - $fullPath = $_ENV['url.base']; - if(strrpos($fullPath, '/') == strlen($fullPath) - 1) $fullPath = substr($fullPath,0,-1); - printRoutesRecursive($codeController, $routes, $fullPath, $omit); - echo ''; - echo ''; -} - -function printRoutesRecursive($codeController, $routingNode, $fullPath, $omit = '') { - if($omit != '' && strpos($fullPath, $omit) === 0) { - return; - } - static $i = 0; - if($routingNode == null) return; - $staticPaths = $routingNode->getStaticPaths(); - $parametricPaths = $routingNode->getParametricPaths(); - $methods = $routingNode->getMethods(); - if(!empty($methods)) { - foreach($methods as $method => $rt) { - $route = $rt->toRoute(); - $i++; - if($i % 2 == 0) { - echo ''; - } else { - echo ''; - } - echo '' . $method . ''; - echo '' . $fullPath . ''; - echo '' . Library::getClassName($route->class) . ''; - echo ''. $route->function . ''; - echo ''; - } - } - - if(!empty($staticPaths) || !empty($parametricPaths)) { - ksort($staticPaths); - ksort($parametricPaths); - foreach($staticPaths as $path => $node) { - printRoutesRecursive($codeController, $node, $fullPath . '/' . $path, $omit); - } - foreach($parametricPaths as $path => $node) { - printRoutesRecursive($codeController, $node, $fullPath . '/$' . $path, $omit); - } - } -} -?> \ No newline at end of file diff --git a/recess/recess/apps/tools/views/tests/home.php b/recess/recess/apps/tools/views/tests/home.php deleted file mode 100644 index 475b477..0000000 --- a/recess/recess/apps/tools/views/tests/home.php +++ /dev/null @@ -1,9 +0,0 @@ - - -

    Tests Browser

    - - \ No newline at end of file diff --git a/recess/recess/framework/helpers/Layout.class.php b/recess/recess/framework/helpers/Layout.class.php index 66f942c..283986e 100644 --- a/recess/recess/framework/helpers/Layout.class.php +++ b/recess/recess/framework/helpers/Layout.class.php @@ -14,7 +14,7 @@ class Layout extends AbstractHelper { protected static $app; - public static function init($view) { + public static function init(AbstractView $view) { $response = $view->getResponse(); self::$app = $response->meta->app; } diff --git a/recess/recess/framework/helpers/Part.class.php b/recess/recess/framework/helpers/Part.class.php index ff98f4d..b1f37c5 100644 --- a/recess/recess/framework/helpers/Part.class.php +++ b/recess/recess/framework/helpers/Part.class.php @@ -10,7 +10,7 @@ class Part extends AbstractHelper { protected static $loaded = array(); - public static function init($view) { + public static function init(AbstractView $view) { $response = $view->getResponse(); self::$app = $response->meta->app; }