@@ -148,9 +148,6 @@ # <Session> require_once INCLUDES_DIR."/class/Session.php"; - if (!JAVASCRIPT) - session(); - # File: Flash # See Also: # <Flash> @@ -205,13 +202,17 @@ # <Feather> require_once INCLUDES_DIR."/interface/Feather.php"; + session(); timer_start(); + set_locale($config->locale); $flash = Flash::current(); - set_locale($config->locale); - - # Require feathers/modules and load their translations. + /** + * Array: $feathers + * Contains all of the enabled Feather's Classes. + */ + $feathers = array(); foreach ($config->enabled_feathers as $index => $feather) { if (!file_exists(FEATHERS_DIR."/".$feather."/".$feather.".php")) { unset($config->enabled_feathers[$index]); @@ -222,8 +223,26 @@ load_translator($feather, FEATHERS_DIR."/".$feather."/locale/".$config->locale.".mo"); require FEATHERS_DIR."/".$feather."/".$feather.".php"; + + $camelized = camelize($feather); + if (!class_exists($camelized)) + continue; + + $feathers[$feather] = new $camelized; + $feathers[$feather]->safename = $feather; + + if (!ADMIN and $route->action != "feed") + continue; + + foreach (YAML::load(FEATHERS_DIR."/".$feather."/info.yaml") as $key => $val) + $feathers[$feather]->$key = (is_string($val)) ? __($val, $feather) : $val ; } + /** + * Array: $modules + * Contains all of the enabled Module's Classes. + */ + $modules = array(); foreach ($config->enabled_modules as $index => $module) { if (!file_exists(MODULES_DIR."/".$module."/".$module.".php")) { unset($config->enabled_modules[$index]); @@ -234,11 +253,31 @@ load_translator($module, MODULES_DIR."/".$module."/locale/".$config->locale.".mo"); require MODULES_DIR."/".$module."/".$module.".php"; + + $camelized = camelize($module); + if (!class_exists($camelized)) + continue; + + $modules[$module] = new $camelized; + $modules[$module]->safename = $module; + + if (!ADMIN) + continue; + + foreach (YAML::load(MODULES_DIR."/".$module."/info.yaml") as $key => $val) + $modules[$module]->$key = (is_string($val)) ? __($val, $module) : $val ; } - # Load the /clean/urls into their correct $_GET values. - if (INDEX or ADMIN) - $route->determine_action(); + # Now that they're all instantiated, call __init(). + foreach ($feathers as $feather) + if (method_exists($feather, "__init")) + $feather->__init(); + + foreach ($modules as $module) + if (method_exists($module, "__init")) + $module->__init(); + + $route->determine_action(); # Variable: $visitor # Holds the current user and their group. @@ -251,11 +290,11 @@ $theme = PREVIEWING ? $_GET['theme'] : $config->theme; # Constant: THEME_DIR - # Absolute path to /themes/(current theme) + # Absolute path to /themes/(current/previewed theme) define('THEME_DIR', MAIN_DIR."/themes/".$theme); # Constant: THEME_URL - # URL to /themes/(current theme) + # URL to /themes/(current/previewed theme) define('THEME_URL', $config->chyrp_url."/themes/".$theme); $theme = Theme::current(); @@ -263,56 +302,7 @@ foreach (YAML::load(THEME_DIR."/info.yaml") as $key => $val) $theme->$key = $val; - if (INDEX) - header("Content-type: ".fallback($theme->type, "text/html")."; charset=UTF-8"); - elseif (AJAX) - header("Content-type: text/html; charset=UTF-8"); - - # These are down here so that the modules are - # initialized after the $_GET values are filled. - /** - * Array: $feathers - * Contains all of the enabled Feather's Classes. - */ - $feathers = array(); - foreach ($config->enabled_feathers as $feather) { - $camelized = camelize($feather); - if (!class_exists($camelized)) continue; - - $feathers[$feather] = new $camelized; - $feathers[$feather]->safename = $feather; - - if (!ADMIN and $route->action != "feed") continue; - - foreach (YAML::load(FEATHERS_DIR."/".$feather."/info.yaml") as $key => $val) - $feathers[$feather]->$key = (is_string($val)) ? __($val, $feather) : $val ; - } - - /** - * Array: $modules - * Contains all of the enabled Module's Classes. - */ - $modules = array(); - foreach ($config->enabled_modules as $module) { - $camelized = camelize($module); - if (!class_exists($camelized)) continue; - - $modules[$module] = new $camelized; - $modules[$module]->safename = $module; - - if (!ADMIN) continue; - - foreach (YAML::load(MODULES_DIR."/".$module."/info.yaml") as $key => $val) - $modules[$module]->$key = (is_string($val)) ? __($val, $module) : $val ; - } - - # Now that they're all instantiated, call __init(). - foreach ($feathers as $feather) - if (method_exists($feather, "__init")) - $feather->__init(); - foreach ($modules as $module) - if (method_exists($module, "__init")) - $module->__init(); + header("Content-type: ".(INDEX ? fallback($theme->type, "text/html") : "text/html")."; charset=UTF-8"); if (INDEX) { $route->check_custom_routes(); @@ -322,12 +312,12 @@ $route->check_viewing_page(); $route->check_viewing_post(true); } else { - $route->check_viewing_post(); $route->check_viewing_page(true); + $route->check_viewing_post(); } - } - if (INDEX or ADMIN) + $trigger->call("runtime"); + } elseif (ADMIN) $trigger->call("runtime"); # Array: $statuses @@ -335,6 +325,7 @@ $statuses = array("public"); if (logged_in()) $statuses[] = "registered_only"; + if ($visitor->group()->can("view_private")) $statuses[] = "private"; includes/common.php @@ -223,6 +223,11 @@ fallback($_POST['login']); fallback($_POST['password']); + $trigger = Trigger::current(); + + if ($trigger->exists("authenticate")) + return $trigger->call("authenticate"); + if (!User::authenticate($_POST['login'], md5($_POST['password']))) if (!count(User::find(array("where" => array("login" => $_POST['login']))))) Flash::warning(__("There is no user with that login name.")); includes/controller/Main.php @@ -602,6 +602,9 @@ * * Returns: * A CamelCased string. + * + * See Also: + * <decamelize> */ function camelize($string, $keep_spaces = false) { $lower = strtolower($string); @@ -626,7 +629,7 @@ * A de_camel_cased string. * * See Also: - * <camelize> + * <camelize> */ function decamelize($string) { return strtolower(preg_replace("/([a-z])([A-Z])/", "\\1_\\2", $string)); @@ -1032,6 +1035,11 @@ function cancel_module($target) { $this_disabled = array(); + global $modules; + + if (isset($modules[$target])) + $modules[$target]->cancelled = true; + $config = Config::current(); foreach ($config->enabled_modules as $module) if ($module != $target) includes/helpers.php @@ -219,7 +219,7 @@ $(this).parent().find("ul:first").append(ui.draggable);self.element.data("sortab var self = this; this.interval = window.setInterval(function() { self.checkExpand() }, 400); // this.textarea.keydown(function() { - // self.checkExpand() + // self.checkExpand() // }) }, stopExpand: function() { includes/lib/plugins.js @@ -4,6 +4,7 @@ /** * Class: Group * The Group model. + * * See Also: * <Model> */ includes/model/Group.php @@ -2,6 +2,7 @@ /** * Class: Page * The Page model. + * * See Also: * <Model> */ includes/model/Page.php @@ -2,6 +2,7 @@ /** * Class: Post * The Post model. + * * See Also: * <Model> */ includes/model/Post.php @@ -2,6 +2,7 @@ /** * Class: User * The User model. + * * See Also: * <Model> */ includes/model/User.php @@ -2,6 +2,7 @@ /** * Class: Visitor * The model for the currently browsing <User>. Group falls back to whatever group is set as the "Guest Group". + * * See Also: * <User> */ @@ -15,9 +16,13 @@ * Checks if a valid user is logged in. */ public function __construct() { - if (isset($_SESSION['login']) and isset($_SESSION['password'])) - parent::__construct(null, array("where" => array("login" => $_SESSION['login'], - "password" => $_SESSION['password']))); + $trigger = Trigger::current(); + + if (!$trigger->exists("authenticate") and isset($_SESSION['login']) and isset($_SESSION['password'])) + parent::__construct(null, array("where" => array("login" => $_SESSION['login'], + "password" => $_SESSION['password']))); + + $trigger->filter($this, "visitor"); } /** includes/model/Visitor.php @@ -1,6 +1,16 @@ <?php class Cacher extends Modules { - public function __init() { + static function __install() { + $config = Config::current(); + $config->set("cache_expire", 1800); + } + + static function __uninstall() { + $config = Config::current(); + $config->remove("cache_expire"); + } + + public function prepare() { $this->user = (logged_in()) ? Visitor::current()->login : "guest" ; $this->caches = INCLUDES_DIR."/caches"; $this->path = INCLUDES_DIR."/caches/".sanitize($this->user); @@ -18,18 +28,10 @@ $this->remove_expired(); } - static function __install() { - $config = Config::current(); - $config->set("cache_expire", 1800); - } - - static function __uninstall() { - $config = Config::current(); - $config->remove("cache_expire"); - } - public function runtime() { - if (!file_exists($this->file) or Flash::exists()) + $this->prepare(); + + if ($this->cancelled or !file_exists($this->file) or Flash::exists()) return; $action = Route::current()->action; modules/cacher/cacher.php @@ -2,6 +2,9 @@ /** * Class: Comment * The model for the Comments SQL table. + * + * See Also: + * <Model> */ class Comment extends Model { public $no_results = false; modules/comments/model.Comment.php 7b38ea6d900434a89a0511e2c660bd2d893ab5c8 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/a3d1c5c28f03588ac451190abd4957e766f56a19 a3d1c5c28f03588ac451190abd4957e766f56a19 2008-09-06T12:28:46-07:00 2008-09-06T12:28:46-07:00 * Extensible authentication system. [#135 state:resolved] * Added a "visitor" filter that modifies the Visitor. * If an "authenticate" trigger exists... * Its functionality will be used instead of the standard log-in functionality. * The Visitor::__construct() will not load a User object. * Cleaned up the sequence of execution in common.php. * Visitor, Theme, and Route-parsed URL values are no longer available to __init functions. Use the more appropriate "runtime" trigger instead. * Merged those two feather/module preparing loops into one. * Documentation cleanups. 74490c7f50ceb1fec22f2c327e34497a25995abd Alex Suraci i.am@toogeneric.com