Permalink
Browse files

applied patch

  • Loading branch information...
1 parent 1929cfb commit fe90bf3d93c4a795ca01b05bc34395e11039b559 @elinw elinw committed Jun 21, 2011
Showing with 2,023 additions and 1,029 deletions.
  1. +11 −6 libraries/joomla/application/cli/daemon.php
  2. +25 −23 libraries/joomla/application/component/controller.php
  3. +12 −5 libraries/joomla/application/component/controlleradmin.php
  4. +27 −14 libraries/joomla/application/component/controllerform.php
  5. +4 −4 libraries/joomla/application/component/helper.php
  6. +32 −29 libraries/joomla/application/component/model.php
  7. +44 −30 libraries/joomla/application/component/modeladmin.php
  8. +20 −4 libraries/joomla/application/component/modelform.php
  9. +6 −2 libraries/joomla/application/component/modelitem.php
  10. +6 −3 libraries/joomla/application/component/modellist.php
  11. +7 −3 libraries/joomla/application/input/cli.php
  12. +2 −1 libraries/joomla/application/input/cookie.php
  13. +1 −1 libraries/joomla/application/input/files.php
  14. +14 −15 libraries/joomla/application/module/helper.php
  15. +3 −2 libraries/joomla/cache/controller/callback.php
  16. +2 −2 libraries/joomla/cache/controller/output.php
  17. +5 −4 libraries/joomla/cache/controller/page.php
  18. +6 −6 libraries/joomla/cache/controller/view.php
  19. +23 −20 libraries/joomla/cache/storage/apc.php
  20. +14 −7 libraries/joomla/cache/storage/cachelite.php
  21. +25 −14 libraries/joomla/cache/storage/eaccelerator.php
  22. +43 −37 libraries/joomla/cache/storage/file.php
  23. +12 −4 libraries/joomla/cache/storage/helpers/helper.php
  24. +35 −23 libraries/joomla/cache/storage/memcache.php
  25. +17 −9 libraries/joomla/cache/storage/wincache.php
  26. +24 −16 libraries/joomla/cache/storage/xcache.php
  27. +45 −10 libraries/joomla/error/error.php
  28. +68 −47 libraries/joomla/factory.php
  29. +9 −6 libraries/joomla/html/html/grid.php
  30. +17 −10 libraries/joomla/html/html/image.php
  31. +3 −1 libraries/joomla/html/html/list.php
  32. +35 −1 libraries/joomla/html/pane.php
  33. +26 −0 libraries/joomla/html/parameter.php
  34. +29 −5 libraries/joomla/html/parameter/element.php
  35. +14 −2 libraries/joomla/html/parameter/element/calendar.php
  36. +7 −0 libraries/joomla/html/parameter/element/category.php
  37. +5 −0 libraries/joomla/html/parameter/element/componentlayouts.php
  38. +4 −1 libraries/joomla/html/parameter/element/contentlanguages.php
  39. +6 −0 libraries/joomla/html/parameter/element/editors.php
  40. +7 −1 libraries/joomla/html/parameter/element/filelist.php
  41. +6 −0 libraries/joomla/html/parameter/element/folderlist.php
  42. +6 −0 libraries/joomla/html/parameter/element/helpsites.php
  43. +12 −0 libraries/joomla/html/parameter/element/hidden.php
  44. +6 −0 libraries/joomla/html/parameter/element/languages.php
  45. +7 −1 libraries/joomla/html/parameter/element/list.php
  46. +6 −0 libraries/joomla/html/parameter/element/menu.php
  47. +6 −0 libraries/joomla/html/parameter/element/menuitem.php
  48. +3 −0 libraries/joomla/html/parameter/element/modulelayouts.php
  49. +7 −1 libraries/joomla/html/parameter/element/password.php
  50. +6 −0 libraries/joomla/html/parameter/element/radio.php
  51. +12 −0 libraries/joomla/html/parameter/element/spacer.php
  52. +8 −2 libraries/joomla/html/parameter/element/sql.php
  53. +12 −1 libraries/joomla/html/parameter/element/templatestyle.php
  54. +6 −0 libraries/joomla/html/parameter/element/textarea.php
  55. +6 −0 libraries/joomla/html/parameter/element/timezones.php
  56. +6 −0 libraries/joomla/html/parameter/element/usergroup.php
  57. +8 −8 libraries/joomla/language/help.php
  58. +8 −7 libraries/joomla/language/helper.php
  59. +87 −84 libraries/joomla/language/language.php
  60. +4 −3 libraries/joomla/language/latin_transliterate.php
  61. +33 −24 libraries/joomla/log/log.php
  62. +10 −5 libraries/joomla/log/logentry.php
  63. +2 −3 libraries/joomla/log/logger.php
  64. +13 −5 libraries/joomla/mail/helper.php
  65. +40 −43 libraries/joomla/mail/mail.php
  66. +33 −31 libraries/joomla/methods.php
  67. +11 −11 libraries/joomla/plugin/helper.php
  68. +6 −6 libraries/joomla/plugin/plugin.php
  69. +9 −6 libraries/joomla/registry/format.php
  70. +69 −41 libraries/joomla/registry/registry.php
  71. +86 −44 libraries/joomla/session/session.php
  72. +24 −10 libraries/joomla/session/storage.php
  73. +134 −12 libraries/joomla/updater/update.php
  74. +27 −0 libraries/joomla/updater/updateadapter.php
  75. +19 −3 libraries/joomla/updater/updater.php
  76. +34 −17 libraries/joomla/user/authentication.php
  77. +43 −32 libraries/joomla/user/helper.php
  78. +108 −54 libraries/joomla/user/user.php
  79. +37 −25 libraries/joomla/utilities/arrayhelper.php
  80. +73 −3 libraries/joomla/utilities/buffer.php
  81. +13 −14 libraries/joomla/utilities/date.php
  82. +17 −14 libraries/joomla/utilities/simplecrypt.php
  83. +76 −22 libraries/joomla/utilities/simplexml.php
  84. +123 −70 libraries/joomla/utilities/string.php
  85. +56 −52 libraries/joomla/utilities/utility.php
  86. +7 −3 libraries/joomla/utilities/xmlelement.php
  87. +3 −4 libraries/platform.php
@@ -19,6 +19,9 @@
* @package Joomla.Platform
* @subpackage Application
* @since 11.1
+ *
+ * @see http://www.php.net/manual/en/book.pcntl.php
+ * @see http://php.net/manual/en/features.commandline.php
*/
class JDaemon extends JCli
{
@@ -36,7 +39,9 @@ class JDaemon extends JCli
/**
* Exiting status
- * @var boolean True if the daemon is in the process of exiting.
+ * True if the daemon is in the process of exiting.
+ *
+ * @var boolean
* @since 11.1
*/
protected $exiting = false;
@@ -50,7 +55,8 @@ class JDaemon extends JCli
/**
* Running status
- * @var boolean True if the daemon is currently running.
+ * True if the daemon is currently running.
+ * @var boolean
* @since 11.1
*/
protected $running = false;
@@ -295,7 +301,7 @@ public function restart()
/**
* Spawn daemon process.
*
- * @return bool True if successfully spawned
+ * @return boolean True if successfully spawned
*
* @since 11.1
*/
@@ -346,11 +352,10 @@ public function stop()
/**
* Method to change the identity of the daemon process and resources.
*
- * @return boolean True if identitye successfully changed
+ * @return boolean True if identity successfully changed
*
* @since 11.1
* @see posix_setuid()
- * @see posix_setgid()
*/
protected function changeIdentity()
{
@@ -530,7 +535,7 @@ protected function gc()
* Method to attach the JDaemon signal handler to the known signals. Applications can override
* these handlers by using the pcntl_signal() function and attaching a different callback method.
*
- * @return void
+ * @return boolean
*
* @since 11.1
* @see pcntl_signal()
@@ -49,7 +49,9 @@ class JController extends JObject
protected $basePath;
/**
- * @var string The default view for the display method.
+ * The default view for the display method.
+ *
+ * @var string
* @since 11.1
*/
protected $default_view;
@@ -149,7 +151,7 @@ class JController extends JObject
* @param mixed $path The directory (string), or list of directories (array) to add.
* @param string $prefix A prefix for models
*
- * @return void
+ * @return voi
*/
public static function addModelPath($path, $prefix='')
{
@@ -281,8 +283,8 @@ public static function getInstance($prefix, $config = array())
* Constructor.
*
* @param array $config An optional associative array of configuration settings.
- * Recognized key values include 'name', 'default_task', 'model_path', and
- * 'view_path' (this list is not meant to be comprehensive).
+ * Recognized key values include 'name', 'default_task', 'model_path', and
+ * 'view_path' (this list is not meant to be comprehensive).
*
* @return JController
* @since 11.1
@@ -389,7 +391,7 @@ public function __construct($config = array())
* @param string $type The path type (e.g. 'model', 'view').
* @param mixed $path The directory string or stream array to search.
*
- * @return JController A JController object to support chaining.
+ * @return JController A JController object to support chaining.
* @since 11.1
* @note Replaces _addPath.
*/
@@ -418,9 +420,9 @@ protected function addPath($type, $path)
/**
* Add one or more view paths to the controller's stack, in LIFO order.
*
- * @param string|array $path The directory (string) or list of directories (array) to add.
+ * @param mixed $path The directory (string) or list of directories (array) to add.
*
- * @return JController This object to support chaining.
+ * @return JController This object to support chaining.
*/
public function addViewPath($path)
{
@@ -432,9 +434,9 @@ public function addViewPath($path)
/**
* Authorisation check
*
- * @param string $task The ACO Section Value to check access on
+ * @param string $task The ACO Section Value to check access on
*
- * @return bool True if authorised
+ * @return boolean True if authorised
* @since 11.1
* @deprecated
*/
@@ -448,14 +450,14 @@ public function authorize($task)
*
* @param string $task The ACO Section Value to check access on.
*
- * @return bool True if authorised
+ * @return bool True if authorised
* @since 11.1
*/
public function authorise($task)
{
// Only do access check if the aco section is set
if ($this->_acoSection) {
- // If we have a section value set that trumps the passed task ???
+ // If we have a section value set that trumps the passed task
if ($this->_acoSectionValue) {
// We have one, so set it and lets do the check
$task = $this->_acoSectionValue;
@@ -466,7 +468,7 @@ public function authorise($task)
return $user->authorise($this->_acoSection, $task);
}
else {
- // Nothing set, nothing to check... so obviously its ok :)
+ // Nothing set, nothing to check... so obviously it's ok :)
return true;
}
}
@@ -475,9 +477,9 @@ public function authorise($task)
* Method to check whether an ID is in the edit list.
*
* @param string $context The context for the session storage.
- * @param integer $id The ID of the record to add to the edit list.
+ * @param integer $id The ID of the record to add to the edit list.
*
- * @return boolean True if the ID is in the edit list.
+ * @return boolean True if the ID is in the edit list.
* @since 11.1
*/
protected function checkEditId($context, $id)
@@ -506,9 +508,9 @@ protected function checkEditId($context, $id)
/**
* Method to load and return a model object.
*
- * @param string $name The name of the model.
- * @param string $prefix Optional model prefix.
- * @param array $config Configuration array for the model. Optional.
+ * @param string $name The name of the model.
+ * @param string $prefix Optional model prefix.
+ * @param array $config Configuration array for the model. Optional.
*
* @return mixed Model object on success; otherwise null failure.
* @since 11.1
@@ -538,7 +540,7 @@ protected function createModel($name, $prefix = '', $config = array())
* @param string $type The type of view.
* @param array $config Configuration array for the view. Optional.
*
- * @return mixed View object on success; null or error result on failure.
+ * @return mixed View object on success; null or error result on failure.
* @since 11.1
* @note Replaces _createView.
*/
@@ -588,7 +590,7 @@ protected function createView($name, $prefix = '', $type = '', $config = array()
* @param bool $cachable If true, the view output will be cached
* @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
*
- * @return JController A JController object to support chaining.
+ * @return JController A JController object to support chaining.
* @since 11.1
*/
public function display($cachable = false, $urlparams = false)
@@ -770,10 +772,10 @@ public function getTasks()
/**
* Method to get a reference to the current view and load it if necessary.
*
- * @param string $name The view name. Optional, defaults to the controller name.
- * @param string $type The view type. Optional.
- * @param string $prefix The class prefix. Optional.
- * @param array $config Configuration array for view. Optional.
+ * @param string $name The view name. Optional, defaults to the controller name.
+ * @param string $type The view type. Optional.
+ * @param string $prefix The class prefix. Optional.
+ * @param array $config Configuration array for view. Optional.
*
* @return object Reference to the view or an error.
* @since 11.1
@@ -24,27 +24,34 @@
class JControllerAdmin extends JController
{
/**
- * @var string The URL option for the component.
+ * The URL option for the component.
+ *
+ * @var string
* @since 11.1
*/
protected $option;
/**
- * @var string The prefix to use with controller messages.
+ * The prefix to use with controller messages.
+ *
+ * @var string
* @since 11.1
*/
protected $text_prefix;
/**
- * @var string The URL view list variable.
+ * The URL view list variable.
+ *
+ * @var string
* @since 11.1
*/
protected $view_list;
/**
* Constructor.
*
- * @param array An optional associative array of configuration settings.
+ * @param array An optional associative array of configuration settings.
+ *
* @see JController
* @since 11.1
*/
@@ -122,7 +129,7 @@ function delete()
* @param bool $cachable If true, the view output will be cached
* @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
*
- * @return JController A JController object to support chaining.
+ * @return JController A JController object to support chaining.
* @since 11.1
*/
public function display($cachable = false, $urlparams = false)
@@ -11,43 +11,53 @@
jimport('joomla.application.component.controller');
-// @TODO Add ability to set redirect manually to better cope with frontend usage.
-
/**
* Controller tailored to suit most form-based admin operations.
*
* @package Joomla.Platform
* @subpackage Application
* @since 11.1
+ *
+ * @todo Add ability to set redirect manually to better cope with frontend usage.
*/
class JControllerForm extends JController
{
/**
- * @var string The context for storing internal data, e.g. record.
+ * The context for storing internal data, e.g. record.
+ *
+ * @var string
* @since 11.1
*/
protected $context;
/**
- * @var string The URL option for the component.
+ * The URL option for the component.
+ *
+ * @var string
* @since 11.1
*/
protected $option;
/**
- * @var string The URL view item variable.
+ * The URL view item variable.
+ *
+ * @var string
* @since 11.1
*/
protected $view_item;
/**
- * @var string The URL view list variable.
+ * The URL view list variable.
+ *
+ * @var string
* @since 11.1
*/
protected $view_list;
/**
- * @var string The prefix to use with controller messages.
+ * The prefix to use with controller messages.
+ *
+ * @var string
* @since 11.1
*/
protected $text_prefix;
@@ -59,8 +69,8 @@ class JControllerForm extends JController
*
* @return JControllerForm A JControllerForm object
*
- * @see JController
* @since 11.1
+ * @see JController
*/
public function __construct($config = array())
{
@@ -176,7 +186,7 @@ protected function allowAdd($data = array())
* Extended classes can override this if necessary.
*
* @param array $data An array of input data.
- * @param string $key The name of the key for the primary key.
+ * @param string $key The name of the key for the primary key; default is id..
*
* @return boolean
* @since 11.1
@@ -297,7 +307,8 @@ public function cancel($key = null)
* Method to edit an existing record.
*
* @param string $key The name of the primary key of the URL variable.
- * @param string $urlVar The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+ * @param string $urlVar The name of the URL variable if different from the primary key
+ * (sometimes required to avoid router collisions).
*
* @return boolean True if access level check and checkout passes, false otherwise.
* @since 11.1
@@ -357,9 +368,9 @@ public function edit($key = null, $urlVar = null)
/**
* Method to get a model object, loading it if required.
*
- * @param string $name The model name. Optional.
- * @param string $prefix The class prefix. Optional.
- * @param array $config Configuration array for model. Optional.
+ * @param string $name The model name. Optional.
+ * @param string $prefix The class prefix. Optional.
+ * @param array $config Configuration array for model. Optional.
*
* @return object The model.
* @since 11.1
@@ -408,6 +419,7 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
* Gets the URL arguments to append to a list redirect.
*
* @return string The arguments to append to the redirect URL.
+ *
* @since 11.1
*/
protected function getRedirectToListAppend()
@@ -424,7 +436,8 @@ protected function getRedirectToListAppend()
}
/**
- * Function that allows child controller access to model data after the data has been saved.
+ * Function that allows child controller access to model data
+ * after the data has been saved.
*
* @param JModel $model The data model object.
* @param array $validData The validated data.
Oops, something went wrong.

0 comments on commit fe90bf3

Please sign in to comment.