@@ -17,41 +17,41 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | interface CertificateProviderInterface { |
| 19 | 19 | |
| 20 | - /** |
|
| 21 | - * Returns the certificates directory path as it is really (within the firewall directory). |
|
| 22 | - * |
|
| 23 | - * @return string Real certificates directory path |
|
| 24 | - */ |
|
| 25 | - function getRealCertificatesDirectory(); |
|
| 20 | + /** |
|
| 21 | + * Returns the certificates directory path as it is really (within the firewall directory). |
|
| 22 | + * |
|
| 23 | + * @return string Real certificates directory path |
|
| 24 | + */ |
|
| 25 | + function getRealCertificatesDirectory(); |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * Returns an array of the folders (cities) in the certificate directory. |
|
| 29 | - * Cities name are UTF8 encoded. |
|
| 30 | - * |
|
| 31 | - * @return array Array of cities name |
|
| 32 | - */ |
|
| 33 | - function getCitiesList(); |
|
| 27 | + /** |
|
| 28 | + * Returns an array of the folders (cities) in the certificate directory. |
|
| 29 | + * Cities name are UTF8 encoded. |
|
| 30 | + * |
|
| 31 | + * @return array Array of cities name |
|
| 32 | + */ |
|
| 33 | + function getCitiesList(); |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Returns the list of available certificates for a specified city. |
|
| 37 | - * Format of the list : |
|
| 38 | - * < file name , date of the certificate , type of certificate , name of the certificate > |
|
| 39 | - * Data are UTF8 encoded. |
|
| 40 | - * |
|
| 41 | - * @param string $selCity City to look in |
|
| 42 | - * @return array List of certificates |
|
| 43 | - */ |
|
| 44 | - function getCertificatesList($selCity); |
|
| 35 | + /** |
|
| 36 | + * Returns the list of available certificates for a specified city. |
|
| 37 | + * Format of the list : |
|
| 38 | + * < file name , date of the certificate , type of certificate , name of the certificate > |
|
| 39 | + * Data are UTF8 encoded. |
|
| 40 | + * |
|
| 41 | + * @param string $selCity City to look in |
|
| 42 | + * @return array List of certificates |
|
| 43 | + */ |
|
| 44 | + function getCertificatesList($selCity); |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * Return the list of certificates from a city $city and containing the characters $contains |
|
| 48 | - * |
|
| 49 | - * @param string $city City to search in |
|
| 50 | - * @param string $contains Characters to match |
|
| 51 | - * @param string $limit Maximum number of results |
|
| 52 | - * @return array Array of matching certificates |
|
| 53 | - */ |
|
| 54 | - function getCertificatesListBeginWith($city, $contains, $limit); |
|
| 46 | + /** |
|
| 47 | + * Return the list of certificates from a city $city and containing the characters $contains |
|
| 48 | + * |
|
| 49 | + * @param string $city City to search in |
|
| 50 | + * @param string $contains Characters to match |
|
| 51 | + * @param string $limit Maximum number of results |
|
| 52 | + * @return array Array of matching certificates |
|
| 53 | + */ |
|
| 54 | + function getCertificatesListBeginWith($city, $contains, $limit); |
|
| 55 | 55 | |
| 56 | 56 | } |
| 57 | 57 | |
@@ -35,12 +35,12 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | class Certificate extends Media { |
| 37 | 37 | |
| 38 | - const URL_PREFIX = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid='; |
|
| 38 | + const URL_PREFIX = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid='; |
|
| 39 | 39 | |
| 40 | - /** @var string The "TITL" value from the GEDCOM |
|
| 41 | - * This is a tweak to overcome the private level from the parent object... |
|
| 42 | - */ |
|
| 43 | - protected $title = ''; |
|
| 40 | + /** @var string The "TITL" value from the GEDCOM |
|
| 41 | + * This is a tweak to overcome the private level from the parent object... |
|
| 42 | + */ |
|
| 43 | + protected $title = ''; |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * Certificate provider |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * @param CertificateProviderInterface $provider |
| 81 | 81 | */ |
| 82 | 82 | public function __construct($data, Tree $tree, CertificateProviderInterface $provider) { |
| 83 | - $this->provider = $provider; |
|
| 83 | + $this->provider = $provider; |
|
| 84 | 84 | // Data is only the file name |
| 85 | 85 | $data = str_replace("\\", '/', $data); |
| 86 | 86 | $xref = Functions::encryptToSafeBase64($data); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | * @see \Fisharebest\Webtrees\Media::getTitle() |
| 166 | 166 | */ |
| 167 | 167 | public function getTitle() { |
| 168 | - return $this->title; |
|
| 168 | + return $this->title; |
|
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | /** |
@@ -241,26 +241,26 @@ discard block |
||
| 241 | 241 | $module = Module::getModuleByName(Constants::MODULE_MAJ_CERTIF_NAME); |
| 242 | 242 | |
| 243 | 243 | if($module) { |
| 244 | - $wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.')); |
|
| 245 | - $sid= Filter::get('sid', WT_REGEX_XREF); |
|
| 244 | + $wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.')); |
|
| 245 | + $sid= Filter::get('sid', WT_REGEX_XREF); |
|
| 246 | 246 | |
| 247 | - if($sid){ |
|
| 248 | - $this->source = Source::getInstance($sid, $this->tree); |
|
| 249 | - } |
|
| 250 | - else{ |
|
| 251 | - $this->fetchALinkedSource(); // the method already attach the source to the Certificate object; |
|
| 252 | - } |
|
| 247 | + if($sid){ |
|
| 248 | + $this->source = Source::getInstance($sid, $this->tree); |
|
| 249 | + } |
|
| 250 | + else{ |
|
| 251 | + $this->fetchALinkedSource(); // the method already attach the source to the Certificate object; |
|
| 252 | + } |
|
| 253 | 253 | |
| 254 | - if($this->source) { |
|
| 255 | - $wmtext = '©'; |
|
| 256 | - $repofact = $this->source->getFirstFact('REPO'); |
|
| 257 | - if($repofact) { |
|
| 258 | - $repo = $repofact->getTarget(); |
|
| 259 | - if($repo && $repo instanceof Repository) $wmtext .= ' '.$repo->getFullName().' - '; |
|
| 260 | - } |
|
| 261 | - $wmtext .= $this->source->getFullName(); |
|
| 262 | - } |
|
| 263 | - return $wmtext; |
|
| 254 | + if($this->source) { |
|
| 255 | + $wmtext = '©'; |
|
| 256 | + $repofact = $this->source->getFirstFact('REPO'); |
|
| 257 | + if($repofact) { |
|
| 258 | + $repo = $repofact->getTarget(); |
|
| 259 | + if($repo && $repo instanceof Repository) $wmtext .= ' '.$repo->getFullName().' - '; |
|
| 260 | + } |
|
| 261 | + $wmtext .= $this->source->getFullName(); |
|
| 262 | + } |
|
| 263 | + return $wmtext; |
|
| 264 | 264 | } |
| 265 | 265 | return ''; |
| 266 | 266 | } |
@@ -323,8 +323,8 @@ discard block |
||
| 323 | 323 | ' FROM `##individuals`'. |
| 324 | 324 | ' WHERE i_file= :gedcom_id AND i_gedcom LIKE :gedcom') |
| 325 | 325 | ->execute(array( |
| 326 | - 'gedcom_id' => $this->tree->getTreeId(), |
|
| 327 | - 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 326 | + 'gedcom_id' => $this->tree->getTreeId(), |
|
| 327 | + 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 328 | 328 | ))->fetchAll(); |
| 329 | 329 | |
| 330 | 330 | $list = array(); |
@@ -347,8 +347,8 @@ discard block |
||
| 347 | 347 | ' FROM `##families`'. |
| 348 | 348 | ' WHERE f_file= :gedcom_id AND f_gedcom LIKE :gedcom') |
| 349 | 349 | ->execute(array( |
| 350 | - 'gedcom_id' => $this->tree->getTreeId(), |
|
| 351 | - 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 350 | + 'gedcom_id' => $this->tree->getTreeId(), |
|
| 351 | + 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 352 | 352 | ))->fetchAll(); |
| 353 | 353 | |
| 354 | 354 | $list = array(); |
@@ -375,25 +375,25 @@ discard block |
||
| 375 | 375 | 'SELECT i_gedcom AS gedrec FROM `##individuals`'. |
| 376 | 376 | ' WHERE i_file=:gedcom_id AND i_gedcom LIKE :gedcom') |
| 377 | 377 | ->execute(array( |
| 378 | - 'gedcom_id' => $this->tree->getTreeId(), |
|
| 379 | - 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 378 | + 'gedcom_id' => $this->tree->getTreeId(), |
|
| 379 | + 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 380 | 380 | ))->fetchOne(); |
| 381 | 381 | if(!$ged){ |
| 382 | 382 | $ged = Database::prepare( |
| 383 | 383 | 'SELECT f_gedcom AS gedrec FROM `##families`'. |
| 384 | 384 | ' WHERE f_file=:gedcom_id AND f_gedcom LIKE :gedcom') |
| 385 | - ->execute(array( |
|
| 386 | - 'gedcom_id' => $this->tree->getTreeId(), |
|
| 387 | - 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 388 | - ))->fetchOne(); |
|
| 385 | + ->execute(array( |
|
| 386 | + 'gedcom_id' => $this->tree->getTreeId(), |
|
| 387 | + 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 388 | + ))->fetchOne(); |
|
| 389 | 389 | if(!$ged){ |
| 390 | 390 | $ged = Database::prepare( |
| 391 | - 'SELECT o_gedcom AS gedrec FROM `##other`'. |
|
| 392 | - ' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom') |
|
| 393 | - ->execute(array( |
|
| 394 | - 'gedcom_id' => $this->tree->getTreeId(), |
|
| 395 | - 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 396 | - ))->fetchOne(); |
|
| 391 | + 'SELECT o_gedcom AS gedrec FROM `##other`'. |
|
| 392 | + ' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom') |
|
| 393 | + ->execute(array( |
|
| 394 | + 'gedcom_id' => $this->tree->getTreeId(), |
|
| 395 | + 'gedcom' => '%_ACT '.$this->getFilename().'%' |
|
| 396 | + ))->fetchOne(); |
|
| 397 | 397 | } |
| 398 | 398 | } |
| 399 | 399 | //If a record has been found, parse it to find the source reference. |
@@ -25,17 +25,17 @@ discard block |
||
| 25 | 25 | * {@inhericDoc} |
| 26 | 26 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 27 | 27 | */ |
| 28 | - protected function renderContent() { |
|
| 29 | - ?> |
|
| 28 | + protected function renderContent() { |
|
| 29 | + ?> |
|
| 30 | 30 | <div id="maj-cert-page" class="center"> |
| 31 | 31 | <h2><?php echo $this->data->get('title'); ?></h2> |
| 32 | 32 | |
| 33 | 33 | <?php if($this->data->get('has_certif', false)) { |
| 34 | - /** @var Certificate $certificate */ |
|
| 35 | - $certificate = $this->data->get('certificate'); |
|
| 36 | - $has_linked_indis = $this->data->get('has_linked_indis', false); |
|
| 37 | - $has_linked_fams = $this->data->get('has_linked_fams', false); |
|
| 38 | - ?> |
|
| 34 | + /** @var Certificate $certificate */ |
|
| 35 | + $certificate = $this->data->get('certificate'); |
|
| 36 | + $has_linked_indis = $this->data->get('has_linked_indis', false); |
|
| 37 | + $has_linked_fams = $this->data->get('has_linked_fams', false); |
|
| 38 | + ?> |
|
| 39 | 39 | <div id="certificate-details"> |
| 40 | 40 | <h3> |
| 41 | 41 | <?php echo $certificate->getCity(); ?> |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | </div> |
| 87 | 87 | |
| 88 | 88 | <?php |
| 89 | - } |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | \ No newline at end of file |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | * {@inhericDoc} |
| 27 | 27 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 28 | 28 | */ |
| 29 | - protected function renderContent() { |
|
| 29 | + protected function renderContent() { |
|
| 30 | 30 | |
| 31 | - /** @var AbstractModule $module */ |
|
| 32 | - $module = $this->data->get('module'); |
|
| 33 | - ?> |
|
| 31 | + /** @var AbstractModule $module */ |
|
| 32 | + $module = $this->data->get('module'); |
|
| 33 | + ?> |
|
| 34 | 34 | <ol class="breadcrumb small"> |
| 35 | 35 | <li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li> |
| 36 | 36 | <li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li> |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | </form> |
| 187 | 187 | |
| 188 | 188 | <?php |
| 189 | - } |
|
| 189 | + } |
|
| 190 | 190 | |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | \ No newline at end of file |
@@ -22,20 +22,20 @@ |
||
| 22 | 22 | * {@inhericDoc} |
| 23 | 23 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 24 | 24 | */ |
| 25 | - protected function renderContent() { |
|
| 26 | - if($this->data->get('has_stats', false)) { |
|
| 27 | - $html = I18N::translate('%1$s visits since the beginning of %2$s<br>(%3$s today)' , |
|
| 28 | - '<span class="odometer">' . I18N::number($this->data->get('visits_year')) . '</span>', |
|
| 29 | - date('Y'), |
|
| 30 | - '<span class="odometer">' . I18N::number($this->data->get('visits_today')) . '</span>' |
|
| 31 | - ); |
|
| 32 | - } |
|
| 33 | - else { |
|
| 34 | - $html = I18N::translate('No statistics could be retrieved from Piwik.'); |
|
| 35 | - } |
|
| 25 | + protected function renderContent() { |
|
| 26 | + if($this->data->get('has_stats', false)) { |
|
| 27 | + $html = I18N::translate('%1$s visits since the beginning of %2$s<br>(%3$s today)' , |
|
| 28 | + '<span class="odometer">' . I18N::number($this->data->get('visits_year')) . '</span>', |
|
| 29 | + date('Y'), |
|
| 30 | + '<span class="odometer">' . I18N::number($this->data->get('visits_today')) . '</span>' |
|
| 31 | + ); |
|
| 32 | + } |
|
| 33 | + else { |
|
| 34 | + $html = I18N::translate('No statistics could be retrieved from Piwik.'); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - return $html; |
|
| 38 | - } |
|
| 37 | + return $html; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | } |
@@ -23,51 +23,51 @@ |
||
| 23 | 23 | * {@inhericDoc} |
| 24 | 24 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 25 | 25 | */ |
| 26 | - protected function renderContent() { |
|
| 26 | + protected function renderContent() { |
|
| 27 | 27 | |
| 28 | - return ' |
|
| 28 | + return ' |
|
| 29 | 29 | <tr> |
| 30 | 30 | <td class="descriptionbox wrap width33">' . |
| 31 | - I18N::translate('Enable Piwik Statistics') . |
|
| 32 | - // Ideally, would like to add helpLink, but this does not work for modules... |
|
| 33 | - // FunctionsPrint::helpLink('piwik_enabled', $this->getName()); |
|
| 34 | - '</td> |
|
| 31 | + I18N::translate('Enable Piwik Statistics') . |
|
| 32 | + // Ideally, would like to add helpLink, but this does not work for modules... |
|
| 33 | + // FunctionsPrint::helpLink('piwik_enabled', $this->getName()); |
|
| 34 | + '</td> |
|
| 35 | 35 | <td class="optionbox">' . |
| 36 | - FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) . |
|
| 37 | - '</td> |
|
| 36 | + FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) . |
|
| 37 | + '</td> |
|
| 38 | 38 | </tr>' . |
| 39 | 39 | |
| 40 | - '<tr> |
|
| 40 | + '<tr> |
|
| 41 | 41 | <td class="descriptionbox wrap width33">' . |
| 42 | - I18N::translate('Piwik URL') . |
|
| 43 | - '</td> |
|
| 42 | + I18N::translate('Piwik URL') . |
|
| 43 | + '</td> |
|
| 44 | 44 | <td class="optionbox"> |
| 45 | 45 | <input type="text" name="piwik_url" size="45" value="' . |
| 46 | - $this->data->get('piwik_url', '') . '" /> |
|
| 46 | + $this->data->get('piwik_url', '') . '" /> |
|
| 47 | 47 | </td> |
| 48 | 48 | </tr>' . |
| 49 | 49 | |
| 50 | - '<tr> |
|
| 50 | + '<tr> |
|
| 51 | 51 | <td class="descriptionbox wrap width33">' . |
| 52 | - I18N::translate('Piwik Token') . |
|
| 53 | - '</td> |
|
| 52 | + I18N::translate('Piwik Token') . |
|
| 53 | + '</td> |
|
| 54 | 54 | <td class="optionbox"> |
| 55 | 55 | <input type="text" name="piwik_token" size="45" value="' . |
| 56 | - $this->data->get('piwik_token', '') . '" /> |
|
| 56 | + $this->data->get('piwik_token', '') . '" /> |
|
| 57 | 57 | </td> |
| 58 | 58 | </tr>' . |
| 59 | 59 | |
| 60 | - '<tr> |
|
| 60 | + '<tr> |
|
| 61 | 61 | <td class="descriptionbox wrap width33">' . |
| 62 | - I18N::translate('Piwik Site ID') . |
|
| 63 | - '</td> |
|
| 62 | + I18N::translate('Piwik Site ID') . |
|
| 63 | + '</td> |
|
| 64 | 64 | <td class="optionbox"> |
| 65 | 65 | <input type="text" name="piwik_siteid" size="4" value="' . |
| 66 | - $this->data->get('piwik_siteid', '') . '" /> |
|
| 66 | + $this->data->get('piwik_siteid', '') . '" /> |
|
| 67 | 67 | </td> |
| 68 | 68 | </tr>' ; |
| 69 | 69 | |
| 70 | - } |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | 72 | |
| 73 | 73 | } |
@@ -15,12 +15,12 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | interface MvcControllerInterface { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Return the module attached to this controller. |
|
| 20 | - * |
|
| 21 | - * @return \Fisharebest\Webtrees\Module\AbstractModule |
|
| 22 | - */ |
|
| 23 | - function getModule(); |
|
| 18 | + /** |
|
| 19 | + * Return the module attached to this controller. |
|
| 20 | + * |
|
| 21 | + * @return \Fisharebest\Webtrees\Module\AbstractModule |
|
| 22 | + */ |
|
| 23 | + function getModule(); |
|
| 24 | 24 | |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | \ No newline at end of file |
@@ -17,28 +17,28 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | class MvcController implements MvcControllerInterface |
| 19 | 19 | { |
| 20 | - /** |
|
| 21 | - * Reference module |
|
| 22 | - * @var Fisharebest\Webtrees\Module\AbstractModule $module |
|
| 23 | - */ |
|
| 24 | - protected $module; |
|
| 20 | + /** |
|
| 21 | + * Reference module |
|
| 22 | + * @var Fisharebest\Webtrees\Module\AbstractModule $module |
|
| 23 | + */ |
|
| 24 | + protected $module; |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Constructor for MvcController |
|
| 28 | - * |
|
| 29 | - * @param AbstractModule $module |
|
| 30 | - */ |
|
| 31 | - public function __construct(AbstractModule $module) { |
|
| 32 | - $this->module = $module; |
|
| 33 | - } |
|
| 26 | + /** |
|
| 27 | + * Constructor for MvcController |
|
| 28 | + * |
|
| 29 | + * @param AbstractModule $module |
|
| 30 | + */ |
|
| 31 | + public function __construct(AbstractModule $module) { |
|
| 32 | + $this->module = $module; |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * {@inheritDoc} |
|
| 37 | - * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface::getModule() |
|
| 38 | - */ |
|
| 39 | - public function getModule() { |
|
| 40 | - return $this->module; |
|
| 41 | - } |
|
| 35 | + /** |
|
| 36 | + * {@inheritDoc} |
|
| 37 | + * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface::getModule() |
|
| 38 | + */ |
|
| 39 | + public function getModule() { |
|
| 40 | + return $this->module; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | \ No newline at end of file |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | * @param \Fisharebest\Webtrees\Module\AbstractModule $module |
| 22 | 22 | * @param string $request |
| 23 | 23 | */ |
| 24 | - public function handle(\Fisharebest\Webtrees\Module\AbstractModule $module, $request); |
|
| 24 | + public function handle(\Fisharebest\Webtrees\Module\AbstractModule $module, $request); |
|
| 25 | 25 | |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | \ No newline at end of file |