nash-ye / ebloodbank

bootstrap.php

Spacing +19 added lines, -19 removed lines

@@ -27,7 +27,7 @@ 
 }
 
 foreach (['spl', 'date', 'filter', 'session'] as $ext) {
-    if (! extension_loaded($ext)) {
+    if (!extension_loaded($ext)) {
         die(
             sprintf(
                 'eBloodBank requires the PHP extension %s.',
@@ -38,14 +38,14 @@ 
 }
 
 if (function_exists('apache_get_modules')) {
-    if (! in_array('mod_rewrite', apache_get_modules())) {
+    if (!in_array('mod_rewrite', apache_get_modules())) {
         die('eBloodBank requires Apache mod_rewrite module.');
     }
 }
 
 /*** Paths Constants **********************************************************/
 
-if (! defined('EBB_DIR')) {
+if (!defined('EBB_DIR')) {
     define('EBB_DIR', dirname(__FILE__));
 }
 
@@ -56,7 +56,7 @@ 
 
 /*** PHP Configurations *******************************************************/
 
-if (! ini_get('date.timezone')) {
+if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
@@ -69,63 +69,63 @@ 
     require_once EBB_DIR . '/config/config.php';
 }
 
-if (! defined('EBB_DB_NAME')) {
+if (!defined('EBB_DB_NAME')) {
     define('EBB_DB_NAME', '');
 }
 
-if (! defined('EBB_DB_USER')) {
+if (!defined('EBB_DB_USER')) {
     define('EBB_DB_USER', '');
 }
 
-if (! defined('EBB_DB_PASS')) {
+if (!defined('EBB_DB_PASS')) {
     define('EBB_DB_PASS', '');
 }
 
-if (! defined('EBB_DB_HOST')) {
+if (!defined('EBB_DB_HOST')) {
     define('EBB_DB_HOST', 'localhost');
 }
 
-if (! defined('EBB_DB_DRIVER')) {
+if (!defined('EBB_DB_DRIVER')) {
     define('EBB_DB_DRIVER', 'mysqli');
 }
 
-if (! defined('EBB_DEFAULT_THEME')) {
+if (!defined('EBB_DEFAULT_THEME')) {
     define('EBB_DEFAULT_THEME', 'winry');
 }
 
-if (! defined('EBB_DEFAULT_LOCALE')) {
+if (!defined('EBB_DEFAULT_LOCALE')) {
     define('EBB_DEFAULT_LOCALE', '');
 }
 
-if (! defined('EBB_REDIS_CACHE')) {
+if (!defined('EBB_REDIS_CACHE')) {
     define('EBB_REDIS_CACHE', false);
 }
 
-if (! defined('EBB_REDIS_HOST')) {
+if (!defined('EBB_REDIS_HOST')) {
     define('EBB_REDIS_HOST', 'localhost');
 }
 
-if (! defined('EBB_REDIS_PORT')) {
+if (!defined('EBB_REDIS_PORT')) {
     define('EBB_REDIS_PORT', 6379);
 }
 
-if (! defined('EBB_REDIS_DB')) {
+if (!defined('EBB_REDIS_DB')) {
     define('EBB_REDIS_DB', '');
 }
 
-if (! defined('EBB_REDIS_PASS')) {
+if (!defined('EBB_REDIS_PASS')) {
     define('EBB_REDIS_PASS', '');
 }
 
-if (! defined('EBB_APCU_CACHE')) {
+if (!defined('EBB_APCU_CACHE')) {
     define('EBB_APCU_CACHE', true);
 }
 
-if (! defined('EBB_FS_CACHE')) {
+if (!defined('EBB_FS_CACHE')) {
     define('EBB_FS_CACHE', true);
 }
 
-if (! defined('EBB_DEV_MODE')) {
+if (!defined('EBB_DEV_MODE')) {
     define('EBB_DEV_MODE', false);
 }
 

public/themes/winry/templates/0/notices.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 $notices = Notices::getNotices();
 
-if (! empty($notices) && is_array($notices)) : ?>
+if (!empty($notices) && is_array($notices)) : ?>
     <div class="alerts">
         <?php foreach ($notices as $notice) : ?>
         <div class="alert alert-<?= $notice->type ?> alert-code-<?= $notice->code ?>" role="alert">

public/themes/winry/templates/0/form-user.php

Braces +5 added lines, -2 removed lines

@@ -38,9 +38,12 @@
 		<div class="col-sm-2">
             <?php if ($user->isExists()) : ?>
             <label for="user_pass"><?= EBB\escHTML(d__('winry', 'New Password')) ?></label>
-            <?php else : ?>
+            <?php else {
+    : ?>
             <label for="user_pass"><?= EBB\escHTML(d__('winry', 'Password')) ?> <span class="form-required">*</span></label>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 		</div>
 		<div class="col-sm-4">
 			<input type="password" name="user_pass_1" id="user_pass_1" class="form-control" value="" placeholder="<?= EBB\escAttr(d__('winry', 'Type the password')) ?>" autocomplete="off" />

public/themes/winry/templates/0/pagination.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     'page_url' => $view->get('page_url'),
 ]);
 
-if (! empty($urls)) : ?>
+if (!empty($urls)) : ?>
     <nav>
         <ul class="pagination">
             <?php if ($view->get('current') > 1) : ?>

Braces +5 added lines, -2 removed lines

@@ -30,9 +30,12 @@
 
             <?php if ($number == $view->get('current')) : ?>
             <li class="active"><span><?= EBB\escHTML(number_format($number)) ?></span></li>
-            <?php else : ?>
+            <?php else {
+    : ?>
             <li><a href="<?= EBB\escURL($url) ?>"><?= EBB\escHTML(number_format($number)) ?></a></li>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <?php endforeach; ?>
 

public/themes/winry/templates/0/home.php

Braces +5 added lines, -2 removed lines

@@ -20,10 +20,13 @@
             <?= EBB\getAddCityLink(['content' => EBB\escHTML(d__('winry', 'Add City')), 'atts' => ['class' => 'btn btn-lg btn-default']], $context) ?>
             <?= EBB\getAddDistrictLink(['content' => EBB\escHTML(d__('winry', 'Add District')), 'atts' => ['class' => 'btn btn-lg btn-default']], $context) ?>
             <?= EBB\getAddUserLink(['content' => EBB\escHTML(d__('winry', 'Add User')), 'atts' => ['class' => 'btn btn-lg btn-default']], $context) ?>
-            <?php else : ?>
+            <?php else {
+    : ?>
             <?= EBB\getSignupLink(['atts' => ['class' => 'btn btn-lg btn-primary']]) ?>
             <?= EBB\getLoginLink(['atts' => ['class' => 'btn btn-lg btn-default']]) ?>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         </div>
     </div>
 

public/themes/winry/templates/0/form-donor.php

Spacing +2 added lines, -2 removed lines

@@ -11,12 +11,12 @@
 use EBloodBank\Options;
 
 $donorEmailVisibility = $donor->getMeta('email_visibility');
-if (empty($donorEmailVisibility) && ! $donor->isExists()) {
+if (empty($donorEmailVisibility) && !$donor->isExists()) {
     $donorEmailVisibility = Options::getOption('default_donor_email_visibility');
 }
 
 $donorPhoneVisibility = $donor->getMeta('phone_visibility');
-if (empty($donorPhoneVisibility) && ! $donor->isExists()) {
+if (empty($donorPhoneVisibility) && !$donor->isExists()) {
     $donorPhoneVisibility = Options::getOption('default_donor_phone_visibility');
 }
 ?>

public/themes/winry/templates/0/header.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 		<!-- Page Content -->
 		<div class="container">
 
-            <?php if (! $view->get('page_header.hide')) : ?>
+            <?php if (!$view->get('page_header.hide')) : ?>
             <header class="page-header">
                 <h1><?= EBB\escHTML($view->isExists('page_header.title') ? $view->get('page_header.title') : $view->get('title')) ?></h1>
             </header>

Braces +5 added lines, -2 removed lines

@@ -55,10 +55,13 @@
                         <?php if ($currentUser) : ?>
                         <?= EBB\getEditUserLink(['user' => $currentUser, 'content' => sprintf(d__('winry', 'Hello, <b>%s</b>!'), EBB\escHTML($currentUser->get('name'))), 'before' => '<li>', 'after' => '</li>'], $context) ?>
                         <?= EBB\getLogoutLink(['before' => '<li>', 'after' => '</li>'], $context) ?>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                         <?= EBB\getLoginLink(['content' => EBB\escHTML(d__('winry', 'Anonymous, Log In?')), 'before' => '<li>', 'after' => '</li>'], $context) ?>
                         <?= EBB\getSignupLink(['before' => '<li>', 'after' => '</li>']) ?>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
 					</ul>
 				</div>
 				<!-- /.navbar-collapse -->

public/themes/winry/templates/0/view-donor.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 
 		<?php $donorEmailVisibility = $donor->getMeta('email_visibility') ?>
 
-		<?php if (! $donorEmailVisibility || 'everyone' === $donorEmailVisibility) : ?>
+		<?php if (!$donorEmailVisibility || 'everyone' === $donorEmailVisibility) : ?>
         <dt><?= EBB\escHTML(d__('winry', 'E-mail')) ?></dt>
         <dd><?= EBB\escHTML($donor->getMeta('email')) ?></dd>
 		<?php elseif ('members' === $donorEmailVisibility) : ?>
@@ -55,7 +55,7 @@ 
 
 		<?php $donorPhoneVisibility = $donor->getMeta('phone_visibility') ?>
 
-		<?php if (! $donorPhoneVisibility || 'everyone' === $donorPhoneVisibility) : ?>
+		<?php if (!$donorPhoneVisibility || 'everyone' === $donorPhoneVisibility) : ?>
         <dt><?= EBB\escHTML(d__('winry', 'Phone')) ?></dt>
         <dd><?= EBB\escHTML($donor->getMeta('phone')) ?></dd>
 		<?php elseif ('members' === $donorPhoneVisibility) : ?>

Braces +20 added lines, -8 removed lines

@@ -41,16 +41,22 @@ 
         <dt><?= EBB\escHTML(d__('winry', 'E-mail')) ?></dt>
 		<?php if ($currentUser && $acl->canReadEntity($currentUser, $donor)) : ?>
         <dd><?= EBB\escHTML($donor->getMeta('email')) ?></dd>
-		<?php else : ?>
+		<?php else {
+    : ?>
 		<dd><span class="text-warning"><?= EBB\escHTML(d__('winry', 'Only site members can view this donor e-mail address.')) ?></span></dd>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?php elseif ('staff' === $donorEmailVisibility) : ?>
         <dt><?= EBB\escHTML(d__('winry', 'E-mail')) ?></dt>
 		<?php if ($currentUser && $acl->canEditEntity($currentUser, $donor)) : ?>
         <dd><?= EBB\escHTML($donor->getMeta('email')) ?></dd>
-		<?php else : ?>
+		<?php else {
+    : ?>
 		<dd><span class="text-warning"><?= EBB\escHTML(d__('winry', 'Only site staff can view this donor e-mail address.')) ?></span></dd>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?php endif; ?>
 
 		<?php $donorPhoneVisibility = $donor->getMeta('phone_visibility') ?>
@@ -62,16 +68,22 @@ 
         <dt><?= EBB\escHTML(d__('winry', 'Phone')) ?></dt>
 		<?php if ($currentUser && $acl->canReadEntity($currentUser, $donor)) : ?>
         <dd><?= EBB\escHTML($donor->getMeta('phone')) ?></dd>
-		<?php else : ?>
+		<?php else {
+    : ?>
 		<dd><span class="text-warning"><?= EBB\escHTML(d__('winry', 'Only site members can view this donor phone number.')) ?></span></dd>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?php elseif ('staff' === $donorPhoneVisibility) : ?>
         <dt><?= EBB\escHTML(d__('winry', 'Phone')) ?></dt>
 		<?php if ($currentUser && $acl->canEditEntity($currentUser, $donor)) : ?>
         <dd><?= EBB\escHTML($donor->getMeta('phone')) ?></dd>
-		<?php else : ?>
+		<?php else {
+    : ?>
 		<dd><span class="text-warning"><?= EBB\escHTML(d__('winry', 'Only site staff can view this donor phone number.')) ?></span></dd>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?php endif; ?>
 
         <dt><?= EBB\escHTML(d__('winry', 'City\District')) ?></dt>

src/EBloodBank/Models/City.php

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
     public function isExists()
     {
         $id = (int) $this->get('id');
-        return ! empty($id);
+        return !empty($id);
     }
 
     /**
@@ -127,17 +127,17 @@ 
     {
         switch ($key) {
             case 'id':
-                if (! EBB\isValidID($value)) {
+                if (!EBB\isValidID($value)) {
                     throw new InvalidArgumentException(__('Invalid city ID.'));
                 }
                 break;
             case 'name':
-                if (! is_string($value) || empty($value)) {
+                if (!is_string($value) || empty($value)) {
                     throw new InvalidArgumentException(__('Invalid city name.'));
                 }
                 break;
             case 'created_by':
-                if (! $value instanceof User || ! $value->isExists()) {
+                if (!$value instanceof User || !$value->isExists()) {
                     throw new InvalidArgumentException(__('Invalid city originator.'));
                 }
                 break;