@@ -60,14 +60,14 @@ |
||
60 | 60 | 'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH', |
61 | 61 | 'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV', |
62 | 62 | 'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC', |
63 | - 'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE', |
|
64 | - 'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO', |
|
63 | + 'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE', |
|
64 | + 'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO', |
|
65 | 65 | 'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA', |
66 | - 'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL', |
|
67 | - 'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA', |
|
66 | + 'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL', |
|
67 | + 'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA', |
|
68 | 68 | 'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI', |
69 | - 'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA', |
|
70 | - 'VILLA', 'WASHI', 'WINTE', |
|
69 | + 'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA', |
|
70 | + 'VILLA', 'WASHI', 'WINTE', |
|
71 | 71 | ); |
72 | 72 | } |
73 | 73 |
@@ -49,7 +49,7 @@ |
||
49 | 49 | try { |
50 | 50 | $fp = fsockopen($scheme . $host, $port, $errno, $errstr, 5); |
51 | 51 | |
52 | - fputs($fp, "GET $path?$query HTTP/1.0\r\nHost: $host\r\nConnection: Close\r\n\r\n"); |
|
52 | + fputs($fp, "get $path?$query HTTP/1.0\r\nHost: $host\r\nConnection: Close\r\n\r\n"); |
|
53 | 53 | |
54 | 54 | // The first part of the response include the HTTP headers |
55 | 55 | $response = fread($fp, 65536); |
@@ -91,8 +91,7 @@ |
||
91 | 91 | // Create the underlying PDO object |
92 | 92 | self::$pdo = new PDO( |
93 | 93 | (substr($DBHOST, 0, 1) === '/' ? |
94 | - "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : |
|
95 | - "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
94 | + "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
96 | 95 | ), |
97 | 96 | $DBUSER, $DBPASS, |
98 | 97 | array( |
@@ -138,7 +138,7 @@ |
||
138 | 138 | } |
139 | 139 | } catch (\Exception $ex) { |
140 | 140 | // The module has been deleted or is broken? Disable it. |
141 | - Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it"); |
|
141 | + Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it"); |
|
142 | 142 | Database::prepare( |
143 | 143 | "UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name" |
144 | 144 | )->execute(array( |
@@ -1714,24 +1714,24 @@ |
||
1714 | 1714 | if ($endjd === WT_CLIENT_JD) { |
1715 | 1715 | // We're dealing with the Today’s Events block |
1716 | 1716 | if ($filter === 0) { |
1717 | - $html .= I18N::translate('No events exist for today.'); |
|
1717 | + $html .= I18N::translate('No events exist for today.'); |
|
1718 | 1718 | } else { |
1719 | - $html .= I18N::translate('No events for living individuals exist for today.'); |
|
1719 | + $html .= I18N::translate('No events for living individuals exist for today.'); |
|
1720 | 1720 | } |
1721 | 1721 | } else { |
1722 | 1722 | // We're dealing with the Upcoming Events block |
1723 | 1723 | if ($filter === 0) { |
1724 | 1724 | if ($endjd === $startjd) { |
1725 | - $html .= I18N::translate('No events exist for tomorrow.'); |
|
1725 | + $html .= I18N::translate('No events exist for tomorrow.'); |
|
1726 | 1726 | } else { |
1727 | - $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1727 | + $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1728 | 1728 | } |
1729 | 1729 | } else { |
1730 | 1730 | if ($endjd === $startjd) { |
1731 | - $html .= I18N::translate('No events for living individuals exist for tomorrow.'); |
|
1731 | + $html .= I18N::translate('No events for living individuals exist for tomorrow.'); |
|
1732 | 1732 | } else { |
1733 | 1733 | // I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” |
1734 | - $html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1734 | + $html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1735 | 1735 | } |
1736 | 1736 | } |
1737 | 1737 | } |
@@ -759,7 +759,7 @@ |
||
759 | 759 | new JewishDate($jd), |
760 | 760 | new HijriDate($jd), |
761 | 761 | new JalaliDate($jd), |
762 | - ) as $anniv) { |
|
762 | + ) as $anniv) { |
|
763 | 763 | // Build a SQL where clause to match anniversaries in the appropriate calendar. |
764 | 764 | $ind_sql = |
765 | 765 | "SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" . |
@@ -110,10 +110,13 @@ |
||
110 | 110 | </option> |
111 | 111 | </select> |
112 | 112 | </td> |
113 | - <?php else: ?> |
|
113 | + <?php else { |
|
114 | + : ?> |
|
114 | 115 | <td class="descriptionbox wrap"></td> |
115 | 116 | <td class="optionbox wrap"></td> |
116 | - <?php endif; ?> |
|
117 | + <?php endif; |
|
118 | +} |
|
119 | +?> |
|
117 | 120 | </tr> |
118 | 121 | <tr> |
119 | 122 | <td class="descriptionbox wrap"> |
@@ -137,25 +137,25 @@ |
||
137 | 137 | } |
138 | 138 | |
139 | 139 | switch (Filter::get('action')) { |
140 | - case 'site': |
|
141 | - $controller->setPageTitle(I18N::translate('Website preferences')); |
|
142 | - break; |
|
143 | - case 'email': |
|
144 | - $controller->setPageTitle(I18N::translate('Sending email')); |
|
145 | - break; |
|
146 | - case 'login': |
|
147 | - $controller->setPageTitle(I18N::translate('Sign-in and registration')); |
|
148 | - break; |
|
149 | - case 'tracking': |
|
150 | - $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics')); |
|
151 | - break; |
|
152 | - case 'languages': |
|
153 | - $controller->setPageTitle(I18N::translate('Languages')); |
|
154 | - break; |
|
155 | - default: |
|
156 | - header('Location: ' . WT_BASE_URL . 'admin.php'); |
|
157 | - |
|
158 | - return; |
|
140 | + case 'site': |
|
141 | + $controller->setPageTitle(I18N::translate('Website preferences')); |
|
142 | + break; |
|
143 | + case 'email': |
|
144 | + $controller->setPageTitle(I18N::translate('Sending email')); |
|
145 | + break; |
|
146 | + case 'login': |
|
147 | + $controller->setPageTitle(I18N::translate('Sign-in and registration')); |
|
148 | + break; |
|
149 | + case 'tracking': |
|
150 | + $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics')); |
|
151 | + break; |
|
152 | + case 'languages': |
|
153 | + $controller->setPageTitle(I18N::translate('Languages')); |
|
154 | + break; |
|
155 | + default: |
|
156 | + header('Location: ' . WT_BASE_URL . 'admin.php'); |
|
157 | + |
|
158 | + return; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | $controller->pageHeader(); |
@@ -131,7 +131,8 @@ |
||
131 | 131 | * @param Family $family |
132 | 132 | * @param Individual $individual |
133 | 133 | */ |
134 | -function print_navigator_family(Family $family, Individual $individual) { |
|
134 | +function print_navigator_family(Family $family, Individual $individual) |
|
135 | +{ |
|
135 | 136 | foreach ($family->getSpouses() as $spouse) { |
136 | 137 | ?> |
137 | 138 | <tr class="fact_value"> |