29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-28 16:13:42 +00:00

Add scopes to a lot of methods.

Further improve class docblocks.
This commit is contained in:
Rouven Weßling 2012-07-18 00:43:09 +02:00
parent 8e84ff0aed
commit 46e21dcae4
178 changed files with 428 additions and 271 deletions

View File

@ -47,7 +47,7 @@ class AdminModelHelp extends JModelLegacy
* Method to get the help search string
* @return string Help search string
*/
function &getHelpSearch()
public function &getHelpSearch()
{
if (is_null($this->help_search)) {
$this->help_search = JFactory::getApplication()->input->getString('helpsearch');
@ -59,7 +59,7 @@ class AdminModelHelp extends JModelLegacy
* Method to get the page
* @return string page
*/
function &getPage()
public function &getPage()
{
if (is_null($this->page))
{
@ -74,7 +74,7 @@ class AdminModelHelp extends JModelLegacy
*
* @return string lang iso tag
*/
function getLangTag()
public function getLangTag()
{
if (is_null($this->lang_tag))
{
@ -95,7 +95,7 @@ class AdminModelHelp extends JModelLegacy
* Method to get the toc
* @return array Table of contents
*/
function &getToc()
public function &getToc()
{
if (is_null($this->toc))
{
@ -142,7 +142,7 @@ class AdminModelHelp extends JModelLegacy
* Method to get the latest version check;
* @return string Latest Version Check URL
*/
function &getLatestVersionCheck()
public function &getLatestVersionCheck()
{
if (!$this->latest_version_check) {
$override = 'http://help.joomla.org/proxy/index.php?option=com_help&keyref=Help{major}{minor}:Joomla_Version_{major}_{minor}_{maintenance}';

View File

@ -53,7 +53,7 @@ class AdminModelSysInfo extends JModelLegacy
*
* @return array some php settings
*/
function &getPhpSettings()
public function &getPhpSettings()
{
if (is_null($this->php_settings))
{
@ -77,12 +77,13 @@ class AdminModelSysInfo extends JModelLegacy
}
return $this->php_settings;
}
/**
* method to get the config
*
* @return array config values
*/
function &getConfig()
public function &getConfig()
{
if (is_null($this->config))
{
@ -95,12 +96,13 @@ class AdminModelSysInfo extends JModelLegacy
}
return $this->config;
}
/**
* method to get the system information
*
* @return array system information values
*/
function &getInfo()
public function &getInfo()
{
if (is_null($this->info))
{
@ -132,7 +134,7 @@ class AdminModelSysInfo extends JModelLegacy
*
* @return string PHP info
*/
function &getPHPInfo()
public function &getPHPInfo()
{
if (is_null($this->php_info))
{
@ -238,7 +240,7 @@ class AdminModelSysInfo extends JModelLegacy
*
* has to be removed (it is present in the config...)
*/
function &getEditor()
public function &getEditor()
{
if (is_null($this->editor))
{

View File

@ -52,7 +52,7 @@ class joomlaInstallerScript
*
* @return void
*/
function update($installer)
public function update($installer)
{
$this->deleteUnexistingFiles();
$this->updateManifestCaches();
@ -314,6 +314,7 @@ class joomlaInstallerScript
}
}
}
public function deleteUnexistingFiles()
{
$files = array(

View File

@ -51,7 +51,7 @@ class AdminViewHelp extends JViewLegacy
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
// Initialise variables.
$this->help_search = $this->get('HelpSearch');

View File

@ -46,7 +46,7 @@ class AdminViewSysinfo extends JViewLegacy
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
// Access check.
if (!JFactory::getUser()->authorise('core.admin')) {

View File

@ -434,7 +434,7 @@ class BannersModelBanner extends JModelAdmin
*
* @since 1.6
*/
function stick(&$pks, $value = 1)
public function stick(&$pks, $value = 1)
{
// Initialise variables.
$user = JFactory::getUser();

View File

@ -57,7 +57,7 @@ class BannersModelBanners extends JModelList
*
* @since 1.6
*/
function &getCategoryOrders()
public function &getCategoryOrders()
{
if (!isset($this->cache['categoryorders'])) {
$db = $this->getDbo();

View File

@ -23,14 +23,14 @@ class BannersTableBanner extends JTable
*
* @since 1.5
*/
function __construct(&$_db)
public function __construct(&$_db)
{
parent::__construct('#__banners', 'id', $_db);
$date = JFactory::getDate();
$this->created = $date->toSql();
}
function clicks()
public function clicks()
{
$query = 'UPDATE #__banners'
. ' SET clicks = (clicks + 1)'
@ -47,7 +47,7 @@ class BannersTableBanner extends JTable
* @see JTable::check
* @since 1.5
*/
function check()
public function check()
{
// Set name
$this->name = htmlspecialchars_decode($this->name, ENT_QUOTES);
@ -122,7 +122,7 @@ class BannersTableBanner extends JTable
*
* @param boolean $updateNulls True to update fields even if they are null.
*/
function store($updateNulls = false)
public function store($updateNulls = false)
{
if (empty($this->id))
{

View File

@ -18,7 +18,7 @@ defined('_JEXEC') or die;
*/
class BannersTableClient extends JTable
{
function __construct(&$_db)
public function __construct(&$_db)
{
$this->checked_out_time = $_db->getNullDate();
parent::__construct('#__banner_clients', 'id', $_db);

View File

@ -23,7 +23,7 @@ class CacheHelper
*
* @return array An array of JHtmlOption elements.
*/
static function getClientOptions()
public static function getClientOptions()
{
// Build the filter options.
$options = array();

View File

@ -27,7 +27,7 @@ class CategoriesControllerCategories extends JControllerAdmin
* @return object The model.
* @since 1.6
*/
function getModel($name = 'Category', $prefix = 'CategoriesModel', $config = array('ignore_request' => true))
public function getModel($name = 'Category', $prefix = 'CategoriesModel', $config = array('ignore_request' => true))
{
$model = parent::getModel($name, $prefix, $config);
return $model;

View File

@ -123,7 +123,7 @@ class CategoriesModelCategories extends JModelList
* @return string
* @since 1.6
*/
function getListQuery()
protected function getListQuery()
{
// Create a new query object.
$db = $this->getDbo();

View File

@ -465,7 +465,7 @@ class CategoriesModelCategory extends JModelAdmin
*
* @since 2.5
*/
function publish(&$pks, $value = 1)
public function publish(&$pks, $value = 1)
{
if (parent::publish($pks, $value)) {
// Initialise variables.

View File

@ -13,8 +13,11 @@ defined('_JEXEC') or die;
JLoader::register('JTableCategory', JPATH_PLATFORM . '/joomla/database/table/category.php');
/**
* Category table
*
* @package Joomla.Administrator
* @subpackage com_categories
* @since 1.6
*/
class CategoriesTableCategory extends JTableCategory
{

View File

@ -14,6 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_categories
* @since 1.6
*/
class CategoriesViewCategory extends JViewLegacy
{

View File

@ -14,6 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_config
* @since 1.5
*/
class ConfigControllerApplication extends JControllerLegacy
{
@ -24,7 +25,7 @@ class ConfigControllerApplication extends JControllerLegacy
* @return void
* @since 1.5
*/
function __construct($config = array())
public function __construct($config = array())
{
parent::__construct($config);
@ -123,7 +124,7 @@ class ConfigControllerApplication extends JControllerLegacy
/**
* Cancel operation
*/
function cancel()
public function cancel()
{
// Check if the user is authorized to do this.
if (!JFactory::getUser()->authorise('core.admin', 'com_config'))
@ -142,7 +143,7 @@ class ConfigControllerApplication extends JControllerLegacy
$this->setRedirect('index.php');
}
function refreshHelp()
public function refreshHelp()
{
jimport('joomla.filesystem.file');

View File

@ -14,6 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_config
* @since 1.5
*/
class ConfigControllerComponent extends JControllerLegacy
{
@ -24,7 +25,7 @@ class ConfigControllerComponent extends JControllerLegacy
* @return void
* @since 1.5
*/
function __construct($config = array())
public function __construct($config = array())
{
parent::__construct($config);
@ -35,7 +36,7 @@ class ConfigControllerComponent extends JControllerLegacy
/**
* Save the configuration
*/
function save()
public function save()
{
// Check for request forgeries.
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

View File

@ -216,7 +216,7 @@ class ConfigModelApplication extends JModelForm
*
* @since 1.6
*/
function removeroot()
public function removeroot()
{
// Get the previous configuration.
$prev = new JConfig;

View File

@ -14,6 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_config
* @since 1.5
*/
class ConfigModelComponent extends JModelForm
{

View File

@ -14,6 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_config
* @since 1.5
*/
class ConfigViewApplication extends JViewLegacy
{

View File

@ -21,7 +21,7 @@ class ConfigViewClose extends JViewLegacy
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
// close a modal window
JFactory::getDocument()->addScriptDeclaration('

View File

@ -14,13 +14,14 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_config
* @since 1.5
*/
class ConfigViewComponent extends JViewLegacy
{
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
$form = $this->get('Form');
$component = $this->get('Component');

View File

@ -40,7 +40,7 @@ class ContactControllerContacts extends JControllerAdmin
* @return void
* @since 1.6
*/
function featured()
public function featured()
{
// Check for request forgeries
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

View File

@ -23,7 +23,7 @@ abstract class JHtmlContact
* @return string The anchor tag to toggle featured/unfeatured contacts.
* @since 1.6
*/
static function featured($value = 0, $i, $canChange = true)
public static function featured($value = 0, $i, $canChange = true)
{
// Array of image, task, title, action
$states = array(

View File

@ -101,7 +101,7 @@ class ContactTableContact extends JTable
* @see JTable::check
* @since 1.5
*/
function check()
public function check()
{
$this->default_con = (int) $this->default_con;

View File

@ -14,6 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_content
* @since 1.5
*/
class ContentController extends JControllerLegacy
{

View File

@ -23,7 +23,7 @@ class ContentControllerArticle extends JControllerForm
*
* @since 1.6
*/
function __construct($config = array())
public function __construct($config = array())
{
parent::__construct($config);

View File

@ -47,7 +47,7 @@ class ContentControllerArticles extends JControllerAdmin
* @return void
* @since 1.6
*/
function featured()
public function featured()
{
// Check for request forgeries
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

View File

@ -20,7 +20,7 @@ class ContentControllerFeatured extends ContentControllerArticles
/**
* Removes an item
*/
function delete()
public function delete()
{
// Check for request forgeries
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
@ -62,7 +62,7 @@ class ContentControllerFeatured extends ContentControllerArticles
* @return void
* @since 1.0
*/
function publish()
public function publish()
{
parent::publish();

View File

@ -19,7 +19,7 @@ abstract class JHtmlContentAdministrator
* @param int $value The state value
* @param int $i
*/
static function featured($value = 0, $i, $canChange = true)
public static function featured($value = 0, $i, $canChange = true)
{
// Array of image, task, title, action
$states = array(

View File

@ -58,7 +58,7 @@ class ContentModelFeatured extends ContentModelArticles
*
* @return string
*/
function getListQuery($resolveFKs = true)
protected function getListQuery($resolveFKs = true)
{
// Create a new query object.
$db = $this->getDbo();

View File

@ -18,7 +18,7 @@ class ContentTableFeatured extends JTable
/**
* @param JDatabaseDriver A database connector object
*/
function __construct(&$db)
public function __construct(&$db)
{
parent::__construct('#__content_frontpage', 'content_id', $db);
}

View File

@ -22,7 +22,7 @@ class InstallerControllerDatabase extends JControllerLegacy
*
* @since 2.5
*/
function fix()
public function fix()
{
$model = $this->getModel('database');
$model->fix();

View File

@ -32,7 +32,7 @@ class InstallerControllerDiscover extends JControllerLegacy
*
* @since 1.6
*/
function install()
public function install()
{
$model = $this->getModel('discover');
$model->discover_install();
@ -44,7 +44,7 @@ class InstallerControllerDiscover extends JControllerLegacy
*
* @since 1.6
*/
function purge()
public function purge()
{
$model = $this->getModel('discover');
$model->purge();

View File

@ -95,7 +95,7 @@ class InstallerControllerManage extends JControllerLegacy
*
* @since 1.6
*/
function refresh()
public function refresh()
{
// Check for request forgeries
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

View File

@ -20,7 +20,7 @@ class InstallerControllerUpdate extends JControllerLegacy
*
* @since 1.6
*/
function update()
public function update()
{
// Check for request forgeries
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
@ -53,7 +53,7 @@ class InstallerControllerUpdate extends JControllerLegacy
*
* @since 1.6
*/
function find()
public function find()
{
// Check for request forgeries
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
@ -76,7 +76,7 @@ class InstallerControllerUpdate extends JControllerLegacy
*
* @since 1.6
*/
function purge()
public function purge()
{
// Purge updates
// Check for request forgeries
@ -94,7 +94,7 @@ class InstallerControllerUpdate extends JControllerLegacy
*
* @since 2.5
*/
function ajax()
public function ajax()
{
// Note: we don't do a token check as we're fetching information
// asynchronously. This means that between requests the token might

View File

@ -62,7 +62,7 @@ class InstallerModelDiscover extends InstallerModel
*
* @since 1.6
*/
function discover()
public function discover()
{
$installer = JInstaller::getInstance();
$results = $installer->discover();
@ -96,7 +96,7 @@ class InstallerModelDiscover extends InstallerModel
*
* @since 1.6
*/
function discover_install()
public function discover_install()
{
$app = JFactory::getApplication();
$installer = JInstaller::getInstance();
@ -132,7 +132,7 @@ class InstallerModelDiscover extends InstallerModel
*
* @since 1.6
*/
function purge()
public function purge()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);

View File

@ -64,7 +64,7 @@ class InstallerModelInstall extends JModelLegacy
* @return boolean result of install
* @since 1.5
*/
function install()
public function install()
{
$this->setState('action', 'install');

View File

@ -82,7 +82,7 @@ class InstallerModelManage extends InstallerModel
* @return boolean True on success
* @since 1.5
*/
function publish(&$eid = array(), $value = 1)
public function publish(&$eid = array(), $value = 1)
{
// Initialise variables.
$user = JFactory::getUser();
@ -141,7 +141,7 @@ class InstallerModelManage extends InstallerModel
* @return boolean result of refresh
* @since 1.6
*/
function refresh($eid)
public function refresh($eid)
{
if (!is_array($eid)) {
$eid = array($eid => 0);
@ -169,7 +169,7 @@ class InstallerModelManage extends InstallerModel
* @return boolean True on success
* @since 1.5
*/
function remove($eid = array())
public function remove($eid = array())
{
// Initialise variables.
$user = JFactory::getUser();

View File

@ -55,7 +55,7 @@ class InstallerModelWarnings extends JModelList
*
* @since 1.6
*/
function getItems()
public function getItems()
{
static $messages;
if ($messages) {

View File

@ -23,7 +23,7 @@ class InstallerViewDatabase extends InstallerViewDefault
/**
* @since 1.6
*/
function display($tpl=null)
public function display($tpl = null)
{
// Get data from the model
$this->state = $this->get('State');

View File

@ -21,7 +21,7 @@ class InstallerViewDefault extends JViewLegacy
/**
* @since 1.5
*/
function __construct($config = null)
public function __construct($config = null)
{
$app = JFactory::getApplication();
parent::__construct($config);
@ -32,7 +32,7 @@ class InstallerViewDefault extends JViewLegacy
/**
* @since 1.5
*/
function display($tpl=null)
public function display($tpl=null)
{
// Get data from the model
$state = $this->get('State');

View File

@ -23,7 +23,7 @@ class InstallerViewDiscover extends InstallerViewDefault
/**
* @since 1.6
*/
function display($tpl=null)
public function display($tpl = null)
{
// Get data from the model
$this->state = $this->get('State');

View File

@ -23,7 +23,7 @@ class InstallerViewInstall extends InstallerViewDefault
/**
* @since 1.5
*/
function display($tpl=null)
public function display($tpl = null)
{
$paths = new stdClass;
$paths->first = '';

View File

@ -31,7 +31,7 @@ class InstallerViewManage extends InstallerViewDefault
/**
* @since 1.6
*/
function display($tpl=null)
public function display($tpl = null)
{
// Get data from the model
$this->state = $this->get('State');

View File

@ -23,7 +23,7 @@ class InstallerViewUpdate extends InstallerViewDefault
/**
* @since 1.6
*/
function display($tpl=null)
public function display($tpl = null)
{
// Get data from the model
$this->state = $this->get('State');

View File

@ -23,7 +23,7 @@ class InstallerViewWarnings extends InstallerViewDefault
/**
* @since 1.6
*/
function display($tpl=null)
public function display($tpl = null)
{
$items = $this->get('Items');
$this->messages = &$items;

View File

@ -21,7 +21,7 @@ class LanguagesControllerInstalled extends JControllerLegacy
/**
* task to set the default language
*/
function setDefault()
public function setDefault()
{
// Check for request forgeries
JSession::checkToken() or jexit(JText::_('JInvalid_Token'));

View File

@ -51,7 +51,7 @@ class LanguagesViewInstalled extends JViewLegacy
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
// Get data from the model
$this->ftp = $this->get('Ftp');

View File

@ -27,7 +27,7 @@ class LanguagesViewLanguages extends JViewLegacy
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');

View File

@ -21,7 +21,7 @@ class LanguagesViewMultilangstatus extends JViewLegacy
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
require_once JPATH_COMPONENT . '/helpers/multilangstatus.php';

View File

@ -51,7 +51,7 @@ class LanguagesViewOverrides extends JViewLegacy
*
* @since 2.5
*/
function display($tpl = null)
public function display($tpl = null)
{
// Get data from the model
$this->state = $this->get('State');

View File

@ -81,7 +81,7 @@ class MediaController extends JControllerLegacy
return $this;
}
function ftpValidate()
public function ftpValidate()
{
// Set FTP credentials, if given
JClientHelper::setCredentialsFromRequest('ftp');

View File

@ -12,6 +12,7 @@ defined('_JEXEC') or die;
/**
* @package Joomla.Administrator
* @subpackage com_media
* @since 1.5
*/
abstract class MediaHelper
{

View File

@ -21,7 +21,7 @@ jimport('joomla.filesystem.file');
*/
class MediaModelList extends JModelLegacy
{
function getState($property = null, $default = null)
public function getState($property = null, $default = null)
{
static $set;
@ -38,21 +38,21 @@ class MediaModelList extends JModelLegacy
return parent::getState($property, $default);
}
function getImages()
public function getImages()
{
$list = $this->getList();
return $list['images'];
}
function getFolders()
public function getFolders()
{
$list = $this->getList();
return $list['folders'];
}
function getDocuments()
public function getDocuments()
{
$list = $this->getList();
@ -65,7 +65,7 @@ class MediaModelList extends JModelLegacy
* @param string $listFolder The image directory to display
* @since 1.5
*/
function getList()
public function getList()
{
static $list;

View File

@ -18,7 +18,7 @@ defined('_JEXEC') or die;
*/
class MediaModelManager extends JModelLegacy
{
function getState($property = null, $default = null)
public function getState($property = null, $default = null)
{
static $set;

View File

@ -18,7 +18,7 @@ defined('_JEXEC') or die;
*/
class MediaViewImages extends JViewLegacy
{
function display($tpl = null)
public function display($tpl = null)
{
$config = JComponentHelper::getParams('com_media');
$app = JFactory::getApplication();

View File

@ -18,7 +18,7 @@ defined('_JEXEC') or die;
*/
class MediaViewImagesList extends JViewLegacy
{
function display($tpl = null)
public function display($tpl = null)
{
// Do not allow cache
JResponse::allowCache(false);

View File

@ -18,7 +18,7 @@ defined('_JEXEC') or die;
*/
class MediaViewMedia extends JViewLegacy
{
function display($tpl = null)
public function display($tpl = null)
{
$app = JFactory::getApplication();
$config = JComponentHelper::getParams('com_media');

View File

@ -18,7 +18,7 @@ defined('_JEXEC') or die;
*/
class MediaViewMediaList extends JViewLegacy
{
function display($tpl = null)
public function display($tpl = null)
{
// Do not allow cache
JResponse::allowCache(false);

View File

@ -297,7 +297,7 @@ class MenusControllerItem extends JControllerForm
*
* @since 1.6
*/
function setType()
public function setType()
{
// Initialise variables.
$app = JFactory::getApplication();

View File

@ -28,7 +28,7 @@ class MenusControllerItems extends JControllerAdmin
* Proxy for getModel
* @since 1.6
*/
function getModel($name = 'Item', $prefix = 'MenusModel', $config = array())
public function getModel($name = 'Item', $prefix = 'MenusModel', $config = array())
{
return parent::getModel($name, $prefix, array('ignore_request' => true));
}
@ -85,7 +85,7 @@ class MenusControllerItems extends JControllerAdmin
*
* @since 1.6
*/
function setDefault()
public function setDefault()
{
// Check for request forgeries
JSession::checkToken('request') or die(JText::_('JINVALID_TOKEN'));

View File

@ -20,7 +20,7 @@ abstract class MenusHtmlMenus
/**
* @param int $itemid The menu item id
*/
static function association($itemid)
public static function association($itemid)
{
// Get the associations
$associations = MenusHelper::getAssociations($itemid);

View File

@ -1315,7 +1315,7 @@ class MenusModelItem extends JModelAdmin
* @return boolean True on success.
* @since 1.6
*/
function setHome(&$pks, $value = 1)
public function setHome(&$pks, $value = 1)
{
// Initialise variables.
$table = $this->getTable();
@ -1385,7 +1385,7 @@ class MenusModelItem extends JModelAdmin
* @return boolean True on success.
* @since 1.6
*/
function publish(&$pks, $value = 1)
public function publish(&$pks, $value = 1)
{
// Initialise variables.
$table = $this->getTable();

View File

@ -12,6 +12,8 @@ defined('_JEXEC') or die;
JLoader::register('JTableMenu', JPATH_PLATFORM . '/joomla/database/table/menu.php');
/**
* Menu table
*
* @package Joomla.Administrator
* @subpackage com_menus
*/

View File

@ -63,7 +63,7 @@ class MessagesHelper
*
* @return array An array of JHtmlOption elements.
*/
static function getStateOptions()
public static function getStateOptions()
{
// Build the filter options.
$options = array();

View File

@ -23,7 +23,7 @@ class MessagesTableMessage extends JTable
*
* @param database A database connector object
*/
function __construct(& $db)
public function __construct(& $db)
{
parent::__construct('#__messages', 'message_id', $db);
}
@ -33,7 +33,7 @@ class MessagesTableMessage extends JTable
*
* @return boolean
*/
function check()
public function check()
{
// Check the to and from users.
$user = new JUser($this->user_id_from);

View File

@ -76,7 +76,7 @@ abstract class ModulesHelper
return $options;
}
static function getPositions($clientId)
public static function getPositions($clientId)
{
$db = JFactory::getDbo();
$query = $db->getQuery(true);

View File

@ -10,20 +10,26 @@
defined('_JEXEC') or die;
/**
* Helper for parse XML module files
*
* @package Joomla.Administrator
* @subpackage com_modules
* @since 1.5
*/
class ModulesHelperXML
{
function parseXMLModuleFile(&$rows)
/**
* @since 1.5
*/
public function parseXMLModuleFile(&$rows)
{
foreach ($rows as $i => $row)
{
if ($row->module == '')
{
$rows[$i]->name = 'custom';
$rows[$i]->module = 'custom';
$rows[$i]->descrip = 'Custom created module, using Module Manager New function';
$rows[$i]->name = 'custom';
$rows[$i]->module = 'custom';
$rows[$i]->descrip = 'Custom created module, using Module Manager New function';
}
else
{
@ -31,8 +37,8 @@ class ModulesHelperXML
if ($data['type'] == 'module')
{
$rows[$i]->name = $data['name'];
$rows[$i]->descrip = $data['description'];
$rows[$i]->name = $data['name'];
$rows[$i]->descrip = $data['description'];
}
}
}

View File

@ -18,7 +18,7 @@ defined('_JEXEC') or die;
*/
class ModulesViewPreview extends JViewLegacy
{
function display($tpl = null)
public function display($tpl = null)
{
$editor = JFactory::getConfig()->get('editor');

View File

@ -25,7 +25,7 @@ class ModulesViewSelect extends JViewLegacy
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
$state = $this->get('State');
$items = $this->get('Items');

View File

@ -331,7 +331,7 @@ class NewsfeedsModelNewsfeed extends JModelAdmin
* @return boolean True on success.
* @since 1.6
*/
function publish(&$pks, $value = 1)
public function publish(&$pks, $value = 1)
{
$result = parent::publish($pks, $value);

View File

@ -54,7 +54,7 @@ class NewsfeedsTableNewsfeed extends JTable
*
* @return boolean True on success.
*/
function check()
public function check()
{
// Check for valid name.
if (trim($this->name) == '') {

View File

@ -93,7 +93,8 @@ class PluginsHelper
return $options;
}
function parseXMLTemplateFile($templateBaseDir, $templateDir)
public function parseXMLTemplateFile($templateBaseDir, $templateDir)
{
$data = new JObject;

View File

@ -14,6 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_search
* @since 1.5
*/
class SearchHelper
{
@ -48,7 +49,7 @@ class SearchHelper
return $result;
}
static function santiseSearchWord(&$searchword, $searchphrase)
public static function santiseSearchWord(&$searchword, $searchphrase)
{
$ignored = false;
@ -88,7 +89,10 @@ class SearchHelper
return $ignored;
}
static function limitSearchWord(&$searchword)
/**
* @since 1.5
*/
public static function limitSearchWord(&$searchword)
{
$restriction = false;
@ -110,7 +114,10 @@ class SearchHelper
return $restriction;
}
static function logSearch($search_term)
/**
* @since 1.5
*/
public static function logSearch($search_term)
{
$db = JFactory::getDbo();
@ -149,6 +156,8 @@ class SearchHelper
* @param string The source string
* @param string The searchword to select around
* @return string
*
* @since 1.5
*/
public static function prepareSearchContent($text, $searchword)
{
@ -202,8 +211,10 @@ class SearchHelper
* @param int Number of chars to return
* @param string The searchword to select around
* @return string
*
* @since 1.5
*/
static function _smartSubstr($text, $searchword)
public static function _smartSubstr($text, $searchword)
{
$lang = JFactory::getLanguage();
$length = $lang->getSearchDisplayedCharactersNumber();

View File

@ -14,13 +14,16 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_search
* @since 1.5
*/
class JSite extends JObject
{
/**
* False method to fool the frontend search plugins
*
* @since 1.5
*/
function getMenu()
public function getMenu()
{
$result = new JSite;
return $result;
@ -28,8 +31,10 @@ class JSite extends JObject
/**
* False method to fool the frontend search plugins
*
* @since 1.5
*/
function getItems()
public function getItems()
{
return array();
}

View File

@ -56,9 +56,9 @@ class TemplatesController extends JControllerLegacy
}
/**
* Preview Template
*/
function preview()
* Preview Template
*/
public function preview()
{
$this->input->set('view', 'prevuuw');
parent::display();

View File

@ -57,7 +57,7 @@ class TemplatesTableStyle extends JTable
*
* @return boolean True on success.
*/
function check()
public function check()
{
if (empty($this->title))
{

View File

@ -41,7 +41,7 @@ class UsersControllerGroups extends JControllerAdmin
*
* @since 1.6
*/
function delete()
public function delete()
{
if (!JFactory::getUser()->authorise('core.admin', $this->option)) {
JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));
@ -58,7 +58,7 @@ class UsersControllerGroups extends JControllerAdmin
*
* @since 1.6
*/
function publish()
public function publish()
{
if (!JFactory::getUser()->authorise('core.admin', $this->option)) {
JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));

View File

@ -24,7 +24,7 @@ class UsersHelperDebug
* @return array
* @since 1.6
*/
static function getComponents()
public static function getComponents()
{
// Initialise variable.
$db = JFactory::getDbo();
@ -133,7 +133,7 @@ class UsersHelperDebug
*
* @return array An array of JHtmlOption elements.
*/
static function getLevelsOptions()
public static function getLevelsOptions()
{
// Build the filter options.
$options = array();

View File

@ -104,7 +104,7 @@ class UsersHelper
*
* @since 1.6
*/
static function getStateOptions()
public static function getStateOptions()
{
// Build the filter options.
$options = array();
@ -121,7 +121,7 @@ class UsersHelper
*
* @since 1.6
*/
static function getActiveOptions()
public static function getActiveOptions()
{
// Build the filter options.
$options = array();
@ -138,7 +138,7 @@ class UsersHelper
*
* @since 1.6
*/
static function getGroups()
public static function getGroups()
{
$db = JFactory::getDbo();
$db->setQuery(

View File

@ -168,7 +168,7 @@ class UsersModelLevels extends JModelList
* @param array An array of primary key ids.
* @param int +/-1
*/
function saveorder($pks, $order)
public function saveorder($pks, $order)
{
// Initialise variables.
$table = JTable::getInstance('viewlevel');

View File

@ -280,7 +280,7 @@ class UsersModelUser extends JModelAdmin
*
* @since 1.6
*/
function block(&$pks, $value = 1)
public function block(&$pks, $value = 1)
{
// Initialise variables.
$app = JFactory::getApplication();
@ -391,7 +391,7 @@ class UsersModelUser extends JModelAdmin
*
* @since 1.6
*/
function activate(&$pks)
public function activate(&$pks)
{
// Initialise variables.
$dispatcher = JEventDispatcher::getInstance();

View File

@ -25,7 +25,7 @@ class UsersViewMail extends JViewLegacy
/**
* Display the view
*/
function display($tpl = null)
public function display($tpl = null)
{
// Get data from the model
$this->form = $this->get('Form');

View File

@ -12,6 +12,7 @@ defined('_JEXEC') or die;
/**
* @package Joomla.Administrator
* @subpackage com_users
* @since 1.5
*/
class UsersViewUser extends JViewLegacy
{
@ -27,6 +28,8 @@ class UsersViewUser extends JViewLegacy
/**
* Display the view
*
* @since 1.5
*/
public function display($tpl = null)
{

View File

@ -14,6 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage Application
* @since 1.5
*/
class JAdministratorHelper
{

View File

@ -12,6 +12,7 @@ defined('_JEXEC') or die;
* Utility class for the button bar.
*
* @package Joomla.Administrator
* @since 1.5
*/
abstract class JToolbarHelper
{
@ -50,7 +51,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function spacer($width = '')
{
@ -65,7 +66,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function divider()
{
@ -86,7 +87,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function custom($task = '', $icon = '', $iconOver = '', $alt = '', $listSelect = true)
{
@ -107,7 +108,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function preview($url = '', $updateEditors = false)
{
@ -127,7 +128,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function help($ref, $com = false, $override = null, $component = null)
{
@ -146,7 +147,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function back($alt = 'JTOOLBAR_BACK', $href = 'javascript:history.back();')
{
@ -164,7 +165,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function media_manager($directory = '', $alt = 'JTOOLBAR_UPLOAD')
{
@ -182,7 +183,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function makeDefault($task = 'default', $alt = 'JTOOLBAR_DEFAULT')
{
@ -200,7 +201,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function assign($task = 'assign', $alt = 'JTOOLBAR_ASSIGN')
{
@ -219,7 +220,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function addNew($task = 'add', $alt = 'JTOOLBAR_NEW', $check = false)
{
@ -238,7 +239,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function publish($task = 'publish', $alt = 'JTOOLBAR_PUBLISH', $check = false)
{
@ -256,7 +257,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function publishList($task = 'publish', $alt = 'JTOOLBAR_PUBLISH')
{
@ -275,7 +276,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function unpublish($task = 'unpublish', $alt = 'JTOOLBAR_UNPUBLISH', $check = false)
{
@ -293,7 +294,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function unpublishList($task = 'unpublish', $alt = 'JTOOLBAR_UNPUBLISH')
{
@ -311,7 +312,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function archiveList($task = 'archive', $alt = 'JTOOLBAR_ARCHIVE')
{
@ -329,7 +330,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function unarchiveList($task = 'unarchive', $alt = 'JTOOLBAR_UNARCHIVE')
{
@ -347,7 +348,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function editList($task = 'edit', $alt = 'JTOOLBAR_EDIT')
{
@ -365,7 +366,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function editHtml($task = 'edit_source', $alt = 'JTOOLBAR_EDIT_HTML')
{
@ -383,7 +384,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function editCss($task = 'edit_css', $alt = 'JTOOLBAR_EDIT_CSS')
{
@ -402,7 +403,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function deleteList($msg = '', $task = 'remove', $alt = 'JTOOLBAR_DELETE')
{
@ -428,7 +429,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function trash($task = 'remove', $alt = 'JTOOLBAR_TRASH', $check = true)
{
@ -447,7 +448,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function apply($task = 'apply', $alt = 'JTOOLBAR_APPLY')
{
@ -466,7 +467,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function save($task = 'save', $alt = 'JTOOLBAR_SAVE')
{
@ -542,7 +543,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function cancel($task = 'cancel', $alt = 'JTOOLBAR_CANCEL')
{
@ -563,7 +564,7 @@ abstract class JToolbarHelper
*
* @return void
*
* @since 1.0
* @since 1.5
*/
public static function preferences($component, $height = '550', $width = '875', $alt = 'JToolbar_Options', $path = '', $onClose = '')
{
@ -582,6 +583,7 @@ abstract class JToolbarHelper
* Utility class for the submenu.
*
* @package Joomla.Administrator
* @since 1.5
*/
abstract class JSubMenuHelper
{
@ -591,6 +593,8 @@ abstract class JSubMenuHelper
* @param string $name Name of the menu item.
* @param string $link URL of the menu item.
* @param bool True if the item is active, false otherwise.
*
* @since 1.5
*/
public static function addEntry($name, $link = '', $active = false)
{

View File

@ -10,11 +10,17 @@
defined('_JEXEC') or die;
/**
* Helper for mod_feed
*
* @package Joomla.Administrator
* @subpackage mod_feed
* @since 1.5
*/
abstract class modFeedHelper
{
/**
* @since 1.5
*/
public static function render($params)
{
// module params

View File

@ -12,6 +12,8 @@ defined('_JEXEC') or die;
JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR.'/components/com_content/models', 'ContentModel');
/**
* Helper for mod_latest
*
* @package Joomla.Administrator
* @subpackage mod_latest
*/

View File

@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
* Helper for mod_logged
*
* @package Joomla.Administrator
* @subpackage mod_logged
*/

View File

@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
* Helper for mod_login
*
* @package Joomla.Administrator
* @subpackage mod_login
* @since 1.6

View File

@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
* Helper for mod_menu
*
* @package Joomla.Administrator
* @subpackage mod_menu
* @since 1.5

View File

@ -10,8 +10,11 @@
defined('_JEXEC') or die;
/**
* Tree based class to render the admin menu
*
* @package Joomla.Administrator
* @subpackage mod_menu
* @since 1.5
*/
class JAdminCssMenu extends JObject
{
@ -81,12 +84,12 @@ class JAdminCssMenu extends JObject
$this->_current = &$this->_root;
}
function addSeparator()
public function addSeparator()
{
$this->addChild(new JMenuNode(null, null, 'separator', false));
}
function renderMenu($id = 'menu', $class = '')
public function renderMenu($id = 'menu', $class = '')
{
$depth = 1;
@ -119,7 +122,7 @@ class JAdminCssMenu extends JObject
}
}
function renderLevel($depth)
public function renderLevel($depth)
{
/*
* Build the CSS class suffix
@ -198,7 +201,7 @@ class JAdminCssMenu extends JObject
* @return string CSS class name
* @since 1.5
*/
function getIconClass($identifier)
public function getIconClass($identifier)
{
static $classes;
@ -236,8 +239,12 @@ class JAdminCssMenu extends JObject
}
/**
* A Node for JAdminCssMenu
*
* @package Joomla.Administrator
* @subpackage mod_menu
* @since 1.5
* @see JAdminCssMenu
*/
class JMenuNode extends JObject
{

View File

@ -12,6 +12,8 @@ defined('_JEXEC') or die;
JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR.'/components/com_content/models', 'ContentModel');
/**
* Helper for mod_popular
*
* @package Joomla.Administrator
* @subpackage mod_popular
* @since 1.6

View File

@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
* Helper for mod_quickicon
*
* @package Joomla.Administrator
* @subpackage mod_quickicon
* @since 1.6

View File

@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
* Helper for mod_submenu
*
* @package Joomla.Administrator
* @subpackage mod_submenu
* @since 1.6

View File

@ -10,6 +10,8 @@
defined('_JEXEC') or die;
/**
* Helper for mod_version
*
* @package Joomla.Administrator
* @subpackage mod_version
* @since 1.6

View File

@ -18,7 +18,7 @@ defined('_JEXEC') or die;
*/
class BannersController extends JControllerLegacy
{
function click()
public function click()
{
$id = $this->input->getInt('id', 0);

View File

@ -16,6 +16,7 @@ JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
*
* @package Joomla.Site
* @subpackage com_banners
* @since 1.5
*/
class BannersModelBanner extends JModelLegacy
{
@ -25,8 +26,10 @@ class BannersModelBanner extends JModelLegacy
* Clicks the URL, incrementing the counter
*
* @return void
*
* @since 1.5
*/
function click()
public function click()
{
$id = $this->getState('banner.id');
@ -125,7 +128,7 @@ class BannersModelBanner extends JModelLegacy
*
* @return object
*/
function &getItem()
public function &getItem()
{
if (!isset($this->_item))
{
@ -173,8 +176,10 @@ class BannersModelBanner extends JModelLegacy
* Get the URL for a banner
*
* @return string
*
* @since 1.5
*/
function getUrl()
public function getUrl()
{
$item = $this->getItem();
$url = $item->clickurl;

View File

@ -19,7 +19,7 @@ defined('_JEXEC') or die;
*/
class JHtmlIcon
{
static function email($contact, $params, $attribs = array())
public static function email($contact, $params, $attribs = array())
{
require_once JPATH_SITE . '/components/com_mailto/helpers/mailto.php';
$uri = JURI::getInstance();
@ -42,7 +42,7 @@ class JHtmlIcon
return $output;
}
static function print_popup($article, $params, $attribs = array())
public static function print_popup($article, $params, $attribs = array())
{
$url = ContentHelperRoute::getContactRoute($contact->slug, $contact->catid);
$url .= '&tmpl=component&print=1&layout=default&page='.@ $request->limitstart;
@ -63,7 +63,7 @@ class JHtmlIcon
return JHtml::_('link', JRoute::_($url), $text, $attribs);
}
static function print_screen($contact, $params, $attribs = array())
public static function print_screen($contact, $params, $attribs = array())
{
// checks template image directory for image, if non found default are loaded
if ($params->get('show_icons')) {

Some files were not shown because too many files have changed in this diff Show More