fisharebest / webtrees

app/Http/Controllers/AdminMediaController.php

Spacing +10 added lines, -10 removed lines

@@ -119,8 +119,8 @@ 
         $files  = $request->get('files'); // local|external|unused
         $search = $request->get('search');
         $search = $search['value'];
-        $start  = (int)$request->get('start');
-        $length = (int)$request->get('length');
+        $start  = (int) $request->get('start');
+        $length = (int) $request->get('length');
 
         // family tree setting MEDIA_DIRECTORY
         $media_folders = $this->allMediaFolders();
@@ -156,7 +156,7 @@ 
                     "  OR   descriptive_title LIKE CONCAT('%', :search_2, '%'))" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS1   = [
+                $ARGS1 = [
                     'media_path_1' => $media_path,
                     'media_folder' => $media_folder,
                     'media_path_2' => Database::escapeLike($media_path),
@@ -173,7 +173,7 @@ 
                     " AND   multimedia_file_refn LIKE CONCAT(:media_path_3, '%')" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS2   = [
+                $ARGS2 = [
                     'media_folder' => $media_folder,
                     'media_path_3' => $media_path,
                 ];
@@ -185,7 +185,7 @@ 
                     $ARGS2['media_path_4'] = Database::escapeLike($media_path);
                 }
 
-                $order   = $request->get('order', []);
+                $order = $request->get('order', []);
                 $SELECT1 .= " ORDER BY ";
                 if ($order) {
                     foreach ($order as $key => $value) {
@@ -209,7 +209,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -242,7 +242,7 @@ 
                     " JOIN  `##media_file` USING (m_id, m_file)" .
                     " WHERE (multimedia_file_refn LIKE 'http://%' OR multimedia_file_refn LIKE 'https://%')" .
                     " AND   (multimedia_file_refn LIKE CONCAT('%', :search_1, '%') OR descriptive_title LIKE CONCAT('%', :search_2, '%'))";
-                $ARGS1   = [
+                $ARGS1 = [
                     'search_1' => Database::escapeLike($search),
                     'search_2' => Database::escapeLike($search),
                 ];
@@ -278,7 +278,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -578,7 +578,7 @@ 
 
         // $dir comes from the database. The actual folder may not exist.
         if (is_dir($dir)) {
-            foreach (scandir($dir,SCANDIR_SORT_NONE) as $path) {
+            foreach (scandir($dir, SCANDIR_SORT_NONE) as $path) {
                 if (is_dir($dir . $path)) {
                     // What if there are user-defined subfolders “thumbs” or “watermarks”?
                     if ($path != '.' && $path != '..' && $path != 'thumbs' && $path != 'watermark' && $recursive) {
@@ -660,7 +660,7 @@ 
         $full_path = WT_DATA_DIR . $media_folder . $media_path . $file;
         try {
             $size = filesize($full_path);
-            $size = (int)(($size + 1023) / 1024); // Round up to next KB
+            $size = (int) (($size + 1023) / 1024); // Round up to next KB
             /* I18N: size of file in KB */
             $size = I18N::translate('%s KB', I18N::number($size));
             $html .= '<dt>' . I18N::translate('File size') . '</dt>';

app/Http/Controllers/PedigreeChartController.php

Spacing +15 added lines, -15 removed lines

@@ -92,8 +92,8 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $orientation = (int)$request->get('orientation', self::LANDSCAPE);
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
+        $orientation = (int) $request->get('orientation', self::LANDSCAPE);
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
 
         $generations = min(self::MAX_GENERATIONS, $generations);
         $generations = max(self::MIN_GENERATIONS, $generations);
@@ -129,8 +129,8 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $this->orientation = (int)$request->get('orientation');
-        $this->generations = (int)$request->get('generations');
+        $this->orientation = (int) $request->get('orientation');
+        $this->generations = (int) $request->get('generations');
         $bxspacing         = Theme::theme()->parameter('chart-spacing-x');
         $byspacing         = Theme::theme()->parameter('chart-spacing-y');
         $curgen            = 1; // -- track which generation the algorithm is currently working on
@@ -155,7 +155,7 @@ 
         }, array_values($this->sosaStradonitzAncestors($individual, $this->generations)));
 
         //check earliest generation for any ancestors
-        for ($i = (int)($this->treesize / 2); $i < $this->treesize; $i++) {
+        for ($i = (int) ($this->treesize / 2); $i < $this->treesize; $i++) {
             $this->chartHasAncestors = $this->chartHasAncestors || ($this->nodes[$i]['indi'] && $this->nodes[$i]['indi']->getChildFamilies());
         }
 
@@ -189,7 +189,7 @@ 
 
         for ($i = ($this->treesize - 1); $i >= 0; $i--) {
             // -- check to see if we have moved to the next generation
-            if ($i < (int)($this->treesize / (2 ** $curgen))) {
+            if ($i < (int) ($this->treesize / (2 ** $curgen))) {
                 $curgen++;
             }
 
@@ -220,7 +220,7 @@ 
                         } else {
                             $yoffset = $yoffset + (($boxspacing / 2) * ($curgen - 1));
                         }
-                        $parent = (int)(($i - 1) / 2);
+                        $parent = (int) (($i - 1) / 2);
                         $pgen   = $curgen;
                         while ($parent > 0) {
                             if ($parent % 2 == 0) {
@@ -240,7 +240,7 @@ 
                                     $yoffset = $yoffset + (($boxspacing / 2) * $temp);
                                 }
                             }
-                            $parent = (int)(($parent - 1) / 2);
+                            $parent = (int) (($parent - 1) / 2);
                         }
                         if ($curgen > 3) {
                             $temp = 0;
@@ -276,8 +276,8 @@ 
                     }
                     break;
             }
-            $this->nodes[$i]['x'] = (int)$xoffset;
-            $this->nodes[$i]['y'] = (int)$yoffset;
+            $this->nodes[$i]['x'] = (int) $xoffset;
+            $this->nodes[$i]['y'] = (int) $yoffset;
         }
 
         // find the minimum x & y offsets and deduct that number from
@@ -306,7 +306,7 @@ 
         $canvas_width   = $max_xoffset + $bxspacing + Theme::theme()->parameter('chart-box-x') + $addoffset['x'];
         $canvas_height  = $max_yoffset + $byspacing + Theme::theme()->parameter('chart-box-y') + $addoffset['y'];
         $posn           = I18N::direction() === 'rtl' ? 'right' : 'left';
-        $last_gen_start = (int)floor($this->treesize / 2);
+        $last_gen_start = (int) floor($this->treesize / 2);
         if ($this->orientation === self::OLDEST_AT_TOP || $this->orientation === self::OLDEST_AT_BOTTOM) {
             $flex_direction = ' flex-column';
         } else {
@@ -355,7 +355,7 @@ 
             $html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
 
             foreach ($families as $family) {
-                $html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
+                $html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
                 $spouse = $family->getSpouse($this->root);
                 if ($spouse) {
                     $html .= '<a class="name1" href="' . e(route('pedigree', [
@@ -416,9 +416,9 @@ 
         $html = '';
         if ($this->chartHasAncestors) {
             if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
-                $html         .= '<div class="ancestorarrow">';
+                $html .= '<div class="ancestorarrow">';
                 $rootParentId = 1;
-                if ($index > (int)($this->treesize / 2) + (int)($this->treesize / 4)) {
+                if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
                     $rootParentId++;
                 }
                 $html .= '<a class="' . $this->arrows->prevGen . '" href="' . e(route('pedigree', [
@@ -445,7 +445,7 @@ 
     private function generationOptions(Tree $tree): array
     {
         // @TODO - do we need this config setting, given that we cannot show more than 8 generations?
-        $max_generations = min(self::MAX_GENERATIONS, (int)$tree->getPreference('MAX_PEDIGREE_GENERATIONS'));
+        $max_generations = min(self::MAX_GENERATIONS, (int) $tree->getPreference('MAX_PEDIGREE_GENERATIONS'));
 
         return FunctionsEdit::numericOptions(range(self::MIN_GENERATIONS, $max_generations));
     }