Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #541 from realityking/cmsstyle

Some style fixes.
  • Loading branch information...
commit c6c28de8dd30ad7c1d2e08288875af76317ac900 2 parents d4e8d03 + 2f1a66d
@LouisLandry LouisLandry authored
View
18 libraries/joomla/application/module/helper.php
@@ -54,16 +54,16 @@ public static function &getModule($name, $title = null)
// If we didn't find it, and the name is mod_something, create a dummy object
if (is_null($result) && substr($name, 0, 4) == 'mod_')
{
- $result = new stdClass;
- $result->id = 0;
- $result->title = '';
- $result->module = $name;
- $result->position = '';
- $result->content = '';
+ $result = new stdClass;
+ $result->id = 0;
+ $result->title = '';
+ $result->module = $name;
+ $result->position = '';
+ $result->content = '';
$result->showtitle = 0;
- $result->control = '';
- $result->params = '';
- $result->user = 0;
+ $result->control = '';
+ $result->params = '';
+ $result->user = 0;
}
return $result;
View
5 libraries/joomla/application/router.php
@@ -46,7 +46,10 @@ class JRouter extends JObject
* @var array
* @since 11.1
*/
- protected $_rules = array('build' => array(), 'parse' => array());
+ protected $_rules = array(
+ 'build' => array(),
+ 'parse' => array()
+ );
/**
* @var array JRouter instances container.
View
25 libraries/joomla/client/ftp.php
@@ -154,10 +154,8 @@ class JFTP
*
* @since 11.1
*/
-
public function __construct($options = array())
{
-
// If default transfer type is not set, set it to autoascii detect
if (!isset($options['type']))
{
@@ -259,7 +257,6 @@ public function getInstance($host = '127.0.0.1', $port = '21', $options = null,
*/
public function setOptions($options)
{
-
if (isset($options['type']))
{
$this->_type = $options['type'];
@@ -283,7 +280,6 @@ public function setOptions($options)
*/
public function connect($host = '127.0.0.1', $port = 21)
{
-
// Initialise variables.
$errno = null;
$err = null;
@@ -353,7 +349,6 @@ public function isConnected()
*/
public function login($user = 'anonymous', $pass = 'jftp@joomla.org')
{
-
// If native FTP support is enabled let's use it...
if (FTP_NATIVE)
{
@@ -397,7 +392,6 @@ public function login($user = 'anonymous', $pass = 'jftp@joomla.org')
*/
public function quit()
{
-
// If native FTP support is enabled lets use it...
if (FTP_NATIVE)
{
@@ -421,7 +415,6 @@ public function quit()
*/
public function pwd()
{
-
// If native FTP support is enabled let's use it...
if (FTP_NATIVE)
{
@@ -459,7 +452,6 @@ public function pwd()
*/
public function syst()
{
-
// If native FTP support is enabled lets use it...
if (FTP_NATIVE)
{
@@ -509,7 +501,6 @@ public function syst()
*/
public function chdir($path)
{
-
// If native FTP support is enabled lets use it...
if (FTP_NATIVE)
{
@@ -542,7 +533,6 @@ public function chdir($path)
*/
public function reinit()
{
-
// If native FTP support is enabled let's use it...
if (FTP_NATIVE)
{
@@ -576,7 +566,6 @@ public function reinit()
*/
public function rename($from, $to)
{
-
// If native FTP support is enabled let's use it...
if (FTP_NATIVE)
{
@@ -617,7 +606,6 @@ public function rename($from, $to)
*/
public function chmod($path, $mode)
{
-
// If no filename is given, we assume the current directory is the target
if ($path == '')
{
@@ -667,7 +655,6 @@ public function chmod($path, $mode)
*/
public function delete($path)
{
-
// If native FTP support is enabled let's use it...
if (FTP_NATIVE)
{
@@ -705,7 +692,6 @@ public function delete($path)
*/
public function mkdir($path)
{
-
// If native FTP support is enabled let's use it...
if (FTP_NATIVE)
{
@@ -737,7 +723,6 @@ public function mkdir($path)
*/
public function restart($point)
{
-
// If native FTP support is enabled let's use it...
if (FTP_NATIVE)
{
@@ -770,7 +755,6 @@ public function restart($point)
*/
public function create($path)
{
-
// If native FTP support is enabled let's use it...
if (FTP_NATIVE)
{
@@ -830,7 +814,6 @@ public function create($path)
*/
public function read($remote, &$buffer)
{
-
// Determine file type
$mode = $this->_findMode($remote);
@@ -915,7 +898,6 @@ public function read($remote, &$buffer)
*/
public function get($local, $remote)
{
-
// Determine file type
$mode = $this->_findMode($remote);
@@ -993,7 +975,6 @@ public function get($local, $remote)
*/
public function store($local, $remote = null)
{
-
// If remote file is not given, use the filename of the local file in the current
// working directory.
if ($remote == null)
@@ -1097,7 +1078,6 @@ public function store($local, $remote = null)
*/
public function write($remote, $buffer)
{
-
// Determine file type
$mode = $this->_findMode($remote);
@@ -1181,7 +1161,6 @@ public function write($remote, $buffer)
*/
public function listNames($path = null)
{
-
// Initialise variables.
$data = null;
@@ -1279,7 +1258,6 @@ public function listNames($path = null)
*/
public function listDetails($path = null, $type = 'all')
{
-
// Initialise variables.
$dir_list = array();
$data = null;
@@ -1519,7 +1497,6 @@ public function listDetails($path = null, $type = 'all')
*/
protected function _putCmd($cmd, $expectedResponse)
{
-
// Make sure we have a connection to the server
if (!is_resource($this->_conn))
{
@@ -1547,7 +1524,6 @@ protected function _putCmd($cmd, $expectedResponse)
*/
protected function _verifyResponse($expected)
{
-
// Initialise variables.
$parts = null;
@@ -1606,7 +1582,6 @@ protected function _verifyResponse($expected)
*/
protected function _passive()
{
-
// Initialize variables.
$match = array();
$parts = array();
View
2  libraries/joomla/database/database.php
@@ -67,7 +67,7 @@ static function test();
protected $cursor;
/**
- * @var bool The database driver debugging state.
+ * @var boolean The database driver debugging state.
* @since 11.1
*/
protected $debug = false;
View
2  libraries/joomla/user/authentication.php
@@ -263,7 +263,7 @@ public function detach($observer)
}
/**
- * Finds out if a set of login credentials are valid by asking all obvserving
+ * Finds out if a set of login credentials are valid by asking all observing
* objects to run their respective authentication routines.
*
* @param array $credentials Array holding the user credentials.
Please sign in to comment.
Something went wrong with that request. Please try again.