Skip to content

Commit

Permalink
codestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Hunziker committed Aug 19, 2016
1 parent 5f8cf2b commit 3afb4ff
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
16 changes: 8 additions & 8 deletions com_sermonspeaker/site/models/frontendupload.php
Expand Up @@ -21,7 +21,7 @@ class SermonspeakerModelFrontendupload extends SermonspeakerModelSermon
/**
* Get the return URL.
*
* @return string The return URL.
* @return string The return URL.
*/
public function getReturnPage()
{
Expand All @@ -33,8 +33,8 @@ public function getReturnPage()
*
* Note. Calling getState in this method will result in recursion.
*
* @param string $ordering Ordering column
* @param string $direction 'ASC' or 'DESC'
* @param string $ordering Ordering column
* @param string $direction 'ASC' or 'DESC'
*
* @return void
*/
Expand All @@ -50,7 +50,7 @@ public function populateState($ordering = null, $direction = null)
// Add compatibility variable for default naming conventions.
$this->setState('form.id', $pk);

$categoryId = $jinput->get('catid', 0, 'int');
$categoryId = $jinput->get('catid', 0, 'int');
$this->setState('frontendupload.catid', $categoryId);

$return = $jinput->get('return', '', 'base64');
Expand All @@ -63,7 +63,7 @@ public function populateState($ordering = null, $direction = null)
$this->setState('return_page', base64_decode($return));

// Load the parameters.
$params = $app->getParams();
$params = $app->getParams();
$this->setState('params', $params);

$this->setState('layout', $jinput->get('layout'));
Expand All @@ -72,7 +72,7 @@ public function populateState($ordering = null, $direction = null)
/**
* Method to get the data that should be injected in the form.
*
* @return mixed The data for the form.
* @return mixed The data for the form.
*/
protected function loadFormData()
{
Expand Down Expand Up @@ -103,7 +103,7 @@ protected function loadFormData()

// Deprecated with SermonSpeaker 4.4.4. Using Ajax now for Lookup.
// Reading ID3 Tags if the Lookup Button was pressed
$jinput = JFactory::getApplication()->input;
$jinput = JFactory::getApplication()->input;

if ($id3_file = $jinput->get('file', '', 'string'))
{
Expand Down Expand Up @@ -145,7 +145,7 @@ protected function loadFormData()
/**
* Method to save the form data.
*
* @param array $data The form data.
* @param array $data The form data.
*
* @return boolean True on success.
*
Expand Down
12 changes: 6 additions & 6 deletions com_sermonspeaker/site/models/serieform.php
Expand Up @@ -25,7 +25,7 @@ class SermonspeakerModelSerieform extends SermonspeakerModelSerie
/**
* Get the return URL.
*
* @return string The return URL.
* @return string The return URL.
*/
public function getReturnPage()
{
Expand All @@ -37,8 +37,8 @@ public function getReturnPage()
*
* Note. Calling getState in this method will result in recursion
*
* @param string $ordering Ordering column
* @param string $direction 'ASC' or 'DESC'
* @param string $ordering Ordering column
* @param string $direction 'ASC' or 'DESC'
*
* @return void
*/
Expand All @@ -54,7 +54,7 @@ protected function populateState($ordering = null, $direction = null)
// Add compatibility variable for default naming conventions
$this->setState('form.id', $pk);

$categoryId = $jinput->get('catid', 0, 'int');
$categoryId = $jinput->get('catid', 0, 'int');
$this->setState('serieform.catid', $categoryId);

$return = $jinput->get('return', '', 'base64');
Expand All @@ -67,7 +67,7 @@ protected function populateState($ordering = null, $direction = null)
$this->setState('return_page', base64_decode($return));

// Load the parameters.
$params = $app->getParams();
$params = $app->getParams();
$this->setState('params', $params);

$this->setState('layout', $jinput->get('layout'));
Expand All @@ -76,7 +76,7 @@ protected function populateState($ordering = null, $direction = null)
/**
* Method to save the form data.
*
* @param array $data The form data.
* @param array $data The form data.
*
* @return boolean True on success.
*
Expand Down
14 changes: 7 additions & 7 deletions com_sermonspeaker/site/models/speakerform.php
Expand Up @@ -35,15 +35,15 @@ public function getReturnPage()
*
* Note. Calling getState in this method will result in recursion.
*
* @param string $ordering Ordering column
* @param string $direction 'ASC' or 'DESC'
* @param string $ordering Ordering column
* @param string $direction 'ASC' or 'DESC'
*
* @return void
*/
protected function populateState($ordering = null, $direction = null)
{
$app = JFactory::getApplication();
$jinput = $app->input;
$app = JFactory::getApplication();
$jinput = $app->input;

// Load state from the request.
$pk = $jinput->get('s_id', 0, 'int');
Expand All @@ -52,7 +52,7 @@ protected function populateState($ordering = null, $direction = null)
// Add compatibility variable for default naming conventions.
$this->setState('form.id', $pk);

$categoryId = $jinput->get('catid', 0, 'int');
$categoryId = $jinput->get('catid', 0, 'int');
$this->setState('speakerform.catid', $categoryId);

$return = $jinput->get('return', '', 'base64');
Expand All @@ -65,7 +65,7 @@ protected function populateState($ordering = null, $direction = null)
$this->setState('return_page', base64_decode($return));

// Load the parameters.
$params = $app->getParams();
$params = $app->getParams();
$this->setState('params', $params);

$this->setState('layout', $jinput->get('layout'));
Expand All @@ -74,7 +74,7 @@ protected function populateState($ordering = null, $direction = null)
/**
* Method to save the form data.
*
* @param array $data The form data.
* @param array $data The form data.
*
* @return boolean True on success.
*
Expand Down

0 comments on commit 3afb4ff

Please sign in to comment.