natalie/haplousframework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updating framework

Browse Source
This commit is contained in:
Nathan Adams 2014-04-27 21:05:19 -05:00
parent a7c962462d
commit 9eca035c3f
5 changed files with 61 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
system/engine/config-default.php
View File

@ -10,5 +10,6 @@ $config["SMTP_FROM"] = "HF-noreply@yoursite.com";
$config["DEBUG"] = true;
$config["USE_HF_SMTP"] = true;
$config["SITE_NAME"] = "default";
$config["SITE_URL"] = "";
return $config;

6
system/engine/controller.php
View File

@ -12,4 +12,10 @@ class HF_Controller
$this->core = $core;
}
public function loadRender($template, $parameters=array())
{
$this->tpl->loadTemplate($template);
return $this->tpl->render($parameters);
}
}

55
system/engine/core.php
View File

@ -23,27 +23,60 @@ class HF_Core
$this->config = array_merge($config, $newconfig);
if ($this->config["USE_H20_TPL"])
$this->tpl = new H2o(null, array(
"searchpath" => getcwd() . "/application/views/", "cache_dir" => "application/tmp/",
"searchpath" => getcwd() . "/application/views/",
"cache_dir" => "application/tmp/",
'cache' => 'file'
));
set_error_handler("HF_Core::error_handler");
$this->findController();
}
public function siteURL()
{
if (isvarset($this->config["SITE_URL"]))
{
return $this->config["SITE_URL"];
}
$path = explode("/", $_SERVER["REQUEST_URI"]);
$path = array_filter($path, 'strlen');
if (count($path) == 0)
{
return $_SERVER["HTTP_HOST"] . "/";
} else {
if (in_array($this->classname, $path))
{
$newpath = implode("/", array_splice($path, 0, -2));
return $_SERVER["HTTP_HOST"] . "/" . $newpath . "/";
} else {
$newpath = implode("/", $path);
return $_SERVER["HTTP_HOST"] . "/" . $newpath . "/";
}
}
}
private function findController()
{
try
{
$request = $_SERVER["PHP_SELF"];
$splitreq = explode("/", $request);
$request = "";
for($i = 0; $i < count($splitreq); $i++)
if (isvarset($_SERVER["PATH_INFO"]))
{
if ($splitreq[$i] == "index.php")
$request = $_SERVER["PATH_INFO"];
//$request = $_SERVER["PHP_SELF"];
$splitreq = explode("/", $request);
/*$request = "";
for($i = 0; $i < count($splitreq); $i++)
{
$request = implode("/", array_splice($splitreq, $i+1));
}
if ($splitreq[$i] == "index.php")
{
$request = implode("/", array_splice($splitreq, $i+1));
}
}*/
//print $request;
//$request = substr($request, 1);
//$request = substr($request, 0, -1);
} else {
$request = "";
}
if ($request == "" || $request == "/")
{
require("application/controllers/" . $this->config["DEFAULT_ROUTE"] . ".php");
@ -74,7 +107,9 @@ class HF_Core
continue;
}
$this->load404Controller();
include($path . $this->config["DEFAULT_ROUTE"] . ".php");
$this->loadController(new $this->config["DEFAULT_ROUTE"]($this->config, $this, $this->tpl), $this->config["DEFAULT_ROUTE"], "index");
//$this->load404Controller();
break;
// throw exception controller not found
}

3
system/vendor/StackTracePrint.php vendored
View File

@ -19,6 +19,9 @@ function vdump() {
foreach ($args as $arg)
var_dump($arg);
var_dump($_SERVER);
var_dump($_COOKIE);
$str = ob_get_contents();
ob_end_clean();

6
system/vendor/isvarset.php vendored Normal file
View File

@ -0,0 +1,6 @@
<?php
function isvarset(&$var)
{
return (isset($var) && (!empty($var) || is_numeric($var))) ? true : false;
}