Replace x() by isset(), !empty() or defaults()
- Remove extraneous parentheses around empty() calls - Remove duplicate calls to intval(), count() or strlen() after empty() - Replace ternary operators outputting binary value with empty() return value - Rewrite defaults() without x()
This commit is contained in:
parent
ea4e772b1e
commit
458981f75c
101 changed files with 896 additions and 914 deletions
|
@ -1,38 +1,38 @@
|
|||
<!DOCTYPE html >
|
||||
<html>
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
||||
<script type="text/javascript">
|
||||
function ScrollToBottom(){
|
||||
window.scrollTo(0,document.body.scrollHeight);
|
||||
}
|
||||
</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<?php if(x($page, 'header')) echo $page['header']; ?>
|
||||
<?php if(!empty($page['header'])) echo $page['header']; ?>
|
||||
</header>
|
||||
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
<?php if(!empty($page['nav'])) echo $page['nav']; ?>
|
||||
|
||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
||||
<aside><?php if(!empty($page['aside'])) echo $page['aside']; ?></aside>
|
||||
|
||||
<section>
|
||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<?php if(!empty($page['content'])) echo $page['content']; ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
|
||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
||||
<right_aside><?php if(!empty($page['right_aside'])) echo $page['right_aside']; ?></right_aside>
|
||||
|
||||
<footer id="footer">
|
||||
<?php if(x($page, 'footer')) echo $page['footer']; ?>
|
||||
<?php if(!empty($page['footer'])) echo $page['footer']; ?>
|
||||
</footer>
|
||||
|
||||
<tools id="tools">
|
||||
<?php if (x($page, 'tools')) echo $page['tools']; ?>
|
||||
<?php if (!empty($page['tools'])) echo $page['tools']; ?>
|
||||
<div id="scrollup" >
|
||||
<a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
|
||||
<a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
|
||||
|
@ -40,6 +40,6 @@
|
|||
</div>
|
||||
</tools>
|
||||
|
||||
<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
|
||||
<?php if (!empty($page['bottom'])) echo $page['bottom']; ?>
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue