jimeh/zynapse
1
0
Fork 0
mirror of https://github.com/jimeh/zynapse.git synced 2026-02-19 07:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved the main path config's out of ActionEnvironment and into ActionBase where they make more sense to be.

Browse Source
This commit is contained in:
Jim Myhrberg
2009-08-16 02:02:27 +03:00
parent d6c6f19648
commit e610d719b1
3 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
vendor/zynapse/action_base.php vendored
View File

@@ -32,6 +32,38 @@
class ActionBase {
public
# components
$env, // ActionEnvironment
$view, // ActionView
$locale, // ActionLocale
$log, // ActionLog
# paths
$apps_path,
$lib_path,
$log_path,
$public_path,
$tmp_path,
$cache_path,
$script_path;
function __construct () {
$this->set_paths();
}
function set_paths () {
$this->apps_path = ZNAP_ROOT . "/apps";
$this->lib_path = ZNAP_ROOT . "/lib";
$this->log_path = ZNAP_ROOT . "/log";
$this->public_path = ZNAP_ROOT . "/public";
$this->tmp_path = ZNAP_ROOT . "/tmp";
$this->cache_path = $this->tmp_path . "/log";
$this->script_path = ZNAP_ROOT . "/script";
}
}

23
vendor/zynapse/action_environment.php vendored
View File

@@ -54,7 +54,6 @@ class ActionEnvironment {
$path_separator;
function __construct () {
$this->set_paths();
$this->set_include_paths();
$this->load_environment_file();
}
@@ -72,10 +71,6 @@ class ActionEnvironment {
$this->define_constants();
}
function load_environment_specific_file () {
require_once(ZNAP_CONFIG . "/environments/". $this->env . ".php");
}
function load_hosts_file () {
require_once(ZNAP_CONFIG . "/hosts.php");
$host = $this->match_to_host($hosts);
@@ -89,14 +84,8 @@ class ActionEnvironment {
}
}
function set_paths () {
$this->apps_path = ZNAP_ROOT . "/apps";
$this->lib_path = ZNAP_ROOT . "/lib";
$this->log_path = ZNAP_ROOT . "/log";
$this->public_path = ZNAP_ROOT . "/public";
$this->tmp_path = ZNAP_ROOT . "/tmp";
$this->cache_path = $this->tmp_path . "/log";
$this->script_path = ZNAP_ROOT . "/script";
function load_environment_specific_file () {
require_once(ZNAP_CONFIG . "/environments/". $this->env . ".php");
}
function set_include_paths () {
@@ -116,8 +105,12 @@ class ActionEnvironment {
}
function define_constants () {
define("ZNAP_ENV", $this->env);
define("ZNAP_MODE", $this->mode);
if ( !defined("ZNAP_ENV") ) {
define("ZNAP_ENV", $this->env);
}
if ( !defined("ZNAP_MODE") ) {
define("ZNAP_MODE", $this->mode);
}
}
function match_to_host ($list = array()) {

3
vendor/zynapse/zynapse.php vendored
View File

@@ -47,6 +47,9 @@ class Zynapse {
require_once(ZNAP_LIB_ROOT . "/active_session.php");
self::$env = new ActionEnvironment();
self::$base = new ActionBase();
self::$base->env =& self::$env;
echo "hello world<br />\n";
echo self::$env->env;