ci-bonfire / Sprint

myth/Api/Server/ApiController.php

Braces +13 added lines, -12 removed lines

@@ -221,8 +221,7 @@ 
 			if (is_array($this->request->lang))
 			{
 				$this->load->language($file, $this->request->lang[0]);
-			}
-			else
+			} else
 			{
 				$this->load->language($file, $this->request->lang);
 			}
@@ -233,9 +232,15 @@ 
 		$this->config->load('api');
 
 		// Gather config defaults when a value isn't set for this controller
-		if ( empty($this->enable_logging) ) $this->enable_logging = config_item('api.enable_logging');
-		if ( empty($this->enable_rate_limits) ) $this->enable_rate_limits = config_item('api.enable_rate_limits');
-		if ( empty($this->rate_limits) ) $this->rate_limits = config_item('api.rate_limits');
+		if ( empty($this->enable_logging) ) {
+			$this->enable_logging = config_item('api.enable_logging');
+		}
+		if ( empty($this->enable_rate_limits) ) {
+			$this->enable_rate_limits = config_item('api.enable_rate_limits');
+		}
+		if ( empty($this->rate_limits) ) {
+			$this->rate_limits = config_item('api.rate_limits');
+		}
 
 		// Should we restrict to SSL requests?
 		if (config_item('api.require_ssl') === true && ! $this->request->ssl)
@@ -299,8 +304,7 @@ 
 			{
 				$this->logTime();
 			}
-		}
-		else
+		} else
 		{
 			return $this->fail( lang('api.unknown_endpoint'), 'not_implemented');
 		}
@@ -338,9 +342,7 @@ 
 		else if ($data === null && is_numeric($status_code))
 		{
 			$output = null;
-		}
-
-		else
+		} else
 		{
 			header('Content-Type: application/json');
 
@@ -674,8 +676,7 @@ 
 		if (! $page || $page == 1)
 		{
 			$offset = 0;
-		}
-		else
+		} else
 		{
 			$offset = (($page - 1) * $this->per_page) + 1;
 		}

myth/Auth/FlatAuthorization.php

Braces +2 added lines, -5 removed lines

@@ -122,9 +122,7 @@ 
 				{
 					return true;
 				}
-			}
-
-			else if (is_string($group))
+			} else if (is_string($group))
 			{
 				$ids = array_column($user_groups, 'name');
 				if (in_array($group, $ids))
@@ -389,8 +387,7 @@ 
 		if (! empty($permissions))
 		{
 			$permissions = unserialize($permissions);
-		}
-		else
+		} else
 		{
 			$permissions = [];
 		}

myth/Auth/Password.php

Braces +69 added lines, -29 removed lines

@@ -89,21 +89,31 @@ 
             for ($x = 0; $x < $y; $x++)
             {
                 $tempchr = ord(substr($password, $x, 1));
-                if ($x > 19)  $result += $charmult[$tempchr];
-                else if ($x > 7)  $result += $charmult[$tempchr] * 1.5;
-                else if ($x > 0)  $result += $charmult[$tempchr] * 2;
-                else  $result += 4;
+                if ($x > 19) {
+                	$result += $charmult[$tempchr];
+                } else if ($x > 7) {
+                	$result += $charmult[$tempchr] * 1.5;
+                } else if ($x > 0) {
+                	$result += $charmult[$tempchr] * 2;
+                } else {
+                	$result += 4;
+                }
 
                 $charmult[$tempchr] *= 0.75;
             }
 
             return $result;
-        }
-        else
+        } else
         {
-            if ($y > 20)  return 4 + (7 * 2) + (12 * 1.5) + $y - 20;
-            if ($y > 8)  return 4 + (7 * 2) + (($y - 8) * 1.5);
-            if ($y > 1)  return 4 + (($y - 1) * 2);
+            if ($y > 20) {
+            	return 4 + (7 * 2) + (12 * 1.5) + $y - 20;
+            }
+            if ($y > 8) {
+            	return 4 + (7 * 2) + (($y - 8) * 1.5);
+            }
+            if ($y > 1) {
+            	return 4 + (($y - 1) * 2);
+            }
 
             return ($y == 1 ? 4 : 0);
         }
@@ -151,21 +161,32 @@ 
         for ($x = 0; $x < $y; $x++)
         {
             $tempchr = ord(substr($password, $x, 1));
-            if ($tempchr >= ord("A") && $tempchr <= ord("Z"))  $upper = true;
-            else if ($tempchr >= ord("a") && $tempchr <= ord("z"))  $lower = true;
-            else if ($tempchr >= ord("0") && $tempchr <= ord("9"))  $numeric = true;
-            else if ($tempchr == ord(" "))  $space = true;
-            else  $other = true;
+            if ($tempchr >= ord("A") && $tempchr <= ord("Z")) {
+            	$upper = true;
+            } else if ($tempchr >= ord("a") && $tempchr <= ord("z")) {
+            	$lower = true;
+            } else if ($tempchr >= ord("0") && $tempchr <= ord("9")) {
+            	$numeric = true;
+            } else if ($tempchr == ord(" ")) {
+            	$space = true;
+            } else {
+            	$other = true;
+            }
         }
         $extrabits = ($upper && $lower && $other ? ($numeric ? 6 : 5) : ($numeric && !$upper && !$lower ? ($other ? -2 : -6) : 0));
-        if (!$space)  $extrabits -= 2;
-        else if (count(explode(" ", preg_replace('/\s+/', " ", $password))) > 3)  $extrabits++;
+        if (!$space) {
+        	$extrabits -= 2;
+        } else if (count(explode(" ", preg_replace('/\s+/', " ", $password))) > 3) {
+        	$extrabits++;
+        }
         $result = self::getNISTNumBits($password, true) + $extrabits;
 
         $password = strtolower($password);
         $revpassword = strrev($password);
         $numbits = self::getNISTNumBits($password) + $extrabits;
-        if ($result > $numbits)  $result = $numbits;
+        if ($result > $numbits) {
+        	$result = $numbits;
+        }
 
         // Remove QWERTY strings.
         $qwertystrs = array(
@@ -200,11 +221,17 @@ 
             } while ($z > 2);
 
             $numbits = self::getNISTNumBits($qpassword) + $extrabits;
-            if ($result > $numbits)  $result = $numbits;
+            if ($result > $numbits) {
+            	$result = $numbits;
+            }
             $numbits = self::getNISTNumBits($qrevpassword) + $extrabits;
-            if ($result > $numbits)  $result = $numbits;
+            if ($result > $numbits) {
+            	$result = $numbits;
+            }
 
-            if ($result < $minbits)  return false;
+            if ($result < $minbits) {
+            	return false;
+            }
         }
 
         if ($usedict && $result >= $minbits)
@@ -328,15 +355,21 @@ 
                         for ($x2 = $x + 1; $x2 < $y; $x2++)
                         {
                             $tempchr = ord(substr($password, $x2, 1));
-                            if ($tempchr < $a || $tempchr > $z)  break;
+                            if ($tempchr < $a || $tempchr > $z) {
+                            	break;
+                            }
                         }
 
                         $found = false;
                         while (!$found && $x2 - $x >= $minwordlen)
                         {
                             $word = "/\\n" . substr($password, $x, $minwordlen);
-                            for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= "(" . $password{$x3};
-                            for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++)  $word .= ")?";
+                            for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++) {
+                            	$word .= "(" . $password{$x3};
+                            }
+                            for ($x3 = $x + $minwordlen; $x3 < $x2; $x3++) {
+                            	$word .= ")?";
+                            }
                             $word .= "\\n/";
 
                             preg_match_all($word, $data, $matches);
@@ -345,24 +378,31 @@ 
                                 $password{$x} = "*";
                                 $x++;
                                 $numbits = self::getNISTNumBits(substr($password, 0, $x)) + $extrabits;
-                                if ($numbits >= $minbits)  $found = true;
-                            }
-                            else
+                                if ($numbits >= $minbits) {
+                                	$found = true;
+                                }
+                            } else
                             {
                                 foreach ($matches[0] as $match)
                                 {
                                     $password2 = str_replace(trim($match), "*", $password);
                                     $numbits = self::getNISTNumBits($password2) + $extrabits;
-                                    if ($result > $numbits)  $result = $numbits;
+                                    if ($result > $numbits) {
+                                    	$result = $numbits;
+                                    }
 
-                                    if ($result < $minbits)  return false;
+                                    if ($result < $minbits) {
+                                    	return false;
+                                    }
                                 }
 
                                 $found = true;
                             }
                         }
 
-                        if ($found)  break;
+                        if ($found) {
+                        	break;
+                        }
 
                         $x = $x2 - 1;
                     }

myth/CIModules/auth/controllers/Auth.php

Braces +4 added lines, -8 removed lines

@@ -136,8 +136,7 @@ 
             {
                 $this->setMessage(lang('auth.did_register'), 'success');
                 redirect( Route::named('login') );
-            }
-            else
+            } else
             {
                 $this->setMessage($auth->error(), 'danger');
             }
@@ -169,8 +168,7 @@ 
             {
                 $this->setMessage(lang('auth.did_activate'), 'success');
                 redirect( Route::named('login') );
-            }
-            else
+            } else
             {
                 $this->setMessage($auth->error(), 'danger');
             }
@@ -202,8 +200,7 @@ 
             {
                 $this->setMessage(lang('auth.send_success'), 'success');
                 redirect( Route::named('reset_pass') );
-            }
-            else
+            } else
             {
                 $this->setMessage($auth->error(), 'danger');
             }
@@ -237,8 +234,7 @@ 
             {
                 $this->setMessage(lang('auth.new_password_success'), 'success');
                 redirect( Route::named('login') );
-            }
-            else
+            } else
             {
                 $this->setMessage($auth->error(), 'danger');
             }

myth/CIModules/database/libraries/Seeder.php

Braces +1 added lines, -2 removed lines

@@ -116,8 +116,7 @@
             $seeder->run();
 
             unset($seeder);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             show_error($e->getMessage(), $e->getCode());
         }

myth/CIModules/docs/views/_sidebar.php

Braces +15 added lines, -6 removed lines

@@ -11,12 +11,18 @@ 
                             <?php endforeach; ?>
                         </ul>
                     </li>
-                <?php else : ?>
-                    <li><?php echo anchor($docsDir . str_replace($docsExt, '', $file), $name); ?></li>
+                <?php else {
+	: ?>
+                    <li><?php echo anchor($docsDir . str_replace($docsExt, '', $file), $name);
+}
+?></li>
                 <?php endif ?>
             <?php endforeach ?>
-        <?php else : ?>
-            <p class="text-center"><?php echo lang('docs_not_found'); ?></p>
+        <?php else {
+	: ?>
+            <p class="text-center"><?php echo lang('docs_not_found');
+}
+?></p>
         <?php endif ?>
 
         <?php if ( ! empty($module_docs) && is_array($module_docs)) : ?>
@@ -33,8 +39,11 @@ 
                         <?php endforeach; ?>
                         </ul>
                     </li>
-                <?php else : ?>
-                    <li class='parent'><?php echo anchor(site_url($docsDir . '/' . str_replace($docsExt, '', $module)), ucwords(str_replace('_', ' ', $module))); ?></li>
+                <?php else {
+	: ?>
+                    <li class='parent'><?php echo anchor(site_url($docsDir . '/' . str_replace($docsExt, '', $module)), ucwords(str_replace('_', ' ', $module)));
+}
+?></li>
                 <?php endif ?>
             <?php endforeach ?>
         <?php endif ?>

myth/CIModules/docs/views/index.php

Braces +10 added lines, -4 removed lines

@@ -2,15 +2,21 @@
     <div class="alert alert-info" style="margin-top: 40px;">
         <?php if (isset($notice)) : ?>
             <?= $notice; ?>
-        <?php else: ?>
-            <?php echo lang('docs_not_found'); ?>
+        <?php else {
+	: ?>
+            <?php echo lang('docs_not_found');
+}
+?>
         <?php endif; ?>
     </div>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
     <div class="page">
-        <?php echo $content; ?>
+        <?php echo $content;
+}
+?>
     </div>
 
 <?php endif; ?>

myth/CIModules/docs/views/search.php

Braces +5 added lines, -2 removed lines

@@ -24,10 +24,13 @@
     </div>
     <?php endforeach; ?>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
     <div class="alert alert-info">
-        <?php echo sprintf(lang('docs_no_results'), $search_terms); ?>
+        <?php echo sprintf(lang('docs_no_results'), $search_terms);
+}
+?>
     </div>
 
 <?php endif; ?>

myth/CLI.php

Braces +5 added lines, -12 removed lines

@@ -240,9 +240,7 @@ 
             if ($default !== null)
             {
                 $extra_output = ' [ Default: "'.$default.'" ]';
-            }
-
-            elseif ($options !== array())
+            } elseif ($options !== array())
             {
                 $extra_output = ' [ '.implode(', ', $options).' ]';
             }
@@ -353,15 +351,12 @@ 
                 $time--;
             }
             static::write();
-        }
-
-        else
+        } else
         {
             if ($seconds > 0)
             {
                 sleep($seconds);
-            }
-            else
+            } else
             {
                 static::write(static::$wait_msg);
                 static::input();
@@ -522,8 +517,7 @@ 
             fwrite(STDOUT, " {$percent}% Complete" . PHP_EOL);
             // Move up, undo the PHP_EOL
             fwrite(STDOUT, "\033[1A");
-        }
-        else
+        } else
         {
             fwrite(STDERR, "\007");
         }
@@ -637,8 +631,7 @@ 
 			array_walk( $lines, function ( &$line, $index ) use($max, $pad_left, &$first) {
 				if (! $first) {
 					$line = str_repeat( " ", $pad_left ) . $line;
-				}
-				else
+				} else
 				{
 					$first = false;
 				}