thinktomorrow / chief

chief-core/Models/Notes/Note.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
     public $table = 'notes';
     public $translatedAttributes = ['content'];
     public $translationForeignKey = 'note_id';
-    protected $dates = [ 'start_at', 'end_at' ];
+    protected $dates = ['start_at', 'end_at'];
 
     public static $types = ['general', 'payment', 'delivery'];
     public static $levels = ['info', 'warning', 'error'];
@@ -38,18 +38,18 @@ 
     {
         if ($type != 'general') {
             if ($note = self::getActiveNote($type)) {
-                return '<div class="note note-' . $note->level . '"><span><i class="fa fa-fw fa-' . $note->level . '"></i>'.
+                return '<div class="note note-'.$note->level.'"><span><i class="fa fa-fw fa-'.$note->level.'"></i>'.
                     $note->content
                     .'</span></div>';
             }
-        } else {
+        }else {
             if ($note = self::getActiveNote($type)) {
                 if (NoteReminder::hasWatched($note, app()->getLocale())) {
                     return null;
-                } else {
+                }else {
                     NoteReminder::watch($note->id, $note->updated_at, app()->getLocale());
 
-                    return '<div id="note" class="note-' . $note->level . '">' . $note->content . '<a class="close-note" aria-label="Close"><i class="fa fa-inverse fa-times-circle"></i></a></div>';
+                    return '<div id="note" class="note-'.$note->level.'">'.$note->content.'<a class="close-note" aria-label="Close"><i class="fa fa-inverse fa-times-circle"></i></a></div>';
                 }
             }
         }
@@ -98,15 +98,15 @@ 
     {
         $notes = self::findByType($type);
 
-        $notes = $notes->reject(function ($note) {
+        $notes = $notes->reject(function($note) {
             return !Carbon::now()->between($note->start_at, $note->end_at);
         });
 
         if ($notes->count() > 1) {
-            $note = $notes->sortBy(function ($note) {
+            $note = $notes->sortBy(function($note) {
                 return implode(' ', [$note->start_at, $note->created_at]);
             })->last();
-        } else {
+        }else {
             $note = $notes->first();
         }
 

chief-core/Models/Notes/NoteReminder.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
     {
         $cookie = Cookie::get('optiphar-note');
 
-        if (! isset($cookie[$note->id])) {
+        if (!isset($cookie[$note->id])) {
             return false;
         }
 
-        return ! self::shouldWatchAgain($note, $cookie[$note->id], $locale);
+        return !self::shouldWatchAgain($note, $cookie[$note->id], $locale);
     }
 
     /**

chief-core/utils/vendors/htmlLawed.php

Spacing +73 added lines, -73 removed lines

@@ -9,7 +9,7 @@ 
 See htmLawed_README.txt/htm
 */
 
-function htmLawed($t, $C=1, $S=array())
+function htmLawed($t, $C = 1, $S = array())
 {
     $C = is_array($C) ? $C : array();
     if (!empty($C['valid_xhtml'])) {
@@ -27,26 +27,26 @@ 
         $e = array();
     } elseif (strpos($x, '*') === false) {
         $e = array_flip(explode(',', $x));
-    } else {
+    }else {
         if (isset($x[1])) {
             preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
-            for ($i=count($m); --$i>=0;) {
+            for ($i = count($m); --$i >= 0;) {
                 $m[$i] = $m[$i][0];
             }
             foreach ($m as $v) {
                 if ($v[0] == '+') {
                     $e[substr($v, 1)] = 1;
                 }
-                if ($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)) {
+                if ($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'.$v, $m)) {
                     unset($e[$v]);
                 }
             }
         }
     }
-    $C['elements'] =& $e;
+    $C['elements'] = & $e;
     // config attrs
     $x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : '';
-    $x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : '')));
+    $x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x.(!empty($C['safe']) ? ',on*' : '')));
     if (isset($x['on*'])) {
         unset($x['on*']);
         $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1);
@@ -110,7 +110,7 @@ 
     $t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t);
     if ($C['clean_ms_char']) {
         $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ');
-        $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
+        $x = $x+($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
         $t = strtr($t, $x);
     }
     if ($C['cdata'] or $C['comment']) {
@@ -196,7 +196,7 @@ 
     // eof
 }
 
-function hl_bal($t, $do=1, $in='div')
+function hl_bal($t, $do = 1, $in = 'div')
 {
     // balance tags
 // by content
@@ -218,7 +218,7 @@ 
     $eI = array('#pcdata'=>1, 'a'=>1, 'abbr'=>1, 'acronym'=>1, 'applet'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'br'=>1, 'button'=>1, 'cite'=>1, 'code'=>1, 'del'=>1, 'dfn'=>1, 'em'=>1, 'embed'=>1, 'font'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'kbd'=>1, 'label'=>1, 'map'=>1, 'object'=>1, 'q'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'select'=>1, 'script'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1, 'tt'=>1, 'u'=>1, 'var'=>1);
     $eN = array('a'=>1, 'big'=>1, 'button'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'label'=>1, 'object'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1); // Exclude from specific ele; $cN values
     $eO = array('area'=>1, 'caption'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'dt'=>1, 'legend'=>1, 'li'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'script'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'thead'=>1, 'th'=>1, 'tr'=>1); // Missing in $eB & $eI
-    $eF = $eB + $eI;
+    $eF = $eB+$eI;
 
     // $in sets allowed child
     $in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div';
@@ -239,7 +239,7 @@ 
         unset($cI['del'], $cI['ins']);
     }
     if (isset($cO[$in])) {
-        $inOk = $inOk + $cO[$in];
+        $inOk = $inOk+$cO[$in];
     }
     if (isset($cN[$in])) {
         $inOk = array_diff_assoc($inOk, $cN[$in]);
@@ -249,7 +249,7 @@ 
     $ok = $q = array(); // $q seq list of open non-empty ele
     ob_start();
 
-    for ($i=-1, $ci=count($t); ++$i<$ci;) {
+    for ($i = -1, $ci = count($t); ++$i < $ci;) {
         // allowed $ok in parent $p
         if ($ql = count($q)) {
             $p = array_pop($q);
@@ -268,12 +268,12 @@ 
                 unset($cI['del'], $cI['ins']);
             }
             if (isset($cO[$p])) {
-                $ok = $ok + $cO[$p];
+                $ok = $ok+$cO[$p];
             }
             if (isset($cN[$p])) {
                 $ok = array_diff_assoc($ok, $cN[$p]);
             }
-        } else {
+        }else {
             $ok = $inOk;
             unset($cI['del'], $cI['ins']);
         }
@@ -316,10 +316,10 @@ 
                 continue;
             } // Last open
             $add = ''; // Nesting - close open tags that need to be
-            for ($j=-1, $cj=count($q); ++$j<$cj;) {
+            for ($j = -1, $cj = count($q); ++$j < $cj;) {
                 if (($d = array_pop($q)) == $e) {
                     break;
-                } else {
+                }else {
                     $add .= "</{$d}>";
                 }
             }
@@ -331,7 +331,7 @@ 
         // $cB ele needs $eB ele as child
         if (isset($cB[$e]) && strlen(trim($x))) {
             $t[$i] = "{$e}{$a}>";
-            array_splice($t, $i+1, 0, 'div>'. $x);
+            array_splice($t, $i+1, 0, 'div>'.$x);
             unset($e, $x);
             ++$ci;
             --$i;
@@ -373,7 +373,7 @@ 
         // nesting
         $add = '';
         $q2 = array();
-        for ($k=-1, $kc=count($q); ++$k<$kc;) {
+        for ($k = -1, $kc = count($q); ++$k < $kc;) {
             $d = $q[$k];
             $ok2 = array();
             if (isset($cS[$d])) {
@@ -382,7 +382,7 @@ 
             }
             $ok2 = isset($cI[$d]) ? $eI : $eF;
             if (isset($cO[$d])) {
-                $ok2 = $ok2 + $cO[$d];
+                $ok2 = $ok2+$cO[$d];
             }
             if (isset($cN[$d])) {
                 $ok2 = array_diff_assoc($ok2, $cN[$d]);
@@ -392,11 +392,11 @@ 
                     continue 2;
                 }
                 $add = "</{$d}>";
-                for (;++$k<$kc;) {
+                for (;++$k < $kc;) {
                     $add = "</{$q[$k]}>{$add}";
                 }
                 break;
-            } else {
+            }else {
                 $q2[] = $d;
             }
         }
@@ -427,12 +427,12 @@ 
             unset($cI['del'], $cI['ins']);
         }
         if (isset($cO[$p])) {
-            $ok = $ok + $cO[$p];
+            $ok = $ok+$cO[$p];
         }
         if (isset($cN[$p])) {
             $ok = array_diff_assoc($ok, $cN[$p]);
         }
-    } else {
+    }else {
         $ok = $inOk;
         unset($cI['del'], $cI['ins']);
     }
@@ -476,7 +476,7 @@ 
         if (substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' ') {
             $t .= ' ';
         }
-    } else {
+    }else {
         $t = substr($t, 1, -1);
     }
     $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
@@ -489,19 +489,19 @@ 
     // entitity handler
     global $C;
     $t = $t[1];
-    static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1);
-    static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
+    static $U = array('quot'=>1, 'amp'=>1, 'lt'=>1, 'gt'=>1);
+    static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39', 'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
     if ($t[0] != '#') {
-        return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
+        return ($C['and_mark'] ? "\x06" : '&').(isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'.($C['hexdec_entity'] > 1 ? 'x'.dechex($N[$t]) : $N[$t]) : $t) : 'amp;'.$t)).';';
     }
     if (($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))) {
-        return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
+        return ($C['and_mark'] ? "\x06" : '&')."amp;#{$t};";
     }
-    return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
+    return ($C['and_mark'] ? "\x06" : '&').'#'.(((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'.dechex($n)).';';
     // eof
 }
 
-function hl_prot($p, $c=null)
+function hl_prot($p, $c = null)
 {
     // check URL scheme
     global $C;
@@ -528,18 +528,18 @@ 
             $p = substr($p, strlen($C['base_url']));
         } elseif (empty($m[1])) { // Make URL abs
             if (substr($p, 0, 2) == '//') {
-                $p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;
+                $p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1).$p;
             } elseif ($p[0] == '/') {
-                $p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;
+                $p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']).$p;
             } elseif (strcspn($p, './')) {
-                $p = $C['base_url']. $p;
-            } else {
+                $p = $C['base_url'].$p;
+            }else {
                 preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
-                $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
+                $p = preg_replace('`(?<=/)\./`', '', $m[2].$p);
                 while (preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)) {
                     $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
                 }
-                $p = $m[1]. $p;
+                $p = $m[1].$p;
             }
         }
     }
@@ -555,7 +555,7 @@ 
     }
     if ($t = ini_get('track_errors')) {
         $o = isset($php_errormsg) ? $php_errormsg : null;
-    } else {
+    }else {
         ini_set('track_errors', 1);
     }
     unset($php_errormsg);
@@ -569,7 +569,7 @@ 
     $r = isset($php_errormsg) ? 0 : 1;
     if ($t) {
         $php_errormsg = isset($o) ? $o : null;
-    } else {
+    }else {
         ini_set('track_errors', 0);
     }
     return $r;
@@ -581,9 +581,9 @@ 
     // final $spec
     $s = array();
     $t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', create_function('$m', 'return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), $m[0]), 1, -1);'), trim($t)));
-    for ($i = count(($t = explode(';', $t))); --$i>=0;) {
+    for ($i = count(($t = explode(';', $t))); --$i >= 0;) {
         $w = $t[$i];
-        if (empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))) {
+        if (empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a = substr($w, $e+1)))) {
             continue;
         }
         $y = $n = array();
@@ -651,7 +651,7 @@ 
     if (!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)) {
         return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
     } elseif (!isset($C['elements'][($e = strtolower($m[2]))])) {
-        return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
+        return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
     }
     // attr string
     $a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3]));
@@ -660,13 +660,13 @@ 
     if ($C['make_tag_strict'] && isset($eD[$e])) {
         $trt = hl_tag2($e, $a, $C['make_tag_strict']);
         if (!$e) {
-            return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
+            return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
         }
     }
     // close tag
     static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele
     if (!empty($m[1])) {
-        return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
+        return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad']) % 2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
     }
 
     // open tag & attr
@@ -711,7 +711,7 @@ 
                 $w = 1;
                 $mode = 2;
                 $a = ltrim($a, '= ');
-            } else { // No val
+            }else { // No val
                 $w = 1;
                 $mode = 0;
                 $a = ltrim($a);
@@ -776,7 +776,7 @@ 
                                 if (!preg_match('`\bnofollow\b`i', $aA['rel'])) {
                                     $nfr = 1;
                                 }
-                            } else {
+                            }else {
                                 $a['rel'] = 'nofollow';
                             }
                         }
@@ -790,7 +790,7 @@ 
         }
     }
     if ($nfr) {
-        $a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';
+        $a['rel'] = isset($a['rel']) ? $a['rel'].' nofollow' : 'nofollow';
     }
 
     // rqd attr
@@ -813,36 +813,36 @@ 
             if ($k == 'align') {
                 unset($a['align']);
                 if ($e == 'img' && ($v == 'left' or $v == 'right')) {
-                    $c[] = 'float: '. $v;
+                    $c[] = 'float: '.$v;
                 } elseif (($e == 'div' or $e == 'table') && $v == 'center') {
                     $c[] = 'margin: auto';
-                } else {
-                    $c[] = 'text-align: '. $v;
+                }else {
+                    $c[] = 'text-align: '.$v;
                 }
             } elseif ($k == 'bgcolor') {
                 unset($a['bgcolor']);
-                $c[] = 'background-color: '. $v;
+                $c[] = 'background-color: '.$v;
             } elseif ($k == 'border') {
                 unset($a['border']);
                 $c[] = "border: {$v}px";
             } elseif ($k == 'bordercolor') {
                 unset($a['bordercolor']);
-                $c[] = 'border-color: '. $v;
+                $c[] = 'border-color: '.$v;
             } elseif ($k == 'clear') {
                 unset($a['clear']);
-                $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
+                $c[] = 'clear: '.($v != 'all' ? $v : 'both');
             } elseif ($k == 'compact') {
                 unset($a['compact']);
                 $c[] = 'font-size: 85%';
             } elseif ($k == 'height' or $k == 'width') {
                 unset($a[$k]);
-                $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
+                $c[] = $k.': '.($v[0] != '*' ? $v.(ctype_digit($v) ? 'px' : '') : 'auto');
             } elseif ($k == 'hspace') {
                 unset($a['hspace']);
                 $c[] = "margin-left: {$v}px; margin-right: {$v}px";
             } elseif ($k == 'language' && !isset($a['type'])) {
                 unset($a['language']);
-                $a['type'] = 'text/'. strtolower($v);
+                $a['type'] = 'text/'.strtolower($v);
             } elseif ($k == 'name') {
                 if ($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')) {
                     unset($a['name']);
@@ -858,13 +858,13 @@ 
                 $c[] = 'white-space: nowrap';
             } elseif ($k == 'size') {
                 unset($a['size']);
-                $c[] = 'size: '. $v. 'px';
+                $c[] = 'size: '.$v.'px';
             } elseif ($k == 'start' or $k == 'value') {
                 unset($a[$k]);
             } elseif ($k == 'type') {
                 unset($a['type']);
                 static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal');
-                $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
+                $c[] = 'list-style-type: '.(isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
             } elseif ($k == 'vspace') {
                 unset($a['vspace']);
                 $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
@@ -872,16 +872,16 @@ 
         }
         if (count($c)) {
             $c = implode('; ', $c);
-            $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
+            $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$c.';' : $c.';';
         }
     }
     // unique ID
     if ($C['unique_ids'] && isset($a['id'])) {
         if (!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)) {
             unset($a['id']);
-        } else {
+        }else {
             while (isset($GLOBALS['hl_Ids'][$id])) {
-                $id = $C['unique_ids']. $id;
+                $id = $C['unique_ids'].$id;
             }
             $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
         }
@@ -895,7 +895,7 @@ 
     }
     // for transformed tag
     if (!empty($trt)) {
-        $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
+        $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$trt : $trt;
     }
     // return with empty ele /
     if (empty($C['hook_tag'])) {
@@ -903,14 +903,14 @@ 
         foreach ($a as $k=>$v) {
             $aA .= " {$k}=\"{$v}\"";
         }
-        return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
-    } else {
+        return "<{$e}{$aA}".(isset($eE[$e]) ? ' /' : '').'>';
+    }else {
         return $C['hook_tag']($e, $a);
     }
     // eof
 }
 
-function hl_tag2(&$e, &$a, $t=1)
+function hl_tag2(&$e, &$a, $t = 1)
 {
     // transform tag
     if ($e == 'center') {
@@ -933,13 +933,13 @@ 
     if ($e == 'font') {
         $a2 = '';
         if (preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)) {
-            $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';';
+            $a2 .= ' font-family: '.str_replace('"', '\'', trim($m[2])).';';
         }
         if (preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)) {
-            $a2 .= ' color: '. trim($m[2]). ';';
+            $a2 .= ' color: '.trim($m[2]).';';
         }
         if (preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])) {
-            $a2 .= ' font-size: '. $fs[$m]. ';';
+            $a2 .= ' font-size: '.$fs[$m].';';
         }
         $e = 'span';
         return ltrim($a2);
@@ -979,7 +979,7 @@ 
             echo str_repeat($s, ++$n);
         }
         echo ltrim(array_shift($t));
-        for ($i=-1, $j=count($t); ++$i<$j;) {
+        for ($i = -1, $j = count($t); ++$i < $j;) {
             $r = '';
             list($e, $r) = explode('>', $t[$i]);
             $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
@@ -989,22 +989,22 @@ 
                 if (!$x) {
                     if ($n) {
                         echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);
-                    } else {
+                    }else {
                         ++$N;
                         ob_end_clean();
                         continue 2;
                     }
-                } else {
+                }else {
                     echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));
                 }
                 echo $r;
                 continue;
             }
-            $f = "\n". str_repeat($s, $n);
+            $f = "\n".str_repeat($s, $n);
             if (isset($c[$y])) {
                 if (!$x) {
                     echo $e, $f, $r;
-                } else {
+                }else {
                     echo $f, $e, $r;
                 }
             } elseif (isset($b[$y])) {
@@ -1013,7 +1013,7 @@ 
                 echo $e, $f, $r;
             } elseif (!$y) {
                 echo $f, $e, $f, $r;
-            } else {
+            }else {
                 echo $e, $r;
             }
         }
@@ -1035,7 +1035,7 @@ 
     // eof
 }
 
-function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'))
+function kses($t, $h, $p = array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'))
 {
     // kses compat
     foreach ($h as $k=>$v) {
@@ -1045,7 +1045,7 @@ 
     $C['keep_bad'] = 1;
     $C['elements'] = count($h) ? strtolower(implode(',', array_keys($h))) : '-*';
     $C['hook'] = 'kses_hook';
-    $C['schemes'] = '*:'. implode(',', $p);
+    $C['schemes'] = '*:'.implode(',', $p);
     return htmLawed($t, $C, $h);
     // eof
 }

chief-core/utils/helpers.php

Spacing +9 added lines, -9 removed lines

@@ -22,7 +22,7 @@ 
             $text = cleanupHTML($text, $clean);
         }
         $teaser = substr($text, 0, $max);
-        return strlen($text) <= $max ? $teaser : $teaser . $ending;
+        return strlen($text) <= $max ? $teaser : $teaser.$ending;
     }
 }
 
@@ -61,7 +61,7 @@ 
     function cleanupHTML($value, $whitelist = null)
     {
         if (!function_exists('cleanupHTML')) {
-            require_once __DIR__ . '/vendors/htmlLawed.php';
+            require_once __DIR__.'/vendors/htmlLawed.php';
         }
         if (is_null($whitelist)) {
             $whitelist = '<code><span><div><label><a><br><p><b><i><del><strike><u><img><video><audio><iframe><object><embed><param><blockquote><mark><cite><small><ul><ol><li><hr><dl><dt><dd><sup><sub><big><pre><code><figure><figcaption><strong><em><table><tr><td><th><tbody><thead><tfoot><h1><h2><h3><h4><h5><h6>';
@@ -132,7 +132,7 @@ 
  * @throws \InvalidArgumentException
  */
 
-if (! function_exists('revasset')) {
+if (!function_exists('revasset')) {
     function revasset($file)
     {
         static $manifest = null;
@@ -168,16 +168,16 @@ 
             'scheme', 'host', 'port', 'path', 'query', 'fragment'
         ], null), $parsed_url, $overrides);
 
-        $scheme = $parsed_url['scheme'] ? $parsed_url['scheme'] . '://' : null;
-        $port = $parsed_url['port'] ? ':' . $parsed_url['port'] : null;
-        $fragment = $parsed_url['fragment'] ? '#' . $parsed_url['fragment'] : null;
+        $scheme = $parsed_url['scheme'] ? $parsed_url['scheme'].'://' : null;
+        $port = $parsed_url['port'] ? ':'.$parsed_url['port'] : null;
+        $fragment = $parsed_url['fragment'] ? '#'.$parsed_url['fragment'] : null;
 
-        $baseurl = $scheme . $parsed_url['host'] . $port . $parsed_url['path'];
+        $baseurl = $scheme.$parsed_url['host'].$port.$parsed_url['path'];
         $current_query = [];
 
         $_query = explode('&', $parsed_url['query']);
 
-        array_map(function ($v) use (&$current_query) {
+        array_map(function($v) use (&$current_query) {
             if (!$v) {
                 return;
             }
@@ -195,7 +195,7 @@ 
 
         $query = urldecode(http_build_query(array_merge($current_query, $query_params)));
 
-        return $baseurl . '?' . $query . $fragment;
+        return $baseurl.'?'.$query.$fragment;
     }
 }
 

database/factories/ModelFactory.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 use Thinktomorrow\Chief\Users\User;
 use Thinktomorrow\Chief\Pages\Page;
 
-$factory->define(User::class, function (Faker\Generator $faker) {
+$factory->define(User::class, function(Faker\Generator $faker) {
     static $password;
 
     return [
@@ -14,7 +14,7 @@ 
     ];
 });
 
-$factory->define(Page::class, function (Faker\Generator $faker) {
+$factory->define(Page::class, function(Faker\Generator $faker) {
     return [
         'published'   => $faker->boolean(),
         'featured'    => $faker->boolean(),

database/migrations/2017_07_13_112256_create_pages_table.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
      */
     public function up()
     {
-        Schema::create('pages', function (Blueprint $table) {
+        Schema::create('pages', function(Blueprint $table) {
             $table->increments('id');
             $table->boolean('published')->default(false);
             $table->boolean('featured')->default(false);
@@ -23,7 +23,7 @@ 
             $table->softDeletes();
         });
 
-        Schema::create('page_translations', function (Blueprint $table) {
+        Schema::create('page_translations', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('page_id')->unsigned();
             $table->string('locale');

database/migrations/2018_05_04_150724_add_relations_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('relations', function (Blueprint $table) {
+        Schema::create('relations', function(Blueprint $table) {
             $table->string("parent_type");
             $table->unsignedBigInteger("parent_id");
             $table->string("child_type");

app-dev/Console/Kernel.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->call(function () {
+        $schedule->call(function() {
             Page::onlyTrashed()->where('deleted_at', '<', Carbon::today()->subDays($this->daysBeforeDeletion))->forceDelete();
         })->dailyAt('03:00');
     }

src/Users/User.php

Spacing +1 added lines, -1 removed lines

@@ -75,6 +75,6 @@
 
     public function getShortNameAttribute()
     {
-        return $this->firstname . ' ' . substr($this->lastname, 0, 1) . '.';
+        return $this->firstname.' '.substr($this->lastname, 0, 1).'.';
     }
 }