appflow.dia @@ -91,44 +91,6 @@ abstract class Krai_Db_Handler abstract public function FetchOne(Krai_Db_Query &$qid); /** - * Get the number of rows returned for a query - * - * This function returns the number of rows in the resultset of a query - * - * @param Krai_Db_Query $qid The query - * @return integer The number of rows (-1 for an error) - */ - //abstract public function Rows(Krai_Db_Query $qid); - - /** - * Get the error from a query - * - * This function returns the error information associated with a query. - * - * @param Krai_Db_Query $qid The query - * @param string $ret The error format - */ - //abstract public function Error(Krai_Db_Query $qid, $ret); - - /** - * Return the number of rows affected by the last query - * - * This function returns the number of rows affected by a query - * - * @param Krai_Db_Query $qid The query - */ - //abstract public function Affected(Krai_Db_Query $qid); - - /** - * Return the last inserted id - * - * This function returns the last insert id of the query - * - * @param Krai_Db_Query $qid The query - */ - //abstract public function Inserted(Krai_Db_Query $qid); - - /** * Process a query struct according to its type. * * This function processes a query struct in the proper format for the database Krai/Db/Handler.php @@ -164,11 +164,6 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler Krai::WriteLog($sql_real. ":: ".($tstop - $tstart)."s", Krai::LOG_DEBUG, array("sql")); - /*if(!$query) - { - throw new Krai_Db_Exception($this->error("text").$this->error("number")); - }*/ - return new Krai_Db_Query($query, array( "affected" => ($querytype != "select" && $querytype != "transaction") ? $this->_dbc->affected_rows : null, "insertid" => ($querytype == "insert") ? $this->_dbc->insert_id : null, @@ -292,58 +287,6 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler return $row[0]; } - /*public function Error(Krai_Db_Query $qid, $ret) - { - if($ret == "text") - { - return $this->_dbc->error; - } - elseif($ret == "number") - { - return $this->_dbc->errno; - } - elseif($ret == "array") - { - return array($this->_dbc->error, $this->_dbc->errno); - } - else - { - throw new Krai_Db_Exception("Un-recognized return type option passed to Krai_DbMysql::Error."); - } - }*/ - - /*public function Affected(Krai_Db_Query $qid) - { - $d = $qid->GetQuery(); - if(is_array($d)) - { - return $d[1]; - } - }*/ - - /*public function Inserted(Krai_Db_Query $qid) - { - $d = $qid->GetQuery(); - if(is_array($d)) - { - return $d[2]; - } - }*/ - - /*public function Result(Krai_Db_Query $qid) - { - $d = $qid->GetQuery(); - if(is_array($d)) - { - return $d[0]; - } - }*/ - - /*public function Rows(Krai_Db_Query $qid) - { - return $qid->num_rows; - }*/ - /** * Escape the parameter so it is safe to insert into a query * Krai/Db/Handler/Mysql.php @@ -11,10 +11,6 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -/*Krai::Uses( - Krai::$FRAMEWORK."/Db/Querypdo.php" -);*/ - /** * PDO database handler * @@ -283,46 +279,6 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler return $row[0]; } - /*public function Rows(Krai_Db_Query $qid) - { - return $qid->NumRows(); - }*/ - - /*public function Error(Krai_Db_Query $qid, $ret) - { - $stmt = $qid->GetQuery(); - $einfo = $stmt->errorInfo(); - $einfo = (count($einfo) > 0) ? $einfo : $this->_dbc->errorInfo(); - - if($ret == "text") - { - return array_key_exists(2, $einfo) ? $einfo[2] : "Unknown error."; - } - elseif($ret == "number") - { - return array_key_exists(0, $einfo) ? $einfo[0] : "Unknown error."; - } - elseif($ret == "array") - { - return array(array_key_exists(2, $einfo) ? $einfo[2] : "Unknown error.", array_key_exists(1, $einfo) ? $einfo[1] : "Unknown error."); - } - else - { - throw new Krai_Db_Exception("Un-recognized return type option passed to Krai_Db_Handler_Pdo::Error."); - } - }*/ - - /*public function Affected(Krai_Db_Query $qid) - { - $stmt = $qid->GetQuery(); - return $stmt->rowCount(); - }*/ - - /*public function Inserted(Krai_Db_Query $qid) - { - return $this->_dbc->lastInsertId(); - }*/ - /** * Generates DSN strings for a variety of databases from the $dbinfo * Krai/Db/Handler/Pdo.php @@ -93,10 +93,6 @@ abstract class Krai_Module extends Krai } catch(Krai_Module_Exception_Adone $e) { - if($e->getCode() == Krai_Module_Exception_Adone::Rendered) - { - $actioninst->AfterRender(); - } $actioninst->AfterFilters(); $this->AfterFilters(); Krai/Module.php @@ -196,6 +196,8 @@ abstract class Krai_Module_Action extends Krai include $_file; } + $this->AfterRender(); + throw new Krai_Module_Exception_Adone(Krai_Module_Exception_Adone::Rendered); } @@ -304,6 +306,8 @@ abstract class Krai_Module_Action extends Krai echo $_text; } + $this->AfterRender(); + throw new Krai_Module_Exception_Adone(Krai_Module_Exception_Adone::Rendered); } Krai/Module/Action.php @@ -133,7 +133,7 @@ class UserModule_EditAction extends Krai_Module_Action "An e-mail change request has been initiated for the ".Krai::GetConfig("SYSTEM_NAME"). "To activate the new e-mail, please go to the following URL.\n". "If you did NOT request this e-mail change, please do not visit the link.\n\n". - "http://".Krai::GetConfig("DOMAIN").self::$ROUTER->UrlFor("user","confirm",array("id" => $this->_parent->USER->user_id,"code" => $thecode,"type"=>"email"), false)."\n\n"; + Krai::GetConfig("ROOTURL").self::$ROUTER->UrlFor("user","confirm",array("id" => $this->_parent->USER->user_id,"code" => $thecode,"type"=>"email"), false)."\n\n"; if(Krai_Mail::Send($mail)) { self::Notice("An e-mail confirmation was sent to the new address for your requested e-mail change."); script/demo/includes/modules/user.module/actions/edit.action.php @@ -1,20 +1,71 @@ <?xml version="1.0"?> <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <refentry id="{@id framework}"> - <refnamediv> - <refname>Krai Manual</refname> - <refpurpose>This manual provides examples and explanations for functionality in the Krai Framework PHP application framework.</refpurpose> - </refnamediv> - <refsynopsisdiv> - <author>Greg McWhirter - <authorblurb> - {@link mailto:gsmcwhirter@gmail.com Greg McWhirter} - </authorblurb> - </author> - </refsynopsisdiv> - {@toc} - <refsect1 id="{@id framework_intro}"> - <title>Introduction</title> - <para>The user manual and whatnot.</para> - </refsect1> + <refnamediv> + <refname>Krai Manual</refname> + <refpurpose>This manual provides examples and explanations for functionality in the Krai Framework PHP application framework.</refpurpose> + </refnamediv> + <refsynopsisdiv> + <author>Greg McWhirter + <authorblurb>{@link mailto:gsmcwhirter@gmail.com Greg McWhirter}</authorblurb> + </author> + </refsynopsisdiv> + {@toc} + <refsect1 id="{@id framework_intro}"> + <title>Introduction</title> + <para> + + </para> + <refsect2 id="{@id framework_intro_whatis}"> + <title>What is Krai Framework?</title> + <para> + Krai Framework is a {@link http://www.php.net PHP} application + framework specifically for PHP5. The intention is to abstract from + the most nitty-gritty details of developing a web application in + order to focus on functionality and presentation. + </para> + <para> + Krai Framework started life as KvFramework 2.0 beta, which was also + being developed by the same person. The change of names occurred in + order to provide a concise naming scheme when the framework was + converted into a (nominally) {@link http://pear.php.net PEAR} + compatible format. + </para> + </refsect2> + <refsect2 id="{@id framework_intro_devs}"> + <title>The Developers</title> + <para> + Krai Framework currently has a single developer by the name of Greg + McWhirter. He is a graduate student in Logic and the Philosophy of + Science at UC Irvine and a long-time hobbyist programmer. This is + actually the third framework he has developed, but the first that + has been publically released. + </para> + </refsect2> + <refsect2 id="{@id framework_intro_tech}"> + <title>The Technology</title> + <para> + Krai Framework is developed for PHP5 and MySQL mainly, though some + support is available in an alpha state for other databases through + {@link http://www.php.net/pdo PDO}. It is entirely object oriented. + </para> + </refsect2> + </refsect1> + <refsect1 id="{@id framework_intro_phil}"> + <title>Philosophy</title> + <para> + The developer was inspired by having developed applications using + frameworks such as Ruby on Rails. Such frameworks were easy to + develop in, but they seemed a bit too tied to certain libraries. + Additionally, database support was usually too rigid to easily + execute complex queries with a minimum of extraneous data returned. + </para> + <para> + As such, Krai Framework is intended to be a lightweight framework, + trying to provide a framework that changes some of those things. + While providing a core that allows for the development of + applications without the worry of low-level details, it still + provides extreme flexibility for developers. + </para> + </refsect1> </refentry> tutorials/Krai/Krai.pkg @@ -1,12 +1,11 @@ -[Linked Tutorials] -Base +[Linked Tutorials] Cache -Config -Db -Lib -Log -Mail -Markup -Module +Config +Db +Lib +Log +Mail +Markup +Module Router Struct tutorials/Krai/Krai.pkg.ini tutorials/Krai/Base.pkg 8b2ee879d8f210bb56aafe3a295d41446e84c3fb Greg McWhirter greg@hallofkvasir.org http://github.com/gsmcwhirter/krai/commit/ff9f5655b9e7ea141c0fe4c8f1e9e6d14624c54d ff9f5655b9e7ea141c0fe4c8f1e9e6d14624c54d 2008-07-23T17:49:23-07:00 2008-07-23T17:49:23-07:00 Update ff1440e264f873fc2958768bcc241fc5e2436708 Greg McWhirter greg@hallofkvasir.org