Projects / lithium_bin

diff --git a/config/bootstrap.php b/config/bootstrap.php index 699851e..09a7504 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -2,16 +2,10 @@ /** * Lithium: the most rad php framework * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ -namespace lithium; - -use \lithium\core\Environment; -use \lithium\core\Libraries; -use \lithium\storage\Session; - /** * This is the path to the class libraries used by your application, and must contain a copy of the * Lithium core. By default, this directory is named 'libraries', and resides in the same @@ -39,48 +33,61 @@ if (!include LITHIUM_LIBRARY_PATH . '/lithium/core/Libraries.php') { } /** - * Add the Lithium core library. This sets default paths and initializes the autoloader. You - * generally should not need to override any settings. + * This file contains the loading instructions for all class libraries used in the application, + * including the Lithium core, and the application itself. These instructions include library names, + * paths to files, and any applicable class-loading rules. Also includes any statically-loaded + * classes to improve bootstrap performance. + */ +require __DIR__ . '/bootstrap/libraries.php'; + +/** + * This file contains configurations for connecting to external caching resources, as well as + * default caching rules for various systems within your application */ -Libraries::add('lithium'); +// require __DIR__ . '/bootstrap/cache.php'; /** - * Optimize default request cycle by loading common classes. If you're implementing custom - * request/response or dispatch classes, you can safely remove these. Actually, you can safely - * remove them anyway, they're just there to give slightly you better out-of-the-box performance. + * This file contains your application's globalization rules, including inflections, + * transliterations, localized validation, and how localized text should be loaded. Uncomment this + * line if you plan to globalize your site. */ -require LITHIUM_LIBRARY_PATH . '/lithium/core/Object.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/core/StaticObject.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/Collection.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/collection/Filters.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/Inflector.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/Set.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/util/String.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/core/Environment.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/http/Base.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/http/Media.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/http/Request.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/http/Response.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/http/Route.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/action/Controller.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/action/Dispatcher.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/action/Request.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/action/Response.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/template/View.php'; -require LITHIUM_LIBRARY_PATH . '/lithium/template/view/Renderer.php'; +// require __DIR__ . '/bootstrap/g11n.php'; /** - * Add the application. You can pass a `'path'` key here if this bootstrap file is outside of - * your main application, but generally you should not need to change any settings. + * This file configures console filters and settings, specifically output behavior and coloring. */ -Libraries::add('app'); +// require __DIR__ . '/bootstrap/console.php'; -Libraries::add('geshi', array( - 'path' => LITHIUM_APP_PATH. '/libraries/geshi', - 'prefix' => 'Geshi', - 'bootstrap' => 'geshi.php' +/** + * This configures your session storage. The Cookie storage adapter must be connected first, since + * it intercepts any writes where the `'expires'` key is set in the options array. When creating a + * new application, it is suggested that you change the value of `'key'` below. + */ +use \lithium\storage\Session; + +Session::config(array( + 'default' => array('adapter' => 'Cookie') )); -Session::config(array('default' => array('adapter' => 'Cookie'))); + +/** + * The `Collection` class, which serves as the base class for some of Lithium's data objects + * (`RecordSet` and `Document`) provides a way to manage data collections in a very flexible and + * intuitive way, using closures and SPL interfaces. The `to()` method allows a `Collection` (or + * subclass) to be converted to another format, such as an array. The `Collection` class also allows + * other classes to be connected as handlers to convert `Collection` objects to other formats. + * + * The following connects the `Media` class as a format handler, which allows `Collection`s to be + * exported to any format with a handler provided by `Media`, i.e. JSON. This enables things like + * the following: + * {{{ + * $posts = Post::find('all'); + * return $posts->to('json'); + * }}} + */ +// use \lithium\util\Collection; +// +// Collection::formats('\lithium\net\http\Media'); + ?> \ No newline at end of file diff --git a/config/bootstrap/cache.php b/config/bootstrap/cache.php new file mode 100644 index 0000000..435ccef --- /dev/null +++ b/config/bootstrap/cache.php @@ -0,0 +1,33 @@ +<?php +/** + * Lithium: the most rad php framework + * + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) + * @license http://opensource.org/licenses/bsd-license.php The BSD License + */ + +use lithium\storage\Cache; +use lithium\storage\cache\adapter\Apc; +use lithium\core\Libraries; +use lithium\action\Dispatcher; + +Cache::config(array( + 'default' => array( + 'adapter' => '\lithium\storage\cache\adapter\\' . (Apc::enabled() ? 'Apc' : 'File') + ) +)); + +Dispatcher::applyFilter('run', function($self, $params, $chain) { + if ($cache = Cache::read('default', 'core.libraryCache')) { + $cache = (array) unserialize($cache) + Libraries::cache(); + Libraries::cache($cache); + } + $result = $chain->next($self, $params, $chain); + + if ($cache != Libraries::cache()) { + Cache::write('default', 'core.libraryCache', serialize(Libraries::cache()), '+1 day'); + } + return $result; +}); + +?> \ No newline at end of file diff --git a/config/bootstrap/console.php b/config/bootstrap/console.php new file mode 100644 index 0000000..e47e2c0 --- /dev/null +++ b/config/bootstrap/console.php @@ -0,0 +1,19 @@ +<?php +/** + * Lithium: the most rad php framework + * + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) + * @license http://opensource.org/licenses/bsd-license.php The BSD License + */ + +use lithium\console\Dispatcher; + +Dispatcher::applyFilter('_call', function($self, $params, $chain) { + $params['callable']->response->styles(array( + 'heading' => '\033[1;30;46m' + )); + return $chain->next($self, $params, $chain); +}); + + +?> \ No newline at end of file diff --git a/config/bootstrap/g11n.php b/config/bootstrap/g11n.php new file mode 100644 index 0000000..2f10e11 --- /dev/null +++ b/config/bootstrap/g11n.php @@ -0,0 +1,154 @@ +<?php +/** + * Lithium: the most rad php framework + * + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) + * @license http://opensource.org/licenses/bsd-license.php The BSD License + */ + +namespace lithium; + +use \lithium\core\Environment; +use \lithium\g11n\Locale; +use \lithium\g11n\Catalog; +use \lithium\g11n\Message; +use \lithium\util\Inflector; +use \lithium\util\Validator; +use \lithium\net\http\Media; +use \lithium\action\Dispatcher as ActionDispatcher; +use \lithium\console\Dispatcher as ConsoleDispatcher; + +/** + * Sets the default timezone used by all date/time functions. + */ +date_default_timezone_set('UTC'); + +/** + * Adds globalization specific settings to the environment. + * + * The settings for the current locale, time zone and currency are kept as environment + * settings. This allows for _centrally_ switching, _transparently_ setting and retrieving + * globalization related settings. + * + * The environment settings are: + * - `'locale'` The effective locale. Defaults to `'en'`. + * - `'availableLocales'` Application locales available. Defaults to `array('en')`. + */ +Environment::set('production', array( + 'locale' => 'en', + 'availableLocales' => array('en') +)); +Environment::set('development', array( + 'locale' => 'en', + 'availableLocales' => array('en') +)); +Environment::set('test', array( + 'locale' => 'en', + 'availableLocales' => array('en') +)); + +/** + * Globalization (g11n) catalog configuration. The catalog allows for obtaining and + * writing globalized data. Each configuration can be adjusted through the following settings: + * + * - `'adapter' The name of a supported adapter. The builtin adapters are _memory_ (a + * simple adapter good for runtime data and testing), _gettext_, _cldr_ (for + * interfacing with Unicode's common locale data repository) and _code_ (used mainly for + * extracting message templates from source code). + * + * - `'path'` All adapters with the exception of the _memory_ adapter require a directory + * which holds the data. + * + * - `'scope'` If you plan on using scoping i.e. for accessing plugin data separately you + * need to specify a scope for each configuration, except for those using the _memory_, + * _php_ or _gettext_ adapter which handle this internally. + */ +Catalog::config(array( + 'runtime' => array( + 'adapter' => 'Memory' + ), +// 'app' => array( +// 'adapter' => 'Gettext', +// 'path' => LITHIUM_APP_PATH . '/resources/g11n' +// ), + 'lithium' => array( + 'adapter' => 'Php', + 'path' => LITHIUM_LIBRARY_PATH . '/lithium/g11n/resources/php' + ) +)); + +/** + * Globalization runtime data. You can add globalized data during runtime utilizing a + * configuration set up to use the _memory_ adapter. + */ +$data = function($n) { return $n != 1 ? 1 : 0; }; +Catalog::write('message.plural', 'root', $data, array('name' => 'runtime')); + +/** + * Integration with `Inflector`. + */ +// Inflector::rules('transliteration', Catalog::read('inflection.transliteration', 'en')); + +/* + * Inflector configuration examples. If your application has custom singular or plural rules, or + * extra non-ASCII characters to transliterate, you can configure that by uncommenting the lines + * below. + */ +// Inflector::rules('singular', array('rules' => array('/rata/' => '\1ratus'))); +// Inflector::rules('singular', array('irregular' => array('foo' => 'bar'))); +// +// Inflector::rules('plural', array('rules' => array('/rata/' => '\1ratum'))); +// Inflector::rules('plural', array('irregular' => array('bar' => 'foo'))); +// +// Inflector::rules('transliteration', array('/É|Ê/' => 'E')); +// +// Inflector::rules('uninflected', 'bord'); +// Inflector::rules('uninflected', array('bord', 'baird')); + + +/** + * Integration with `View`. Embeds message translation aliases into the `View` + * class (or other content handler, if specified) when content is rendered. This + * enables translation functions, i.e. `<?=$t("Translated content"); ?>`. + */ +Media::applyFilter('_handle', function($self, $params, $chain) { + $params['handler'] += array('outputFilters' => array()); + $params['handler']['outputFilters'] += Message::aliases(); + return $chain->next($self, $params, $chain); +}); + +/** + * Integration with `Validator`. You can load locale dependent rules into the `Validator` + * by specifying them manually or retrieving them with the `Catalog` class. + */ +Validator::add('phone', Catalog::read('validation.phone', 'en_US')); +Validator::add('postalCode', Catalog::read('validation.postalCode', 'en_US')); +Validator::add('ssn', Catalog::read('validation.ssn', 'en_US')); + +/** + * Intercepts dispatching processes in order to set the effective locale by using + * the locale of the request or if that is not available retrieving a locale preferred + * by the client. + */ +ActionDispatcher::applyFilter('_callable', function($self, $params, $chain) { + $request = $params['request']; + $controller = $chain->next($self, $params, $chain); + + if (!$request->locale) { + $request->params['locale'] = Locale::preferred($request); + } + Environment::set(Environment::get(), array('locale' => $request->locale)); + return $controller; +}); +ConsoleDispatcher::applyFilter('_callable', function($self, $params, $chain) { + $request = $params['request']; + $command = $chain->next($self, $params, $chain); + + if (!$request->locale) { + $request->params['locale'] = Locale::preferred($request); + } + Environment::set(Environment::get(), array('locale' => $request->locale)); + return $command; +}); + +?> \ No newline at end of file diff --git a/config/bootstrap/libraries.php b/config/bootstrap/libraries.php new file mode 100644 index 0000000..a96c03b --- /dev/null +++ b/config/bootstrap/libraries.php @@ -0,0 +1,68 @@ +<?php +/** + * Lithium: the most rad php framework + * + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) + * @license http://opensource.org/licenses/bsd-license.php The BSD License + */ + +use lithium\core\Libraries; + +/** + * Optimize default request cycle by loading common classes. If you're implementing custom + * request/response or dispatch classes, you can safely remove these. Actually, you can safely + * remove them anyway, they're just there to give slightly you better out-of-the-box performance. + */ +require LITHIUM_LIBRARY_PATH . '/lithium/core/Object.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/core/StaticObject.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/util/Collection.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/util/collection/Filters.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/util/Inflector.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/util/String.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/core/Adaptable.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/core/Environment.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Base.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Media.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Request.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Response.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Route.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/net/http/Router.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/action/Controller.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/action/Dispatcher.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/action/Request.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/action/Response.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/template/View.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/template/view/Renderer.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/template/view/Compiler.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/template/view/adapter/File.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/storage/Cache.php'; +require LITHIUM_LIBRARY_PATH . '/lithium/storage/cache/adapter/Apc.php'; + +/** + * Add the Lithium core library. This sets default paths and initializes the autoloader. You + * generally should not need to override any settings. + */ +Libraries::add('lithium'); + +/** + * Add the application. You can pass a `'path'` key here if this bootstrap file is outside of + * your main application, but generally you should not need to change any settings. + */ +Libraries::add('app'); + +/** + * Add some plugins + */ +// Libraries::add('plugin', 'li3_docs'); + +/** + * Adding extra libraries + * + */ +Libraries::add('geshi', array( + 'path' => LITHIUM_APP_PATH. '/libraries/geshi', + 'prefix' => 'Geshi', + 'bootstrap' => 'geshi.php' +)); + +?> \ No newline at end of file diff --git a/config/connections.php b/config/connections.php index 267290c..a83051f 100644 --- a/config/connections.php +++ b/config/connections.php @@ -2,7 +2,7 @@ /** * Lithium: the most rad php framework * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ diff --git a/config/routes.php b/config/routes.php index b2652b7..7ea4da8 100644 --- a/config/routes.php +++ b/config/routes.php @@ -2,11 +2,11 @@ /** * Lithium: the most rad php framework * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ -use \lithium\http\Router; +use \lithium\net\http\Router; Router::connect('/', array('controller' => 'pastes', 'action' => 'add')); diff --git a/config/switchboard.php b/config/switchboard.php index cde27f1..412da90 100644 --- a/config/switchboard.php +++ b/config/switchboard.php @@ -2,7 +2,7 @@ /** * Lithium: the most rad php framework * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ @@ -10,18 +10,18 @@ * Welcome to the switchboard. This file contains a series of method filters that allow you to * intercept different parts of Lithium's request cycle as they happen. You can apply filters to * any object method that has a `@filter` flag in its API documentation. - * + * * When applying a filter, you need the name of the method you want to call, along with a *closure*, * that defines what you want the filter to do. All filters take the same 3 parameters: `$self`, * `$params`, and `$chain`. - * + * * - `$self`: If the filter is applied on an object instance, then `$self` will be that instance. If * applied to a static class, then `$self` will be a string containing the fully-namespaced class * name. - * + * * - `$params`: Contains an associative array of the parameters that are passed into the method. You * can modify or inspect these parameters before allowing the method to continue. - * + * * - `$chain`: Finally, `$chain` contains the list of filters in line to be executed. At the bottom * of `$chain` is the method itself. This is why most filters contain a line that looks like * `return $chain->next($self, $params, $chain);`. This passes control to the next filter in the @@ -35,7 +35,7 @@ use \lithium\action\Dispatcher; /** * Loads application routes before the request is dispatched. Change this to `include_once` if * more than one request cycle is executed per HTTP request. - * + * * @see lithium\http\Router */ Dispatcher::applyFilter('run', function($self, $params, $chain) { @@ -46,7 +46,7 @@ Dispatcher::applyFilter('run', function($self, $params, $chain) { /** * Intercepts the `Dispatcher` as it finds a controller object, and passes the `'request'` parameter * to the `Environment` class to detect which environment the application is running in. - * + * * @see lithium\action\Request * @see lithium\core\Environment */ diff --git a/controllers/PastesController.php b/controllers/PastesController.php index ed844fe..d34f2ff 100644 --- a/controllers/PastesController.php +++ b/controllers/PastesController.php @@ -1,4 +1,10 @@ <?php +/** + * Lithium: the most rad php framework + * + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) + * @license http://opensource.org/licenses/bsd-license.php The BSD License + */ namespace app\controllers; diff --git a/index.php b/index.php index f19ecfe..4718294 100644 --- a/index.php +++ b/index.php @@ -1,12 +1,8 @@ <?php /** * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ diff --git a/resources/tmp/cache/templates/empty b/resources/tmp/cache/templates/empty new file mode 100644 index 0000000..e69de29 diff --git a/views/layouts/default.ajax.php b/views/layouts/default.ajax.php deleted file mode 100644 index f0aa163..0000000 --- a/views/layouts/default.ajax.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/** - * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * @license http://opensource.org/licenses/bsd-license.php The BSD License - */ - -echo $content_for_layout; - -?> \ No newline at end of file diff --git a/views/layouts/default.email.html.php b/views/layouts/default.email.html.php deleted file mode 100644 index e4e07a6..0000000 --- a/views/layouts/default.email.html.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * @license http://opensource.org/licenses/bsd-license.php The BSD License - */ -?> -<!doctype html> - -<html> -<head> - <title><?=$this->title; ?></title> -</head> -<body> - <?php echo $this->content; ?> -</body> -</html> \ No newline at end of file diff --git a/views/layouts/default.email.txt.php b/views/layouts/default.email.txt.php deleted file mode 100644 index f0aa163..0000000 --- a/views/layouts/default.email.txt.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/** - * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * @license http://opensource.org/licenses/bsd-license.php The BSD License - */ - -echo $content_for_layout; - -?> \ No newline at end of file diff --git a/views/layouts/default.html.php b/views/layouts/default.html.php index 98c4d56..2086815 100644 --- a/views/layouts/default.html.php +++ b/views/layouts/default.html.php @@ -1,12 +1,8 @@ <?php /** * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ ?> diff --git a/views/layouts/default.xml.php b/views/layouts/default.xml.php deleted file mode 100644 index a2a6809..0000000 --- a/views/layouts/default.xml.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -/** - * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * @license http://opensource.org/licenses/bsd-license.php The BSD License - */ -?> -<?php echo $xml->header(); ?> -<?=$content_for_layout; ?> \ No newline at end of file diff --git a/views/layouts/flash.html.php b/views/layouts/flash.html.php deleted file mode 100644 index 5931844..0000000 --- a/views/layouts/flash.html.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -/** - * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) - * @license http://opensource.org/licenses/bsd-license.php The BSD License - */ - -use \lithium\core\Environment; - -?> -<!doctype html> -<html> -<head> - <?php echo $this->html->charset(); ?> - <title><?php echo $page_title; ?></title> - <?php if (Environment::is('production')) { ?> - <meta http-equiv="Refresh" content="<?=$pause?>;url=<?=$url?>"/> - <?php } ?> - <style> - p { text-align:center; font:bold 1.1em sans-serif } - a { color:#444; text-decoration: none } - a:hover { text-decoration: underline; color: #44E } - </style> -</head> -<body> - <p><a href="<?=$url; ?>"><?=$message; ?></a></p> -</body> -</html> \ No newline at end of file diff --git a/views/pages/home.html.php b/views/pages/home.html.php index ca67a74..c89704f 100644 --- a/views/pages/home.html.php +++ b/views/pages/home.html.php @@ -1,12 +1,8 @@ <?php /** * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ ?> diff --git a/views/pastes/form.html.php b/views/pastes/form.html.php index a5ffb39..35e0cec 100644 --- a/views/pastes/form.html.php +++ b/views/pastes/form.html.php @@ -1,4 +1,4 @@ -<?php +<?php echo $this->form->create($paste, array('url' => $url, 'method' => 'POST')); $errors = $paste->errors(); diff --git a/webroot/css/base.css b/webroot/css/base.css index b1f7c12..a33ff5e 100644 --- a/webroot/css/base.css +++ b/webroot/css/base.css @@ -1,14 +1,9 @@ /** * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ - * { margin: 0; padding: 0; diff --git a/webroot/css/debug.css b/webroot/css/debug.css index 9d163b7..4a583b1 100644 --- a/webroot/css/debug.css +++ b/webroot/css/debug.css @@ -1,11 +1,7 @@ /** * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ * { diff --git a/webroot/index.php b/webroot/index.php index b9ed30e..99026aa 100644 --- a/webroot/index.php +++ b/webroot/index.php @@ -1,17 +1,12 @@ <?php /** * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ - /** - * Welcome to Lithium 3! This front-controller file is the gateway to your application. It is + * Welcome to Lithium! This front-controller file is the gateway to your application. It is * responsible for intercepting requests, and handing them off to the Dispatcher for processing. * * If you're sharing a single Lithium core install or other libraries among multiple