2018-03-16

app/Core/View.php

@@ -112,4 +112,23 @@ EOD;
         }
         return $this->block('content');
     }
+
+    /**
+     * Compile the if statements
+     *
+     * @param  string  $expression
+     * @return string
+     */
+    protected function compileIf($expression)
+    {
+        if (\preg_match('%^\(\s*(\!\s*)?(\$[\w>-]+\[(?:[\'"]\w+[\'"]|\d+)\])\s*\)$%', $expression, $matches)) {
+            if (empty($matches[1])) {
+                return "<?php if(! empty{$expression}): ?>";
+            } else {
+                return "<?php if(empty({$matches[2]})): ?>";
+            }
+        } else {
+            return parent::compileIf($expression);
+        }
+    }
 }

app/templates/ban.tpl

@@ -2,10 +2,10 @@
     <section class="f-main f-message">
       <h2>{{ __('Info') }}</h2>
       <p>{!! __('Ban message') !!}</p>
-@if (! empty($p->ban['expire']))
+@if ($p->ban['expire'])
       <p>{!! __('Ban message 2', dt($p->ban['expire'], true)) !!}</p>
 @endif
-@if (! empty($p->ban['message']))
+@if ($p->ban['message'])
       <p>{!! __('Ban message 3') !!}</p>
       <p><strong>{{ $p->ban['message'] }}</strong></p>
 @endif

app/templates/layouts/form.tpl

@@ -5,27 +5,27 @@
   @endforeach
 @endif
 @foreach ($form['sets'] as $set)
-  @if (isset($set['info']))
+  @if ($set['info'])
     @foreach ($set['info'] as $key => $cur)
-          <p class="f-finfo"> @if (empty($cur['html'])){{ $cur['value'] }} @else{!! $cur['value'] !!} @endif</p>
+          <p class="f-finfo"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
     @endforeach
-  @elseif (isset($set['fields']))
-          <fieldset @if (isset($set['id'])) id="{{ $set['id'] }}" @endif @if (isset($set['class'])) class="f-fs-{!! implode(' f-fs-', (array) $set['class']) !!}" @endif>
-    @if (isset($set['legend']))
+  @elseif ($set['fields'])
+          <fieldset @if ($set['id']) id="{{ $set['id'] }}" @endif @if ($set['class']) class="f-fs-{!! implode(' f-fs-', (array) $set['class']) !!}" @endif>
+    @if ($set['legend'])
             <legend>{!! $set['legend'] !!}</legend>
     @endif
     @foreach ($set['fields'] as $key => $cur)
       @if ('info' === $cur['type'])
-            <p class="f-child6"> @if (empty($cur['html'])){{ $cur['value'] }} @else{!! $cur['value'] !!} @endif</p>
+            <p class="f-child6"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
       @else
-            <dl @if (isset($cur['dl'])) class="f-field-{!! implode(' f-field-', (array) $cur['dl']) !!}" @endif>
-              <dt> @if (isset($cur['title']))<label class="f-child1 @if (! empty($cur['required'])) f-req @endif" @if (is_string($key) && 'radio' !== $cur['type']) for="id-{{ $key }}" @endif>{!! $cur['title'] !!}</label> @endif</dt>
+            <dl @if ($cur['dl']) class="f-field-{!! implode(' f-field-', (array) $cur['dl']) !!}" @endif>
+              <dt> @if ($cur['title'])<label class="f-child1 @if ($cur['required']) f-req @endif" @if (is_string($key) && 'radio' !== $cur['type']) for="id-{{ $key }}" @endif>{!! $cur['title'] !!}</label> @endif</dt>
               <dd>
         @if ('text' === $cur['type'])
-                <input @if (! empty($cur['required'])) required @endif @if (! empty($cur['disabled'])) disabled @endif @if (isset($cur['autofocus'])) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="text" @if (! empty($cur['maxlength'])) maxlength="{{ $cur['maxlength'] }}" @endif @if (isset($cur['pattern'])) pattern="{{ $cur['pattern'] }}" @endif @if (isset($cur['value'])) value="{{ $cur['value'] }}" @endif>
+                <input @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="text" @if ($cur['maxlength']) maxlength="{{ $cur['maxlength'] }}" @endif @if ($cur['pattern']) pattern="{{ $cur['pattern'] }}" @endif @if (isset($cur['value'])) value="{{ $cur['value'] }}" @endif>
         @elseif ('textarea' === $cur['type'])
-                <textarea @if (! empty($cur['required'])) required @endif @if (! empty($cur['disabled'])) disabled @endif @if (isset($cur['autofocus'])) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}">{{ $cur['value'] or '' }}</textarea>
-          @if (isset($cur['bb']))
+                <textarea @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}">{{ $cur['value'] or '' }}</textarea>
+          @if ($cur['bb'])
                 <ul class="f-child5">
             @foreach ($cur['bb'] as $val)
                   <li><span><a href="{!! $val[0] !!}">{!! $val[1] !!}</a> {!! $val[2] !!}</span></li>
@@ -33,7 +33,7 @@
                 </ul>
           @endif
         @elseif ('select' === $cur['type'])
-                <select @if (! empty($cur['required'])) required @endif @if (! empty($cur['disabled'])) disabled @endif @if (isset($cur['autofocus'])) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}">
+                <select @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}">
           @if (null === ($count = null) && is_array(reset($cur['options'])) && 1 === count(reset($cur['options'])) && $count = 0) @endif
           @foreach ($cur['options'] as $v => $option)
             @if (is_array($option))
@@ -43,7 +43,7 @@
                 @endif
                 <optgroup label="{{ $option[0] }}">
               @else
-                  <option value="{{ $option[0] }}" @if ($option[0] == $cur['value']) selected @endif @if (isset($option[2])) disabled @endif>{{ $option[1] }}</option>
+                  <option value="{{ $option[0] }}" @if ($option[0] == $cur['value']) selected @endif @if ($option[2]) disabled @endif>{{ $option[1] }}</option>
               @endif
             @else
                   <option value="{{ $v }}" @if ($v == $cur['value']) selected @endif>{{ $option }}</option>
@@ -54,7 +54,7 @@
           @endif
                 </select>
         @elseif ('multiselect' === $cur['type'])
-                <select @if (! empty($cur['required'])) required @endif @if (! empty($cur['disabled'])) disabled @endif @if (isset($cur['autofocus'])) autofocus @endif @if (! empty($cur['size'])) size="{{ $cur['size'] }}" @endif multiple class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}[]">
+                <select @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif @if ($cur['size']) size="{{ $cur['size'] }}" @endif multiple class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}[]">
           @if (null === ($count = null) && is_array(reset($cur['options'])) && 1 === count(reset($cur['options'])) && $count = 0) @endif
           @foreach ($cur['options'] as $v => $option)
             @if (is_array($option))
@@ -64,7 +64,7 @@
                 @endif
                 <optgroup label="{{ $option[0] }}">
               @else
-                  <option value="{{ $option[0] }}" @if ((is_array($cur['value']) && in_array($option[0], $cur['value'])) || $option[0] == $cur['value']) selected @endif @if (isset($option[2])) disabled @endif>{{ $option[1] }}</option>
+                  <option value="{{ $option[0] }}" @if ((is_array($cur['value']) && in_array($option[0], $cur['value'])) || $option[0] == $cur['value']) selected @endif @if ($option[2]) disabled @endif>{{ $option[1] }}</option>
               @endif
             @else
                   <option value="{{ $v }}" @if ((is_array($cur['value']) && in_array($v, $cur['value'])) || $v == $cur['value']) selected @endif>{{ $option }}</option>
@@ -75,19 +75,19 @@
           @endif
                 </select>
         @elseif ('number' === $cur['type'])
-                <input @if (! empty($cur['required'])) required @endif @if (! empty($cur['disabled'])) disabled @endif @if (isset($cur['autofocus'])) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="number" min="{{ $cur['min'] }}" max="{{ $cur['max'] }}" @if (isset($cur['value'])) value="{{ $cur['value'] }}" @endif>
+                <input @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="number" min="{{ $cur['min'] }}" max="{{ $cur['max'] }}" @if (isset($cur['value'])) value="{{ $cur['value'] }}" @endif>
         @elseif ('checkbox' === $cur['type'])
-                <label class="f-child2"><input @if (isset($cur['autofocus'])) autofocus @endif @if (! empty($cur['disabled'])) disabled @endif type="checkbox" id="id-{{ $key }}" name="{{ $key }}" value="{{ $cur['value'] or '1' }}" @if (! empty($cur['checked'])) checked @endif>{!! $cur['label'] !!}</label>
+                <label class="f-child2"><input @if ($cur['autofocus']) autofocus @endif @if ($cur['disabled']) disabled @endif type="checkbox" id="id-{{ $key }}" name="{{ $key }}" value="{{ $cur['value'] or '1' }}" @if ($cur['checked']) checked @endif>{!! $cur['label'] !!}</label>
         @elseif ('radio' === $cur['type'])
           @foreach ($cur['values'] as $v => $n)
-                <label class="f-label"><input @if (isset($cur['autofocus'])) autofocus @endif @if (! empty($cur['disabled'])) disabled @endif type="radio" id="id-{{ $key }}-{{ $v }}" name="{{ $key }}" value="{{ $v }}" @if ($v == $cur['value']) checked @endif>{{ $n }}</label>
+                <label class="f-label"><input @if ($cur['autofocus']) autofocus @endif @if ($cur['disabled']) disabled @endif type="radio" id="id-{{ $key }}-{{ $v }}" name="{{ $key }}" value="{{ $v }}" @if ($v == $cur['value']) checked @endif>{{ $n }}</label>
           @endforeach
         @elseif ('password' === $cur['type'])
-                <input @if (! empty($cur['required'])) required @endif @if (! empty($cur['disabled'])) disabled @endif @if (isset($cur['autofocus'])) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="password" @if (! empty($cur['maxlength'])) maxlength="{{ $cur['maxlength'] }}" @endif @if (isset($cur['pattern'])) pattern="{{ $cur['pattern'] }}" @endif @if (isset($cur['value'])) value="{{ $cur['value'] }}" @endif>
+                <input @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="password" @if ($cur['maxlength']) maxlength="{{ $cur['maxlength'] }}" @endif @if ($cur['pattern']) pattern="{{ $cur['pattern'] }}" @endif @if (isset($cur['value'])) value="{{ $cur['value'] }}" @endif>
         @elseif ('btn' === $cur['type'])
-                <a class="f-btn @if (! empty($cur['disabled'])) f-disabled @endif" href="{!! $cur['link'] !!}" @if (! empty($cur['disabled'])) tabindex="-1" @endif>{{ $cur['value'] }}</a>
+                <a class="f-btn @if ($cur['disabled']) f-disabled @endif" href="{!! $cur['link'] !!}" @if ($cur['disabled']) tabindex="-1" @endif>{{ $cur['value'] }}</a>
         @endif
-        @if (isset($cur['info']))
+        @if ($cur['info'])
                 <p class="f-child4">{!! $cur['info'] !!}</p>
         @endif
               </dd>
@@ -100,9 +100,9 @@
           <p class="f-btns">
 @foreach ($form['btns'] as $key => $cur)
   @if ('submit' === $cur['type'])
-            <input class="f-btn @if(isset($cur['class'])) {{ $cur['class'] }} @endif" type="{{ $cur['type'] }}" name="{{ $key }}" value="{{ $cur['value'] }}" @if (isset($cur['accesskey'])) accesskey="{{ $cur['accesskey'] }}" @endif>
+            <input class="f-btn @if($cur['class']) {{ $cur['class'] }} @endif" type="{{ $cur['type'] }}" name="{{ $key }}" value="{{ $cur['value'] }}" @if (isset($cur['accesskey'])) accesskey="{{ $cur['accesskey'] }}" @endif>
   @elseif ('btn'=== $cur['type'])
-            <a class="f-btn @if(isset($cur['class'])) {{ $cur['class'] }} @endif" data-name="{{ $key }}" href="{!! $cur['link'] !!}" @if (isset($cur['accesskey'])) accesskey="{{ $cur['accesskey'] }}" @endif>{{ $cur['value'] }}</a>
+            <a class="f-btn @if($cur['class']) {{ $cur['class'] }} @endif" data-name="{{ $key }}" href="{!! $cur['link'] !!}" @if (isset($cur['accesskey'])) accesskey="{{ $cur['accesskey'] }}" @endif>{{ $cur['value'] }}</a>
   @endif
 @endforeach
           </p>

app/templates/layouts/install.tpl

@@ -31,7 +31,7 @@
       </div>
     </section>
 @endif
-@if (empty($p->fIswev['e']))
+@if (! $p->fIswev['e'])
   @if ($form = $p->form2)
     <section class="f-install">
       <h2>{!! __('Install', $p->rev) !!}</h2>

app/templates/layouts/iswev.tpl

@@ -1,4 +1,4 @@
-@if (! empty($iswev['i']))
+@if ($iswev['i'])
     <section class="f-iswev f-info">
       <h2>Info message</h2>
       <ul>
@@ -8,7 +8,7 @@
       </ul>
     </section>
 @endif
-@if (! empty($iswev['s']))
+@if ($iswev['s'])
     <section class="f-iswev f-success">
       <h2>Successful operation message</h2>
       <ul>
@@ -18,7 +18,7 @@
       </ul>
     </section>
 @endif
-@if (! empty($iswev['w']))
+@if ($iswev['w'])
     <section class="f-iswev f-warning">
       <h2>Warning message</h2>
       <ul>
@@ -28,7 +28,7 @@
       </ul>
     </section>
 @endif
-@if (! empty($iswev['e']))
+@if ($iswev['e'])
     <section class="f-iswev f-error">
       <h2>Error message</h2>
       <ul>
@@ -38,7 +38,7 @@
       </ul>
     </section>
 @endif
-@if (! empty($iswev['v']))
+@if ($iswev['v'])
     <section class="f-iswev f-validation">
       <h2>Validation message</h2>
       <ul>

app/templates/layouts/main.tpl

@@ -22,18 +22,18 @@
 @endif
       </div>
 @if ($p->fNavigation)
-      <nav class="f-main-nav f-menu @if (isset($p->fNavigation['search'])) f-main-nav-search @endif">
+      <nav class="f-main-nav f-menu @if ($p->fNavigation['search']) f-main-nav-search @endif">
         <input id="id-mn-checkbox" class="f-menu-checkbox" type="checkbox" style="display: none;">
         <label class="f-menu-toggle" for="id-mn-checkbox"></label>
         <ul class="f-menu-items">
   @foreach ($p->fNavigation as $key => $val)
           <li id="id-nav-{!! $key !!}" class="f-menu-item"><!-- inline -->
             <a class="f-menu-a @if ($key == $p->fIndex) active @endif" href="{!! __($val[0]) !!}">{!! __($val[1]) !!}</a>
-    @if (isset($val[3]))
+    @if ($val[3])
             <ul class="f-submenu-items">
       @foreach ($val[3] as $key => $val)
               <li id="id-nav-{!! $key !!}" class="f-menu-item">
-        @if (isset($val[0]))
+        @if ($val[0])
                 <a class="f-menu-a @if ($key == $p->fSubIndex) active @endif" href="{!! __($val[0]) !!}" title="{!! __($val[2]) !!}">{!! __($val[1]) !!}</a>
         @else
                 <span class="f-menu-span">{!! __($val[1]) !!}</span>

app/templates/post.tpl

@@ -37,7 +37,7 @@
     <section class="f-view-posts">
       <h2>{!! $p->postsTitle !!}</h2>
   @foreach ($p->posts as $post)
-    @if (! empty($post->id))
+    @if ($post->id)
       <article id="p{!! $post->id !!}" class="clearfix f-post">
         <header class="f-post-header clearfix">
           <span class="f-post-posted"><time datetime="{{ utc($post->posted) }}">{{ dt($post->posted) }}</time></span>