\n";
if ($show_html) $var = str_replace('<', '<', str_replace('>', '>', $var));
@@ -228,21 +241,21 @@ function debug($var = false, $show_html = false)
}
-if (!function_exists('getMicrotime'))
+if (!function_exists('getMicrotime'))
{
/**
* Returns microtime for execution time checking.
*
* @return integer
*/
- function getMicrotime()
+ function getMicrotime()
{
list($usec, $sec) = explode(" ", microtime());
return ((float)$usec + (float)$sec);
}
}
-if (!function_exists('sortByKey'))
+if (!function_exists('sortByKey'))
{
/**
* Sorts given $array by key $sortby.
@@ -253,30 +266,33 @@ if (!function_exists('sortByKey'))
* @param integer $type
* @return mixed
*/
- function sortByKey(&$array, $sortby, $order='asc', $type=SORT_NUMERIC)
- {
- if (!is_array($array))
- return null;
-
- foreach ($array as $key => $val)
- {
- $sa[$key] = $val[$sortby];
- }
-
- $order == 'asc'
- ? asort($sa, $type)
- : arsort($sa, $type);
-
- foreach ($sa as $key=>$val)
- {
- $out[] = $array[$key];
- }
-
- return $out;
- }
+function sortByKey(&$array, $sortby, $order='asc', $type=SORT_NUMERIC)
+{
+ if (!is_array($array))
+ {
+ return null;
+ }
+ foreach ($array as $key => $val)
+ {
+ $sa[$key] = $val[$sortby];
+ }
+ if($order == 'asc')
+ {
+ asort($sa, $type);
+ }
+ else
+ {
+ arsort($sa, $type);
+ }
+ foreach ($sa as $key=>$val)
+ {
+ $out[] = $array[$key];
+ }
+ return $out;
+}
}
-if (!function_exists('array_combine'))
+if (!function_exists('array_combine'))
{
/**
* Combines given identical arrays by using the first array's values as keys,
@@ -286,25 +302,29 @@ if (!function_exists('array_combine'))
* @param array $a2
* @return mixed Outputs either combined array or false.
*/
- function array_combine($a1, $a2)
- {
- $a1 = array_values($a1);
- $a2 = array_values($a2);
- $c1 = count($a1);
- $c2 = count($a2);
+function array_combine($a1, $a2)
+{
+ $a1 = array_values($a1);
+ $a2 = array_values($a2);
+ $c1 = count($a1);
+ $c2 = count($a2);
- if ($c1 != $c2) return false; // different lenghts
- if ($c1 <= 0) return false; // arrays are the same and both are empty
-
- $output = array();
-
- for ($i = 0; $i < $c1; $i++)
- {
- $output[$a1[$i]] = $a2[$i];
- }
-
- return $output;
- }
+ if ($c1 != $c2)
+ {
+ return false; // different lenghts
+ }
+ if ($c1 <= 0)
+ {
+ return false; // arrays are the same and both are empty
+ }
+
+ $output = array();
+ for ($i = 0; $i < $c1; $i++)
+ {
+ $output[$a1[$i]] = $a2[$i];
+ }
+ return $output;
+}
}
/**
@@ -315,10 +335,9 @@ if (!function_exists('array_combine'))
*/
function h($text)
{
- return htmlspecialchars($text);
+ return htmlspecialchars($text);
}
-
/**
* Returns an array of all the given parameters, making parameter lists shorter to write.
*
@@ -326,30 +345,35 @@ function h($text)
*/
function a()
{
- $args = func_get_args();
- return $args;
+ $args = func_get_args();
+ return $args;
}
-
/**
- * Hierarchical arrays.
+ * Hierarchical arrays.
*
* @return array
* @todo Explain this method better.
*/
function ha()
{
- $args = func_get_args();
+ $args = func_get_args();
+ $count = count($args);
- for($l=0 ; $l tags around
+ * Print_r convenience function, which prints out tags around
* the output of given array. Similar to debug().
- *
+ *
* @see debug
* @param array $var
*/
function pr($var)
{
- if(DEBUG > 0)
- {
- echo "";
- print_r($var);
- echo "
";
- }
+ if(DEBUG > 0)
+ {
+ echo "";
+ print_r($var);
+ echo "
";
+ }
}
/**
@@ -386,21 +410,21 @@ function pr($var)
function params($p)
{
- if(!is_array($p) || count($p) == 0)
- {
- return null;
- }
- else
- {
- if(is_array($p[0]) && count($p) == 1)
- {
- return $p[0];
- }
- else
- {
- return $p;
- }
- }
+ if(!is_array($p) || count($p) == 0)
+ {
+ return null;
+ }
+ else
+ {
+ if(is_array($p[0]) && count($p) == 1)
+ {
+ return $p[0];
+ }
+ else
+ {
+ return $p;
+ }
+ }
}
@@ -410,23 +434,23 @@ function params($p)
*
* @return string
*/
- function setUri()
+function setUri()
+{
+ if (isset($_SERVER['REQUEST_URI']))
{
- if (isset($_SERVER['REQUEST_URI']))
+ $uri = $_SERVER['REQUEST_URI'];
+ }
+ else
+ {
+ if (isset($_SERVER['argv']))
{
- $uri = $_SERVER['REQUEST_URI'];
+ $uri = $_SERVER['PHP_SELF'] .'/'. $_SERVER['argv'][0];
}
else
{
- if (isset($_SERVER['argv']))
- {
- $uri = $_SERVER['PHP_SELF'] .'/'. $_SERVER['argv'][0];
- }
- else
- {
- $uri = $_SERVER['PHP_SELF'] .'/'. $_SERVER['QUERY_STRING'];
- }
+ $uri = $_SERVER['PHP_SELF'] .'/'. $_SERVER['QUERY_STRING'];
}
- return $uri;
- }
+ }
+ return $uri;
+}
?>
\ No newline at end of file
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 60692951e..16dcc3dfc 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -32,7 +32,7 @@
/**
* List of helpers to include
*/
-uses('error_messages', 'object', 'router', DS.'controller'.DS.'controller', DS.'controller'.DS.'scaffold');
+uses('error_messages', 'router', DS.'controller'.DS.'controller');
/**
* Dispatcher translates URLs to controller-action-paramter triads.
@@ -78,8 +78,8 @@ class Dispatcher extends Object
* the form of Missing Controllers information. It does the same with Actions (methods of Controllers are called
* Actions).
*
- * @param string $url URL information to work on.
- * @return boolean Success
+ * @param string $url URL information to work on.
+ * @return boolean Success
*/
function dispatch($url, $additionalParams=array())
{
@@ -122,7 +122,7 @@ class Dispatcher extends Object
$ctrlName = Inflector::camelize($params['controller']);
$ctrlClass = $ctrlName.'Controller';
- if (!loadController($params['controller']) || !class_exists($ctrlClass))
+ if (!loadController($params['controller']) || !class_exists($ctrlClass, FALSE))
{
if(preg_match('/([\\.]+)/',$ctrlName))
{
@@ -192,6 +192,7 @@ class Dispatcher extends Object
if((in_array('scaffold', array_keys($classVars))) && ($missingAction === true))
{
+ uses(DS.'controller'.DS.'scaffold');
$scaffolding = new Scaffold($controller, $params);
exit;
}
@@ -234,7 +235,7 @@ class Dispatcher extends Object
/**
* Returns array of GET and POST parameters. GET parameters are taken from given URL.
*
- * @param string $from_url URL to mine for parameter information.
+ * @param string $from_url URL to mine for parameter information.
* @return array Parameters found in POST and GET.
*/
function parseParams($from_url)
@@ -292,7 +293,7 @@ class Dispatcher extends Object
/**
* Returns a base URL.
*
- * @return string Base URL
+ * @return string Base URL
*/
function baseUrl()
{
@@ -360,27 +361,27 @@ class Dispatcher extends Object
/**
* Displays an error page (e.g. 404 Not found).
*
- * @param int $code Error code (e.g. 404)
- * @param string $name Name of the error message (e.g. Not found)
+ * @param int $code Error code (e.g. 404)
+ * @param string $name Name of the error message (e.g. Not found)
* @param string $message
* @return unknown
*/
function error ($code, $name, $message)
- {
+ {
$controller =& new Controller ($this);
$controller->base = $this->base;
$controller->autoLayout = true;
$controller->set(array('code'=>$code, 'name'=>$name, 'message'=>$message));
- $controller->pageTitle = $code.' '. $name;
+ $controller->pageTitle = $code.' '. $name;
return $controller->render('errors/error404');
- }
+ }
/**
* Convenience method to display a 404 page.
*
- * @param string $url URL that spawned this message, to be included in the output.
- * @param string $message Message text for the 404 page.
+ * @param string $url URL that spawned this message, to be included in the output.
+ * @param string $message Message text for the 404 page.
*/
function error404 ($url, $message)
{
diff --git a/cake/libs/bake.php b/cake/libs/bake.php
index 6abfa7087..ce184422a 100644
--- a/cake/libs/bake.php
+++ b/cake/libs/bake.php
@@ -43,53 +43,53 @@ uses('object', 'inflector');
class Bake extends Object
{
- /**
- * Standard input stream (php://stdin).
- *
- * @var resource
- * @access private
- */
+ /**
+ * Standard input stream (php://stdin).
+ *
+ * @var resource
+ * @access private
+ */
var $stdin = null;
- /**
- * Standard output stream (php://stdout).
- *
- * @var resource
- * @access private
- */
+ /**
+ * Standard output stream (php://stdout).
+ *
+ * @var resource
+ * @access private
+ */
var $stdout = null;
- /**
- * Standard error stream (php://stderr).
- *
- * @var resource
- * @access private
- */
+ /**
+ * Standard error stream (php://stderr).
+ *
+ * @var resource
+ * @access private
+ */
var $stderr = null;
- /**
- * Counts actions taken.
- *
- * @var integer
- * @access private
- */
+ /**
+ * Counts actions taken.
+ *
+ * @var integer
+ * @access private
+ */
var $actions = null;
- /**
- * Decides whether to overwrite existing files without asking.
- *
- * @var boolean
- * @access private
- */
+ /**
+ * Decides whether to overwrite existing files without asking.
+ *
+ * @var boolean
+ * @access private
+ */
var $dontAsk = false;
- /**
- * Returns code template for PHP file generator.
- *
- * @param string $type
- * @return string
- * @access private
- */
+ /**
+ * Returns code template for PHP file generator.
+ *
+ * @param string $type
+ * @return string
+ * @access private
+ */
function template ($type)
{
switch ($type)
@@ -103,27 +103,27 @@ class Bake extends Object
class %sTest extends TestCase
{
- var $abc;
+ var $abc;
- // called before the tests
- function setUp()
- {
- $this->abc = new %s ();
- }
+ // called before the tests
+ function setUp()
+ {
+ $this->abc = new %s ();
+ }
- // called after the tests
- function tearDown()
- {
- unset($this->abc);
- }
+ // called after the tests
+ function tearDown()
+ {
+ unset($this->abc);
+ }
/*
- function testFoo ()
- {
- $result = $this->abc->Foo();
- $expected = \'\';
- $this->assertEquals($result, $expected);
- }
+ function testFoo ()
+ {
+ $result = $this->abc->Foo();
+ $expected = \'\';
+ $this->assertEquals($result, $expected);
+ }
*/
}
@@ -133,19 +133,19 @@ class %sTest extends TestCase
}
}
- /**
- * Baker's constructor method. Initialises bakery, and starts production.
- *
- * @param string $type
- * @param array $names
- * @access public
- * @uses Bake::stdin Opens stream for reading.
- * @uses Bake::stdout Opens stream for writing.
- * @uses Bake::stderr Opens stream for writing.
- * @uses Bake::newModel() Depending on the case, can create a new model.
- * @uses Bake::newView() Depending on the case, can create a new view.
- * @uses Bake::newController() Depending on the case, can create a new controller.
- */
+ /**
+ * Baker's constructor method. Initialises bakery, and starts production.
+ *
+ * @param string $type
+ * @param array $names
+ * @access public
+ * @uses Bake::stdin Opens stream for reading.
+ * @uses Bake::stdout Opens stream for writing.
+ * @uses Bake::stderr Opens stream for writing.
+ * @uses Bake::newModel() Depending on the case, can create a new model.
+ * @uses Bake::newView() Depending on the case, can create a new view.
+ * @uses Bake::newController() Depending on the case, can create a new controller.
+ */
function __construct ($type, $names)
{
$this->stdin = fopen('php://stdin', 'r');
@@ -221,19 +221,19 @@ class %sTest extends TestCase
}
}
- /**
- * Creates new view in VIEWS/$controller/ directory.
- *
- * @param string $controller
- * @param string $name
- * @access private
- * @uses Inflector::underscore() Underscores directory's name.
- * @uses Bake::createDir() Creates new directory in views dir, named after the controller.
- * @uses VIEWS
- * @uses Bake::createFile() Creates view file.
- * @uses Bake::template() Collects view template.
- * @uses Bake::actions Adds one action for each run.
- */
+ /**
+ * Creates new view in VIEWS/$controller/ directory.
+ *
+ * @param string $controller
+ * @param string $name
+ * @access private
+ * @uses Inflector::underscore() Underscores directory's name.
+ * @uses Bake::createDir() Creates new directory in views dir, named after the controller.
+ * @uses VIEWS
+ * @uses Bake::createFile() Creates view file.
+ * @uses Bake::template() Collects view template.
+ * @uses Bake::actions Adds one action for each run.
+ */
function newView ($controller, $name)
{
$dir = Inflector::underscore($controller);
@@ -245,20 +245,20 @@ class %sTest extends TestCase
$this->actions++;
}
- /**
- * Creates new controller with defined actions, controller's test and
- * helper with helper's test.
- *
- * @param string $name
- * @param array $actions
- * @access private
- * @uses Inflector::pluralize()
- * @uses Bake::makeController()
- * @uses Bake::makeControllerTest()
- * @uses Bake::makeHelper()
- * @uses Bake::makeHelperTest()
- * @uses Bake::actions Adds one action for each run.
- */
+ /**
+ * Creates new controller with defined actions, controller's test and
+ * helper with helper's test.
+ *
+ * @param string $name
+ * @param array $actions
+ * @access private
+ * @uses Inflector::pluralize()
+ * @uses Bake::makeController()
+ * @uses Bake::makeControllerTest()
+ * @uses Bake::makeHelper()
+ * @uses Bake::makeHelperTest()
+ * @uses Bake::actions Adds one action for each run.
+ */
function newController ($name, $actions=array())
{
$this->makeController($name, $actions);
@@ -268,20 +268,20 @@ class %sTest extends TestCase
$this->actions++;
}
- /**
- * Creates new controller file with defined actions.
- *
- * @param string $name
- * @param array $actions
- * @return boolean
- * @access private
- * @uses Bake::makeControllerName() CamelCase for controller's name.
- * @uses Bake::makeHelperName() CamelCase for helper's name.
- * @uses Bake::template() Controller's template.
- * @uses Bake::getActions() Actions' templates to be included in the controller.
- * @uses Bake::createFile() Creates controller's file.
- * @uses Bake::makeControllerFn() Underscored name for controller's filename.
- */
+ /**
+ * Creates new controller file with defined actions.
+ *
+ * @param string $name
+ * @param array $actions
+ * @return boolean
+ * @access private
+ * @uses Bake::makeControllerName() CamelCase for controller's name.
+ * @uses Bake::makeHelperName() CamelCase for helper's name.
+ * @uses Bake::template() Controller's template.
+ * @uses Bake::getActions() Actions' templates to be included in the controller.
+ * @uses Bake::createFile() Creates controller's file.
+ * @uses Bake::makeControllerFn() Underscored name for controller's filename.
+ */
function makeController ($name, $actions)
{
$ctrl = $this->makeControllerName($name);
@@ -291,44 +291,44 @@ class %sTest extends TestCase
return $this->createFile($this->makeControllerFn($name), $body);
}
- /**
- * Returns controller's name in CamelCase.
- *
- * @param string $name
- * @return string
- * @access private
- * @uses Inflector::camelize CamelCase for controller name.
- */
+ /**
+ * Returns controller's name in CamelCase.
+ *
+ * @param string $name
+ * @return string
+ * @access private
+ * @uses Inflector::camelize CamelCase for controller name.
+ */
function makeControllerName ($name)
{
return Inflector::camelize($name).'Controller';
}
- /**
- * Returns a name for controller's file, underscored.
- *
- * @param string $name
- * @return string
- * @access private
- * @uses Inflector::underscore() Underscore for controller's file name.
- */
+ /**
+ * Returns a name for controller's file, underscored.
+ *
+ * @param string $name
+ * @return string
+ * @access private
+ * @uses Inflector::underscore() Underscore for controller's file name.
+ */
function makeControllerFn ($name)
{
return CONTROLLERS.Inflector::underscore($name).'_controller.php';
}
- /**
- * Creates new test for a controller.
- *
- * @param string $name
- * @return boolean
- * @access private
- * @uses CONTROLLER_TESTS
- * @uses Inflector::underscore()
- * @uses Bake::getTestBody()
- * @uses Bake::makeControllerName()
- * @uses Bake::createFile()
- */
+ /**
+ * Creates new test for a controller.
+ *
+ * @param string $name
+ * @return boolean
+ * @access private
+ * @uses CONTROLLER_TESTS
+ * @uses Inflector::underscore()
+ * @uses Bake::getTestBody()
+ * @uses Bake::makeControllerName()
+ * @uses Bake::createFile()
+ */
function makeControllerTest ($name)
{
$fn = CONTROLLER_TESTS.Inflector::underscore($name).'_controller_test.php';
@@ -337,17 +337,17 @@ class %sTest extends TestCase
return true; //$this->createFile($fn, $body); // Disable creating tests till later
}
- /**
- * Creates new helper.
- *
- * @param string $name
- * @return boolean
- * @access private
- * @uses Bake::template()
- * @uses Bake::makeHelperName()
- * @uses Bake::createFile()
- * @uses Bake::makeHelperFn()
- */
+ /**
+ * Creates new helper.
+ *
+ * @param string $name
+ * @return boolean
+ * @access private
+ * @uses Bake::template()
+ * @uses Bake::makeHelperName()
+ * @uses Bake::createFile()
+ * @uses Bake::makeHelperFn()
+ */
function makeHelper ($name)
{
$body = sprintf($this->template('helper'), $this->makeHelperName($name));
@@ -355,45 +355,45 @@ class %sTest extends TestCase
return $this->createFile($this->makeHelperFn($name), $body);
}
- /**
- * Returns CamelCase name for a helper.
- *
- * @param string $name
- * @return string
- * @access private
- * @uses Inflector::camelize()
- */
+ /**
+ * Returns CamelCase name for a helper.
+ *
+ * @param string $name
+ * @return string
+ * @access private
+ * @uses Inflector::camelize()
+ */
function makeHelperName ($name)
{
return Inflector::camelize($name).'Helper';
}
- /**
- * Underscores file name for a helper.
- *
- * @param string $name
- * @return string
- * @access private
- * @uses HELPERS
- * @uses Inflector::underscore()
- */
+ /**
+ * Underscores file name for a helper.
+ *
+ * @param string $name
+ * @return string
+ * @access private
+ * @uses HELPERS
+ * @uses Inflector::underscore()
+ */
function makeHelperFn ($name)
{
return HELPERS.Inflector::underscore($name).'_helper.php';
}
- /**
- * Creates new test for a helper.
- *
- * @param string $name
- * @return boolean
- * @access private
- * @uses HELPER_TESTS
- * @uses Inflector::underscore()
- * @uses Bake::getTestBody()
- * @uses Bake::makeHelperName()
- * @uses Bake::createFile()
- */
+ /**
+ * Creates new test for a helper.
+ *
+ * @param string $name
+ * @return boolean
+ * @access private
+ * @uses HELPER_TESTS
+ * @uses Inflector::underscore()
+ * @uses Bake::getTestBody()
+ * @uses Bake::makeHelperName()
+ * @uses Bake::createFile()
+ */
function makeHelperTest ($name)
{
$fn = HELPER_TESTS.Inflector::underscore($name).'_helper_test.php';
@@ -402,14 +402,14 @@ class %sTest extends TestCase
return $this->createFile($fn, $body);
}
- /**
- * Returns an array of actions' templates.
- *
- * @param array $as
- * @return array
- * @access private
- * @uses Bake::template()
- */
+ /**
+ * Returns an array of actions' templates.
+ *
+ * @param array $as
+ * @return array
+ * @access private
+ * @uses Bake::template()
+ */
function getActions ($as)
{
$out = array();
@@ -420,44 +420,44 @@ class %sTest extends TestCase
return $out;
}
- /**
- * Returns a test template for given class.
- *
- * @param string $class
- * @return string
- * @access private
- * @uses Bake::template()
- */
+ /**
+ * Returns a test template for given class.
+ *
+ * @param string $class
+ * @return string
+ * @access private
+ * @uses Bake::template()
+ */
function getTestBody ($class)
{
return sprintf($this->template('test'), $class, $class);
}
- /**
- * Creates new model.
- *
- * @param string $name
- * @access private
- * @uses Bake::createFile()
- * @uses Bake::getModelFn()
- * @uses Bake::template()
- * @uses Bake::getModelName()
- * @uses Bake::makeModelTest()
- * @uses Bake::actions
- */
+ /**
+ * Creates new model.
+ *
+ * @param string $name
+ * @access private
+ * @uses Bake::createFile()
+ * @uses Bake::getModelFn()
+ * @uses Bake::template()
+ * @uses Bake::getModelName()
+ * @uses Bake::makeModelTest()
+ * @uses Bake::actions
+ */
function newModel ($name)
{
$nameSingular = Inflector::singularize($name);
if ($nameSingular != $name)
{
- fwrite($this->stdout, "I use singular Model names. You entered '$name'. I can inflect it to '$nameSingular'. Should I? If no, I will use '$name'. [y/n/q] ");
+ fwrite($this->stdout, "I use singular Model names. You entered '$name'. I can inflect it to '$nameSingular'. Should I? If no, I will use '$name'. [y/n/q] ");
$key = trim(fgets($this->stdin));
- }
- else
- {
- $key = 'n';
- }
+ }
+ else
+ {
+ $key = 'n';
+ }
if ($key=='q')
{
@@ -475,32 +475,32 @@ class %sTest extends TestCase
$this->actions++;
}
- /**
- * Returns an underscored filename for a model.
- *
- * @param string $name
- * @return string
- * @access private
- * @uses MODELS
- * @uses Inflector::underscore()
- */
+ /**
+ * Returns an underscored filename for a model.
+ *
+ * @param string $name
+ * @return string
+ * @access private
+ * @uses MODELS
+ * @uses Inflector::underscore()
+ */
function getModelFn ($name)
{
return MODELS.Inflector::underscore($name).'.php';
}
- /**
- * Creates a test for a given model.
- *
- * @param string $name
- * @return boolean
- * @access private
- * @uses MODEL_TESTS
- * @uses Inflector::underscore()
- * @uses Bake::getTestBody()
- * @uses Bake::getModelName()
- * @uses Bake::createFile()
- */
+ /**
+ * Creates a test for a given model.
+ *
+ * @param string $name
+ * @return boolean
+ * @access private
+ * @uses MODEL_TESTS
+ * @uses Inflector::underscore()
+ * @uses Bake::getTestBody()
+ * @uses Bake::getModelName()
+ * @uses Bake::createFile()
+ */
function makeModelTest ($name)
{
$fn = MODEL_TESTS.Inflector::underscore($name).'_test.php';
@@ -509,31 +509,31 @@ class %sTest extends TestCase
return $this->createFile($fn, $body);
}
- /**
- * Returns CamelCased name of a model.
- *
- * @param string $name
- * @return string
- * @access private
- * @uses Inflector::camelize()
- */
+ /**
+ * Returns CamelCased name of a model.
+ *
+ * @param string $name
+ * @return string
+ * @access private
+ * @uses Inflector::camelize()
+ */
function getModelName ($name)
{
return Inflector::camelize($name);
}
- /**
- * Creates a file with given path and contents.
- *
- * @param string $path
- * @param string $contents
- * @return boolean
- * @access private
- * @uses Bake::dontAsk
- * @uses Bake::stdin
- * @uses Bake::stdout
- * @uses Bake::stderr
- */
+ /**
+ * Creates a file with given path and contents.
+ *
+ * @param string $path
+ * @param string $contents
+ * @return boolean
+ * @access private
+ * @uses Bake::dontAsk
+ * @uses Bake::stdin
+ * @uses Bake::stdout
+ * @uses Bake::stderr
+ */
function createFile ($path, $contents)
{
echo "\nCreating file $path\n";
@@ -568,26 +568,26 @@ class %sTest extends TestCase
fwrite($f, $contents);
fclose($f);
fwrite($this->stdout, "Wrote {$shortPath}\n");
- // debug ("Wrote {$path}");
+ // debug ("Wrote {$path}");
return true;
}
else
{
fwrite($this->stderr, "Error! Couldn't open {$shortPath} for writing.\n");
- // debug ("Error! Couldn't open {$path} for writing.");
+ // debug ("Error! Couldn't open {$path} for writing.");
return false;
}
}
- /**
- * Creates a directory with given path.
- *
- * @param string $path
- * @return boolean
- * @access private
- * @uses Bake::stdin
- * @uses Bake::stdout
- */
+ /**
+ * Creates a directory with given path.
+ *
+ * @param string $path
+ * @return boolean
+ * @access private
+ * @uses Bake::stdin
+ * @uses Bake::stdout
+ */
function createDir ($path)
{
if (is_dir($path))
@@ -600,13 +600,13 @@ class %sTest extends TestCase
if (mkdir($path))
{
fwrite($this->stdout, "Created {$shortPath}\n");
- // debug ("Created {$path}");
+ // debug ("Created {$path}");
return true;
}
else
{
fwrite($this->stderr, "Error! Couldn't create dir {$shortPath}\n");
- // debug ("Error! Couldn't create dir {$path}");
+ // debug ("Error! Couldn't create dir {$path}");
return false;
}
}
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index d892c0f54..75fdb59d2 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -3,20 +3,20 @@
/**
* Caching for Cake.
- *
- *
+ *
+ *
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework transforms and > to >, no typography additions.
+ * @param string $text String to format
+ * @param boolean $bare Set this to only do
transforms and > to >, no typography additions.
* @param boolean $allowHtml Set this to trim whitespace and disable all HTML
* @return string Formatted text
*/
- function toHtml ($text=null, $bare=false, $allowHtml=false)
+ function toHtml ($text=null, $bare=false, $allowHtml=false)
{
if (empty($text) && empty($this->text))
@@ -98,7 +101,7 @@ class Flay extends Object
$text = str_replace('<', '<', str_replace('>', '>', trim($text)));
}
- if (!$bare)
+ if (!$bare)
{
// multi-paragraph functions
$text = preg_replace('#(?:[\n]{0,2})"""(.*)"""(?:[\n]{0,2})#s', "\n\n%BLOCKQUOTE%\n\n\\1\n\n%ENDBLOCKQUOTE%\n\n", $text);
@@ -112,20 +115,20 @@ class Flay extends Object
// split into paragraphs and parse
$out = '';
- foreach (split('%PARAGRAPH%', $text) as $line)
+ foreach (split('%PARAGRAPH%', $text) as $line)
{
-
- if ($line)
+
+ if ($line)
{
- if (!$bare)
+ if (!$bare)
{
// pre-parse links
$links = array();
$regs = null;
- if (preg_match_all('#\[([^\[]{4,})\]#', $line, $regs))
+ if (preg_match_all('#\[([^\[]{4,})\]#', $line, $regs))
{
- foreach ($regs[1] as $reg)
+ foreach ($regs[1] as $reg)
{
$links[] = $reg;
$line = str_replace("[{$reg}]",'%LINK'.(count($links)-1).'%', $line);
@@ -148,47 +151,47 @@ class Flay extends Object
// guess e-mails
$emails = null;
- if (preg_match_all("#([_A-Za-z0-9+-+]+(?:\.[_A-Za-z0-9+-]+)*@[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*)#", $line, $emails))
+ if (preg_match_all("#([_A-Za-z0-9+-+]+(?:\.[_A-Za-z0-9+-]+)*@[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*)#", $line, $emails))
{
- foreach ($emails[1] as $email)
+ foreach ($emails[1] as $email)
{
$line = str_replace($email, "{$email}", $line);
}
}
- if (!$bare)
+ if (!$bare)
{
// guess links
$urls = null;
- if (preg_match_all("#((?:http|https|ftp|nntp)://[^ ]+)#", $line, $urls))
+ if (preg_match_all("#((?:http|https|ftp|nntp)://[^ ]+)#", $line, $urls))
{
- foreach ($urls[1] as $url)
+ foreach ($urls[1] as $url)
{
$line = str_replace($url, "{$url}", $line);
}
}
if (preg_match_all("#(www\.[^\n\%\ ]+[^\n\%\,\.\ ])#", $line, $urls))
{
- foreach ($urls[1] as $url)
+ foreach ($urls[1] as $url)
{
$line = str_replace($url, "{$url}", $line);
}
}
-
+
// re-parse links
- if (count($links))
- {
- for ($ii=0; $ii
\n", "
{$line}
\n");
}
}
- if (!$bare)
+ if (!$bare)
{
// re-parse multilines
$out = str_replace('%BLOCKQUOTE%
', "", $out);
@@ -247,7 +250,7 @@ class Flay extends Object
* @param string $string
* @return array Array of words
*/
- function extractWords ($string)
+ function extractWords ($string)
{
return preg_split('/[\s,\.:\/="!\(\)<>~\[\]]+/', $string);
}
@@ -255,22 +258,22 @@ class Flay extends Object
/**
* Return given string with words in array colorMarked, up to a number of times (defaults to 5).
*
- * @param array $words Words to look for and markup
- * @param string $string String to look in
- * @param integer $max_snippets Max number of snippets to extract
+ * @param array $words Words to look for and markup
+ * @param string $string String to look in
+ * @param integer $max_snippets Max number of snippets to extract
* @return string
* @see colorMark
*/
- function markedSnippets ($words, $string, $max_snippets=5)
+ function markedSnippets ($words, $string, $max_snippets=5)
{
$string = strip_tags($string);
$snips = array();
$rest = $string;
- foreach ($words as $word)
+ foreach ($words as $word)
{
- if (preg_match_all("/[\s,]+.{0,40}{$word}.{0,40}[\s,]+/i", $rest, $r))
+ if (preg_match_all("/[\s,]+.{0,40}{$word}.{0,40}[\s,]+/i", $rest, $r))
{
foreach ($r as $result)
{
@@ -280,9 +283,9 @@ class Flay extends Object
}
}
- if (count($snips) > $max_snippets)
+ if (count($snips) > $max_snippets)
{
- $snips = array_slice($snips, 0, $max_snippets);
+ $snips = array_slice($snips, 0, $max_snippets);
}
$joined = join(' ... ', $snips);
$snips = $joined? "... {$joined} ...": substr($string, 0, 80) . '...';
@@ -293,16 +296,16 @@ class Flay extends Object
/**
* Returns string with EM elements with color classes added.
*
- * @param array $words Array of words to be colorized
- * @param string $string Text in which the words might be found
- * @return string
+ * @param array $words Array of words to be colorized
+ * @param string $string Text in which the words might be found
+ * @return string
*/
- function colorMark($words, $string)
+ function colorMark($words, $string)
{
$colors = array('yl','gr','rd','bl','fu','cy');
$nextColorIndex = 0;
- foreach ($words as $word)
+ foreach ($words as $word)
{
$string = preg_replace("/({$word})/i", '\\1", $string);
$nextColorIndex++;
@@ -310,24 +313,24 @@ class Flay extends Object
return $string;
}
-
+
/**
* Returns given text with tags stripped out.
*
* @param string $text
* @return string
*/
- function toClean ($text)
+ function toClean ($text)
{
return strip_tags(html_entity_decode($text, ENT_QUOTES));
}
-
+
/**
* Return parsed text with tags stripped out.
*
* @param string $text
* @return string
- */
+ */
function toParsedAndClean ($text)
{
return Flay::toClean(Flay::toHtml($text));
@@ -336,21 +339,21 @@ class Flay extends Object
/**
* Return a fragment of a text, up to $length characters long, with an ellipsis after it.
*
- * @param string $text Text to be truncated.
- * @param integer $length Max length of text.
- * @param string $ellipsis Sign to print after truncated text.
+ * @param string $text Text to be truncated.
+ * @param integer $length Max length of text.
+ * @param string $ellipsis Sign to print after truncated text.
* @return string
*/
- function fragment ($text, $length, $ellipsis='...')
+ function fragment ($text, $length, $ellipsis='...')
{
$soft = $length - 5;
$hard = $length + 5;
$rx = '/(.{' . $soft . ',' . $hard . '})[\s,\.:\/="!\(\)<>~\[\]]+.*/';
- if (preg_match($rx, $text, $r))
+ if (preg_match($rx, $text, $r))
{
$out = $r[1];
}
- else
+ else
{
$out = substr($text, 0, $length);
}
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 2c3b9dc22..230220a80 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -3,19 +3,19 @@
/**
* Convenience class for handling directories.
- *
+ *
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework _doThread($data, $data[$ii]['id']): null;
- $out[] = $tmp;
- }
- }
-
- return $out;
- }
+ function _doThread ($data, $root)
+ {
+ $out = array();
+ for ($ii=0; $iiname]['parent_id'] == $root)
+ {
+ $tmp = $data[$ii];
+ $tmp['children'] = isset($data[$ii][$this->name][$this->primaryKey])? $this->_doThread($data, $data[$ii][$this->name][$this->primaryKey]): null;
+ $out[] = $tmp;
+ }
+ }
+ return $out;
+ }
/**
* Returns an array with keys "prev" and "next" that holds the id's of neighbouring data,
@@ -1427,32 +1426,23 @@ class Model extends Object
* @param array $data POST data
* @return boolean True if there are no errors
*/
- function validates ($data=null)
+ function validates ($data = null)
{
- $errors = count($this->invalidFields($data? $data: $this->data));
-
+ if (!$data)
+ {
+ $data = $this->data;
+ }
+ $errors = count($this->invalidFields($data));
return $errors == 0;
}
-/**
- * Returns an array of invalid fields.
- *
- * @param array $data Posted data
- * @return array Array of invalid fields
- */
- function invalidFields ($data=null)
- {
- return $this->_invalidFields($data);
- }
-
/**
* Returns an array of invalid fields.
*
* @param array $data
* @return array Array of invalid fields
- * @access private
*/
- function _invalidFields ($data=null)
+ function invalidFields ($data = null)
{
if (!isset($this->validate))
{
@@ -1464,15 +1454,26 @@ class Model extends Object
return $this->validationErrors;
}
- $data = ($data? $data: (isset($this->data)? $this->data: array()));
+ if (!$data)
+ {
+ if (isset($this->data))
+ {
+ $data = $this->data;
+ }
+ else
+ {
+ $data = array();
+ }
+ }
$errors = array();
+
foreach ($data as $table => $field)
{
foreach ($this->validate as $field_name=>$validator)
{
if (isset($data[$table][$field_name]) && !preg_match($validator, $data[$table][$field_name]))
{
- $errors[$field_name] = 1;
+ $errors[$field_name] = 1;
}
}
$this->validationErrors = $errors;
@@ -1487,11 +1488,11 @@ class Model extends Object
* @param string $field Returns true if the input string ends in "_id"
* @return True if the field is a foreign key listed in the belongsTo array.
*/
- function isForeignKey( $field )
- {
- $foreignKeys = array();
+ function isForeignKey( $field )
+ {
+ $foreignKeys = array();
- if(!empty($this->_belongsToOther))
+ if(!empty($this->_belongsToOther))
{
foreach ($this->_belongsToOther as $rule)
@@ -1501,44 +1502,44 @@ class Model extends Object
}
}
- if( array_key_exists($field, $foreignKeys) )
- {
- return true;
- }
- return false;
- }
+ if( array_key_exists($field, $foreignKeys) )
+ {
+ return true;
+ }
+ return false;
+ }
/**
* Enter description here...
*
* @return unknown
*/
- function getDisplayField()
- {
- // $displayField defaults to 'name'
- $dispField = 'name';
+ function getDisplayField()
+ {
+ // $displayField defaults to 'name'
+ $dispField = 'name';
- // If the $displayField variable is set in this model, use it.
- if( isset( $this->displayField ) ) {
- $dispField = $this->displayField;
- }
+ // If the $displayField variable is set in this model, use it.
+ if( isset( $this->displayField ) ) {
+ $dispField = $this->displayField;
+ }
- // And if the display field does not exist in the table info structure, use the ID field.
- if( false == $this->hasField( $dispField ) )
- $dispField = $this->primaryKey;
+ // And if the display field does not exist in the table info structure, use the ID field.
+ if( false == $this->hasField( $dispField ) )
+ $dispField = $this->primaryKey;
- return $dispField;
- }
+ return $dispField;
+ }
/**
* Enter description here...
*
* @return unknown
*/
- function getLastInsertID()
- {
+ function getLastInsertID()
+ {
return $this->db->lastInsertId($this->table, $this->primaryKey);
- }
+ }
}
?>
\ No newline at end of file
diff --git a/cake/libs/neat_array.php b/cake/libs/neat_array.php
index 348d83537..ef303b897 100644
--- a/cake/libs/neat_array.php
+++ b/cake/libs/neat_array.php
@@ -3,20 +3,20 @@
/**
* Library of array functions for Cake.
- *
+ *
* Internal use only.
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework value); $ii++)
@@ -207,13 +207,13 @@ class NeatArray
return $this->value;
}
- /**
- * Extracts a value from all array items.
- *
- * @return array
- * @access public
- * @uses NeatArray::value
- */
+/**
+ * Extracts a value from all array items.
+ *
+ * @return array
+ * @access public
+ * @uses NeatArray::value
+ */
function extract ($name)
{
$out = array();
@@ -225,58 +225,58 @@ class NeatArray
return $out;
}
- /**
- * Returns a list of unique elements.
- *
- * @return array
- */
+/**
+ * Returns a list of unique elements.
+ *
+ * @return array
+ */
function unique ()
{
return array_unique($this->value);
}
- /**
- * Removes duplicate elements from the value and returns it.
- *
- * @return array
- */
+/**
+ * Removes duplicate elements from the value and returns it.
+ *
+ * @return array
+ */
function makeUnique ()
{
return $this->value = array_unique($this->value);
}
- /**
- * Joins an array with myself using a key (like a join between database tables).
- *
- * Example:
- *
- * $alice = array('id'=>'1', 'name'=>'Alice');
- * $bob = array('id'=>'2', 'name'=>'Bob');
- *
- * $users = new NeatArray(array($alice, $bob));
- *
- * $born = array
- * (
- * array('user_id'=>'1', 'born'=>'1980'),
- * array('user_id'=>'2', 'born'=>'1976')
- * );
- *
- * $users->joinWith($born, 'id', 'user_id');
- *
- * Result:
- *
- * $users->value == array
- * (
- * array('id'=>'1', 'name'=>'Alice', 'born'=>'1980'),
- * array('id'=>'2', 'name'=>'Bob', 'born'=>'1976')
- * );
- *
- *
- * @param array $his The array to join with myself.
- * @param string $onMine Key to use on myself.
- * @param string $onHis Key to use on him.
- * @return array
- */
+/**
+ * Joins an array with myself using a key (like a join between database tables).
+ *
+ * Example:
+ *
+ * $alice = array('id'=>'1', 'name'=>'Alice');
+ * $bob = array('id'=>'2', 'name'=>'Bob');
+ *
+ * $users = new NeatArray(array($alice, $bob));
+ *
+ * $born = array
+ * (
+ * array('user_id'=>'1', 'born'=>'1980'),
+ * array('user_id'=>'2', 'born'=>'1976')
+ * );
+ *
+ * $users->joinWith($born, 'id', 'user_id');
+ *
+ * Result:
+ *
+ * $users->value == array
+ * (
+ * array('id'=>'1', 'name'=>'Alice', 'born'=>'1980'),
+ * array('id'=>'2', 'name'=>'Bob', 'born'=>'1976')
+ * );
+ *
+ *
+ * @param array $his The array to join with myself.
+ * @param string $onMine Key to use on myself.
+ * @param string $onHis Key to use on him.
+ * @return array
+ */
function joinWith ($his, $onMine, $onHis=null)
{
if (empty($onHis))
@@ -303,21 +303,21 @@ class NeatArray
return $this->value = $out;
}
- /**
- * Enter description here...
- * @todo Explain this function. almost looks like it creates a tree
- *
- * @param string $root
- * @param string $idKey
- * @param string $parentIdKey
- * @param string $childrenKey
- * @return array
- */
+/**
+ * Enter description here...
+ * @todo Explain this function. almost looks like it creates a tree
+ *
+ * @param string $root
+ * @param string $idKey
+ * @param string $parentIdKey
+ * @param string $childrenKey
+ * @return array
+ */
function threaded ($root=null, $idKey='id', $parentIdKey='parent_id', $childrenKey='children')
{
$out = array();
-
- for ($ii=0; $iivalue); $ii++)
+ $sizeof = sizeof($this->value);
+ for ($ii=0; $ii < $sizeof; $ii++)
{
if ($this->value[$ii][$parentIdKey] == $root)
{
@@ -333,21 +333,21 @@ class NeatArray
}
- /**
- * Array multi search
- *
- * @param string $search_value
- * @param array $the_array
- * @return array
- * @link http://php.net/array_search#47116
- */
+/**
+ * Array multi search
+ *
+ * @param string $search_value
+ * @param array $the_array
+ * @return array
+ * @link http://php.net/array_search#47116
+ */
function multi_search($search_value, $the_array=null)
{
if ( $the_array == null )
{
$the_array = $this->value;
}
-
+
if (is_array($the_array))
{
foreach ($the_array as $key => $value)
@@ -380,4 +380,4 @@ class NeatArray
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/neat_string.php b/cake/libs/neat_string.php
index f4b524759..7fe467ea1 100644
--- a/cake/libs/neat_string.php
+++ b/cake/libs/neat_string.php
@@ -40,23 +40,23 @@
*/
class NeatString
{
- /**
- * Returns an array with each of the non-empty characters in $string as an element.
- *
- * @param string $string
- * @return array
- */
+ /**
+ * Returns an array with each of the non-empty characters in $string as an element.
+ *
+ * @param string $string
+ * @return array
+ */
function toArray ($string)
{
return preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
}
- /**
- * Returns string with Cyrillic characters translated to Roman ones.
- *
- * @param string $string
- * @return string
- */
+ /**
+ * Returns string with Cyrillic characters translated to Roman ones.
+ *
+ * @param string $string
+ * @return string
+ */
function toRoman ($string)
{
$pl = array('ą','ć','ę','ł','ń','ó','ś','ź','ż','Ą','Ć','Ę','�?','Ń','Ó','Ś','Ź','Ż');
@@ -65,25 +65,25 @@ class NeatString
return str_replace($pl, $ro, $string);
}
- /**
- * Returns string as lowercase with whitespace removed.
- *
- * @param string $string
- * @return string
- */
+ /**
+ * Returns string as lowercase with whitespace removed.
+ *
+ * @param string $string
+ * @return string
+ */
function toCompressed ($string)
{
$whitespace = array("\n", " ", "\r", "\0", "\x0B", " ");
return strtolower(str_replace($whitespace, '', $string));
}
- /**
- * Returns a random password.
- *
- * @param integer $length Length of generated password
- * @param string $available_chars List of characters to use in password
- * @return string Generated password
- */
+ /**
+ * Returns a random password.
+ *
+ * @param integer $length Length of generated password
+ * @param string $available_chars List of characters to use in password
+ * @return string Generated password
+ */
function randomPassword ($length, $available_chars = 'ABDEFHKMNPRTWXYABDEFHKMNPRTWXY23456789')
{
$chars = preg_split('//', $available_chars, -1, PREG_SPLIT_NO_EMPTY);
diff --git a/cake/libs/object.php b/cake/libs/object.php
index df30198ff..b7b6b1fd6 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -29,11 +29,6 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
-/**
- * Included libraries.
- */
-uses('log');
-
/**
* Object class, allowing __construct and __destruct in PHP4.
*
@@ -121,6 +116,10 @@ class Object
*/
function log ($msg, $type=LOG_ERROR)
{
+ if(!class_exists('Log', FALSE))
+ {
+ uses('log');
+ }
if (is_null($this->_log))
{
$this->_log = new Log ();
@@ -182,6 +181,7 @@ class Object
$this->missingView = $this->name;
$this->pageTitle = 'Missing View';
$this->render('../errors/missingView');
+ exit();
}
/**
@@ -202,8 +202,8 @@ class Object
*/
function missingTable($tableName)
{
- $error =& new Controller();
- $error->constructClasses();
+ $error =& new Controller();
+ $error->constructClasses();
$error->missingTable = $this->table;
$error->missingTableName = $tableName;
$error->pageTitle = 'Missing Database Table';
@@ -218,7 +218,7 @@ class Object
function missingConnection()
{
$error =& new Controller();
- $error->constructClasses();
+ $error->constructClasses();
$error->missingConnection = $this->name;
$error->autoLayout = true;
$error->pageTitle = 'Missing Database Connection';
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 6ece2db2c..52e6c189a 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -3,20 +3,20 @@
/**
* Parses the request URL into controller, action, and parameters.
- *
+ *
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework
.
*
@@ -85,13 +85,13 @@ class Sanitize
else
{
$patterns = array("/\&/", "/%/", "//", '/"/', "/'/", "/\(/", "/\)/", "/\+/", "/-/", "/\n/");
- $replacements = array("&", "%", "<", ">", """, "'", "(", ")", "+", "-", "
");
- $string = preg_replace($patterns, $replacements, $string);
+ $replacements = array("&", "%", "<", ">", """, "'", "(", ")", "+", "-", "
");
+ $string = preg_replace($patterns, $replacements, $string);
}
return $string;
}
-
+
/**
* Recursively sanitizes given array of data for safe input.
*
@@ -131,7 +131,7 @@ class Sanitize
return null;
}
}
-
+
/**
* Do we really need to sanitize array keys? If so, we can use this code...
@@ -154,7 +154,7 @@ class Sanitize
return $key;
}
*/
-
+
/**
* Method used by cleanArray() to sanitize array nodes.
*
@@ -177,10 +177,10 @@ class Sanitize
//Double-check special chars and remove carriage returns
//For increased SQL security
- $val = preg_replace( "/\\\$/" ,"$" ,$val);
- $val = preg_replace( "/\r/" ,"" ,$val);
- $val = str_replace ( "!" ,"!" ,$val);
- $val = str_replace ( "'" , "'" ,$val);
+ $val = preg_replace( "/\\\$/" ,"$" ,$val);
+ $val = preg_replace( "/\r/" ,"" ,$val);
+ $val = str_replace ( "!" ,"!" ,$val);
+ $val = str_replace ( "'" , "'" ,$val);
//Allow unicode (?)
$val = preg_replace("/&#([0-9]+);/s", "&#\\1;", $val );
diff --git a/cake/libs/session.php b/cake/libs/session.php
index ab056d3e9..edc493c71 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -3,20 +3,20 @@
/**
* Short description for file.
- *
+ *
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework
- * linkToRemote("Delete this post",
- * array("update" => "posts", "url" => "delete/{$postid->id}"));
- * linkToRemote(imageTag("refresh"),
- * array("update" => "emails", "url" => "list_emails" ));
- *
- *
- * By default, these remote requests are processed asynchronous during
- * which various callbacks can be triggered (for progress indicators and
- * the likes).
- *
- * Example:
- *
- * linkToRemote (word,
- * array("url" => "undo", "n" => word_counter),
- * array("complete" => "undoRequestCompleted(request)"));
- *
- *
- * The callbacks that may be specified are:
- *
- * - loading:: Called when the remote document is being
- * loaded with data by the browser.
- * - loaded:: Called when the browser has finished loading
- * the remote document.
- * - interactive:: Called when the user can interact with the
- * remote document, even though it has not
- * finished loading.
- * - complete:: Called when the XMLHttpRequest is complete.
- *
- * If you for some reason or another need synchronous processing (that'll
- * block the browser while the request is happening), you can specify
- * options[type] = synchronous.
- *
- * You can customize further browser side call logic by passing
- * in Javascript code snippets via some optional parameters. In
- * their order of use these are:
- *
- * - confirm:: Adds confirmation dialog.
- * -condition:: Perform remote request conditionally
- * by this expression. Use this to
- * describe browser-side conditions when
- * request should not be initiated.
- * - before:: Called before request is initiated.
- * - after:: Called immediately after request was
- * initiated and before loading.
- *
- * @param string $title Title of link
- * @param array $options Options for JavaScript function
- * @return string HTML code for link to remote action
- */
+ /**
+ * Returns link to remote action
+ *
+ * Returns a link to a remote action defined by options[url]
+ * (using the urlFor format) that's called in the background using
+ * XMLHttpRequest. The result of that request can then be inserted into a
+ * DOM object whose id can be specified with options[update].
+ * Usually, the result would be a partial prepared by the controller with
+ * either renderPartial or renderPartialCollection.
+ *
+ * Examples:
+ *
+ * linkToRemote("Delete this post",
+ * array("update" => "posts", "url" => "delete/{$postid->id}"));
+ * linkToRemote(imageTag("refresh"),
+ * array("update" => "emails", "url" => "list_emails" ));
+ *
+ *
+ * By default, these remote requests are processed asynchronous during
+ * which various callbacks can be triggered (for progress indicators and
+ * the likes).
+ *
+ * Example:
+ *
+ * linkToRemote (word,
+ * array("url" => "undo", "n" => word_counter),
+ * array("complete" => "undoRequestCompleted(request)"));
+ *
+ *
+ * The callbacks that may be specified are:
+ *
+ * - loading:: Called when the remote document is being
+ * loaded with data by the browser.
+ * - loaded:: Called when the browser has finished loading
+ * the remote document.
+ * - interactive:: Called when the user can interact with the
+ * remote document, even though it has not
+ * finished loading.
+ * - complete:: Called when the XMLHttpRequest is complete.
+ *
+ * If you for some reason or another need synchronous processing (that'll
+ * block the browser while the request is happening), you can specify
+ * options[type] = synchronous.
+ *
+ * You can customize further browser side call logic by passing
+ * in Javascript code snippets via some optional parameters. In
+ * their order of use these are:
+ *
+ * - confirm:: Adds confirmation dialog.
+ * -condition:: Perform remote request conditionally
+ * by this expression. Use this to
+ * describe browser-side conditions when
+ * request should not be initiated.
+ * - before:: Called before request is initiated.
+ * - after:: Called immediately after request was
+ * initiated and before loading.
+ *
+ * @param string $title Title of link
+ * @param array $options Options for JavaScript function
+ * @return string HTML code for link to remote action
+ */
function linkToRemote ($title, $options = null, $html_options = null)
{
$href = (!empty($options['fallback'])) ? $options['fallback'] : '#';
@@ -162,17 +162,17 @@ class AjaxHelper extends Helper
}
}
- /**
- * Creates JavaScript function for remote AJAX call
- *
- * This function creates the javascript needed to make a remote call
- * it is primarily used as a helper for linkToRemote.
- *
- * @see linkToRemote() for docs on options parameter.
- *
- * @param array $options options for javascript
- * @return string html code for link to remote action
- */
+ /**
+ * Creates JavaScript function for remote AJAX call
+ *
+ * This function creates the javascript needed to make a remote call
+ * it is primarily used as a helper for linkToRemote.
+ *
+ * @see linkToRemote() for docs on options parameter.
+ *
+ * @param array $options options for javascript
+ * @return string html code for link to remote action
+ */
function remoteFunction ($options = null)
{
$javascript_options = $this->_optionsForAjax($options);
@@ -200,16 +200,16 @@ class AjaxHelper extends Helper
return $func;
}
- /**
- * Periodically call remote url via AJAX.
- *
- * Periodically calls the specified url (options[url]) every options[frequency] seconds (default is 10).
- * Usually used to update a specified div (options[update]) with the results of the remote call.
- * The options for specifying the target with url and defining callbacks is the same as linkToRemote.
- *
- * @param array $options Callback options
- * @return string Javascript code
- */
+ /**
+ * Periodically call remote url via AJAX.
+ *
+ * Periodically calls the specified url (options[url]) every options[frequency] seconds (default is 10).
+ * Usually used to update a specified div (options[update]) with the results of the remote call.
+ * The options for specifying the target with url and defining callbacks is the same as linkToRemote.
+ *
+ * @param array $options Callback options
+ * @return string Javascript code
+ */
function remoteTimer ($options = null)
{
$frequency = (isset($options['frequency']))? $options['frequency'] : 10;
@@ -217,18 +217,18 @@ class AjaxHelper extends Helper
return $this->Javascript->codeBlock($code);
}
- /**
- * Returns form tag that will submit using Ajax.
- *
- * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
- * reloading POST arrangement. Even though it's using Javascript to serialize the form elements, the form submission
- * will work just like a regular submission as viewed by the receiving side (all elements available in params).
- * The options for specifying the target with :url and defining callbacks is the same as link_to_remote.
- *
- * @param string $id Form id
- * @param array $options Callback options
- * @return string JavaScript code
- */
+ /**
+ * Returns form tag that will submit using Ajax.
+ *
+ * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
+ * reloading POST arrangement. Even though it's using Javascript to serialize the form elements, the form submission
+ * will work just like a regular submission as viewed by the receiving side (all elements available in params).
+ * The options for specifying the target with :url and defining callbacks is the same as link_to_remote.
+ *
+ * @param string $id Form id
+ * @param array $options Callback options
+ * @return string JavaScript code
+ */
function form($id, $options = null, $html_options = array())
{
$html_options['id'] = $id;
@@ -237,17 +237,17 @@ class AjaxHelper extends Helper
$this->remoteFunction($options) . "; return false;}");
}
- /**
- * Returns a button input tag that will submit using Ajax
- *
- * Returns a button input tag that will submit form using XMLHttpRequest in the background instead of regular
- * reloading POST arrangement. options argument is the same as in form_remote_tag
- *
- * @param string $name Input button name
- * @param string $value Input button value
- * @param array $options Callback options
- * @return string Ajaxed input button
- */
+ /**
+ * Returns a button input tag that will submit using Ajax
+ *
+ * Returns a button input tag that will submit form using XMLHttpRequest in the background instead of regular
+ * reloading POST arrangement. options argument is the same as in form_remote_tag
+ *
+ * @param string $name Input button name
+ * @param string $value Input button value
+ * @param array $options Callback options
+ * @return string Ajaxed input button
+ */
function submit ($name, $value, $options = null)
{
$options['with'] = 'Form.serialize(this.form)';
@@ -258,34 +258,34 @@ class AjaxHelper extends Helper
return $this->Html->tag("input", $options['html'], false);
}
- /**
- * Observe field and call ajax on change.
- *
- * Observes the field with the DOM ID specified by field_id and makes
- * an Ajax when its contents have changed.
- *
- * Required +options+ are:
- * - frequency:: The frequency (in seconds) at which changes to
- * this field will be detected.
- * - url:: @see urlFor() -style options for the action to call
- * when the field has changed.
- *
- * Additional options are:
- * - update:: Specifies the DOM ID of the element whose
- * innerHTML should be updated with the
- * XMLHttpRequest response text.
- * - with:: A Javascript expression specifying the
- * parameters for the XMLHttpRequest. This defaults
- * to Form.Element.serialize('$field_id'), which can be
- * accessed from params['form']['field_id'].
- *
- * Additionally, you may specify any of the options documented in
- * @see linkToRemote().
- *
- * @param string $field_id DOM ID of field to observe
- * @param array $options ajax options
- * @return string ajax script
- */
+ /**
+ * Observe field and call ajax on change.
+ *
+ * Observes the field with the DOM ID specified by field_id and makes
+ * an Ajax when its contents have changed.
+ *
+ * Required +options+ are:
+ * - frequency:: The frequency (in seconds) at which changes to
+ * this field will be detected.
+ * - url:: @see urlFor() -style options for the action to call
+ * when the field has changed.
+ *
+ * Additional options are:
+ * - update:: Specifies the DOM ID of the element whose
+ * innerHTML should be updated with the
+ * XMLHttpRequest response text.
+ * - with:: A Javascript expression specifying the
+ * parameters for the XMLHttpRequest. This defaults
+ * to Form.Element.serialize('$field_id'), which can be
+ * accessed from params['form']['field_id'].
+ *
+ * Additionally, you may specify any of the options documented in
+ * @see linkToRemote().
+ *
+ * @param string $field_id DOM ID of field to observe
+ * @param array $options ajax options
+ * @return string ajax script
+ */
function observeField ($field_id, $options = null)
{
if (!isset($options['with']))
@@ -295,18 +295,18 @@ class AjaxHelper extends Helper
return $this->Javascript->codeBlock($this->_buildObserver('Form.Element.Observer', $field_id, $options));
}
- /**
- * Observe entire form and call ajax on change.
- *
- * Like @see observeField(), but operates on an entire form identified by the
- * DOM ID form_id. options are the same as observe_field, except
- * the default value of the with option evaluates to the
- * serialized (request string) value of the form.
- *
- * @param string $field_id DOM ID of field to observe
- * @param array $options ajax options
- * @return string ajax script
- */
+ /**
+ * Observe entire form and call ajax on change.
+ *
+ * Like @see observeField(), but operates on an entire form identified by the
+ * DOM ID form_id. options are the same as observe_field, except
+ * the default value of the with option evaluates to the
+ * serialized (request string) value of the form.
+ *
+ * @param string $field_id DOM ID of field to observe
+ * @param array $options ajax options
+ * @return string ajax script
+ */
function observeForm ($field_id, $options = array())
{
if (!isset($options['with']))
@@ -316,18 +316,18 @@ class AjaxHelper extends Helper
return $this->Javascript->codeBlock($this->_buildObserver('Form.Observer', $field_id, $options));
}
- /**
- * Create a text field with Autocomplete.
- *
- * Creates an autocomplete field with the given ID and options.
- *
- * options['with'] defaults to "Form.Element.serialize('$field_id')",
- * but can be any valid javascript expression defining the
- *
- * @param string $field_id DOM ID of field to observe
- * @param array $options ajax options
- * @return string ajax script
- */
+ /**
+ * Create a text field with Autocomplete.
+ *
+ * Creates an autocomplete field with the given ID and options.
+ *
+ * options['with'] defaults to "Form.Element.serialize('$field_id')",
+ * but can be any valid javascript expression defining the
+ *
+ * @param string $field_id DOM ID of field to observe
+ * @param array $options ajax options
+ * @return string ajax script
+ */
function autoComplete ($field, $url = "", $options = array())
{
if (!isset($options['id']))
@@ -366,12 +366,12 @@ class AjaxHelper extends Helper
return $this->Javascript->codeBlock("new Draggable('$id'$options);");
}
- /**
- * Enter description here...
- *
- * @param array $options
- * @return array
- */
+ /**
+ * Enter description here...
+ *
+ * @param array $options
+ * @return array
+ */
function _optionsForDraggable ($options)
{
$options = $this->_optionsToString($options, array('handle','constraint'));
@@ -379,11 +379,11 @@ class AjaxHelper extends Helper
return $this->_buildOptions($options, $this->dragOptions);
}
- /**
- * For a reference on the options for this function, check out
- * http://wiki.script.aculo.us/scriptaculous/show/Droppables.add
- *
- */
+ /**
+ * For a reference on the options for this function, check out
+ * http://wiki.script.aculo.us/scriptaculous/show/Droppables.add
+ *
+ */
function drop($id, $options = array())
{
$options = $this->_optionsForDroppable($options);
@@ -402,14 +402,14 @@ class AjaxHelper extends Helper
$options['onDrop'] = "function(element){" . $this->remoteFunction($ajaxOptions) . "}";
}
- /**
- * Makes a list or group of floated objects sortable.
- *
- *
- * @param string $id DOM ID of parent
- * @param array $options Array of options to control sort.http://wiki.script.aculo.us/scriptaculous/show/Sortable.create
- * @link http://wiki.script.aculo.us/scriptaculous/show/Sortable.create
- */
+ /**
+ * Makes a list or group of floated objects sortable.
+ *
+ *
+ * @param string $id DOM ID of parent
+ * @param array $options Array of options to control sort.http://wiki.script.aculo.us/scriptaculous/show/Sortable.create
+ * @link http://wiki.script.aculo.us/scriptaculous/show/Sortable.create
+ */
function sortable($id, $options = array())
{
@@ -428,10 +428,10 @@ class AjaxHelper extends Helper
return $this->_buildOptions($options, $this->sortOptions);
}
- /**
- * Javascript helper function (private).
- *
- */
+ /**
+ * Javascript helper function (private).
+ *
+ */
function _optionsForAjax ($options = array())
{
$js_options = $this->_buildCallbacks($options);
@@ -487,14 +487,14 @@ class AjaxHelper extends Helper
}
}
- /**
- * Enter description here... Return JavaScript text for ...
- *
- * @param string $klass Name of JavaScript class
- * @param string $name
- * @param array $options
- * @return string Formatted JavaScript
- */
+ /**
+ * Enter description here... Return JavaScript text for ...
+ *
+ * @param string $klass Name of JavaScript class
+ * @param string $name
+ * @param array $options
+ * @return string Formatted JavaScript
+ */
function _buildObserver ($klass, $name, $options=null)
{
if(!isset($options['with']) && isset($options['update']))
@@ -509,12 +509,12 @@ class AjaxHelper extends Helper
return $javascript;
}
- /**
- * Enter description here... Return JavaScript text for ...
- *
- * @param array $options
- * @return array
- */
+ /**
+ * Enter description here... Return JavaScript text for ...
+ *
+ * @param array $options
+ * @return array
+ */
function _buildCallbacks($options)
{
$callbacks = array();
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 6dd6e8520..b09994d09 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -9,10 +9,10 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework
"; ?>
@@ -52,9 +52,9 @@ in file : 1):?>
Controller dump:
-db);
-print_r($this);
+print_r($this);
?>
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/cake/libs/view/templates/errors/missing_database.thtml b/cake/libs/view/templates/errors/missing_database.thtml
index 0842be914..a51133364 100644
--- a/cake/libs/view/templates/errors/missing_database.thtml
+++ b/cake/libs/view/templates/errors/missing_database.thtml
@@ -38,12 +38,10 @@
view file, a user-customizable error page for handling errors within CakePHP.
-1):?>
+ 1) { ?>
Controller dump:
-
-db);
-print_r($this);
+db);
+ pr($this);
?>
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/cake/libs/view/templates/errors/missing_helper_class.thtml b/cake/libs/view/templates/errors/missing_helper_class.thtml
index c59895bfd..fa6af4dd2 100644
--- a/cake/libs/view/templates/errors/missing_helper_class.thtml
+++ b/cake/libs/view/templates/errors/missing_helper_class.thtml
@@ -1,75 +1,75 @@
-
- * Copyright (c) 2005, 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) 2005, Cake Software Foundation, Inc.
- * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package cake
- * @subpackage cake.cake.libs.view.templates.errors
- * @since CakePHP v 0.10.0.1076
- * @version $Revision:$
- * @modifiedby $LastChangedBy:$
- * @lastmodified $Date:$
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-?>
-controller->missingHelperClass;
- $missingFile = $this->controller->missingHelperFile;
-
-?>
-Missing Helper Class
-
-You are seeing this error because the view helper class
- can't be found or doesn't exist in
-
-
-
-
-Notice: this error is being rendered by the app/views/errors/missing_helper_class.thtml
-view file, a user-customizable error page for handling non-existent view helper classes.
-
-
-
-Fatal: Create the Class:
-
-
-<?php\n\nclass " . $missingClass ." extends Helper {\n
- // Your helper functions here
- function myHelperFunction ()
- {
- }
-}\n?>
"; ?>
-in file :
-
-
--Error: Unable to load helper class in -View::_loadHelpers -
- -1):?> --db); -print_r($this); -?> -- \ No newline at end of file + + * Copyright (c) 2005, 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) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project + * @package cake + * @subpackage cake.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> +controller->missingHelperClass; + $missingFile = $this->controller->missingHelperFile; + +?> +
You are seeing this error because the view helper class + can't be found or doesn't exist in +
+ + +
+Notice: this error is being rendered by the app/views/errors/missing_helper_class.thtml
+view file, a user-customizable error page for handling non-existent view helper classes.
+
+Fatal: Create the Class: +
++<?php\n\nclass " . $missingClass ." extends Helper {\n + // Your helper functions here + function myHelperFunction () + { + } +}\n?>"; ?> +in file : +
+ ++Error: Unable to load helper class in +View::_loadHelpers +
+ +1):?> ++db); +print_r($this); +?> ++ diff --git a/cake/libs/view/templates/errors/missing_helper_file.thtml b/cake/libs/view/templates/errors/missing_helper_file.thtml index 8a41bebd5..9b12b7aa3 100644 --- a/cake/libs/view/templates/errors/missing_helper_file.thtml +++ b/cake/libs/view/templates/errors/missing_helper_file.thtml @@ -1,75 +1,75 @@ - - * Copyright (c) 2005, 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) 2005, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.cake.libs.view.templates.errors - * @since CakePHP v 0.10.0.1076 - * @version $Revision:$ - * @modifiedby $LastChangedBy:$ - * @lastmodified $Date:$ - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ -?> -controller->missingHelperClass; - $missingFile = $this->controller->missingHelperFile; - -?> -
You are seeing this error because the view helper file - can't be found or doesn't exist -
- - -
-Notice: this error is being rendered by the app/views/errors/missing_helper_file.thtml
-view file, a user-customizable error page for handling non-existent view helper files.
-
-Fatal: Create the Class: -
--<?php\n\nclass " . $missingClass ." extends Helper {\n - // Your helper functions here - function myHelperFunction () - { - } -}\n?>"; ?> -in file : -
- --Error: Unable to load helper file in -View::_loadHelpers -
- -1):?> --db); -print_r($this); -?> -- \ No newline at end of file + + * Copyright (c) 2005, 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) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project + * @package cake + * @subpackage cake.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> +controller->missingHelperClass; + $missingFile = $this->controller->missingHelperFile; + +?> +
You are seeing this error because the view helper file + can't be found or doesn't exist +
+ + +
+Notice: this error is being rendered by the app/views/errors/missing_helper_file.thtml
+view file, a user-customizable error page for handling non-existent view helper files.
+
+Fatal: Create the Class: +
++<?php\n\nclass " . $missingClass ." extends Helper {\n + // Your helper functions here + function myHelperFunction () + { + } +}\n?>"; ?> +in file : +
+ ++Error: Unable to load helper file in +View::_loadHelpers +
+ +1):?> ++db); +print_r($this); +?> ++ diff --git a/cake/libs/view/templates/errors/missing_scaffolddb.thtml b/cake/libs/view/templates/errors/missing_scaffolddb.thtml index 18d4eb7d3..2ca8cbf40 100644 --- a/cake/libs/view/templates/errors/missing_scaffolddb.thtml +++ b/cake/libs/view/templates/errors/missing_scaffolddb.thtml @@ -3,20 +3,20 @@ /** * - * + * * * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework
Missing Database Connection: Scaffold Does not work without a database connection -
+
Notice: this error is being rendered by the app/views/errors/missing_database.thtml
view file, a user-customizable error page for handling errors within CakePHP.
-db); -print_r($this); +print_r($this); ?>- \ No newline at end of file + \ No newline at end of file diff --git a/cake/libs/view/templates/errors/missing_table.thtml b/cake/libs/view/templates/errors/missing_table.thtml index 36d8fda2f..92d086db7 100644 --- a/cake/libs/view/templates/errors/missing_table.thtml +++ b/cake/libs/view/templates/errors/missing_table.thtml @@ -3,20 +3,20 @@ /** * - * + * * * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework
No Database table for model (expected "controller->missingTableName;?>"), create it first. -
+No Database table for model (expected "controller->missingTableName;?>"), create it first. +
Notice: this error is being rendered by the app/views/errors/missing_table.thtml
view file, a user-customizable error page.
diff --git a/cake/libs/view/templates/errors/missing_view.thtml b/cake/libs/view/templates/errors/missing_view.thtml
index 993a2230e..39b5aee38 100644
--- a/cake/libs/view/templates/errors/missing_view.thtml
+++ b/cake/libs/view/templates/errors/missing_view.thtml
@@ -3,20 +3,20 @@
/**
*
- *
+ *
*
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework
You are seeing this error because the view missingView;?> - for action params['action'];?> +
You are seeing this error because the view missingView;?> + for action params['action'];?> in controller name);?> could not be found. -
+
Notice: this error is being rendered by the app/views/errors/missing_view.thtml
@@ -48,9 +48,9 @@ action missingView;?>::params['action'];
1):?>
Controller dump:
-db);
-print_r($this);
+print_r($this);
?>
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml
index f5481679a..e79ef1fb5 100644
--- a/cake/libs/view/templates/layouts/default.thtml
+++ b/cake/libs/view/templates/layouts/default.thtml
@@ -42,15 +42,15 @@
image('cake.logo.png', array('alt'=>'CakePHP : Rapid Development Framework', 'border'=>"0"))?>