fisharebest / webtrees

edituser.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 $form_pass2          = Filter::post('form_pass2', WT_REGEX_PASSWORD);
 $form_email          = Filter::postEmail('form_email');
 $form_rootid         = Filter::post('form_rootid', WT_REGEX_XREF);
-$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), '');;
+$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), ''); ;
 $form_language       = Filter::post('form_language');
 $form_timezone       = Filter::post('form_timezone');
 $form_contact_method = Filter::post('form_contact_method');

Braces +5 added lines, -2 removed lines

@@ -183,8 +183,11 @@
             <div class="value">
                 <?php if ($my_individual_record): ?>
                     <?php echo $my_individual_record->formatList('span'); ?>
-                <?php else: ?>
-                    <?php echo I18N::translateContext('unknown people', 'Unknown'); ?>
+                <?php else {
+    : ?>
+                    <?php echo I18N::translateContext('unknown people', 'Unknown');
+}
+?>
                 <?php endif; ?>
                 <p class="small text-muted">
                     <?php echo I18N::translate('This is a link to your own record in the family tree. If this is the wrong individual, contact an administrator.'); ?>

admin_trees_config.php

Braces +10 added lines, -4 removed lines

@@ -551,18 +551,24 @@
                     <div class="bg-danger text-danger">
                         <?php echo $resn->xref, ' — ', I18N::translate('this record does not exist'); ?>
                     </div>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                     <div class="text-muted">
-                        <?php echo I18N::translate('All records'); ?>
+                        <?php echo I18N::translate('All records');
+}
+?>
                     </div>
                     <?php endif; ?>
                 </td>
                 <td>
                     <?php if ($resn->tag_label): ?>
                         <?php echo $resn->tag_label; ?>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                     <div class="text-muted">
-                        <?php echo I18N::translate('All facts and events'); ?>
+                        <?php echo I18N::translate('All facts and events');
+}
+?>
                     </div>
                     <?php endif; ?>
                 </td>

admin_site_logs.php

Switch Indentation +39 added lines, -39 removed lines

@@ -98,52 +98,52 @@
 }
 
 switch ($action) {
-    case 'delete':
-        $sql_delete =
-        "DELETE `##log` FROM `##log`" .
-        " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-        " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
-
-        Database::prepare($sql_delete . $where)->execute($args);
-        break;
-
-    case 'export':
-        header('Content-Type: text/csv');
-        header('Content-Disposition: attachment; filename="webtrees-logs.csv"');
-        $rows = Database::prepare($sql_select . $where . ' ORDER BY log_id')->execute($args)->fetchAll();
-        foreach ($rows as $row) {
-            echo
-            '"', $row->log_time, '",',
-            '"', $row->log_type, '",',
-            '"', str_replace('"', '""', $row->log_message), '",',
-            '"', $row->ip_address, '",',
-            '"', str_replace('"', '""', $row->user_name), '",',
-            '"', str_replace('"', '""', $row->gedcom_name), '"',
-            "\n";
-        }
+        case 'delete':
+            $sql_delete =
+            "DELETE `##log` FROM `##log`" .
+            " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+            " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+
+            Database::prepare($sql_delete . $where)->execute($args);
+            break;
+
+        case 'export':
+            header('Content-Type: text/csv');
+            header('Content-Disposition: attachment; filename="webtrees-logs.csv"');
+            $rows = Database::prepare($sql_select . $where . ' ORDER BY log_id')->execute($args)->fetchAll();
+            foreach ($rows as $row) {
+                echo
+                '"', $row->log_time, '",',
+                '"', $row->log_type, '",',
+                '"', str_replace('"', '""', $row->log_message), '",',
+                '"', $row->ip_address, '",',
+                '"', str_replace('"', '""', $row->user_name), '",',
+                '"', str_replace('"', '""', $row->gedcom_name), '"',
+                "\n";
+            }
 
-        return;
-    case 'load_json':
-        $start  = Filter::getInteger('start');
-        $length = Filter::getInteger('length');
-        $order  = Filter::getArray('order');
-
-        if ($order) {
-            $order_by = " ORDER BY ";
-            foreach ($order as $key => $value) {
-                if ($key > 0) {
-                    $order_by .= ',';
-                }
-                // Datatables numbers columns 0, 1, 2
-                // MySQL numbers columns 1, 2, 3
-                switch ($value['dir']) {
+            return;
+        case 'load_json':
+            $start  = Filter::getInteger('start');
+            $length = Filter::getInteger('length');
+            $order  = Filter::getArray('order');
+
+            if ($order) {
+                $order_by = " ORDER BY ";
+                foreach ($order as $key => $value) {
+                    if ($key > 0) {
+                        $order_by .= ',';
+                    }
+                    // Datatables numbers columns 0, 1, 2
+                    // MySQL numbers columns 1, 2, 3
+                    switch ($value['dir']) {
                     case 'asc':
                         $order_by .= (1 + $value['column']) . " ASC ";
                         break;
                     case 'desc':
                         $order_by .= (1 + $value['column']) . " DESC ";
                     break;
-                }
+                    }
             }
         } else {
             $order_by = " ORDER BY 1 ASC";

calendar.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -63,14 +63,14 @@
     if (strlen($match[1]) > strlen($match[2])) {
         $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
     }
-    $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+    $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
     $view     = 'year';
 } else {
     // advanced-year "decade/century wildcard"
     if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
         $y1       = $match[1] . str_replace('?', '0', $match[2]);
         $y2       = $match[1] . str_replace('?', '9', $match[2]);
-        $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+        $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
         $view     = 'year';
     } else {
         if ($year < 0) {

admin_module_menus.php

Braces +5 added lines, -2 removed lines

@@ -98,8 +98,11 @@
                 <td class="col-xs-1">
                     <?php if ($module instanceof ModuleConfigInterface): ?>
                     <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-                    <?php else: ?>
-                    <?php echo $module->getTitle(); ?>
+                    <?php else {
+    : ?>
+                    <?php echo $module->getTitle();
+}
+?>
                     <?php endif; ?>
                 </td>
                 <td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

admin.php

Braces +35 added lines, -14 removed lines

@@ -625,8 +625,11 @@ 
                     <a href="admin_site_upgrade.php" class="error">
                         <?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
                     </a>
-                    <?php else: ?>
-                        <?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.'); ?>
+                    <?php else {
+    : ?>
+                        <?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.');
+}
+?>
                     <?php endif; ?>
                 </p>
                 <?php endif; ?>
@@ -788,9 +791,12 @@ 
                                     <?php echo I18N::number($changes[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                 -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </td>
                             <td class="text-right flip">
                                 <?php if ($individuals[$tree->getTreeId()]): ?>
@@ -798,9 +804,12 @@ 
                                     <?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                                 </td>
                             <td class="text-right flip">
                                 <?php if ($families[$tree->getTreeId()]): ?>
@@ -808,9 +817,12 @@ 
                                     <?php echo I18N::number($families[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                 -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                                 </td>
                             <td class="text-right flip">
                                 <?php if ($sources[$tree->getTreeId()]): ?>
@@ -818,9 +830,12 @@ 
                                     <?php echo I18N::number($sources[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                 -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </td>
                             <td class="text-right flip">
                                 <?php if ($repositories[$tree->getTreeId()]): ?>
@@ -828,9 +843,12 @@ 
                                     <?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </td>
                             <td class="text-right flip">
                                 <?php if ($media[$tree->getTreeId()]): ?>
@@ -838,9 +856,12 @@ 
                                     <?php echo I18N::number($media[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                 -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </td>
                         </tr>
                         <?php endforeach; ?>

admin_module_blocks.php

Braces +5 added lines, -2 removed lines

@@ -81,8 +81,11 @@
                 <td class="col-xs-2">
                     <?php if ($module instanceof ModuleConfigInterface): ?>
                         <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-                    <?php else: ?>
-                        <?php echo $module->getTitle(); ?>
+                    <?php else {
+    : ?>
+                        <?php echo $module->getTitle();
+}
+?>
                     <?php endif; ?>
                 </td>
                 <td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

app/Module/FamilyNavigatorModule.php

Indentation +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
             $father = $family->getHusband();
             $mother = $family->getWife();
             $html .= $this->getHTML($father) .
-                     $this->getHTML($mother);
+                        $this->getHTML($mother);
 
             // Can only have a step parent if one & only one parent found at this point
             if ($father instanceof Individual xor $mother instanceof Individual) {

Braces +10 added lines, -4 removed lines

@@ -147,8 +147,11 @@ 
                     <div class="font9">
                         <?php echo $spouse->getLifeSpan(); ?>
                     </div>
-                    <?php else: ?>
-                        <?php echo $spouse->getFullName(); ?>
+                    <?php else {
+    : ?>
+                        <?php echo $spouse->getFullName();
+}
+?>
                     <?php endif; ?>
                 </td>
             </tr>
@@ -172,8 +175,11 @@ 
                     <div class="font9">
                         <?php echo $child->getLifeSpan(); ?>
                     </div>
-                    <?php else: ?>
-                        <?php echo $child->getFullName(); ?>
+                    <?php else {
+    : ?>
+                        <?php echo $child->getFullName();
+}
+?>
                     <?php endif; ?>
                 </td>
             </tr>

app/Module/BatchUpdateModule.php

Braces +10 added lines, -4 removed lines

@@ -241,12 +241,15 @@ 
                     <?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
                     <?php // page, which makes them all again!  ?>
                     <script>reset_reload();</script>
-            <?php else: ?>
+            <?php else {
+    : ?>
                     <hr>
                     <div id="batch_update2" class="col-sm-12">
                         <?php if ($this->curr_xref): ?>
                             <?php // Create an object, so we can get the latest version of the name. ?>
-                                <?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE); ?>
+                                <?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE);
+}
+?>
                             <div class="form-group">
                                 <?php echo self::createSubmitButton(I18N::translate('previous'), $this->prev_xref) ?>
                             <?php echo self::createSubmitButton(I18N::translate('next'), $this->next_xref) ?>
@@ -258,8 +261,11 @@ 
                             <div class="form-group">
                             <?php echo implode(' ', $this->PLUGIN->getActionButtons($this->curr_xref, $this->record)); ?>
                             </div>
-                        <?php else: ?>
-                            <div class="alert alert-info"><?php echo I18N::translate('Nothing found.'); ?></div>
+                        <?php else {
+    : ?>
+                            <div class="alert alert-info"><?php echo I18N::translate('Nothing found.');
+}
+?></div>
                     <?php endif; ?>
                     </div>
                 <?php endif; ?>