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

app/GedcomCode/GedcomCodeTemp.php

Spacing +6 added lines, -6 removed lines

@@ -60,14 +60,14 @@
             'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
             'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
             'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
-            'OGDEN', 'OKLAH',   'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
-            'PAYSO', 'PERTH',   'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
+            'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
+            'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
             'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
-            'SAMOA', 'SANTI',   'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
-            'SGEOR', 'SJOSE',   'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
+            'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
+            'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA',
             'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
-            'TIHUA', 'TOKYO',   'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
-            'VILLA', 'WASHI',   'WINTE',
+            'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
+            'VILLA', 'WASHI', 'WINTE',
         );
     }
 

app/Database.php

Spacing +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
         // Create the underlying PDO object
         self::$pdo = new PDO(
             (substr($DBHOST, 0, 1) === '/' ?
-                "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-                "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+                "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
             ),
             $DBUSER, $DBPASS,
             array(