fisharebest / webtrees

app/Schema/Migration22.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                     $_tmp_dir   = $WT_DATA_DIR;
                     while (strpos($_mf_dir, $_tmp_dir) !== 0) {
                         $_media_dir .= '../';
-                        $_tmp_dir   = preg_replace('~[^/\\\\]+[/\\\\]$~', '', $_tmp_dir);
+                        $_tmp_dir = preg_replace('~[^/\\\\]+[/\\\\]$~', '', $_tmp_dir);
                         if ($_tmp_dir == '') {
                             // Shouldn't get here - but this script is not allowed to fail...
                             continue 2;

app/Http/Controllers/CalendarController.php

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

@@ -72,14 +72,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) {
@@ -191,14 +191,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) {

app/Functions/FunctionsPrint.php

Indentation +4 added lines, -4 removed lines

@@ -345,10 +345,10 @@
         }
         // print gedcom ages
         foreach ([
-                     I18N::translate('Age')     => $fact_age,
-                     I18N::translate('Husband') => $husb_age,
-                     I18N::translate('Wife')    => $wife_age,
-                 ] as $label => $age) {
+                        I18N::translate('Age')     => $fact_age,
+                        I18N::translate('Husband') => $husb_age,
+                        I18N::translate('Wife')    => $wife_age,
+                    ] as $label => $age) {
             if ($age != '') {
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
             }

app/MediaFile.php

Indentation +4 added lines, -4 removed lines

@@ -224,10 +224,10 @@
             $src    = $this->imageUrl($width, $height, $fit);
             $srcset = [];
             foreach ([
-                         2,
-                         3,
-                         4,
-                     ] as $x) {
+                            2,
+                            3,
+                            4,
+                        ] as $x) {
                 $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x';
             }
         }

app/Http/Controllers/AdminLocationController.php

Braces +4 added lines, -2 removed lines

@@ -342,9 +342,11 @@
             'fqpn',
         ];
 
-        if ($serverfile !== '') {  // first choice is file on server
+        if ($serverfile !== '') {
+// first choice is file on server
             $filename = WT_DATA_DIR . 'places/' . $serverfile;
-        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file
+        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) {
+// 2nd choice is local file
             $filename = $_FILES['localfile']['tmp_name'];
         }
 

app/Http/Controllers/HomePageController.php

Indentation +3 added lines, -3 removed lines

@@ -840,9 +840,9 @@
         }
 
         foreach ([
-             'main' => $main_blocks,
-             'side' => $side_blocks,
-         ] as $location => $updated_blocks) {
+                'main' => $main_blocks,
+                'side' => $side_blocks,
+            ] as $location => $updated_blocks) {
             foreach ($updated_blocks as $block_order => $block_id) {
                 if (is_numeric($block_id)) {
                     // Updated block

app/Http/Controllers/PendingChangesController.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         $changes = Database::prepare(
             "SELECT change_id, xref, old_gedcom, new_gedcom" .
@@ -204,7 +204,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         // Reject a change, and subsequent changes to the same record
         Database::prepare(

app/Http/Controllers/AdminUsersController.php

Indentation +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
             // Link to send email to other users.
             if ($user_id != $user->getUserId()) {
                 $datum[4] = '<a href="' . e(route('message', ['to'  => $datum[2],
-                                                              'url' => route('admin-users'),
+                                                                'url' => route('admin-users'),
                     ])) . '">' . $datum[4] . '</a>';
             }
 

app/Services/CalendarService.php

Indentation +3 added lines, -3 removed lines

@@ -327,9 +327,9 @@
 
             // Now fetch these anniversaries
             foreach ([
-                         'INDI' => $ind_sql . $where . $order_by,
-                         'FAM'  => $fam_sql . $where . $order_by,
-                     ] as $type => $sql) {
+                            'INDI' => $ind_sql . $where . $order_by,
+                            'FAM'  => $fam_sql . $where . $order_by,
+                        ] as $type => $sql) {
                 $rows = Database::prepare($sql)->execute($args)->fetchAll();
                 foreach ($rows as $row) {
                     if ($type === 'INDI') {