Skip to content

Replace unnecessary double quotes in administrator #3 #13295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 25, 2016
Merged

Replace unnecessary double quotes in administrator #3 #13295

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c677d7
Replace unnecessary double quotes
frankmayer Dec 20, 2016
fafd8b4
And one unnecessary semicolon... ;)
frankmayer Dec 20, 2016
b94f908
CS Fix + removal of unnecessary space
frankmayer Dec 20, 2016
471d450
some more double quote replacements
frankmayer Dec 20, 2016
a9cf8ed
Changes, based on @shur's comments
frankmayer Dec 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions administrator/includes/toolbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,8 @@ public static function versions($typeAlias, $itemId, $height = 800, $width = 500
public static function modal($targetModalId, $icon, $alt)
{
$title = JText::_($alt);
$dhtml = "<button data-toggle='modal' data-target='#" . $targetModalId . "' class='btn btn-small'>
<span class='" . $icon . "' title='" . $title . "'></span> " . $title . "</button>";
$dhtml = '<button data-toggle="modal" data-target="# ' . $targetModalId . '" class="btn btn-small">
Copy link
Contributor

@shur shur Dec 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

data-target="# ' - this is not correct, you add an extra space here.

Copy link
Contributor Author

@frankmayer frankmayer Dec 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops! Yes ;)

<span class="' . $icon . '" title="' . $title . '"></span> ' . $title . '</button>';

$bar = JToolbar::getInstance('toolbar');
$bar->appendButton('Custom', $dhtml, $alt);
Expand Down
14 changes: 7 additions & 7 deletions administrator/modules/mod_feed/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,35 @@
{
$lang = JFactory::getLanguage();
$myrtl = $params->get('rssrtl');
$direction = " ";
$direction = ' ';

if ($lang->isRtl() && $myrtl == 0)
{
$direction = " redirect-rtl";
$direction = ' redirect-rtl';
}

// Feed description
elseif ($lang->isRtl() && $myrtl == 1)
{
$direction = " redirect-ltr";
$direction = ' redirect-ltr';
}

elseif ($lang->isRtl() && $myrtl == 2)
{
$direction = " redirect-rtl";
$direction = ' redirect-rtl';
}

elseif ($myrtl == 0)
{
$direction = " redirect-ltr";
$direction = ' redirect-ltr';
}
elseif ($myrtl == 1)
{
$direction = " redirect-ltr";
$direction = ' redirect-ltr';
}
elseif ($myrtl == 2)
{
$direction = " redirect-rtl";
$direction = ' redirect-rtl';
}

if ($feed != false) :
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_latest/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ public static function getTitle($params)
$title = '';
}

return JText::plural('MOD_LATEST_TITLE' . $type . ($catid ? "_CATEGORY" : '') . ($who != '0' ? "_$who" : ''), (int) $params->get('count'), $title);
return JText::plural('MOD_LATEST_TITLE' . $type . ($catid ? '_CATEGORY' : '') . ($who != '0' ? "_$who" : ''), (int) $params->get('count'), $title);
}
}
2 changes: 1 addition & 1 deletion administrator/modules/mod_login/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static function getLanguageList()
$languages,
function ($a, $b)
{
return strcmp($a["value"], $b["value"]);
return strcmp($a['value'], $b['value']);
}
);

Expand Down
14 changes: 7 additions & 7 deletions administrator/modules/mod_menu/menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function renderMenu($id = 'menu', $class = '')
// Recurse through children if they exist
while ($this->_current->hasChildren())
{
echo "<ul " . $id . " " . $class . ">\n";
echo '<ul ' . $id . ' ' . $class . ">\n";
Copy link
Contributor

@andrepereiradasilva andrepereiradasilva Dec 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hum why don't we use PHP_EOL const here ...

Copy link
Contributor Author

@frankmayer frankmayer Dec 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depending on OS PHP_EOL sends \n (linux) or \r\n (windows) so unfortunately it's not doable...

Copy link
Contributor

@andrepereiradasilva andrepereiradasilva Dec 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok


foreach ($this->_current->getChildren() as $child)
{
Expand Down Expand Up @@ -177,7 +177,7 @@ public function renderLevel($depth)
}

// Print the item
echo "<li" . $class . ">";
echo '<li' . $class . '>';

// Print a link if it exists
$linkClass = array();
Expand Down Expand Up @@ -214,20 +214,20 @@ public function renderLevel($depth)

if ($this->_current->link != null && $this->_current->target != null)
{
echo "<a" . $linkClass . " " . $dataToggle . " href=\"" . $this->_current->link . "\" target=\"" . $this->_current->target . "\" >"
. $this->_current->title . $dropdownCaret . "</a>";
echo '<a' . $linkClass . ' ' . $dataToggle . ' href="' . $this->_current->link . '" target="' . $this->_current->target . '" >'
Copy link
Contributor

@shur shur Dec 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this extra space is not needed
Please replase '" >' to '">' as it is done below.

Copy link
Contributor Author

@frankmayer frankmayer Dec 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, done.

. $this->_current->title . $dropdownCaret . '</a>';
}
elseif ($this->_current->link != null && $this->_current->target == null)
{
echo "<a" . $linkClass . " " . $dataToggle . " href=\"" . $this->_current->link . "\">" . $this->_current->title . $dropdownCaret . "</a>";
echo '<a' . $linkClass . ' ' . $dataToggle . ' href="' . $this->_current->link . '">' . $this->_current->title . $dropdownCaret . '</a>';
}
elseif ($this->_current->title != null)
{
echo "<a" . $linkClass . " " . $dataToggle . ">" . $this->_current->title . $dropdownCaret . "</a>";
echo '<a' . $linkClass . ' ' . $dataToggle . '>' . $this->_current->title . $dropdownCaret . '</a>';
}
else
{
echo "<span></span>";
echo '<span></span>';
}

// Recurse through children if they exist
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_popular/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,6 @@ public static function getTitle($params)
$title = '';
}

return JText::plural('MOD_POPULAR_TITLE' . ($catid ? "_CATEGORY" : '') . ($who != '0' ? "_$who" : ''), (int) $params->get('count'), $title);
return JText::plural('MOD_POPULAR_TITLE' . ($catid ? '_CATEGORY' : '') . ($who != '0' ? "_$who" : ''), (int) $params->get('count'), $title);
}
}
2 changes: 1 addition & 1 deletion administrator/templates/hathor/cpanel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<div id="header">
<!-- Site Title and Skip to Content -->
<div class="title-ua">
<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . " " . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
<div id="skiplinkholder"><p><a id="skiplink" href="#skiptarget"><?php echo JText::_('TPL_HATHOR_SKIP_TO_MAIN_CONTENT'); ?></a></p></div>
</div>
</div><!-- end header -->
Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/hathor/html/com_banners/tracks/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@
'height' => '300px',
'footer' => '<a class="btn" data-dismiss="modal" type="button"'
. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
. JText::_("COM_BANNERS_CANCEL") . '</a>'
. JText::_('COM_BANNERS_CANCEL') . '</a>'
. '<button class="btn btn-success" type="button"'
. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
. JText::_("COM_BANNERS_TRACKS_EXPORT") . '</button>',
. JText::_('COM_BANNERS_TRACKS_EXPORT') . '</button>',
)
); ?>

Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/hathor/html/com_finder/maps/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
</td>
<td class="center btns">
<?php if ((int) $item->num_children === 0) : ?>
<span class="badge <?php if ($item->num_nodes > 0) echo "badge-info"; ?>"><?php echo $item->num_nodes; ?></span>
<span class="badge <?php if ($item->num_nodes > 0) echo 'badge-info'; ?>"><?php echo $item->num_nodes; ?></span>
<?php else : ?>
&nbsp;
<?php endif; ?>
Expand Down
10 changes: 5 additions & 5 deletions administrator/templates/hathor/html/com_menus/menus/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
$modMenuId = (int) $this->get('ModMenuId');

$script = array();
$script[] = "jQuery(document).ready(function() {";
$script[] = 'jQuery(document).ready(function() {';

foreach ($this->items as $item) :
if ($user->authorise('core.edit', 'com_menus')) :
Expand All @@ -39,7 +39,7 @@
$script[] = ' window.parent.location.reload();';
$script[] = ' },1000);';
$script[] = ' });';
$script[] = "});";
$script[] = '});';

JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
?>
Expand Down Expand Up @@ -162,10 +162,10 @@
'height' => '300px',
'width' => '800px',
'footer' => '<a class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</a>'
. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
. '<button class="btn btn-success" data-dismiss="modal" aria-hidden="true" onclick="jQuery(\'#module'
. $module->id . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
. JText::_("JSAVE") . '</button>'
. JText::_('JSAVE') . '</button>'
)
); ?>
<?php endif; ?>
Expand All @@ -182,7 +182,7 @@
'height' => '500px',
'width' => '800px',
'footer' => '<a class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</a>'
. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
)
); ?>
<?php endif; ?>
Expand Down
20 changes: 11 additions & 9 deletions administrator/templates/hathor/html/com_postinstall/messages/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@
$renderer = JFactory::getDocument()->loadRenderer('module');
$options = array('style' => 'raw');
$mod = JModuleHelper::getModule('mod_feed');
$param = array("rssurl" => "https://www.joomla.org/announcements/release-news.feed?type=rss",
"rsstitle" => 0,
"rssdesc" => 0,
"rssimage" => 1,
"rssitems" => 5,
"rssitemdesc" => 1,
"word_count" => 200,
"cache" => 0,
"moduleclass_sfx" => ' list-striped');
$param = array(
'rssurl' => 'https://www.joomla.org/announcements/release-news.feed?type=rss',
'rsstitle' => 0,
'rssdesc' => 0,
'rssimage' => 1,
'rssitems' => 5,
'rssitemdesc' => 1,
'word_count' => 200,
'cache' => 0,
'moduleclass_sfx' => ' list-striped'
);
$params = array('params' => json_encode($param));
?>

Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/hathor/html/com_templates/template/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function clearCoords()
};
});");
}
JFactory::getDocument()->addStyleDeclaration("
JFactory::getDocument()->addStyleDeclaration('
/* Styles for modals */
.selected{
background: #08c;
Expand All @@ -112,7 +112,7 @@ function clearCoords()
.tree-holder{
overflow-x: auto;
}
");
');
if ($this->type == 'font')
{
JFactory::getDocument()->addStyleDeclaration(
Expand Down
6 changes: 3 additions & 3 deletions administrator/templates/hathor/html/com_templates/template/default_tree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@

if ($count == count($keyArray))
{
$class = "folder show";
$class = 'folder show';
}
else
{
$class = "folder";
$class = 'folder';
}
}
else
{
$class = "folder";
$class = 'folder';
}

?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/hathor/html/modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function modChrome_xhtmlid($module, &$params, &$attribs)

</div>
<?php
} elseif ($attribs['id'] == "submenu-box")
} elseif ($attribs['id'] == 'submenu-box')
{
?>
<div id="no-submenu"></div>
Expand Down
38 changes: 19 additions & 19 deletions administrator/templates/hathor/html/pagination.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ function pagination_list_footer($list)
$fixlimit = $list['limitfield'];
$fixlimit = preg_replace('/onchange="Joomla.submitform\(\);"/', '', $fixlimit);

$html = "<div class=\"containerpg\"><div class=\"pagination\">\n";
$html = '<div class="containerpg"><div class="pagination">';

$html .= "\n<div class=\"limit\"><label for=\"limit\">".JText::_('JGLOBAL_DISPLAY_NUM')." </label>";
$html .= "\n".$fixlimit;
$html .= "\n<button id=\"pagination-go\" type=\"button\" onclick=\"Joomla.submitform()\">" . JText::_('JSUBMIT') . "</button></div>";
$html .= '<div class="limit"><label for="limit">' . JText::_('JGLOBAL_DISPLAY_NUM') . ' </label>';
$html .= "\n" . $fixlimit;
$html .= "\n" . '<button id="pagination-go" type="button" onclick="Joomla.submitform()">' . JText::_('JSUBMIT') . '</button></div>';
$html .= "\n" . $list['pageslinks'];
$html .= "\n<div class=\"limit\">".$list['pagescounter']."</div>";
$html .= "\n" . '<div class="limit">' . $list['pagescounter'] . '</div>';

$html .= "\n<input type=\"hidden\" name=\"" . $list['prefix'] . "limitstart\" value=\"".$list['limitstart']."\" />";
$html .= "\n<div class=\"clr\"></div></div></div>";
$html .= "\n" . '<input type="hidden" name="' . $list['prefix'] . 'limitstart" value="' . $list['limitstart'] . '" />';
$html .= "\n" . '<div class="clr"></div></div></div>';

return $html;
}
Expand All @@ -93,35 +93,35 @@ function pagination_list_render($list)

if ($list['start']['active'])
{
$html .= "<div class=\"button2-right\"><div class=\"start\">".$list['start']['data']."</div></div>";
$html .= '<div class="button2-right"><div class="start">'. $list['start']['data']. '</div></div>';
} else {
$html .= "<div class=\"button2-right off\"><div class=\"start\">".$list['start']['data']."</div></div>";
$html .= '<div class="button2-right off"><div class="start">'. $list['start']['data']. '</div></div>';
}
if ($list['previous']['active'])
{
$html .= "<div class=\"button2-right\"><div class=\"prev\">".$list['previous']['data']."</div></div>";
$html .= '<div class="button2-right"><div class="prev">'. $list['previous']['data']. '</div></div>';
} else {
$html .= "<div class=\"button2-right off\"><div class=\"prev\">".$list['previous']['data']."</div></div>";
$html .= '<div class="button2-right off"><div class="prev">'. $list['previous']['data']. '</div></div>';
}

$html .= "\n<div class=\"button2-left\"><div class=\"page\">";
$html .= '<div class="button2-left"><div class="page">';
foreach ($list['pages'] as $page)
{
$html .= $page['data'];
}
$html .= "\n</div></div>";
$html .= '</div></div>';

if ($list['next']['active'])
{
$html .= "<div class=\"button2-left\"><div class=\"next\">".$list['next']['data']."</div></div>";
$html .= '<div class="button2-left"><div class="next">'. $list['next']['data']. '</div></div>';
} else {
$html .= "<div class=\"button2-left off\"><div class=\"next\">".$list['next']['data']."</div></div>";
$html .= '<div class="button2-left off"><div class="next">'. $list['next']['data']. '</div></div>';
}
if ($list['end']['active'])
{
$html .= "<div class=\"button2-left\"><div class=\"end\">".$list['end']['data']."</div></div>";
$html .= '<div class="button2-left"><div class="end">'. $list['end']['data']. '</div></div>';
} else {
$html .= "<div class=\"button2-left off\"><div class=\"end\">".$list['end']['data']."</div></div>";
$html .= '<div class="button2-left off"><div class="end">'. $list['end']['data']. '</div></div>';
}

return $html;
Expand All @@ -131,11 +131,11 @@ function pagination_item_active(&$item)
{
if ($item->base > 0)
{
return "<a href=\"#\" title=\"".$item->text."\" onclick=\"document.adminForm." . $item->prefix . "limitstart.value=".$item->base."; Joomla.submitform();return false;\">".$item->text."</a>";
return '<a href="#" title="'.$item->text.'" onclick="document.adminForm.' . $item->prefix . 'limitstart.value=' .$item->base.'; Joomla.submitform();return false;">'.$item->text. '</a>';
}
else
{
return "<a href=\"#\" title=\"".$item->text."\" onclick=\"document.adminForm." . $item->prefix . "limitstart.value=0; Joomla.submitform();return false;\">".$item->text."</a>";
return '<a href="#" title="'.$item->text.'" onclick="document.adminForm.' . $item->prefix . 'limitstart.value=0; Joomla.submitform();return false;">'.$item->text. '</a>';
}
}

Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/hathor/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<div id="header">
<!-- Site Title and Skip to Content -->
<div class="title-ua">
<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . " " . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
<div id="skiplinkholder"><p><a id="skiplink" href="#skiptarget"><?php echo JText::_('TPL_HATHOR_SKIP_TO_MAIN_CONTENT'); ?></a></p></div>
</div>
</div><!-- end header -->
Expand All @@ -132,7 +132,7 @@
<?php if (!$app->input->getInt('hidemainmenu')) : ?>
<h3 class="element-invisible"><?php echo JText::_('TPL_HATHOR_SUB_MENU'); ?></h3>
<jdoc:include type="modules" name="submenu" style="xhtmlid" id="submenu-box" />
<?php echo " " ?>
<?php echo ' ' ?>
<?php else : ?>
<div id="no-submenu"></div>
<?php endif; ?>
Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/hathor/login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
if ($this->direction === 'rtl')
{
JHtml::_('stylesheet', 'template_rtl.css', array('version' => 'auto', 'relative' => true));
JHtml::_('stylesheet', 'colour_' . $colour . '_rtl.css', array('version' => 'auto', 'relative' => true));;
JHtml::_('stylesheet', 'colour_' . $colour . '_rtl.css', array('version' => 'auto', 'relative' => true));
}

// Load additional CSS styles for bold Text
Expand Down Expand Up @@ -93,7 +93,7 @@
<div id="containerwrap">
<!-- Header Logo -->
<div id="header">
<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . " " . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
</div><!-- end header -->
<!-- Content Area -->
<div id="content">
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/isis/error.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<script src="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/js/template.js"></script>
<!--[if lt IE 9]><script src="<?php echo JUri::root(true); ?>/media/jui/js/html5.js"></script><![endif]-->
</head>
<body class="admin <?php echo $option . " view-" . $view . " layout-" . $layout . " task-" . $task . " ";?>" data-spy="scroll" data-target=".subhead" data-offset="87">
<body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ' task-' . $task;?>" data-spy="scroll" data-target=".subhead" data-offset="87">
<!-- Top Navigation -->
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
Expand Down
Loading