adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring Helper class and adding tags.php as a var.

Browse source 
Removing old /config/tags.php

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3890 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-11-22 03:16:34 +00:00
parent 95c919a7a5
commit 204ff6bcbb
4 changed files with 49 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cake/bootstrap.php
View file

@ -41,7 +41,6 @@ if (!defined('PHP5')) {
require LIBS . 'object.php'; require LIBS . 'object.php';
require LIBS . 'session.php'; require LIBS . 'session.php';
require LIBS . 'security.php'; require LIBS . 'security.php';
//require LIBS . 'neat_array.php';
require LIBS . 'inflector.php'; require LIBS . 'inflector.php';
require LIBS . 'configure.php'; require LIBS . 'configure.php';
$paths = Configure::getInstance(); $paths = Configure::getInstance();
@ -105,13 +104,7 @@ if (!defined('PHP5')) {
} }
require CAKE . 'dispatcher.php'; require CAKE . 'dispatcher.php';
//require LIBS . 'model' . DS . 'connection_manager.php';
//config('database');
//if (!class_exists('AppModel')) {
// require LIBS . 'model' . DS . 'model.php';
// loadModels();
//}
if (defined('CACHE_CHECK') && CACHE_CHECK === true) { if (defined('CACHE_CHECK') && CACHE_CHECK === true) {
if (empty($uri)) { if (empty($uri)) {
$uri = setUri(); $uri = setUri();

146
cake/config/tags.php
View file

@ -1,146 +0,0 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
*
* In this file, you can set up 'templates' for every tag generated by the tag
* generator.
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
* Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
* @since CakePHP v 0.2.9
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
$tags = array(
// Tag template for a link tag.
'metalink' => '<link href="%s" title="%s"%s />',
// Tag template for a link.
'link' => '<a href="%s" %s>%s</a>',
// Tag template for a mailto: link.
'mailto' => '<a href="mailto:%s" %s>%s</a>',
// Tag template for opening form tag.
'form' => '<form %s>',
// Tag template for an input type='text' tag.
'input' => '<input name="data[%s][%s]" %s/>',
// Tag template for an input type='textarea' tag
'textarea' => '<textarea name="data[%s][%s]" %s>%s</textarea>',
// Tag template for an input type='hidden' tag.
'hidden' => '<input type="hidden" name="data[%s][%s]" %s/>',
// Tag template for a textarea tag.
'textarea' => '<textarea name="data[%s][%s]" %s>%s</textarea>',
// Tag template for a input type='checkbox ' tag.
'checkbox' => '<input type="checkbox" name="data[%s][%s]" %s/>',
// Tag template for a input type='radio' tag.
'radio' => '<input type="radio" name="data[%s][%s]" id="%s" %s />%s',
// Tag template for a select opening tag.
'selectstart' => '<select name="data[%s][%s]" %s>',
// Tag template for a select opening tag.
'selectmultiplestart' => '<select name="data[%s][%s][]" %s>',
// Tag template for an empty select option tag.
'selectempty' => '<option value="" %s>&nbsp;</option>',
// Tag template for a select option tag.
'selectoption' => '<option value="%s" %s>%s</option>',
// Tag template for a closing select tag.
'selectend' => '</select>',
// Tag template for a option group tag.
'optiongroup' => '<optgroup label="%s"%s>',
'optiongroupend' => '</optgroup>',
// Tag template for a password tag.
'password' => '<input type="password" name="data[%s][%s]" %s/>',
// Tag template for a file input tag.
'file' => '<input type="file" name="data[%s][%s]" %s/>',
// Tag template for a file input tag with no associated model.
'file_no_model' => '<input type="file" name="%s" %s/>',
// Tag template for a submit button tag.
'submit' => '<input type="submit" %s/>',
// Tag template for a image input tag.
'submitimage' => '<input type="image" src="%s" %s/>',
// Tag template for an image tag.
'image' => '<img src="%s" %s/>',
// Tag template for a table header tag.
'tableheader' => '<th%s>%s</th>',
// Tag template for table headers row tag.
'tableheaderrow' => '<tr%s>%s</tr>',
// Tag template for a table cell tag.
'tablecell' => '<td%s>%s</td>',
// Tag template for a table row tag.
'tablerow' => '<tr%s>%s</tr>',
// Tag templates for a block-level element (DIV).
'block' => '<div%s>%s</div>',
'blockstart' => '<div%s>',
'blockend' => '</div>',
// Tag templates for a paragraph element.
'para' => '<p%s>%s</p>',
'parastart' => '<p%s>',
// Tag templates for a label element.
'label' => '<label for="%s"%s>%s</label>',
// Tag templates for fieldset and legend element.
'fieldset' => '<fieldset><legend>%s</legend>%s</fieldset>',
'fieldsetstart' => '<fieldset><legend>%s</legend>',
'fieldsetend' => '</fieldset>',
'legend' => '<legend>%s</legend>',
// Tag template for a CSS link tag.
'css' => '<link rel="%s" type="text/css" href="%s" %s/>',
// Tag template for a CSS tag block.
'style' => '<style type="text/css"%s>%s</style>',
// Tag template for a charset meta-tag.
'charset' => '<meta http-equiv="Content-Type" content="text/html; charset=%s" />',
// Tag template for inline JavaScript.
'javascriptblock' => '<script type="text/javascript">%s</script>',
'javascriptstart' => '<script type="text/javascript">',
// Tag template for included JavaScript.
'javascriptlink' => '<script type="text/javascript" src="%s"></script>'
);

52
cake/libs/view/helper.php
View file

@ -79,21 +79,61 @@ class Helper extends Overloadable {
* @access public * @access public
* @var array * @var array
*/ */
var $tags = array(); var $tags = array('metalink' => '<link href="%s" title="%s"%s />',
'link' => '<a href="%s" %s>%s</a>',
'mailto' => '<a href="mailto:%s" %s>%s</a>',
'form' => '<form %s>',
'input' => '<input name="data[%s][%s]" %s/>',
'textarea' => '<textarea name="data[%s][%s]" %s>%s</textarea>',
'hidden' => '<input type="hidden" name="data[%s][%s]" %s/>',
'textarea' => '<textarea name="data[%s][%s]" %s>%s</textarea>',
'checkbox' => '<input type="checkbox" name="data[%s][%s]" %s/>',
'radio' => '<input type="radio" name="data[%s][%s]" id="%s" %s />%s',
'selectstart' => '<select name="data[%s][%s]" %s>',
'selectmultiplestart' => '<select name="data[%s][%s][]" %s>',
'selectempty' => '<option value="" %s>&nbsp;</option>',
'selectoption' => '<option value="%s" %s>%s</option>',
'selectend' => '</select>',
'optiongroup' => '<optgroup label="%s"%s>',
'optiongroupend' => '</optgroup>',
'password' => '<input type="password" name="data[%s][%s]" %s/>',
'file' => '<input type="file" name="data[%s][%s]" %s/>',
'file_no_model' => '<input type="file" name="%s" %s/>',
'submit' => '<input type="submit" %s/>',
'submitimage' => '<input type="image" src="%s" %s/>',
'image' => '<img src="%s" %s/>',
'tableheader' => '<th%s>%s</th>',
'tableheaderrow' => '<tr%s>%s</tr>',
'tablecell' => '<td%s>%s</td>',
'tablerow' => '<tr%s>%s</tr>',
'block' => '<div%s>%s</div>',
'blockstart' => '<div%s>',
'blockend' => '</div>',
'para' => '<p%s>%s</p>',
'parastart' => '<p%s>',
'label' => '<label for="%s"%s>%s</label>',
'fieldset' => '<fieldset><legend>%s</legend>%s</fieldset>',
'fieldsetstart' => '<fieldset><legend>%s</legend>',
'fieldsetend' => '</fieldset>',
'legend' => '<legend>%s</legend>',
'css' => '<link rel="%s" type="text/css" href="%s" %s/>',
'style' => '<style type="text/css"%s>%s</style>',
'charset' => '<meta http-equiv="Content-Type" content="text/html; charset=%s" />',
'javascriptblock' => '<script type="text/javascript">%s</script>',
'javascriptstart' => '<script type="text/javascript">',
'javascriptlink' => '<script type="text/javascript" src="%s"></script>');
/** /**
* Parses tag templates into $this->tags. * Parses tag templates into $this->tags.
* *
* @return void * @return void
*/ */
function loadConfig() { function loadConfig() {
require(CAKE . 'config' . DS . 'tags.php');
$cakeConfig = $tags;
if (file_exists(APP . 'config' . DS . 'tags.ini.php')) { if (file_exists(APP . 'config' . DS . 'tags.ini.php')) {
$appConfig = $this->readConfigFile(APP . 'config' . DS . 'tags.ini.php'); $appConfig = $this->readConfigFile(APP . 'config' . DS . 'tags.ini.php');
$cakeConfig = am($cakeConfig, $appConfig); $this->tags = am($this->tags, $appConfig);
} }
return $cakeConfig; return $this->tags;
} }
/** /**
* Finds URL for specified action. * Finds URL for specified action.

6
cake/libs/view/view.php
View file

@ -783,9 +783,9 @@ class View extends Object {
$camelBackedHelper = Inflector::variable($helper); $camelBackedHelper = Inflector::variable($helper);
${$camelBackedHelper} =& new $helperCn; ${$camelBackedHelper} =& new $helperCn();
${$camelBackedHelper}->view =& $this; ${$camelBackedHelper}->view =& $this;
${$camelBackedHelper}->tags = $tags; //${$camelBackedHelper}->tags = $tags;
$vars = array('base', 'webroot', 'here', 'params', 'action', 'data', 'themeWeb', 'plugin', 'namedArgs', 'argSeparator'); $vars = array('base', 'webroot', 'here', 'params', 'action', 'data', 'themeWeb', 'plugin', 'namedArgs', 'argSeparator');
$c = count($vars); $c = count($vars);