diff options
| -rw-r--r-- | addmedia.php | 2 | ||||
| -rw-r--r-- | app/Controller/PedigreeController.php | 6 | ||||
| -rw-r--r-- | app/Database.php | 2 | ||||
| -rw-r--r-- | app/Module/CensusAssistantModule.php | 6 | ||||
| -rw-r--r-- | app/Report/ReportBase.php | 490 | ||||
| -rw-r--r-- | app/Report/ReportParserGenerate.php | 4 | ||||
| -rw-r--r-- | app/Report/ReportParserSetup.php | 6 | ||||
| -rw-r--r-- | app/SurnameTradition/IcelandicSurnameTradition.php | 2 | ||||
| -rw-r--r-- | app/SurnameTradition/SpanishSurnameTradition.php | 2 | ||||
| -rw-r--r-- | edit_interface.php | 2 | ||||
| -rw-r--r-- | medialist.php | 8 |
11 files changed, 265 insertions, 265 deletions
diff --git a/addmedia.php b/addmedia.php index 1d53f8c3dc..b801b24859 100644 --- a/addmedia.php +++ b/addmedia.php @@ -473,7 +473,7 @@ if ($gedfile == 'FILE') { '<p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '<br>' . I18N::translate('You may enter a URL, beginning with “http://”.') . '</p>' ); } - $folder = ''; + $folder = ''; } else { if ($isExternal) { $fileName = substr($gedfile, 5); diff --git a/app/Controller/PedigreeController.php b/app/Controller/PedigreeController.php index 1c1d9d8e78..d82756c0aa 100644 --- a/app/Controller/PedigreeController.php +++ b/app/Controller/PedigreeController.php @@ -152,7 +152,7 @@ class PedigreeController extends ChartController { switch ($this->orientation) { case self::PORTRAIT: $xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8); - if(!$i && $this->root->getSpouseFamilies()) { + if (!$i && $this->root->getSpouseFamilies()) { $xoffset -= self::ARROW_SIZE; } // -- compact the tree @@ -207,7 +207,7 @@ class PedigreeController extends ChartController { case self::OLDEST_AT_TOP: //swap x & y offsets as chart is rotated $xoffset = $yoffset; - $yoffset = $curgen * ($this->getBoxDimensions()->height + ($byspacing * 4)); + $yoffset = $curgen * ($this->getBoxDimensions()->height + ($byspacing * 4)); break; case self::OLDEST_AT_BOTTOM: //swap x & y offsets as chart is rotated @@ -245,7 +245,7 @@ class PedigreeController extends ChartController { return $item['y']; }, $this->nodes)); - $this->chartsize['x'] = $max_xoffset + $bxspacing + $this->getBoxDimensions()->width + $addoffset['x']; + $this->chartsize['x'] = $max_xoffset + $bxspacing + $this->getBoxDimensions()->width + $addoffset['x']; $this->chartsize['y'] = $max_yoffset + $byspacing + $this->getBoxDimensions()->height + $addoffset['y']; } diff --git a/app/Database.php b/app/Database.php index 9462522cc1..987b5793f4 100644 --- a/app/Database.php +++ b/app/Database.php @@ -214,7 +214,7 @@ class Database { * * The native quote() function does not convert PHP nulls to DB nulls * - * @param $string + * @param string $string * * @return string * diff --git a/app/Module/CensusAssistantModule.php b/app/Module/CensusAssistantModule.php index 8243260144..942f77ec03 100644 --- a/app/Module/CensusAssistantModule.php +++ b/app/Module/CensusAssistantModule.php @@ -417,10 +417,10 @@ class CensusAssistantModule extends AbstractModule { * @return string */ public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) { - $headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>'; + $headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>'; foreach ($family->getSpouses() as $spouse) { - $menu = new Menu(Functions::getCloseRelationshipName($head, $spouse)); + $menu = new Menu(Functions::getCloseRelationshipName($head, $spouse)); foreach ($spouse->getChildFamilies() as $grandparents) { foreach ($grandparents->getSpouses() as $grandparent) { $submenu = new Menu( @@ -455,7 +455,7 @@ class CensusAssistantModule extends AbstractModule { } foreach ($family->getChildren() as $child) { - $menu = new Menu(Functions::getCloseRelationshipName($head, $child)); + $menu = new Menu(Functions::getCloseRelationshipName($head, $child)); foreach ($child->getSpouseFamilies() as $spouse_family) { foreach ($spouse_family->getSpouses() as $spouse_family_spouse) { if ($spouse_family_spouse != $child) { diff --git a/app/Report/ReportBase.php b/app/Report/ReportBase.php index e24aa70805..aab2cdbcd7 100644 --- a/app/Report/ReportBase.php +++ b/app/Report/ReportBase.php @@ -139,258 +139,258 @@ class ReportBase { */ switch ($this->pageFormat) { // ISO A series - case '4A0': // ISO 216, 1682 mm x 2378 mm - $sizes = array(4767.86, 6740.79); - break; - case '2A0': // ISO 216, 1189 mm x 1682 mm - $sizes = array(3370.39, 4767.86); - break; - case 'A0': // ISO 216, 841 mm x 1189mm - $sizes = array(2383.94, 3370.39); - break; - case 'A1': // ISO 216, 594 mm x 841 mm - $sizes = array(1683.78, 2383.94); - break; - case 'A2': // ISO 216, 420 mm x 594 mm - $sizes = array(1190.55, 1683.78); - break; - case 'A3': // ISO 216, 297 mm x 420 mm - $sizes = array(841.89, 1190.55); - break; - case 'A4': // ISO 216, 210 mm 297 mm - $sizes = array(595.28, 841.89); - break; - case 'A5': // ISO 216, 148 mm x 210 mm - $sizes = array(419.53, 595.28); - break; - case 'A6': // ISO 216, 105 mm x 148 mm - $sizes = array(297.64, 419.53); - break; - case 'A7': // ISO 216, 74 mm x 105 mm - $sizes = array(209.76, 297.64); - break; - case 'A8': // ISO 216, 52 mm x 74 mm - $sizes = array(147.40, 209.76); - break; - case 'A9': // ISO 216, 37 mm x 52 mm - $sizes = array(104.88, 147.40); - break; - case 'A10': // ISO 216, 26 mm x 37 mm - $sizes = array(73.70, 104.88); - break; + case '4A0': // ISO 216, 1682 mm x 2378 mm + $sizes = array(4767.86, 6740.79); + break; + case '2A0': // ISO 216, 1189 mm x 1682 mm + $sizes = array(3370.39, 4767.86); + break; + case 'A0': // ISO 216, 841 mm x 1189mm + $sizes = array(2383.94, 3370.39); + break; + case 'A1': // ISO 216, 594 mm x 841 mm + $sizes = array(1683.78, 2383.94); + break; + case 'A2': // ISO 216, 420 mm x 594 mm + $sizes = array(1190.55, 1683.78); + break; + case 'A3': // ISO 216, 297 mm x 420 mm + $sizes = array(841.89, 1190.55); + break; + case 'A4': // ISO 216, 210 mm 297 mm + $sizes = array(595.28, 841.89); + break; + case 'A5': // ISO 216, 148 mm x 210 mm + $sizes = array(419.53, 595.28); + break; + case 'A6': // ISO 216, 105 mm x 148 mm + $sizes = array(297.64, 419.53); + break; + case 'A7': // ISO 216, 74 mm x 105 mm + $sizes = array(209.76, 297.64); + break; + case 'A8': // ISO 216, 52 mm x 74 mm + $sizes = array(147.40, 209.76); + break; + case 'A9': // ISO 216, 37 mm x 52 mm + $sizes = array(104.88, 147.40); + break; + case 'A10': // ISO 216, 26 mm x 37 mm + $sizes = array(73.70, 104.88); + break; - // ISO B series - case 'B0': // ISO 216, 1000 mm x 1414 mm - $sizes = array(2834.65, 4008.19); - break; - case 'B1': // ISO 216, 707 mm x 1000 mm - $sizes = array(2004.09, 2834.65); - break; - case 'B2': // ISO 216, 500 mm x 707 mm - $sizes = array(1417.32, 2004.09); - break; - case 'B3': // ISO 216, 353 mm x 500 mm - $sizes = array(1000.63, 1417.32); - break; - case 'B4': // ISO 216, 250 mm x 353 mm - $sizes = array(708.66, 1000.63); - break; - case 'B5': // ISO 216, 176 mm x 250 mm - $sizes = array(498.90, 708.66); - break; - case 'B6': // ISO 216, 125 mm x 176 mm - $sizes = array(354.33, 498.90); - break; - case 'B7': // ISO 216, 88 mm x 125 mm - $sizes = array(249.45, 354.33); - break; - case 'B8': // ISO 216, 62 mm x 88 mm - $sizes = array(175.75, 249.45); - break; - case 'B9': // ISO 216, 44 mm x 62 mm - $sizes = array(124.72, 175.75); - break; - case 'B10': // ISO 216, 31 mm x 44 mm - $sizes = array(87.87, 124.72); - break; + // ISO B series + case 'B0': // ISO 216, 1000 mm x 1414 mm + $sizes = array(2834.65, 4008.19); + break; + case 'B1': // ISO 216, 707 mm x 1000 mm + $sizes = array(2004.09, 2834.65); + break; + case 'B2': // ISO 216, 500 mm x 707 mm + $sizes = array(1417.32, 2004.09); + break; + case 'B3': // ISO 216, 353 mm x 500 mm + $sizes = array(1000.63, 1417.32); + break; + case 'B4': // ISO 216, 250 mm x 353 mm + $sizes = array(708.66, 1000.63); + break; + case 'B5': // ISO 216, 176 mm x 250 mm + $sizes = array(498.90, 708.66); + break; + case 'B6': // ISO 216, 125 mm x 176 mm + $sizes = array(354.33, 498.90); + break; + case 'B7': // ISO 216, 88 mm x 125 mm + $sizes = array(249.45, 354.33); + break; + case 'B8': // ISO 216, 62 mm x 88 mm + $sizes = array(175.75, 249.45); + break; + case 'B9': // ISO 216, 44 mm x 62 mm + $sizes = array(124.72, 175.75); + break; + case 'B10': // ISO 216, 31 mm x 44 mm + $sizes = array(87.87, 124.72); + break; - // ISO C series, Envelope - case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet - $sizes = array(2599.37, 3676.54); - break; - case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet - $sizes = array(1836.85, 2599.37); - break; - case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half - $sizes = array(1298.27, 1836.85); - break; - case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half - $sizes = array(918.43, 1298.27); - break; - case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half - $sizes = array(649.13, 918.43); - break; - case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half - $sizes = array(459.21, 649.13); - break; - case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope - $sizes = array(323.15, 649.13); - break; - case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half - $sizes = array(323.15, 459.21); - break; - case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds - $sizes = array(229.61, 459.21); - break; - case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters - $sizes = array(229.61, 323.15); - break; - case 'C8': // ISO 269, 57 mm x 81 mm - $sizes = array(161.57, 229.61); - break; - case 'C9': // ISO 269, 40 mm x 57 mm - $sizes = array(113.39, 161.57); - break; - case 'C10': // ISO 269, 28 mm x 40 mm - $sizes = array(79.37, 113.39); - break; - case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half - $sizes = array(311.81, 623.62); - break; + // ISO C series, Envelope + case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet + $sizes = array(2599.37, 3676.54); + break; + case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet + $sizes = array(1836.85, 2599.37); + break; + case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half + $sizes = array(1298.27, 1836.85); + break; + case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half + $sizes = array(918.43, 1298.27); + break; + case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half + $sizes = array(649.13, 918.43); + break; + case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half + $sizes = array(459.21, 649.13); + break; + case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope + $sizes = array(323.15, 649.13); + break; + case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half + $sizes = array(323.15, 459.21); + break; + case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds + $sizes = array(229.61, 459.21); + break; + case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters + $sizes = array(229.61, 323.15); + break; + case 'C8': // ISO 269, 57 mm x 81 mm + $sizes = array(161.57, 229.61); + break; + case 'C9': // ISO 269, 40 mm x 57 mm + $sizes = array(113.39, 161.57); + break; + case 'C10': // ISO 269, 28 mm x 40 mm + $sizes = array(79.37, 113.39); + break; + case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half + $sizes = array(311.81, 623.62); + break; - // Untrimmed stock sizes for the ISO-A Series - ISO primary range - case 'RA0': // ISO 478, 860 mm x 1220 mm - $sizes = array(2437.80, 3458.27); - break; - case 'RA1': // ISO 478, 610 mm x 860 mm - $sizes = array(1729.13, 2437.80); - break; - case 'RA2': // ISO 478, 430 mm x 610 mm - $sizes = array(1218.90, 1729.13); - break; - case 'RA3': // ISO 478, 305 mm x 430 mm - $sizes = array(864.57, 1218.90); - break; - case 'RA4': // ISO 478, 215 mm x 305 mm - $sizes = array(609.45, 864.57); - break; + // Untrimmed stock sizes for the ISO-A Series - ISO primary range + case 'RA0': // ISO 478, 860 mm x 1220 mm + $sizes = array(2437.80, 3458.27); + break; + case 'RA1': // ISO 478, 610 mm x 860 mm + $sizes = array(1729.13, 2437.80); + break; + case 'RA2': // ISO 478, 430 mm x 610 mm + $sizes = array(1218.90, 1729.13); + break; + case 'RA3': // ISO 478, 305 mm x 430 mm + $sizes = array(864.57, 1218.90); + break; + case 'RA4': // ISO 478, 215 mm x 305 mm + $sizes = array(609.45, 864.57); + break; - // Untrimmed stock sizes for the ISO-A Series - ISO supplementary range - case 'SRA0': // ISO 593, 900 mm x 1280 mm - $sizes = array(2551.18, 3628.35); - break; - case 'SRA1': // ISO 593, 640 mm x 900 mm - $sizes = array(1814.17, 2551.18); - break; - case 'SRA2': // ISO 593, 450 mm x 640 mm - $sizes = array(1275.59, 1814.17); - break; - case 'SRA3': // ISO 593, 320 mm x 450 mm - $sizes = array(907.09, 1275.59); - break; - case 'SRA4': // ISO 593, 225 mm x 320 mm - $sizes = array(637.80, 907.09); - break; + // Untrimmed stock sizes for the ISO-A Series - ISO supplementary range + case 'SRA0': // ISO 593, 900 mm x 1280 mm + $sizes = array(2551.18, 3628.35); + break; + case 'SRA1': // ISO 593, 640 mm x 900 mm + $sizes = array(1814.17, 2551.18); + break; + case 'SRA2': // ISO 593, 450 mm x 640 mm + $sizes = array(1275.59, 1814.17); + break; + case 'SRA3': // ISO 593, 320 mm x 450 mm + $sizes = array(907.09, 1275.59); + break; + case 'SRA4': // ISO 593, 225 mm x 320 mm + $sizes = array(637.80, 907.09); + break; - // ISO size variations - case 'A2EXTRA': // ISO 216, 445 mm x 619 mm - $sizes = array(1261.42, 1754.65); - break; - case 'A2SUPER': // ISO 216, 305 mm x 508 mm - $sizes = array(864.57, 1440.00); - break; - case 'A3EXTRA': // ISO 216, 322 mm x 445 mm - $sizes = array(912.76, 1261.42); - break; - case 'SUPERA3': // ISO 216, 305 mm x 487 mm - $sizes = array(864.57, 1380.47); - break; - case 'A4EXTRA': // ISO 216, 235 mm x 322 mm - $sizes = array(666.14, 912.76); - break; - case 'A4LONG': // ISO 216, 210 mm x 348 mm - $sizes = array(595.28, 986.46); - break; - case 'A4SUPER': // ISO 216, 229 mm x 322 mm - $sizes = array(649.13, 912.76); - break; - case 'SUPERA4': // ISO 216, 227 mm x 356 mm - $sizes = array(643.46, 1009.13); - break; - case 'A5EXTRA': // ISO 216, 173 mm x 235 mm - $sizes = array(490.39, 666.14); - break; - case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm - $sizes = array(572.60, 782.36); - break; + // ISO size variations + case 'A2EXTRA': // ISO 216, 445 mm x 619 mm + $sizes = array(1261.42, 1754.65); + break; + case 'A2SUPER': // ISO 216, 305 mm x 508 mm + $sizes = array(864.57, 1440.00); + break; + case 'A3EXTRA': // ISO 216, 322 mm x 445 mm + $sizes = array(912.76, 1261.42); + break; + case 'SUPERA3': // ISO 216, 305 mm x 487 mm + $sizes = array(864.57, 1380.47); + break; + case 'A4EXTRA': // ISO 216, 235 mm x 322 mm + $sizes = array(666.14, 912.76); + break; + case 'A4LONG': // ISO 216, 210 mm x 348 mm + $sizes = array(595.28, 986.46); + break; + case 'A4SUPER': // ISO 216, 229 mm x 322 mm + $sizes = array(649.13, 912.76); + break; + case 'SUPERA4': // ISO 216, 227 mm x 356 mm + $sizes = array(643.46, 1009.13); + break; + case 'A5EXTRA': // ISO 216, 173 mm x 235 mm + $sizes = array(490.39, 666.14); + break; + case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm + $sizes = array(572.60, 782.36); + break; - // Japanese version of the ISO 216 B series - case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm - $sizes = array(2919.69, 4127.24); - break; - case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm - $sizes = array(2063.62, 2919.69); - break; - case 'JB2': // JIS P 0138-61, 515 mm x 728 mm - $sizes = array(1459.84, 2063.62); - break; - case 'JB3': // JIS P 0138-61, 364 mm x 515 mm - $sizes = array(1031.81, 1459.84); - break; - case 'JB4': // JIS P 0138-61, 257 mm x 364 mm - $sizes = array(728.50, 1031.81); - break; - case 'JB5': // JIS P 0138-61, 182 mm x 257 mm - $sizes = array(515.91, 728.50); - break; - case 'JB6': // JIS P 0138-61, 128 mm x 182 mm - $sizes = array(362.83, 515.91); - break; - case 'JB7': // JIS P 0138-61, 91 mm x 128 mm - $sizes = array(257.95, 362.83); - break; - case 'JB8': // JIS P 0138-61, 64 mm x 91 mm - $sizes = array(181.42, 257.95); - break; - case 'JB9': // JIS P 0138-61, 45 mm x 64 mm - $sizes = array(127.56, 181.42); - break; - case 'JB10': // JIS P 0138-61, 32 mm x 45 mm - $sizes = array(90.71, 127.56); - break; + // Japanese version of the ISO 216 B series + case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm + $sizes = array(2919.69, 4127.24); + break; + case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm + $sizes = array(2063.62, 2919.69); + break; + case 'JB2': // JIS P 0138-61, 515 mm x 728 mm + $sizes = array(1459.84, 2063.62); + break; + case 'JB3': // JIS P 0138-61, 364 mm x 515 mm + $sizes = array(1031.81, 1459.84); + break; + case 'JB4': // JIS P 0138-61, 257 mm x 364 mm + $sizes = array(728.50, 1031.81); + break; + case 'JB5': // JIS P 0138-61, 182 mm x 257 mm + $sizes = array(515.91, 728.50); + break; + case 'JB6': // JIS P 0138-61, 128 mm x 182 mm + $sizes = array(362.83, 515.91); + break; + case 'JB7': // JIS P 0138-61, 91 mm x 128 mm + $sizes = array(257.95, 362.83); + break; + case 'JB8': // JIS P 0138-61, 64 mm x 91 mm + $sizes = array(181.42, 257.95); + break; + case 'JB9': // JIS P 0138-61, 45 mm x 64 mm + $sizes = array(127.56, 181.42); + break; + case 'JB10': // JIS P 0138-61, 32 mm x 45 mm + $sizes = array(90.71, 127.56); + break; - // US pages - case 'EXECUTIVE': // 7.25 in x 10.5 in - $sizes = array(522.00, 756.00); - break; - case 'FOLIO': // 8.5 in x 13 in - $sizes = array(612.00, 936.00); - break; - case 'FOOLSCAP': // 13.5 in x 17 in - $sizes = array(972.00, 1224.00); - break; - case 'LEDGER': // 11 in x 17 in - $sizes = array(792.00, 1224.00); - break; - case 'LEGAL': // 8.5 in x 14 in - $sizes = array(612.00, 1008.00); - break; - case 'LETTER': // 8.5 in x 11 in - $sizes = array(612.00, 792.00); - break; - case 'QUARTO': // 8.46 in x 10.8 in - $sizes = array(609.12, 777.50); - break; - case 'STATEMENT': // 5.5 in x 8.5 in - $sizes = array(396.00, 612.00); - break; - case 'USGOVT': // 8 in x 11 in - $sizes = array(576.00, 792.00); - break; - default: - $this->pageFormat = 'A4'; - $sizes = array(595.28, 841.89); - break; + // US pages + case 'EXECUTIVE': // 7.25 in x 10.5 in + $sizes = array(522.00, 756.00); + break; + case 'FOLIO': // 8.5 in x 13 in + $sizes = array(612.00, 936.00); + break; + case 'FOOLSCAP': // 13.5 in x 17 in + $sizes = array(972.00, 1224.00); + break; + case 'LEDGER': // 11 in x 17 in + $sizes = array(792.00, 1224.00); + break; + case 'LEGAL': // 8.5 in x 14 in + $sizes = array(612.00, 1008.00); + break; + case 'LETTER': // 8.5 in x 11 in + $sizes = array(612.00, 792.00); + break; + case 'QUARTO': // 8.46 in x 10.8 in + $sizes = array(609.12, 777.50); + break; + case 'STATEMENT': // 5.5 in x 8.5 in + $sizes = array(396.00, 612.00); + break; + case 'USGOVT': // 8 in x 11 in + $sizes = array(576.00, 792.00); + break; + default: + $this->pageFormat = 'A4'; + $sizes = array(595.28, 841.89); + break; } $this->pagew = $sizes[0]; $this->pageh = $sizes[1]; diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php index bb60a7235f..1bcaacbbe8 100644 --- a/app/Report/ReportParserGenerate.php +++ b/app/Report/ReportParserGenerate.php @@ -954,7 +954,7 @@ class ReportParserGenerate extends ReportParserBase { } } $tmp = explode(':', $tag); - if (in_array(end($tmp), array('NOTE', 'TEXT'))) { + if (in_array(end($tmp), array('NOTE', 'TEXT'))) { $value = Filter::formatText($value, $WT_TREE); // We'll strip HTML in addText() } $this->current_element->addText($value); @@ -2733,7 +2733,7 @@ class ReportParserGenerate extends ReportParserBase { $tags = explode(':', $tag); $origlevel = $level; if ($level == 0) { - $level = $gedrec{0} + 1; + $level = $gedrec{0} +1; } $subrec = $gedrec; diff --git a/app/Report/ReportParserSetup.php b/app/Report/ReportParserSetup.php index 08ee696c5e..c6a6dcd172 100644 --- a/app/Report/ReportParserSetup.php +++ b/app/Report/ReportParserSetup.php @@ -66,11 +66,11 @@ class ReportParserSetup extends ReportParserBase { */ protected function varStartHandler($attrs) { if (preg_match('/^I18N::number\((.+)\)$/', $attrs['var'], $match)) { - $this->text .= I18N::number($match[1]); + $this->text .= I18N::number($match[1]); } elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $attrs['var'], $match)) { - $this->text .= I18N::translate($match[1]); + $this->text .= I18N::translate($match[1]); } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $attrs['var'], $match)) { - $this->text .= I18N::translateContext($match[1], $match[2]); + $this->text .= I18N::translateContext($match[1], $match[2]); } else { $this->text .= $attrs['var']; } diff --git a/app/SurnameTradition/IcelandicSurnameTradition.php b/app/SurnameTradition/IcelandicSurnameTradition.php index 9dd99e926d..924c4c2769 100644 --- a/app/SurnameTradition/IcelandicSurnameTradition.php +++ b/app/SurnameTradition/IcelandicSurnameTradition.php @@ -42,7 +42,7 @@ class IcelandicSurnameTradition extends DefaultSurnameTradition implements Surna */ public function newChildNames($father_name, $mother_name, $child_sex) { if (preg_match(self::REGEX_GIVN, $father_name, $father_match)) { - switch($child_sex) { + switch ($child_sex) { case 'M': return array( 'NAME' => $father_match['GIVN'] . 'sson', diff --git a/app/SurnameTradition/SpanishSurnameTradition.php b/app/SurnameTradition/SpanishSurnameTradition.php index e957bad424..09c96e70a7 100644 --- a/app/SurnameTradition/SpanishSurnameTradition.php +++ b/app/SurnameTradition/SpanishSurnameTradition.php @@ -61,7 +61,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition implements Surname */ public function newParentNames($child_name, $parent_sex) { if (preg_match(self::REGEX_SURNS, $child_name, $match)) { - switch($parent_sex) { + switch ($parent_sex) { case 'M': return array( 'NAME' => '/' . $match['SURN1'] . '/ //', diff --git a/edit_interface.php b/edit_interface.php index 96466785cb..040229f8d3 100644 --- a/edit_interface.php +++ b/edit_interface.php @@ -2066,7 +2066,7 @@ case 'changefamily_update': } $CHIL = array(); - for ($i = 0;; ++$i) { + for ($i = 0; ; ++$i) { if (isset($_POST['CHIL' . $i])) { $CHIL[] = Filter::post('CHIL' . $i, WT_REGEX_XREF); } else { diff --git a/medialist.php b/medialist.php index c1c3688e9f..0bf5277432 100644 --- a/medialist.php +++ b/medialist.php @@ -239,13 +239,13 @@ if ($action === 'submit') { echo '<', $tsection, '><tr><td colspan="2">'; echo '<table class="list_table_controls"><tr><td>'; if ($page > 1) { - echo '<a href="', $url, '&page=1" class="icon-', $icons['first'] ,'"></a>'; - echo '<a href="', $url, '&page=', $page - 1 ,'" class="icon-', $icons['previous'] , '"></a>'; + echo '<a href="', $url, '&page=1" class="icon-', $icons['first'], '"></a>'; + echo '<a href="', $url, '&page=', $page - 1, '" class="icon-', $icons['previous'], '"></a>'; } echo '</td><td>', I18N::translate('Page %s of %s', $page, $pages), '</td><td>'; if ($page < $pages) { - echo '<a href="', $url, '&page=', $page + 1 ,'" class="icon-', $icons['next'] , '"></a>'; - echo '<a href="', $url, '&page=', $pages ,'" class="icon-', $icons['last'] ,'"></a>'; + echo '<a href="', $url, '&page=', $page + 1, '" class="icon-', $icons['next'], '"></a>'; + echo '<a href="', $url, '&page=', $pages, '" class="icon-', $icons['last'], '"></a>'; } echo '</td></tr></table>'; echo '</td></tr></', $tsection, '>'; |