fisharebest / webtrees

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";

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_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

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; ?>

app/Module/StoriesModule.php

Braces +5 added lines, -2 removed lines

@@ -403,8 +403,11 @@
                         <a href="<?php echo $individual->getHtmlUrl(); ?>#stories">
                             <?php echo $individual->getFullName(); ?>
                         </a>
-                        <?php else: ?>
-                            <?php echo $story->xref; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $story->xref;
+}
+?>
                         <?php endif; ?>
                         </td>
                         <td>

medialist.php

Braces +5 added lines, -2 removed lines

@@ -110,10 +110,13 @@
                         </option>
                     </select>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                     <td class="descriptionbox wrap"></td>
                     <td class="optionbox wrap"></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             </tr>
             <tr>
                 <td class="descriptionbox wrap">

admin_site_config.php

Switch Indentation +19 added lines, -19 removed lines

@@ -137,25 +137,25 @@
 }
 
 switch (Filter::get('action')) {
-    case 'site':
-        $controller->setPageTitle(I18N::translate('Website preferences'));
-        break;
-    case 'email':
-        $controller->setPageTitle(I18N::translate('Sending email'));
-        break;
-    case 'login':
-        $controller->setPageTitle(I18N::translate('Sign-in and registration'));
-        break;
-    case 'tracking':
-        $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics'));
-        break;
-    case 'languages':
-        $controller->setPageTitle(I18N::translate('Languages'));
-        break;
-    default:
-        header('Location: ' . WT_BASE_URL . 'admin.php');
-
-        return;
+        case 'site':
+            $controller->setPageTitle(I18N::translate('Website preferences'));
+            break;
+        case 'email':
+            $controller->setPageTitle(I18N::translate('Sending email'));
+            break;
+        case 'login':
+            $controller->setPageTitle(I18N::translate('Sign-in and registration'));
+            break;
+        case 'tracking':
+            $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics'));
+            break;
+        case 'languages':
+            $controller->setPageTitle(I18N::translate('Languages'));
+            break;
+        default:
+            header('Location: ' . WT_BASE_URL . 'admin.php');
+
+            return;
 }
 
 $controller->pageHeader();