@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | interface PageHeaderExtenderInterface { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Get HTML code for extending the header of a page. |
|
| 20 | - * |
|
| 21 | - * @return string HTML code extension |
|
| 22 | - */ |
|
| 23 | - public function hPrintHeader(); |
|
| 18 | + /** |
|
| 19 | + * Get HTML code for extending the header of a page. |
|
| 20 | + * |
|
| 21 | + * @return string HTML code extension |
|
| 22 | + */ |
|
| 23 | + public function hPrintHeader(); |
|
| 24 | 24 | |
| 25 | 25 | } |
| 26 | 26 | |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | interface PageFooterExtenderInterface { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Get HTML code for extending the footer of a page. |
|
| 20 | - * |
|
| 21 | - * @return string HTML code extension |
|
| 22 | - */ |
|
| 23 | - public function hPrintFooter(); |
|
| 18 | + /** |
|
| 19 | + * Get HTML code for extending the footer of a page. |
|
| 20 | + * |
|
| 21 | + * @return string HTML code extension |
|
| 22 | + */ |
|
| 23 | + public function hPrintFooter(); |
|
| 24 | 24 | |
| 25 | 25 | } |
| 26 | 26 | |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | use Fisharebest\Webtrees\Controller\IndividualController; |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -18,12 +18,12 @@ discard block |
||
| 18 | 18 | interface CustomSimpleTagManagerInterface { |
| 19 | 19 | |
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * Returns the list of expected tags, classified by type of records. |
|
| 23 | - * |
|
| 24 | - * @return array List of expected tags |
|
| 25 | - */ |
|
| 26 | - public function hGetExpectedTags(); |
|
| 21 | + /** |
|
| 22 | + * Returns the list of expected tags, classified by type of records. |
|
| 23 | + * |
|
| 24 | + * @return array List of expected tags |
|
| 25 | + */ |
|
| 26 | + public function hGetExpectedTags(); |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Return the HTML code to be display for this tag. |
@@ -15,66 +15,66 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | abstract class AbstractView { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Reference controller |
|
| 20 | - * @var \Fisharebest\Webtrees\Controller\BaseController $ctrl |
|
| 21 | - */ |
|
| 22 | - protected $ctrl; |
|
| 18 | + /** |
|
| 19 | + * Reference controller |
|
| 20 | + * @var \Fisharebest\Webtrees\Controller\BaseController $ctrl |
|
| 21 | + */ |
|
| 22 | + protected $ctrl; |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * Structure containing the data of the view |
|
| 26 | - * @var ViewBag $data |
|
| 27 | - */ |
|
| 28 | - protected $data; |
|
| 24 | + /** |
|
| 25 | + * Structure containing the data of the view |
|
| 26 | + * @var ViewBag $data |
|
| 27 | + */ |
|
| 28 | + protected $data; |
|
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * Constructor |
|
| 32 | - * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl Controller |
|
| 33 | - * @param ViewBag $data ViewBag holding view data |
|
| 34 | - */ |
|
| 35 | - public function __construct(\Fisharebest\Webtrees\Controller\BaseController $ctrl, ViewBag $data) { |
|
| 36 | - $this->ctrl = $ctrl; |
|
| 37 | - $this->data = $data; |
|
| 38 | - } |
|
| 30 | + /** |
|
| 31 | + * Constructor |
|
| 32 | + * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl Controller |
|
| 33 | + * @param ViewBag $data ViewBag holding view data |
|
| 34 | + */ |
|
| 35 | + public function __construct(\Fisharebest\Webtrees\Controller\BaseController $ctrl, ViewBag $data) { |
|
| 36 | + $this->ctrl = $ctrl; |
|
| 37 | + $this->data = $data; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * Render the view to the page, including header. |
|
| 42 | - * |
|
| 43 | - * @throws \Exception |
|
| 44 | - */ |
|
| 45 | - public function render() { |
|
| 40 | + /** |
|
| 41 | + * Render the view to the page, including header. |
|
| 42 | + * |
|
| 43 | + * @throws \Exception |
|
| 44 | + */ |
|
| 45 | + public function render() { |
|
| 46 | 46 | global $controller; |
| 47 | 47 | |
| 48 | - if(!$this->ctrl) throw new \Exception('Controller not initialised'); |
|
| 48 | + if(!$this->ctrl) throw new \Exception('Controller not initialised'); |
|
| 49 | 49 | |
| 50 | 50 | $controller = $this->ctrl; |
| 51 | - $this->ctrl->pageHeader(); |
|
| 51 | + $this->ctrl->pageHeader(); |
|
| 52 | 52 | |
| 53 | - echo $this->renderContent(); |
|
| 54 | - } |
|
| 53 | + echo $this->renderContent(); |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * Render the view to the page, without any header |
|
| 58 | - */ |
|
| 59 | - public function renderPartial() { |
|
| 60 | - echo $this->getHtmlPartial(); |
|
| 61 | - } |
|
| 56 | + /** |
|
| 57 | + * Render the view to the page, without any header |
|
| 58 | + */ |
|
| 59 | + public function renderPartial() { |
|
| 60 | + echo $this->getHtmlPartial(); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * Return the HTML code generated by the view, without any header |
|
| 65 | - */ |
|
| 66 | - public function getHtmlPartial() { |
|
| 67 | - ob_start(); |
|
| 68 | - $html_render = $this->renderContent(); |
|
| 69 | - $html_buffer = ob_get_clean(); |
|
| 63 | + /** |
|
| 64 | + * Return the HTML code generated by the view, without any header |
|
| 65 | + */ |
|
| 66 | + public function getHtmlPartial() { |
|
| 67 | + ob_start(); |
|
| 68 | + $html_render = $this->renderContent(); |
|
| 69 | + $html_buffer = ob_get_clean(); |
|
| 70 | 70 | |
| 71 | - return empty($html_render) ? $html_buffer : $html_render; |
|
| 72 | - } |
|
| 71 | + return empty($html_render) ? $html_buffer : $html_render; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Abstract method containing the details of the view. |
|
| 76 | - */ |
|
| 77 | - abstract protected function renderContent(); |
|
| 74 | + /** |
|
| 75 | + * Abstract method containing the details of the view. |
|
| 76 | + */ |
|
| 77 | + abstract protected function renderContent(); |
|
| 78 | 78 | |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | \ No newline at end of file |
@@ -40,10 +40,10 @@ |
||
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | - * Check if this family's marriages are sourced |
|
| 44 | - * |
|
| 45 | - * @return int Level of sources |
|
| 46 | - * */ |
|
| 43 | + * Check if this family's marriages are sourced |
|
| 44 | + * |
|
| 45 | + * @return int Level of sources |
|
| 46 | + * */ |
|
| 47 | 47 | function isMarriageSourced(){ |
| 48 | 48 | if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced; |
| 49 | 49 | $this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC'); |
@@ -34,26 +34,26 @@ |
||
| 34 | 34 | protected $fact; |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | - * Contructor for the decorator |
|
| 38 | - * |
|
| 39 | - * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend |
|
| 40 | - */ |
|
| 37 | + * Contructor for the decorator |
|
| 38 | + * |
|
| 39 | + * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend |
|
| 40 | + */ |
|
| 41 | 41 | public function __construct(\Fisharebest\Webtrees\Fact $fact_in){ |
| 42 | 42 | $this->fact = $fact_in; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | - * Check if a fact has a date and is sourced |
|
| 47 | - * Values: |
|
| 48 | - * - 0, if no date is found for the fact |
|
| 49 | - * - -1, if the date is not precise |
|
| 50 | - * - -2, if the date is precise, but no source is found |
|
| 51 | - * - 1, if the date is precise, and a source is found |
|
| 52 | - * - 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage) |
|
| 53 | - * - 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date |
|
| 54 | - * |
|
| 55 | - * @return int Level of sources |
|
| 56 | - */ |
|
| 46 | + * Check if a fact has a date and is sourced |
|
| 47 | + * Values: |
|
| 48 | + * - 0, if no date is found for the fact |
|
| 49 | + * - -1, if the date is not precise |
|
| 50 | + * - -2, if the date is precise, but no source is found |
|
| 51 | + * - 1, if the date is precise, and a source is found |
|
| 52 | + * - 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage) |
|
| 53 | + * - 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date |
|
| 54 | + * |
|
| 55 | + * @return int Level of sources |
|
| 56 | + */ |
|
| 57 | 57 | public function isSourced(){ |
| 58 | 58 | $isSourced=0; |
| 59 | 59 | $date = $this->fact->getDate(); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | * @return boolean |
| 136 | 136 | */ |
| 137 | 137 | public static function isEncryptionCompatible() { |
| 138 | - return function_exists('mcrypt_encrypt') && function_exists('mcrypt_encrypt') && function_exists('mcrypt_decrypt'); |
|
| 138 | + return function_exists('mcrypt_encrypt') && function_exists('mcrypt_encrypt') && function_exists('mcrypt_decrypt'); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | * @return string Encrypted and encoded text |
| 147 | 147 | */ |
| 148 | 148 | public static function encryptToSafeBase64($data){ |
| 149 | - if(!self::isEncryptionCompatible()) |
|
| 150 | - throw new \Exception('MCrypt PHP extension is required to use encryption.'); |
|
| 149 | + if(!self::isEncryptionCompatible()) |
|
| 150 | + throw new \Exception('MCrypt PHP extension is required to use encryption.'); |
|
| 151 | 151 | |
| 152 | 152 | $key = 'STANDARDKEYIFNOSERVER'; |
| 153 | 153 | if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE'))) |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | * @return string Decrypted text |
| 170 | 170 | */ |
| 171 | 171 | public static function decryptFromSafeBase64($encrypted){ |
| 172 | - if(!self::isEncryptionCompatible()) |
|
| 173 | - throw new \Exception('MCrypt PHP extension is required to use encryption.'); |
|
| 172 | + if(!self::isEncryptionCompatible()) |
|
| 173 | + throw new \Exception('MCrypt PHP extension is required to use encryption.'); |
|
| 174 | 174 | |
| 175 | 175 | $key = 'STANDARDKEYIFNOSERVER'; |
| 176 | 176 | if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE'))) |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | */ |
| 198 | 198 | public static function encodeFileSystemToUtf8($string){ |
| 199 | 199 | if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') { |
| 200 | - return iconv('cp1252', 'utf-8//IGNORE',$string); |
|
| 200 | + return iconv('cp1252', 'utf-8//IGNORE',$string); |
|
| 201 | 201 | } |
| 202 | 202 | return $string; |
| 203 | 203 | } |
@@ -262,20 +262,20 @@ discard block |
||
| 262 | 262 | * @return boolean|string Is supported? |
| 263 | 263 | */ |
| 264 | 264 | public static function isImageTypeSupported($reqtype) { |
| 265 | - $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png'); |
|
| 266 | - $reqtype = strtolower($reqtype); |
|
| 265 | + $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png'); |
|
| 266 | + $reqtype = strtolower($reqtype); |
|
| 267 | 267 | |
| 268 | - if (empty($supportByGD[$reqtype])) { |
|
| 269 | - return false; |
|
| 270 | - } |
|
| 268 | + if (empty($supportByGD[$reqtype])) { |
|
| 269 | + return false; |
|
| 270 | + } |
|
| 271 | 271 | |
| 272 | - $type = $supportByGD[$reqtype]; |
|
| 272 | + $type = $supportByGD[$reqtype]; |
|
| 273 | 273 | |
| 274 | - if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) { |
|
| 275 | - return $type; |
|
| 276 | - } |
|
| 274 | + if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) { |
|
| 275 | + return $type; |
|
| 276 | + } |
|
| 277 | 277 | |
| 278 | - return false; |
|
| 278 | + return false; |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | } |