@@ -842,7 +842,7 @@ |
||
| 842 | 842 | /** |
| 843 | 843 | * Which months follows this one? Calendars with leap-months should provide their own implementation. |
| 844 | 844 | * |
| 845 | - * @return int[] |
|
| 845 | + * @return integer[] |
|
| 846 | 846 | */ |
| 847 | 847 | protected function nextMonth() { |
| 848 | 848 | return array($this->m === $this->calendar->monthsInYear() ? $this->nextYear($this->y) : $this->y, ($this->m % $this->calendar->monthsInYear()) + 1); |
@@ -247,7 +247,7 @@ |
||
| 247 | 247 | /** |
| 248 | 248 | * Which months follows this one? Calendars with leap-months should provide their own implementation. |
| 249 | 249 | * |
| 250 | - * @return int[] |
|
| 250 | + * @return integer[] |
|
| 251 | 251 | */ |
| 252 | 252 | protected function nextMonth() { |
| 253 | 253 | if ($this->m == 6 && !$this->isLeapYear()) { |
@@ -103,7 +103,8 @@ discard block |
||
| 103 | 103 | <?php if ($ancestors_only === '1'): ?> |
| 104 | 104 | <input type="hidden" name="ancestors" value="1"> |
| 105 | 105 | <?php echo I18N::translate('Find relationships via ancestors') ?> |
| 106 | - <?php else: ?> |
|
| 106 | + <?php else { |
|
| 107 | + : ?> |
|
| 107 | 108 | <label> |
| 108 | 109 | <input type="radio" name="ancestors" value="0" <?php echo $ancestors == 0 ? 'checked' : '' ?>> |
| 109 | 110 | <?php echo I18N::translate('Find any relationship') ?> |
@@ -113,14 +114,17 @@ discard block |
||
| 113 | 114 | <input type="radio" name="ancestors" value="1" <?php echo $ancestors == 1 ? 'checked' : '' ?>> |
| 114 | 115 | <?php echo I18N::translate('Find relationships via ancestors') ?> |
| 115 | 116 | </label> |
| 116 | - <?php endif; ?> |
|
| 117 | + <?php endif; |
|
| 118 | +} |
|
| 119 | +?> |
|
| 117 | 120 | |
| 118 | 121 | <hr> |
| 119 | 122 | |
| 120 | 123 | <?php if ($max_recursion == 0): ?> |
| 121 | 124 | <?php echo I18N::translate('Find the closest relationships') ?> |
| 122 | 125 | <input type="hidden" name="recursion" value="0"> |
| 123 | - <?php else: ?> |
|
| 126 | + <?php else { |
|
| 127 | + : ?> |
|
| 124 | 128 | <label> |
| 125 | 129 | <input type="radio" name="recursion" value="0" <?php echo $recursion == 0 ? 'checked' : '' ?>> |
| 126 | 130 | <?php echo I18N::translate('Find the closest relationships') ?> |
@@ -132,7 +136,9 @@ discard block |
||
| 132 | 136 | <?php echo I18N::translate('Find all possible relationships') ?> |
| 133 | 137 | <?php else: ?> |
| 134 | 138 | <?php echo I18N::translate('Find other relationships') ?> |
| 135 | - <?php endif; ?> |
|
| 139 | + <?php endif; |
|
| 140 | +} |
|
| 141 | +?> |
|
| 136 | 142 | </label> |
| 137 | 143 | <?php endif; ?> |
| 138 | 144 | </td> |
@@ -81,8 +81,11 @@ |
||
| 81 | 81 | <td class="col-xs-2"> |
| 82 | 82 | <?php if ($module instanceof ModuleConfigInterface): ?> |
| 83 | 83 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
| 84 | - <?php else: ?> |
|
| 85 | - <?php echo $module->getTitle(); ?> |
|
| 84 | + <?php else { |
|
| 85 | + : ?> |
|
| 86 | + <?php echo $module->getTitle(); |
|
| 87 | +} |
|
| 88 | +?> |
|
| 86 | 89 | <?php endif; ?> |
| 87 | 90 | </td> |
| 88 | 91 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -98,8 +98,11 @@ |
||
| 98 | 98 | <td class="col-xs-1"> |
| 99 | 99 | <?php if ($module instanceof ModuleConfigInterface): ?> |
| 100 | 100 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
| 101 | - <?php else: ?> |
|
| 102 | - <?php echo $module->getTitle(); ?> |
|
| 101 | + <?php else { |
|
| 102 | + : ?> |
|
| 103 | + <?php echo $module->getTitle(); |
|
| 104 | +} |
|
| 105 | +?> |
|
| 103 | 106 | <?php endif; ?> |
| 104 | 107 | </td> |
| 105 | 108 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -81,8 +81,11 @@ |
||
| 81 | 81 | <td class="col-xs-2"> |
| 82 | 82 | <?php if ($module instanceof ModuleConfigInterface): ?> |
| 83 | 83 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
| 84 | - <?php else: ?> |
|
| 85 | - <?php echo $module->getTitle(); ?> |
|
| 84 | + <?php else { |
|
| 85 | + : ?> |
|
| 86 | + <?php echo $module->getTitle(); |
|
| 87 | +} |
|
| 88 | +?> |
|
| 86 | 89 | <?php endif; ?> |
| 87 | 90 | </td> |
| 88 | 91 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -98,8 +98,11 @@ |
||
| 98 | 98 | <td class="col-xs-1"> |
| 99 | 99 | <?php if ($module instanceof ModuleConfigInterface): ?> |
| 100 | 100 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
| 101 | - <?php else: ?> |
|
| 102 | - <?php echo $module->getTitle(); ?> |
|
| 101 | + <?php else { |
|
| 102 | + : ?> |
|
| 103 | + <?php echo $module->getTitle(); |
|
| 104 | +} |
|
| 105 | +?> |
|
| 103 | 106 | <?php endif; ?> |
| 104 | 107 | </td> |
| 105 | 108 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -16,8 +16,8 @@ |
||
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Exception; |
| 19 | -use Swift_Mailer; |
|
| 20 | 19 | use Swift_MailTransport; |
| 20 | +use Swift_Mailer; |
|
| 21 | 21 | use Swift_Message; |
| 22 | 22 | use Swift_NullTransport; |
| 23 | 23 | use Swift_Preferences; |
@@ -103,20 +103,20 @@ |
||
| 103 | 103 | case 'sendmail': |
| 104 | 104 | return Swift_SendmailTransport::newInstance(); |
| 105 | 105 | case 'external': |
| 106 | - $transport = Swift_SmtpTransport::newInstance() |
|
| 107 | - ->setHost(Site::getPreference('SMTP_HOST')) |
|
| 108 | - ->setPort(Site::getPreference('SMTP_PORT')) |
|
| 109 | - ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
| 106 | + $transport = Swift_SmtpTransport::newInstance() |
|
| 107 | + ->setHost(Site::getPreference('SMTP_HOST')) |
|
| 108 | + ->setPort(Site::getPreference('SMTP_PORT')) |
|
| 109 | + ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
| 110 | 110 | |
| 111 | - if (Site::getPreference('SMTP_AUTH')) { |
|
| 112 | - $transport |
|
| 113 | - ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
| 114 | - ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
| 115 | - } |
|
| 111 | + if (Site::getPreference('SMTP_AUTH')) { |
|
| 112 | + $transport |
|
| 113 | + ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
| 114 | + ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
| 118 | - $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
| 119 | - } |
|
| 117 | + if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
| 118 | + $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | 121 | return $transport; |
| 122 | 122 | default: |