Inspection of "Fixes suggested by SensioLabsInsight" - jon48/webtrees-lib - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — feature/code-analysis ( 1158f1...5e4834 )

by Jonathan

created 2016-07-01 21:01 UTC

Status

Indentation +92 added lines, -92 removed lines patch added patch discarded remove patch

@@ -20,111 +20,111 @@
 block discarded – undo
  */
 class CertificateFileProvider implements CertificateProviderInterface {
     
-    /**
-     * Relative path to the root certificate folder
-     * @var string $root_path
-     */
-    protected $root_path;
+	/**
+	 * Relative path to the root certificate folder
+	 * @var string $root_path
+	 */
+	protected $root_path;
     
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    protected $tree;
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	protected $tree;
     
-    /**
-     * Cached list of certificates' cities.
-     * @var (null|array) $cities_list
-     */
-    protected $cities_list = null;
+	/**
+	 * Cached list of certificates' cities.
+	 * @var (null|array) $cities_list
+	 */
+	protected $cities_list = null;
     
-    /**
-     * Constructor for the File Provider
-     * @param string $root_path
-     * @param Tree $tree
-     */
-    public function __construct($root_path, Tree $tree) {
-        $this->root_path = $root_path;
-        $this->tree = $tree;
-    }
+	/**
+	 * Constructor for the File Provider
+	 * @param string $root_path
+	 * @param Tree $tree
+	 */
+	public function __construct($root_path, Tree $tree) {
+		$this->root_path = $root_path;
+		$this->tree = $tree;
+	}
         
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
-     */
-    public function getRealCertificatesDirectory(){
-        return WT_DATA_DIR . $this->root_path;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
+	 */
+	public function getRealCertificatesDirectory(){
+		return WT_DATA_DIR . $this->root_path;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
-     */
-    public function getCitiesList(){
-        if(!isset($this->cities_list) || is_null($this->cities_list)){
-            $certdir = $this->getRealCertificatesDirectory();
-            $this->cities_list = array();
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
+	 */
+	public function getCitiesList(){
+		if(!isset($this->cities_list) || is_null($this->cities_list)){
+			$certdir = $this->getRealCertificatesDirectory();
+			$this->cities_list = array();
     
-            $dir = opendir($certdir);
+			$dir = opendir($certdir);
             
-            while($entry = readdir($dir)){
-                if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
-                    $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
-                }
-            }
-            sort($this->cities_list);
-        }
-        return $this->cities_list;
-    }
+			while($entry = readdir($dir)){
+				if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
+					$this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
+				}
+			}
+			sort($this->cities_list);
+		}
+		return $this->cities_list;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
-     */
-    public function getCertificatesList($selCity){
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
+	 */
+	public function getCertificatesList($selCity){
     
-        $selCity = Functions::encodeUtf8ToFileSystem($selCity);
+		$selCity = Functions::encodeUtf8ToFileSystem($selCity);
     
-        $certdir = $this->getRealCertificatesDirectory();
-        $tabCertif= array();
+		$certdir = $this->getRealCertificatesDirectory();
+		$tabCertif= array();
     
-        if(is_dir($certdir.$selCity)){
-            $dir=opendir($certdir.$selCity);
-            while($entry = readdir($dir)){
-                if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
-                    $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
-                    $certificate = new Certificate($path, $this->tree, $this);
-                    if(Functions::isImageTypeSupported($certificate->extension())){
-                        $tabCertif[] = 	$certificate;
-                    }
-                }
-            }
-        }
-        return $tabCertif;
-    }
+		if(is_dir($certdir.$selCity)){
+			$dir=opendir($certdir.$selCity);
+			while($entry = readdir($dir)){
+				if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
+					$path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
+					$certificate = new Certificate($path, $this->tree, $this);
+					if(Functions::isImageTypeSupported($certificate->extension())){
+						$tabCertif[] = 	$certificate;
+					}
+				}
+			}
+		}
+		return $tabCertif;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
-     */
-    public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
-        $tabFiles= array();
-        $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
-        $contains = utf8_decode($contains);
-        $nbCert = 0;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
+	 */
+	public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
+		$tabFiles= array();
+		$dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
+		$contains = utf8_decode($contains);
+		$nbCert = 0;
     
-        if(is_dir($dirPath)){
-            $dir=opendir($dirPath);
-            while(($entry = readdir($dir)) && $nbCert < $limit){
-                if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
-                    $tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
-                    $nbCert++;
-                }
-            }
-        }
-        sort($tabFiles);
-        return $tabFiles;
-    }
+		if(is_dir($dirPath)){
+			$dir=opendir($dirPath);
+			while(($entry = readdir($dir)) && $nbCert < $limit){
+				if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
+					$tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
+					$nbCert++;
+				}
+			}
+		}
+		sort($tabFiles);
+		return $tabFiles;
+	}
     
 }
 

Please login to merge, or discard this patch.

src/Webtrees/Module/PatronymicLineageModule.php 1 patch

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -18,40 +18,40 @@
 block discarded – undo
  * Patronymic Lineage Module.
  */
 class PatronymicLineageModule extends fw\Module\AbstractModule 
-    implements ModuleMenuItemInterface
+	implements ModuleMenuItemInterface
 {
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
         
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
-     /** 
-      * {@inhericDoc}
-      * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
-      */
-     public function getMenu(fw\Tree $tree, $reference) {
-         $tree_url = $tree ? $tree->getNameUrl() : '';
-         $surname = $reference && is_string($reference) ? $reference : '';
-         return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));
-     }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
+	 /** 
+	  * {@inhericDoc}
+	  * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
+	  */
+	 public function getMenu(fw\Tree $tree, $reference) {
+		 $tree_url = $tree ? $tree->getNameUrl() : '';
+		 $surname = $reference && is_string($reference) ? $reference : '';
+		 return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));
+	 }
 
 }
  
\ No newline at end of file

Please login to merge, or discard this patch.

src/Webtrees/Module/MiscExtensionsModule.php 1 patch

Indentation +72 added lines, -72 removed lines patch added patch discarded remove patch

@@ -30,49 +30,49 @@  discard block
 block discarded – undo
 class MiscExtensionsModule extends AbstractModule 
 implements HookSubscriberInterface, IndividualHeaderExtenderInterface, PageHeaderExtenderInterface, PageFooterExtenderInterface, ModuleConfigInterface
 {    
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
-     */
-    public function getTitle() {
-        return I18N::translate('Miscellaneous extensions');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
+	 */
+	public function getTitle() {
+		return I18N::translate('Miscellaneous extensions');
+	}
     
    /**
     * {@inheritDoc}
     * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
     */
-    public function getDescription() {
-        return I18N::translate('Miscellaneous extensions for <strong>webtrees</strong>.');
-    }
+	public function getDescription() {
+		return I18N::translate('Miscellaneous extensions for <strong>webtrees</strong>.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&amp;mod_action=AdminConfig';
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		return 'module.php?mod=' . $this->getName() . '&amp;mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
 	public function getSubscribedHooks() {
 		return array(
-		    'hExtendIndiHeaderLeft' => 20,
-		    'hPrintHeader' => 20,
-		    'hPrintFooter' => 20
+			'hExtendIndiHeaderLeft' => 20,
+			'hPrintHeader' => 20,
+			'hPrintFooter' => 20
 		);
 	}
 	
@@ -87,22 +87,22 @@  discard block
 block discarded – undo
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
 	 */
 	public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { 
-	    $res = '';
-	    $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	    $titles = $dindi->getTitles();
-	    if(count($titles)>0){
-	        $res = '
+		$res = '';
+		$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+		$titles = $dindi->getTitles();
+		if(count($titles)>0){
+			$res = '
 	            <dl>
 	               <dt class="label">'.I18N::translate('Titles').'</dt>';
-            foreach($titles as $title=>$props){
-                $res .= 
-                    '<dd class="field">' . $title. ' ' .
-                    FunctionsPrint::getListFromArray($props) .
-                    '</dd>';
-            }
-            $res .=  '</dl>';
-        }
-	    return array( 'indi-header-titles' , $res);	    
+			foreach($titles as $title=>$props){
+				$res .= 
+					'<dd class="field">' . $title. ' ' .
+					FunctionsPrint::getListFromArray($props) .
+					'</dd>';
+			}
+			$res .=  '</dl>';
+		}
+		return array( 'indi-header-titles' , $res);	    
 	}
 	
 	/**
@@ -116,15 +116,15 @@  discard block
 block discarded – undo
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageHeaderExtenderInterface::hPrintHeader()
 	 */
 	public function hPrintHeader() {	 
-	    global $WT_TREE;
+		global $WT_TREE;
 	    
-	    $html = '';
-	    if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
-	        if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
-	            $html .= $this->getSetting('MAJ_HTML_HEADER', '');
-	        }
-	    }	
-	    return $html;
+		$html = '';
+		if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
+			if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
+				$html .= $this->getSetting('MAJ_HTML_HEADER', '');
+			}
+		}	
+		return $html;
 	}
 	
 	/**
@@ -132,26 +132,26 @@  discard block
 block discarded – undo
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageFooterExtenderInterface::hPrintFooter()
 	 */
 	public function hPrintFooter() {
-	    global $WT_TREE;
+		global $WT_TREE;
 	     
-	    $html = '';
-	    if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
-	        $html .= '<br/>';
-	        $html .= '<div class="center">';
-	        $cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
-	        if($cnil_ref != ''){
-	            $html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
-	        }
-	        $html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.', Theme::theme()->contactLink(User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'))));
-	        $html .= '</div>';
-	    }
+		$html = '';
+		if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
+			$html .= '<br/>';
+			$html .= '<div class="center">';
+			$cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
+			if($cnil_ref != ''){
+				$html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
+			}
+			$html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.', Theme::theme()->contactLink(User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'))));
+			$html .= '</div>';
+		}
 	    
-	    if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
-	        if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
-	            $html .= $this->getSetting('MAJ_HTML_FOOTER', '');
-	        }
-	    }
-	    return $html;
+		if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
+			if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
+				$html .= $this->getSetting('MAJ_HTML_FOOTER', '');
+			}
+		}
+		return $html;
 	}
 	
 }

Please login to merge, or discard this patch.

src/Webtrees/Module/WelcomeBlockModule.php 1 patch

Indentation +58 added lines, -58 removed lines patch added patch discarded remove patch

@@ -19,76 +19,76 @@
 block discarded – undo
  * Welcome Block Module.
  */
 class WelcomeBlockModule extends AbstractModule
-    implements ModuleBlockInterface
+	implements ModuleBlockInterface
 {
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
         
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
-     */
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
 	public function getBlock($block_id, $template = true, $cfg = array()) {
-        global $controller, $WT_TREE;
+		global $controller, $WT_TREE;
         
-        $wb_controller = new WelcomeBlockController($this);           
-        return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
-    }
+		$wb_controller = new WelcomeBlockController($this);           
+		return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
-     */
-    public function loadAjax() {
-        return false;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
+	 */
+	public function loadAjax() {
+		return false;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
-     */
-    public function isUserBlock() {
-        return false;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
+	 */
+	public function isUserBlock() {
+		return false;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
-     */
-    public function isGedcomBlock() {
-        return true;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
+	 */
+	public function isGedcomBlock() {
+		return true;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
-     */
-    public function configureBlock($block_id) {
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
+	 */
+	public function configureBlock($block_id) {
 
-        $wb_controller = new WelcomeBlockController($this);
-        return $wb_controller->config($block_id);        
-    }
+		$wb_controller = new WelcomeBlockController($this);
+		return $wb_controller->config($block_id);        
+	}
 
 }
  
\ No newline at end of file

Please login to merge, or discard this patch.

src/Webtrees/Module/CertificatesModule.php 1 patch

Indentation +177 added lines, -177 removed lines patch added patch discarded remove patch

@@ -29,142 +29,142 @@  discard block
 block discarded – undo
  * Certificates Module.
  */
 class CertificatesModule 
-    extends AbstractModule 
-    implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface
+	extends AbstractModule 
+	implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface
 {
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
         
-    /**
-     * Provider for Certificates
-     * @var CertificateProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Provider for Certificates
+	 * @var CertificateProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&amp;mod_action=AdminConfig';
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		return 'module.php?mod=' . $this->getName() . '&amp;mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
-    public function getSubscribedHooks() {
-        return array(
-            'hFactSourcePrepend' => 50,
-            'hGetExpectedTags' => 50,
-            'hHtmlSimpleTagDisplay#_ACT' => 50,
-            'hHtmlSimpleTagEditor#_ACT'	=> 50,
-            'hAddSimpleTag#SOUR'	=> 50,
-            'hHasHelpTextTag#_ACT'	=> 50,
-            'hGetHelpTextTag#_ACT'	=> 50
-        );
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
+	public function getSubscribedHooks() {
+		return array(
+			'hFactSourcePrepend' => 50,
+			'hGetExpectedTags' => 50,
+			'hHtmlSimpleTagDisplay#_ACT' => 50,
+			'hHtmlSimpleTagEditor#_ACT'	=> 50,
+			'hAddSimpleTag#SOUR'	=> 50,
+			'hHasHelpTextTag#_ACT'	=> 50,
+			'hGetHelpTextTag#_ACT'	=> 50
+		);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
-     */
-    public function getMenu(Tree $tree, $reference = null) {
-        $tree_url = $tree ? $tree->getNameUrl() : '';
-        return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
+	 */
+	public function getMenu(Tree $tree, $reference = null) {
+		$tree_url = $tree ? $tree->getNameUrl() : '';
+		return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
-     */
-    public function hFactSourcePrepend($srec) {
-        global $WT_TREE;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
+	 */
+	public function hFactSourcePrepend($srec) {
+		global $WT_TREE;
         
-        $html='';
-        $sid=null;
+		$html='';
+		$sid=null;
         
-        if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
-            if (!$srec || strlen($srec) == 0) return $html;
+		if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
+			if (!$srec || strlen($srec) == 0) return $html;
             	
-            $certificate = null;
-            $subrecords = explode("\n", $srec);
-            $levelSOUR = substr($subrecords[0], 0, 1);
-            if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
-                $sid=$match[1];
-            };
-            $nb_subrecords = count($subrecords);
-            for ($i=0; $i < $nb_subrecords; $i++) {
-                $subrecords[$i] = trim($subrecords[$i]);
-                $tag = substr($subrecords[$i], 2, 4);
-                $text = substr($subrecords[$i], 7);
-                if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
-            }
+			$certificate = null;
+			$subrecords = explode("\n", $srec);
+			$levelSOUR = substr($subrecords[0], 0, 1);
+			if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
+				$sid=$match[1];
+			};
+			$nb_subrecords = count($subrecords);
+			for ($i=0; $i < $nb_subrecords; $i++) {
+				$subrecords[$i] = trim($subrecords[$i]);
+				$tag = substr($subrecords[$i], 2, 4);
+				$text = substr($subrecords[$i], 7);
+				if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
+			}
             	
-            if($certificate && $certificate->canShow())
-                $html = $this->getDisplay_ACT($certificate, $sid);
+			if($certificate && $certificate->canShow())
+				$html = $this->getDisplay_ACT($certificate, $sid);
                 	
-        }
-        return $html;
-    }
+		}
+		return $html;
+	}
    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
-     */
-    public function hFactSourceAppend($srec) { }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
+	 */
+	public function hFactSourceAppend($srec) { }
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
-     */
-    public function hGetExpectedTags() {
-        return array('SOUR' => '_ACT');
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
+	 */
+	public function hGetExpectedTags() {
+		return array('SOUR' => '_ACT');
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
-     */
-    public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
-        $html = '';
-        switch($tag){
-            case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
-                break;
-        }
-        return $html;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
+	 */
+	public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
+		$html = '';
+		switch($tag){
+			case '_ACT':
+				if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+				break;
+		}
+		return $html;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
-     */
-    public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {
-        global $controller, $WT_TREE;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
+	 */
+	public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {
+		global $controller, $WT_TREE;
         
-        $html = '';
+		$html = '';
 		
 		switch($tag){
 			case '_ACT':
@@ -192,78 +192,78 @@  discard block
 block discarded – undo
 		}
 		
 		return $html;
-    }
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
-     */
-    public function hAddSimpleTag($context, $level) {
-        switch($context){
-            case 'SOUR':
-                FunctionsEdit::addSimpleTag($level.' _ACT');
-                break;
-        }
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
+	 */
+	public function hAddSimpleTag($context, $level) {
+		switch($context){
+			case 'SOUR':
+				FunctionsEdit::addSimpleTag($level.' _ACT');
+				break;
+		}
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
-     */
-    public function hHasHelpTextTag($tag) {
-        switch($tag){
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
+	 */
+	public function hHasHelpTextTag($tag) {
+		switch($tag){
 			case '_ACT':
 				return true;
 				break;
 		}
 		return false;
-    }
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
-     */
-    public function hGetHelpTextTag($tag) {
-        switch($tag){
-            case '_ACT':
-                return array(
-                I18N::translate('Certificate'),
-                '<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
-            default:
-                return null;
-        }
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
+	 */
+	public function hGetHelpTextTag($tag) {
+		switch($tag){
+			case '_ACT':
+				return array(
+				I18N::translate('Certificate'),
+				'<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
+			default:
+				return null;
+		}
+	}
 
-    /**
-     * Returns the default Certificate File Provider, as configured in the module
-     *
-     * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
-     */
-    public function getProvider() {
-        global $WT_TREE;
+	/**
+	 * Returns the default Certificate File Provider, as configured in the module
+	 *
+	 * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
+	 */
+	public function getProvider() {
+		global $WT_TREE;
     
-        if(!$this->provider) {
-            $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
-            $this->provider = new CertificateFileProvider($root_path, $WT_TREE);
-        }
-        return $this->provider;
-    }
+		if(!$this->provider) {
+			$root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
+			$this->provider = new CertificateFileProvider($root_path, $WT_TREE);
+		}
+		return $this->provider;
+	}
     
     
-    /**
-     * Return the HTML code for custom simple tag _ACT
-     *
-     * @param Certificate $certificatePath Certificate (as per the GEDCOM)
-     * @param string|null $sid Linked Source ID, if it exists
-     */
-    protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
-        $html = '';
-        if($certificate){
-            $certificate->setSource($sid);
-            $html = $certificate->displayImage('icon');
-        }
-        return $html;
-    }
+	/**
+	 * Return the HTML code for custom simple tag _ACT
+	 *
+	 * @param Certificate $certificatePath Certificate (as per the GEDCOM)
+	 * @param string|null $sid Linked Source ID, if it exists
+	 */
+	protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
+		$html = '';
+		if($certificate){
+			$certificate->setSource($sid);
+			$html = $certificate->displayImage('icon');
+		}
+		return $html;
+	}
 
 }
  
\ No newline at end of file

Please login to merge, or discard this patch.

src/Webtrees/Module/Sosa/SosaStatsController.php 1 patch

Indentation +178 added lines, -178 removed lines patch added patch discarded remove patch

@@ -25,215 +25,215 @@
 block discarded – undo
  */
 class SosaStatsController extends MvcController
 {
-    /**
-     * Sosa Provider for the controller
-     * @var SosaProvider $sosa_provider
-     */
-    protected $sosa_provider;
+	/**
+	 * Sosa Provider for the controller
+	 * @var SosaProvider $sosa_provider
+	 */
+	protected $sosa_provider;
     
-    /**
-     * Constructor for SosaStatsController
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        global $WT_TREE;
+	/**
+	 * Constructor for SosaStatsController
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		global $WT_TREE;
         
-        parent::__construct($module);
+		parent::__construct($module);
         
-        $this->sosa_provider = new SosaProvider($WT_TREE, Auth::user());
-    }
+		$this->sosa_provider = new SosaProvider($WT_TREE, Auth::user());
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaStats@index
-     */
-    public function index() {
-        global $WT_TREE;
+	/**
+	 * SosaStats@index
+	 */
+	public function index() {
+		global $WT_TREE;
         
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Sosa Statistics'))
-            ->addInlineJavascript('$(".help_tooltip").tooltip();')
-        ;
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Sosa Statistics'))
+			->addInlineJavascript('$(".help_tooltip").tooltip();')
+		;
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $controller->getPageTitle());
-        $view_bag->set('is_setup', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $controller->getPageTitle());
+		$view_bag->set('is_setup', false);
         
-        if($this->sosa_provider->isSetup()) {
-            $view_bag->set('is_setup', true);
+		if($this->sosa_provider->isSetup()) {
+			$view_bag->set('is_setup', true);
             
-            $sosaCount = $this->sosa_provider->getSosaCount();
-            $diffSosaCount = $this->sosa_provider->getDifferentSosaCount();
+			$sosaCount = $this->sosa_provider->getSosaCount();
+			$diffSosaCount = $this->sosa_provider->getDifferentSosaCount();
             
-            $general_stats = array(
-                'sosa_count' => $sosaCount,
-                'distinct_count' => $diffSosaCount,
-                'sosa_rate' => Functions::safeDivision($diffSosaCount, $this->sosa_provider->getTotalIndividuals()),
-                'pedi_collapse' => 1 - Functions::safeDivision($diffSosaCount, $sosaCount),
-                'mean_gen_time' => $this->sosa_provider->getMeanGenerationTime()
-            );
-            $view_bag->set('general_stats', $general_stats);
+			$general_stats = array(
+				'sosa_count' => $sosaCount,
+				'distinct_count' => $diffSosaCount,
+				'sosa_rate' => Functions::safeDivision($diffSosaCount, $this->sosa_provider->getTotalIndividuals()),
+				'pedi_collapse' => 1 - Functions::safeDivision($diffSosaCount, $sosaCount),
+				'mean_gen_time' => $this->sosa_provider->getMeanGenerationTime()
+			);
+			$view_bag->set('general_stats', $general_stats);
             
-            $stats_gen = $this->sosa_provider->getStatisticsByGeneration();
-            $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$WT_TREE->getNameUrl().'&gen=');
+			$stats_gen = $this->sosa_provider->getStatisticsByGeneration();
+			$view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$WT_TREE->getNameUrl().'&gen=');
             
-            $gen_theoretical=1;
-            $total_theoretical=0;
-            $prev_diff=0;
-            $prev_known=0.5;
-            $gen_equiv=0;            
-            $generation_stats = array();
+			$gen_theoretical=1;
+			$total_theoretical=0;
+			$prev_diff=0;
+			$prev_known=0.5;
+			$gen_equiv=0;            
+			$generation_stats = array();
             
-            foreach($stats_gen as $gen => $tab){
-                $genY1= I18N::translate('-');
-                $genY2= I18N::translate('-');
-                if($tab['firstBirth']>0) $genY1=$tab['firstBirth'];
-                if($tab['lastBirth']>0) $genY2=$tab['lastBirth'];
-                $total_theoretical += $gen_theoretical;
-                $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
-                $gen_equiv += $perc_sosa_count_theor;
-                $missing=2*$prev_known - $tab['sosaCount'];
-                $gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
+			foreach($stats_gen as $gen => $tab){
+				$genY1= I18N::translate('-');
+				$genY2= I18N::translate('-');
+				if($tab['firstBirth']>0) $genY1=$tab['firstBirth'];
+				if($tab['lastBirth']>0) $genY2=$tab['lastBirth'];
+				$total_theoretical += $gen_theoretical;
+				$perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
+				$gen_equiv += $perc_sosa_count_theor;
+				$missing=2*$prev_known - $tab['sosaCount'];
+				$gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
                 
-                $generation_stats[$gen] = array(
-                    'gen_min_birth' => $genY1,
-                    'gen_max_birth' => $genY2,
-                    'theoretical' => $gen_theoretical,
-                    'known' => $tab['sosaCount'],
-                    'perc_known' => $perc_sosa_count_theor,
-                    'missing' => $missing,
-                    'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
-                    'total_known' => $tab['sosaTotalCount'],
-                    'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
-                    'different' => $gen_diff,
-                    'perc_different' => Functions::safeDivision($gen_diff, $tab['sosaCount']),
-                    'total_different' => $tab['diffSosaTotalCount'],
-                    'pedi_collapse' => 1 - Functions::safeDivision($tab['diffSosaTotalCount'], $tab['sosaTotalCount'])
-                );
+				$generation_stats[$gen] = array(
+					'gen_min_birth' => $genY1,
+					'gen_max_birth' => $genY2,
+					'theoretical' => $gen_theoretical,
+					'known' => $tab['sosaCount'],
+					'perc_known' => $perc_sosa_count_theor,
+					'missing' => $missing,
+					'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
+					'total_known' => $tab['sosaTotalCount'],
+					'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
+					'different' => $gen_diff,
+					'perc_different' => Functions::safeDivision($gen_diff, $tab['sosaCount']),
+					'total_different' => $tab['diffSosaTotalCount'],
+					'pedi_collapse' => 1 - Functions::safeDivision($tab['diffSosaTotalCount'], $tab['sosaTotalCount'])
+				);
                 
-                $gen_theoretical = $gen_theoretical * 2;
-                $prev_known=$tab['sosaCount'];
-                $prev_diff=$tab['diffSosaTotalCount'];
-            }
+				$gen_theoretical = $gen_theoretical * 2;
+				$prev_known=$tab['sosaCount'];
+				$prev_diff=$tab['diffSosaTotalCount'];
+			}
             
-            $view_bag->set('generation_stats', $generation_stats);
-            $view_bag->set('equivalent_gen', $gen_equiv);
+			$view_bag->set('generation_stats', $generation_stats);
+			$view_bag->set('equivalent_gen', $gen_equiv);
                         
-            $view_bag->set('chart_img_g2', $this->htmlAncestorDispersionG2());
-            $view_bag->set('chart_img_g3', $this->htmlAncestorDispersionG3());
+			$view_bag->set('chart_img_g2', $this->htmlAncestorDispersionG2());
+			$view_bag->set('chart_img_g3', $this->htmlAncestorDispersionG3());
             
-        }
+		}
         
-        ViewFactory::make('SosaStats', $this, $controller, $view_bag)->render();   
-    }
+		ViewFactory::make('SosaStats', $this, $controller, $view_bag)->render();   
+	}
     
-    /**
-     * Returns HTML code for a graph showing the dispersion of ancestors across father & mother
-     * @return string HTML code
-     */
-     private function htmlAncestorDispersionG2()
-    {
-        $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
-        if(count($ancestorsDispGen2) == 0) return;
+	/**
+	 * Returns HTML code for a graph showing the dispersion of ancestors across father & mother
+	 * @return string HTML code
+	 */
+	 private function htmlAncestorDispersionG2()
+	{
+		$ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
+		if(count($ancestorsDispGen2) == 0) return;
         
-        $size = '600x300';
+		$size = '600x300';
         
-        $total = array_sum($ancestorsDispGen2);
-        $father_count = isset($ancestorsDispGen2[1]) ? $ancestorsDispGen2[1] : 0;
-        $father = array (
-            'color' => '84beff', 
-            'count' => $father_count, 
-            'perc' => Functions::safeDivision($father_count, $total), 
-            'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
-        );
-        $mother_count = isset($ancestorsDispGen2[2]) ? $ancestorsDispGen2[2] : 0;
-        $mother = array (
-            'color' => 'ffd1dc', 
-            'count' => $mother_count, 
-            'perc' => Functions::safeDivision($mother_count, $total),
-            'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
-        );
-        $shared_count = isset($ancestorsDispGen2[-1]) ? $ancestorsDispGen2[-1] : 0;
-        $shared = array (
-            'color' => '777777', 
-            'count' => $shared_count, 
-            'perc' => Functions::safeDivision($shared_count, $total),
-            'name' => I18N::translate('Shared')
-        );
+		$total = array_sum($ancestorsDispGen2);
+		$father_count = isset($ancestorsDispGen2[1]) ? $ancestorsDispGen2[1] : 0;
+		$father = array (
+			'color' => '84beff', 
+			'count' => $father_count, 
+			'perc' => Functions::safeDivision($father_count, $total), 
+			'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
+		);
+		$mother_count = isset($ancestorsDispGen2[2]) ? $ancestorsDispGen2[2] : 0;
+		$mother = array (
+			'color' => 'ffd1dc', 
+			'count' => $mother_count, 
+			'perc' => Functions::safeDivision($mother_count, $total),
+			'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
+		);
+		$shared_count = isset($ancestorsDispGen2[-1]) ? $ancestorsDispGen2[-1] : 0;
+		$shared = array (
+			'color' => '777777', 
+			'count' => $shared_count, 
+			'perc' => Functions::safeDivision($shared_count, $total),
+			'name' => I18N::translate('Shared')
+		);
         
-        $chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
-        $chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
-        $chl = 
-             $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
-             $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
-             $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
-        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
-    }
+		$chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
+		$chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
+		$chl = 
+			 $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
+			 $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
+			 $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
+		return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+	}
     
-    /**
-     * Returns HTML code for a graph showing the dispersion of ancestors across grand-parents
-     * @return string HTML code
-     */
-    private function htmlAncestorDispersionG3()
-    {
-        $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(3);
+	/**
+	 * Returns HTML code for a graph showing the dispersion of ancestors across grand-parents
+	 * @return string HTML code
+	 */
+	private function htmlAncestorDispersionG3()
+	{
+		$ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(3);
         
-        $size = '700x300';
+		$size = '700x300';
         
-        $color_motmot = 'ffd1dc';
-        $color_motfat = 'b998a0';
-        $color_fatfat = '577292';
-        $color_fatmot = '84beff';
-        $color_shared = '777777';
+		$color_motmot = 'ffd1dc';
+		$color_motfat = 'b998a0';
+		$color_fatfat = '577292';
+		$color_fatmot = '84beff';
+		$color_shared = '777777';
     
-        $total_fatfat = $ancestorsDispGen2[1] ?: 0;
-        $total_fatmot = $ancestorsDispGen2[2] ?: 0;
-        $total_motfat = $ancestorsDispGen2[4] ?: 0;
-        $total_motmot = $ancestorsDispGen2[8] ?: 0;
-        $total_sha = $ancestorsDispGen2[-1] ?: 0;
-        $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
+		$total_fatfat = $ancestorsDispGen2[1] ?: 0;
+		$total_fatmot = $ancestorsDispGen2[2] ?: 0;
+		$total_motfat = $ancestorsDispGen2[4] ?: 0;
+		$total_motmot = $ancestorsDispGen2[8] ?: 0;
+		$total_sha = $ancestorsDispGen2[-1] ?: 0;
+		$total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
     
-        $chd = $this->arrayToExtendedEncoding(array(
-            4095 * $total_fatfat / $total, 
-            4095 * $total_fatmot / $total,
-            4095 * $total_sha / $total, 
-            4095 * $total_motfat / $total,
-            4095 * $total_motmot / $total            
-        ));
-        $chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
-        $chl =
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
-            I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
-         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
-    }
+		$chd = $this->arrayToExtendedEncoding(array(
+			4095 * $total_fatfat / $total, 
+			4095 * $total_fatmot / $total,
+			4095 * $total_sha / $total, 
+			4095 * $total_motfat / $total,
+			4095 * $total_motmot / $total            
+		));
+		$chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
+		$chl =
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
+			I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
+		 return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+	}
 
-    /**
-     * Convert an array to Google Chart encoding
-     * @param arrat $a Array to encode
-     * @return string
-     */
-    private function arrayToExtendedEncoding($a) {
-        $xencoding = WT_GOOGLE_CHART_ENCODING;
+	/**
+	 * Convert an array to Google Chart encoding
+	 * @param arrat $a Array to encode
+	 * @return string
+	 */
+	private function arrayToExtendedEncoding($a) {
+		$xencoding = WT_GOOGLE_CHART_ENCODING;
     
-        $encoding = '';
-        foreach ($a as $value) {
-            if ($value < 0) {
-                $value = 0;
-            }
-            $first  = (int) ($value / 64);
-            $second = $value % 64;
-            $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
-        }
+		$encoding = '';
+		foreach ($a as $value) {
+			if ($value < 0) {
+				$value = 0;
+			}
+			$first  = (int) ($value / 64);
+			$second = $value % 64;
+			$encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
+		}
     
-        return $encoding;
-    }
+		return $encoding;
+	}
     
     
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/Webtrees/Hook/HookInterfaces/CustomSimpleTagManagerInterface.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <[email protected]>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <[email protected]>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
 
 /**
@@ -18,12 +18,12 @@  discard block
 block discarded – undo
 interface CustomSimpleTagManager {
 
 
-    /**
-     * Returns the list of expected tags, classified by type of records.
-     *
-     * @return array List of expected tags
-     */
-    public function hGetExpectedTags();
+	/**
+	 * Returns the list of expected tags, classified by type of records.
+	 *
+	 * @return array List of expected tags
+	 */
+	public function hGetExpectedTags();
     
 	/**
 	 * Return the HTML code to be display for this tag.

Please login to merge, or discard this patch.

src/Webtrees/Hook/HookInterfaces/RecordNameTextExtenderInterface.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@
 block discarded – undo
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <[email protected]>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <[email protected]>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook;
 
 use \Fisharebest\Webtrees as fw;

Please login to merge, or discard this patch.

src/Webtrees/Hook/HookInterfaces/PageFooterExtenderInterface.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <[email protected]>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <[email protected]>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
 
 /**
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
  */
 interface PageFooterExtender {
 		
-    /**
-     * Get HTML code for extending the footer of a page.
-     * 
-     * @return string HTML code extension
-     */
-    public function hPrintFooter();
+	/**
+	 * Get HTML code for extending the footer of a page.
+	 * 
+	 * @return string HTML code extension
+	 */
+	public function hPrintFooter();
 	
 }
 

Please login to merge, or discard this patch.

		@@ -20,111 +20,111 @@
		block discarded – undo
20	20	*/
21	21	class CertificateFileProvider implements CertificateProviderInterface {
22	22
23		- /**
24		- * Relative path to the root certificate folder
25		- * @var string $root_path
26		- */
27		- protected $root_path;
	23	+ /**
	24	+ * Relative path to the root certificate folder
	25	+ * @var string $root_path
	26	+ */
	27	+ protected $root_path;
28	28
29		- /**
30		- * Reference tree
31		- * @var Tree $tree
32		- */
33		- protected $tree;
	29	+ /**
	30	+ * Reference tree
	31	+ * @var Tree $tree
	32	+ */
	33	+ protected $tree;
34	34
35		- /**
36		- * Cached list of certificates' cities.
37		- * @var (null\|array) $cities_list
38		- */
39		- protected $cities_list = null;
	35	+ /**
	36	+ * Cached list of certificates' cities.
	37	+ * @var (null\|array) $cities_list
	38	+ */
	39	+ protected $cities_list = null;
40	40
41		- /**
42		- * Constructor for the File Provider
43		- * @param string $root_path
44		- * @param Tree $tree
45		- */
46		- public function __construct($root_path, Tree $tree) {
47		- $this->root_path = $root_path;
48		- $this->tree = $tree;
49		- }
	41	+ /**
	42	+ * Constructor for the File Provider
	43	+ * @param string $root_path
	44	+ * @param Tree $tree
	45	+ */
	46	+ public function __construct($root_path, Tree $tree) {
	47	+ $this->root_path = $root_path;
	48	+ $this->tree = $tree;
	49	+ }
50	50
51		- /**
52		- * {@inhericDoc}
53		- * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
54		- */
55		- public function getRealCertificatesDirectory(){
56		- return WT_DATA_DIR . $this->root_path;
57		- }
	51	+ /**
	52	+ * {@inhericDoc}
	53	+ * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
	54	+ */
	55	+ public function getRealCertificatesDirectory(){
	56	+ return WT_DATA_DIR . $this->root_path;
	57	+ }
58	58
59		- /**
60		- * {@inhericDoc}
61		- * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
62		- */
63		- public function getCitiesList(){
64		- if(!isset($this->cities_list) \|\| is_null($this->cities_list)){
65		- $certdir = $this->getRealCertificatesDirectory();
66		- $this->cities_list = array();
	59	+ /**
	60	+ * {@inhericDoc}
	61	+ * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
	62	+ */
	63	+ public function getCitiesList(){
	64	+ if(!isset($this->cities_list) \|\| is_null($this->cities_list)){
	65	+ $certdir = $this->getRealCertificatesDirectory();
	66	+ $this->cities_list = array();
67	67
68		- $dir = opendir($certdir);
	68	+ $dir = opendir($certdir);
69	69
70		- while($entry = readdir($dir)){
71		- if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
72		- $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
73		- }
74		- }
75		- sort($this->cities_list);
76		- }
77		- return $this->cities_list;
78		- }
	70	+ while($entry = readdir($dir)){
	71	+ if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
	72	+ $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
	73	+ }
	74	+ }
	75	+ sort($this->cities_list);
	76	+ }
	77	+ return $this->cities_list;
	78	+ }
79	79
80		- /**
81		- * {@inhericDoc}
82		- * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
83		- */
84		- public function getCertificatesList($selCity){
	80	+ /**
	81	+ * {@inhericDoc}
	82	+ * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
	83	+ */
	84	+ public function getCertificatesList($selCity){
85	85
86		- $selCity = Functions::encodeUtf8ToFileSystem($selCity);
	86	+ $selCity = Functions::encodeUtf8ToFileSystem($selCity);
87	87
88		- $certdir = $this->getRealCertificatesDirectory();
89		- $tabCertif= array();
	88	+ $certdir = $this->getRealCertificatesDirectory();
	89	+ $tabCertif= array();
90	90
91		- if(is_dir($certdir.$selCity)){
92		- $dir=opendir($certdir.$selCity);
93		- while($entry = readdir($dir)){
94		- if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
95		- $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
96		- $certificate = new Certificate($path, $this->tree, $this);
97		- if(Functions::isImageTypeSupported($certificate->extension())){
98		- $tabCertif[] = $certificate;
99		- }
100		- }
101		- }
102		- }
103		- return $tabCertif;
104		- }
	91	+ if(is_dir($certdir.$selCity)){
	92	+ $dir=opendir($certdir.$selCity);
	93	+ while($entry = readdir($dir)){
	94	+ if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
	95	+ $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
	96	+ $certificate = new Certificate($path, $this->tree, $this);
	97	+ if(Functions::isImageTypeSupported($certificate->extension())){
	98	+ $tabCertif[] = $certificate;
	99	+ }
	100	+ }
	101	+ }
	102	+ }
	103	+ return $tabCertif;
	104	+ }
105	105
106		- /**
107		- * {@inhericDoc}
108		- * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
109		- */
110		- public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
111		- $tabFiles= array();
112		- $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
113		- $contains = utf8_decode($contains);
114		- $nbCert = 0;
	106	+ /**
	107	+ * {@inhericDoc}
	108	+ * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
	109	+ */
	110	+ public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
	111	+ $tabFiles= array();
	112	+ $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
	113	+ $contains = utf8_decode($contains);
	114	+ $nbCert = 0;
115	115
116		- if(is_dir($dirPath)){
117		- $dir=opendir($dirPath);
118		- while(($entry = readdir($dir)) && $nbCert < $limit){
119		- if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
120		- $tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
121		- $nbCert++;
122		- }
123		- }
124		- }
125		- sort($tabFiles);
126		- return $tabFiles;
127		- }
	116	+ if(is_dir($dirPath)){
	117	+ $dir=opendir($dirPath);
	118	+ while(($entry = readdir($dir)) && $nbCert < $limit){
	119	+ if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
	120	+ $tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
	121	+ $nbCert++;
	122	+ }
	123	+ }
	124	+ }
	125	+ sort($tabFiles);
	126	+ return $tabFiles;
	127	+ }
128	128
129	129	}
130	130

		@@ -18,40 +18,40 @@
		block discarded – undo
18	18	* Patronymic Lineage Module.
19	19	*/
20	20	class PatronymicLineageModule extends fw\Module\AbstractModule
21		- implements ModuleMenuItemInterface
	21	+ implements ModuleMenuItemInterface
22	22	{
23		- /** @var string For custom modules - link for support, upgrades, etc. */
24		- const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
	23	+ /** @var string For custom modules - link for support, upgrades, etc. */
	24	+ const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
25	25
26		- /**
27		- * {@inhericDoc}
28		- */
29		- public function getTitle() {
30		- return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
31		- }
	26	+ /**
	27	+ * {@inhericDoc}
	28	+ */
	29	+ public function getTitle() {
	30	+ return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
	31	+ }
32	32
33		- /**
34		- * {@inhericDoc}
35		- */
36		- public function getDescription() {
37		- return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
38		- }
	33	+ /**
	34	+ * {@inhericDoc}
	35	+ */
	36	+ public function getDescription() {
	37	+ return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
	38	+ }
39	39
40		- /**
41		- * {@inhericDoc}
42		- */
43		- public function modAction($mod_action) {
44		- \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
45		- }
46		- /**
47		- * {@inhericDoc}
48		- * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
49		- */
50		- public function getMenu(fw\Tree $tree, $reference) {
51		- $tree_url = $tree ? $tree->getNameUrl() : '';
52		- $surname = $reference && is_string($reference) ? $reference : '';
53		- return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));
54		- }
	40	+ /**
	41	+ * {@inhericDoc}
	42	+ */
	43	+ public function modAction($mod_action) {
	44	+ \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
	45	+ }
	46	+ /**
	47	+ * {@inhericDoc}
	48	+ * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
	49	+ */
	50	+ public function getMenu(fw\Tree $tree, $reference) {
	51	+ $tree_url = $tree ? $tree->getNameUrl() : '';
	52	+ $surname = $reference && is_string($reference) ? $reference : '';
	53	+ return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));
	54	+ }
55	55
56	56	}
57	57
58	58	\ No newline at end of file

		@@ -30,49 +30,49 @@ discard block
		block discarded – undo
30	30	class MiscExtensionsModule extends AbstractModule
31	31	implements HookSubscriberInterface, IndividualHeaderExtenderInterface, PageHeaderExtenderInterface, PageFooterExtenderInterface, ModuleConfigInterface
32	32	{
33		- /** @var string For custom modules - link for support, upgrades, etc. */
34		- const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
	33	+ /** @var string For custom modules - link for support, upgrades, etc. */
	34	+ const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
35	35
36		- /**
37		- * {@inheritDoc}
38		- * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
39		- */
40		- public function getTitle() {
41		- return I18N::translate('Miscellaneous extensions');
42		- }
	36	+ /**
	37	+ * {@inheritDoc}
	38	+ * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
	39	+ */
	40	+ public function getTitle() {
	41	+ return I18N::translate('Miscellaneous extensions');
	42	+ }
43	43
44	44	/**
45	45	* {@inheritDoc}
46	46	* @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
47	47	*/
48		- public function getDescription() {
49		- return I18N::translate('Miscellaneous extensions for <strong>webtrees</strong>.');
50		- }
	48	+ public function getDescription() {
	49	+ return I18N::translate('Miscellaneous extensions for <strong>webtrees</strong>.');
	50	+ }
51	51
52		- /**
53		- * {@inhericDoc}
54		- */
55		- public function modAction($mod_action) {
56		- \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
57		- }
	52	+ /**
	53	+ * {@inhericDoc}
	54	+ */
	55	+ public function modAction($mod_action) {
	56	+ \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
	57	+ }
58	58
59		- /**
60		- * {@inhericDoc}
61		- * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
62		- */
63		- public function getConfigLink() {
64		- return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
65		- }
	59	+ /**
	60	+ * {@inhericDoc}
	61	+ * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
	62	+ */
	63	+ public function getConfigLink() {
	64	+ return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
	65	+ }
66	66
67		- /**
68		- * {@inheritDoc}
69		- * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
70		- */
	67	+ /**
	68	+ * {@inheritDoc}
	69	+ * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
	70	+ */
71	71	public function getSubscribedHooks() {
72	72	return array(
73		- 'hExtendIndiHeaderLeft' => 20,
74		- 'hPrintHeader' => 20,
75		- 'hPrintFooter' => 20
	73	+ 'hExtendIndiHeaderLeft' => 20,
	74	+ 'hPrintHeader' => 20,
	75	+ 'hPrintFooter' => 20
76	76	);
77	77	}
78	78
		@@ -87,22 +87,22 @@ discard block
		block discarded – undo
87	87	* @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
88	88	*/
89	89	public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) {
90		- $res = '';
91		- $dindi = new Individual($ctrlIndi->getSignificantIndividual());
92		- $titles = $dindi->getTitles();
93		- if(count($titles)>0){
94		- $res = '
	90	+ $res = '';
	91	+ $dindi = new Individual($ctrlIndi->getSignificantIndividual());
	92	+ $titles = $dindi->getTitles();
	93	+ if(count($titles)>0){
	94	+ $res = '
95	95	<dl>
96	96	<dt class="label">'.I18N::translate('Titles').'</dt>';
97		- foreach($titles as $title=>$props){
98		- $res .=
99		- '<dd class="field">' . $title. ' ' .
100		- FunctionsPrint::getListFromArray($props) .
101		- '</dd>';
102		- }
103		- $res .= '</dl>';
104		- }
105		- return array( 'indi-header-titles' , $res);
	97	+ foreach($titles as $title=>$props){
	98	+ $res .=
	99	+ '<dd class="field">' . $title. ' ' .
	100	+ FunctionsPrint::getListFromArray($props) .
	101	+ '</dd>';
	102	+ }
	103	+ $res .= '</dl>';
	104	+ }
	105	+ return array( 'indi-header-titles' , $res);
106	106	}
107	107
108	108	/**
		@@ -116,15 +116,15 @@ discard block
		block discarded – undo
116	116	* @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageHeaderExtenderInterface::hPrintHeader()
117	117	*/
118	118	public function hPrintHeader() {
119		- global $WT_TREE;
	119	+ global $WT_TREE;
120	120
121		- $html = '';
122		- if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
123		- if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE) && !Filter::getBool('noheader')){
124		- $html .= $this->getSetting('MAJ_HTML_HEADER', '');
125		- }
126		- }
127		- return $html;
	121	+ $html = '';
	122	+ if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
	123	+ if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE) && !Filter::getBool('noheader')){
	124	+ $html .= $this->getSetting('MAJ_HTML_HEADER', '');
	125	+ }
	126	+ }
	127	+ return $html;
128	128	}
129	129
130	130	/**
		@@ -132,26 +132,26 @@ discard block
		block discarded – undo
132	132	* @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageFooterExtenderInterface::hPrintFooter()
133	133	*/
134	134	public function hPrintFooter() {
135		- global $WT_TREE;
	135	+ global $WT_TREE;
136	136
137		- $html = '';
138		- if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
139		- $html .= '<br/>';
140		- $html .= '<div class="center">';
141		- $cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
142		- if($cnil_ref != ''){
143		- $html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
144		- }
145		- $html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.', Theme::theme()->contactLink(User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'))));
146		- $html .= '</div>';
147		- }
	137	+ $html = '';
	138	+ if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
	139	+ $html .= '<br/>';
	140	+ $html .= '<div class="center">';
	141	+ $cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
	142	+ if($cnil_ref != ''){
	143	+ $html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
	144	+ }
	145	+ $html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.', Theme::theme()->contactLink(User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'))));
	146	+ $html .= '</div>';
	147	+ }
148	148
149		- if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
150		- if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE) && !Filter::getBool('nofooter')){
151		- $html .= $this->getSetting('MAJ_HTML_FOOTER', '');
152		- }
153		- }
154		- return $html;
	149	+ if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
	150	+ if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE) && !Filter::getBool('nofooter')){
	151	+ $html .= $this->getSetting('MAJ_HTML_FOOTER', '');
	152	+ }
	153	+ }
	154	+ return $html;
155	155	}
156	156
157	157	}

		@@ -19,76 +19,76 @@
		block discarded – undo
19	19	* Welcome Block Module.
20	20	*/
21	21	class WelcomeBlockModule extends AbstractModule
22		- implements ModuleBlockInterface
	22	+ implements ModuleBlockInterface
23	23	{
24		- /** @var string For custom modules - link for support, upgrades, etc. */
25		- const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
	24	+ /** @var string For custom modules - link for support, upgrades, etc. */
	25	+ const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
26	26
27		- /**
28		- * {@inhericDoc}
29		- */
30		- public function getTitle() {
31		- return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
32		- }
	27	+ /**
	28	+ * {@inhericDoc}
	29	+ */
	30	+ public function getTitle() {
	31	+ return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
	32	+ }
33	33
34		- /**
35		- * {@inhericDoc}
36		- */
37		- public function getDescription() {
38		- return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
39		- }
	34	+ /**
	35	+ * {@inhericDoc}
	36	+ */
	37	+ public function getDescription() {
	38	+ return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
	39	+ }
40	40
41		- /**
42		- * {@inhericDoc}
43		- */
44		- public function modAction($mod_action) {
45		- \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
46		- }
	41	+ /**
	42	+ * {@inhericDoc}
	43	+ */
	44	+ public function modAction($mod_action) {
	45	+ \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
	46	+ }
47	47
48		- /**
49		- * {@inhericDoc}
50		- * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
51		- */
	48	+ /**
	49	+ * {@inhericDoc}
	50	+ * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
	51	+ */
52	52	public function getBlock($block_id, $template = true, $cfg = array()) {
53		- global $controller, $WT_TREE;
	53	+ global $controller, $WT_TREE;
54	54
55		- $wb_controller = new WelcomeBlockController($this);
56		- return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
57		- }
	55	+ $wb_controller = new WelcomeBlockController($this);
	56	+ return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
	57	+ }
58	58
59		- /**
60		- * {@inhericDoc}
61		- * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
62		- */
63		- public function loadAjax() {
64		- return false;
65		- }
	59	+ /**
	60	+ * {@inhericDoc}
	61	+ * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
	62	+ */
	63	+ public function loadAjax() {
	64	+ return false;
	65	+ }
66	66
67		- /**
68		- * {@inhericDoc}
69		- * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
70		- */
71		- public function isUserBlock() {
72		- return false;
73		- }
	67	+ /**
	68	+ * {@inhericDoc}
	69	+ * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
	70	+ */
	71	+ public function isUserBlock() {
	72	+ return false;
	73	+ }
74	74
75		- /**
76		- * {@inhericDoc}
77		- * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
78		- */
79		- public function isGedcomBlock() {
80		- return true;
81		- }
	75	+ /**
	76	+ * {@inhericDoc}
	77	+ * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
	78	+ */
	79	+ public function isGedcomBlock() {
	80	+ return true;
	81	+ }
82	82
83		- /**
84		- * {@inhericDoc}
85		- * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
86		- */
87		- public function configureBlock($block_id) {
	83	+ /**
	84	+ * {@inhericDoc}
	85	+ * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
	86	+ */
	87	+ public function configureBlock($block_id) {
88	88
89		- $wb_controller = new WelcomeBlockController($this);
90		- return $wb_controller->config($block_id);
91		- }
	89	+ $wb_controller = new WelcomeBlockController($this);
	90	+ return $wb_controller->config($block_id);
	91	+ }
92	92
93	93	}
94	94
95	95	\ No newline at end of file

		@@ -29,142 +29,142 @@ discard block
		block discarded – undo
29	29	* Certificates Module.
30	30	*/
31	31	class CertificatesModule
32		- extends AbstractModule
33		- implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface
	32	+ extends AbstractModule
	33	+ implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface
34	34	{
35		- /** @var string For custom modules - link for support, upgrades, etc. */
36		- const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
	35	+ /** @var string For custom modules - link for support, upgrades, etc. */
	36	+ const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
37	37
38		- /**
39		- * Provider for Certificates
40		- * @var CertificateProviderInterface $provider
41		- */
42		- protected $provider;
	38	+ /**
	39	+ * Provider for Certificates
	40	+ * @var CertificateProviderInterface $provider
	41	+ */
	42	+ protected $provider;
43	43
44		- /**
45		- * {@inhericDoc}
46		- */
47		- public function getTitle() {
48		- return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
49		- }
	44	+ /**
	45	+ * {@inhericDoc}
	46	+ */
	47	+ public function getTitle() {
	48	+ return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
	49	+ }
50	50
51		- /**
52		- * {@inhericDoc}
53		- */
54		- public function getDescription() {
55		- return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
56		- }
	51	+ /**
	52	+ * {@inhericDoc}
	53	+ */
	54	+ public function getDescription() {
	55	+ return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
	56	+ }
57	57
58		- /**
59		- * {@inhericDoc}
60		- */
61		- public function modAction($mod_action) {
62		- \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
63		- }
	58	+ /**
	59	+ * {@inhericDoc}
	60	+ */
	61	+ public function modAction($mod_action) {
	62	+ \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
	63	+ }
64	64
65		- /**
66		- * {@inhericDoc}
67		- * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
68		- */
69		- public function getConfigLink() {
70		- return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
71		- }
	65	+ /**
	66	+ * {@inhericDoc}
	67	+ * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
	68	+ */
	69	+ public function getConfigLink() {
	70	+ return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
	71	+ }
72	72
73		- /**
74		- * {@inhericDoc}
75		- * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
76		- */
77		- public function getSubscribedHooks() {
78		- return array(
79		- 'hFactSourcePrepend' => 50,
80		- 'hGetExpectedTags' => 50,
81		- 'hHtmlSimpleTagDisplay#_ACT' => 50,
82		- 'hHtmlSimpleTagEditor#_ACT' => 50,
83		- 'hAddSimpleTag#SOUR' => 50,
84		- 'hHasHelpTextTag#_ACT' => 50,
85		- 'hGetHelpTextTag#_ACT' => 50
86		- );
87		- }
	73	+ /**
	74	+ * {@inhericDoc}
	75	+ * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
	76	+ */
	77	+ public function getSubscribedHooks() {
	78	+ return array(
	79	+ 'hFactSourcePrepend' => 50,
	80	+ 'hGetExpectedTags' => 50,
	81	+ 'hHtmlSimpleTagDisplay#_ACT' => 50,
	82	+ 'hHtmlSimpleTagEditor#_ACT' => 50,
	83	+ 'hAddSimpleTag#SOUR' => 50,
	84	+ 'hHasHelpTextTag#_ACT' => 50,
	85	+ 'hGetHelpTextTag#_ACT' => 50
	86	+ );
	87	+ }
88	88
89		- /**
90		- * {@inhericDoc}
91		- * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
92		- */
93		- public function getMenu(Tree $tree, $reference = null) {
94		- $tree_url = $tree ? $tree->getNameUrl() : '';
95		- return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
96		- }
	89	+ /**
	90	+ * {@inhericDoc}
	91	+ * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
	92	+ */
	93	+ public function getMenu(Tree $tree, $reference = null) {
	94	+ $tree_url = $tree ? $tree->getNameUrl() : '';
	95	+ return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
	96	+ }
97	97
98		- /**
99		- * {@inhericDoc}
100		- * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
101		- */
102		- public function hFactSourcePrepend($srec) {
103		- global $WT_TREE;
	98	+ /**
	99	+ * {@inhericDoc}
	100	+ * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
	101	+ */
	102	+ public function hFactSourcePrepend($srec) {
	103	+ global $WT_TREE;
104	104
105		- $html='';
106		- $sid=null;
	105	+ $html='';
	106	+ $sid=null;
107	107
108		- if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
109		- if (!$srec \|\| strlen($srec) == 0) return $html;
	108	+ if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
	109	+ if (!$srec \|\| strlen($srec) == 0) return $html;
110	110
111		- $certificate = null;
112		- $subrecords = explode("\n", $srec);
113		- $levelSOUR = substr($subrecords[0], 0, 1);
114		- if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
115		- $sid=$match[1];
116		- };
117		- $nb_subrecords = count($subrecords);
118		- for ($i=0; $i < $nb_subrecords; $i++) {
119		- $subrecords[$i] = trim($subrecords[$i]);
120		- $tag = substr($subrecords[$i], 2, 4);
121		- $text = substr($subrecords[$i], 7);
122		- if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
123		- }
	111	+ $certificate = null;
	112	+ $subrecords = explode("\n", $srec);
	113	+ $levelSOUR = substr($subrecords[0], 0, 1);
	114	+ if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
	115	+ $sid=$match[1];
	116	+ };
	117	+ $nb_subrecords = count($subrecords);
	118	+ for ($i=0; $i < $nb_subrecords; $i++) {
	119	+ $subrecords[$i] = trim($subrecords[$i]);
	120	+ $tag = substr($subrecords[$i], 2, 4);
	121	+ $text = substr($subrecords[$i], 7);
	122	+ if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
	123	+ }
124	124
125		- if($certificate && $certificate->canShow())
126		- $html = $this->getDisplay_ACT($certificate, $sid);
	125	+ if($certificate && $certificate->canShow())
	126	+ $html = $this->getDisplay_ACT($certificate, $sid);
127	127
128		- }
129		- return $html;
130		- }
	128	+ }
	129	+ return $html;
	130	+ }
131	131
132		- /**
133		- * {@inhericDoc}
134		- * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
135		- */
136		- public function hFactSourceAppend($srec) { }
	132	+ /**
	133	+ * {@inhericDoc}
	134	+ * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
	135	+ */
	136	+ public function hFactSourceAppend($srec) { }
137	137
138		- /**
139		- * {@inhericDoc}
140		- * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
141		- */
142		- public function hGetExpectedTags() {
143		- return array('SOUR' => '_ACT');
144		- }
	138	+ /**
	139	+ * {@inhericDoc}
	140	+ * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
	141	+ */
	142	+ public function hGetExpectedTags() {
	143	+ return array('SOUR' => '_ACT');
	144	+ }
145	145
146		- /**
147		- * {@inhericDoc}
148		- * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
149		- */
150		- public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
151		- $html = '';
152		- switch($tag){
153		- case '_ACT':
154		- if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
155		- break;
156		- }
157		- return $html;
158		- }
	146	+ /**
	147	+ * {@inhericDoc}
	148	+ * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
	149	+ */
	150	+ public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
	151	+ $html = '';
	152	+ switch($tag){
	153	+ case '_ACT':
	154	+ if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
	155	+ break;
	156	+ }
	157	+ return $html;
	158	+ }
159	159
160		- /**
161		- * {@inhericDoc}
162		- * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
163		- */
164		- public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {
165		- global $controller, $WT_TREE;
	160	+ /**
	161	+ * {@inhericDoc}
	162	+ * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
	163	+ */
	164	+ public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {
	165	+ global $controller, $WT_TREE;
166	166
167		- $html = '';
	167	+ $html = '';
168	168
169	169	switch($tag){
170	170	case '_ACT':
		@@ -192,78 +192,78 @@ discard block
		block discarded – undo
192	192	}
193	193
194	194	return $html;
195		- }
	195	+ }
196	196
197		- /**
198		- * {@inhericDoc}
199		- * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
200		- */
201		- public function hAddSimpleTag($context, $level) {
202		- switch($context){
203		- case 'SOUR':
204		- FunctionsEdit::addSimpleTag($level.' _ACT');
205		- break;
206		- }
207		- }
	197	+ /**
	198	+ * {@inhericDoc}
	199	+ * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
	200	+ */
	201	+ public function hAddSimpleTag($context, $level) {
	202	+ switch($context){
	203	+ case 'SOUR':
	204	+ FunctionsEdit::addSimpleTag($level.' _ACT');
	205	+ break;
	206	+ }
	207	+ }
208	208
209		- /**
210		- * {@inhericDoc}
211		- * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
212		- */
213		- public function hHasHelpTextTag($tag) {
214		- switch($tag){
	209	+ /**
	210	+ * {@inhericDoc}
	211	+ * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
	212	+ */
	213	+ public function hHasHelpTextTag($tag) {
	214	+ switch($tag){
215	215	case '_ACT':
216	216	return true;
217	217	break;
218	218	}
219	219	return false;
220		- }
	220	+ }
221	221
222		- /**
223		- * {@inhericDoc}
224		- * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
225		- */
226		- public function hGetHelpTextTag($tag) {
227		- switch($tag){
228		- case '_ACT':
229		- return array(
230		- I18N::translate('Certificate'),
231		- '<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
232		- default:
233		- return null;
234		- }
235		- }
	222	+ /**
	223	+ * {@inhericDoc}
	224	+ * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
	225	+ */
	226	+ public function hGetHelpTextTag($tag) {
	227	+ switch($tag){
	228	+ case '_ACT':
	229	+ return array(
	230	+ I18N::translate('Certificate'),
	231	+ '<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
	232	+ default:
	233	+ return null;
	234	+ }
	235	+ }
236	236
237		- /**
238		- * Returns the default Certificate File Provider, as configured in the module
239		- *
240		- * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
241		- */
242		- public function getProvider() {
243		- global $WT_TREE;
	237	+ /**
	238	+ * Returns the default Certificate File Provider, as configured in the module
	239	+ *
	240	+ * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
	241	+ */
	242	+ public function getProvider() {
	243	+ global $WT_TREE;
244	244
245		- if(!$this->provider) {
246		- $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
247		- $this->provider = new CertificateFileProvider($root_path, $WT_TREE);
248		- }
249		- return $this->provider;
250		- }
	245	+ if(!$this->provider) {
	246	+ $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
	247	+ $this->provider = new CertificateFileProvider($root_path, $WT_TREE);
	248	+ }
	249	+ return $this->provider;
	250	+ }
251	251
252	252
253		- /**
254		- * Return the HTML code for custom simple tag _ACT
255		- *
256		- * @param Certificate $certificatePath Certificate (as per the GEDCOM)
257		- * @param string\|null $sid Linked Source ID, if it exists
258		- */
259		- protected function getDisplay_ACT(Certificate $certificate, $sid = null){
260		- $html = '';
261		- if($certificate){
262		- $certificate->setSource($sid);
263		- $html = $certificate->displayImage('icon');
264		- }
265		- return $html;
266		- }
	253	+ /**
	254	+ * Return the HTML code for custom simple tag _ACT
	255	+ *
	256	+ * @param Certificate $certificatePath Certificate (as per the GEDCOM)
	257	+ * @param string\|null $sid Linked Source ID, if it exists
	258	+ */
	259	+ protected function getDisplay_ACT(Certificate $certificate, $sid = null){
	260	+ $html = '';
	261	+ if($certificate){
	262	+ $certificate->setSource($sid);
	263	+ $html = $certificate->displayImage('icon');
	264	+ }
	265	+ return $html;
	266	+ }
267	267
268	268	}
269	269
270	270	\ No newline at end of file

		@@ -25,215 +25,215 @@
		block discarded – undo
25	25	*/
26	26	class SosaStatsController extends MvcController
27	27	{
28		- /**
29		- * Sosa Provider for the controller
30		- * @var SosaProvider $sosa_provider
31		- */
32		- protected $sosa_provider;
	28	+ /**
	29	+ * Sosa Provider for the controller
	30	+ * @var SosaProvider $sosa_provider
	31	+ */
	32	+ protected $sosa_provider;
33	33
34		- /**
35		- * Constructor for SosaStatsController
36		- * @param AbstractModule $module
37		- */
38		- public function __construct(AbstractModule $module) {
39		- global $WT_TREE;
	34	+ /**
	35	+ * Constructor for SosaStatsController
	36	+ * @param AbstractModule $module
	37	+ */
	38	+ public function __construct(AbstractModule $module) {
	39	+ global $WT_TREE;
40	40
41		- parent::__construct($module);
	41	+ parent::__construct($module);
42	42
43		- $this->sosa_provider = new SosaProvider($WT_TREE, Auth::user());
44		- }
	43	+ $this->sosa_provider = new SosaProvider($WT_TREE, Auth::user());
	44	+ }
45	45
46		- /**
47		- * Pages
48		- */
	46	+ /**
	47	+ * Pages
	48	+ */
49	49
50		- /**
51		- * SosaStats@index
52		- */
53		- public function index() {
54		- global $WT_TREE;
	50	+ /**
	51	+ * SosaStats@index
	52	+ */
	53	+ public function index() {
	54	+ global $WT_TREE;
55	55
56		- $controller = new PageController();
57		- $controller
58		- ->setPageTitle(I18N::translate('Sosa Statistics'))
59		- ->addInlineJavascript('$(".help_tooltip").tooltip();')
60		- ;
	56	+ $controller = new PageController();
	57	+ $controller
	58	+ ->setPageTitle(I18N::translate('Sosa Statistics'))
	59	+ ->addInlineJavascript('$(".help_tooltip").tooltip();')
	60	+ ;
61	61
62		- $view_bag = new ViewBag();
63		- $view_bag->set('title', $controller->getPageTitle());
64		- $view_bag->set('is_setup', false);
	62	+ $view_bag = new ViewBag();
	63	+ $view_bag->set('title', $controller->getPageTitle());
	64	+ $view_bag->set('is_setup', false);
65	65
66		- if($this->sosa_provider->isSetup()) {
67		- $view_bag->set('is_setup', true);
	66	+ if($this->sosa_provider->isSetup()) {
	67	+ $view_bag->set('is_setup', true);
68	68
69		- $sosaCount = $this->sosa_provider->getSosaCount();
70		- $diffSosaCount = $this->sosa_provider->getDifferentSosaCount();
	69	+ $sosaCount = $this->sosa_provider->getSosaCount();
	70	+ $diffSosaCount = $this->sosa_provider->getDifferentSosaCount();
71	71
72		- $general_stats = array(
73		- 'sosa_count' => $sosaCount,
74		- 'distinct_count' => $diffSosaCount,
75		- 'sosa_rate' => Functions::safeDivision($diffSosaCount, $this->sosa_provider->getTotalIndividuals()),
76		- 'pedi_collapse' => 1 - Functions::safeDivision($diffSosaCount, $sosaCount),
77		- 'mean_gen_time' => $this->sosa_provider->getMeanGenerationTime()
78		- );
79		- $view_bag->set('general_stats', $general_stats);
	72	+ $general_stats = array(
	73	+ 'sosa_count' => $sosaCount,
	74	+ 'distinct_count' => $diffSosaCount,
	75	+ 'sosa_rate' => Functions::safeDivision($diffSosaCount, $this->sosa_provider->getTotalIndividuals()),
	76	+ 'pedi_collapse' => 1 - Functions::safeDivision($diffSosaCount, $sosaCount),
	77	+ 'mean_gen_time' => $this->sosa_provider->getMeanGenerationTime()
	78	+ );
	79	+ $view_bag->set('general_stats', $general_stats);
80	80
81		- $stats_gen = $this->sosa_provider->getStatisticsByGeneration();
82		- $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$WT_TREE->getNameUrl().'&gen=');
	81	+ $stats_gen = $this->sosa_provider->getStatisticsByGeneration();
	82	+ $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$WT_TREE->getNameUrl().'&gen=');
83	83
84		- $gen_theoretical=1;
85		- $total_theoretical=0;
86		- $prev_diff=0;
87		- $prev_known=0.5;
88		- $gen_equiv=0;
89		- $generation_stats = array();
	84	+ $gen_theoretical=1;
	85	+ $total_theoretical=0;
	86	+ $prev_diff=0;
	87	+ $prev_known=0.5;
	88	+ $gen_equiv=0;
	89	+ $generation_stats = array();
90	90
91		- foreach($stats_gen as $gen => $tab){
92		- $genY1= I18N::translate('-');
93		- $genY2= I18N::translate('-');
94		- if($tab['firstBirth']>0) $genY1=$tab['firstBirth'];
95		- if($tab['lastBirth']>0) $genY2=$tab['lastBirth'];
96		- $total_theoretical += $gen_theoretical;
97		- $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
98		- $gen_equiv += $perc_sosa_count_theor;
99		- $missing=2*$prev_known - $tab['sosaCount'];
100		- $gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
	91	+ foreach($stats_gen as $gen => $tab){
	92	+ $genY1= I18N::translate('-');
	93	+ $genY2= I18N::translate('-');
	94	+ if($tab['firstBirth']>0) $genY1=$tab['firstBirth'];
	95	+ if($tab['lastBirth']>0) $genY2=$tab['lastBirth'];
	96	+ $total_theoretical += $gen_theoretical;
	97	+ $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
	98	+ $gen_equiv += $perc_sosa_count_theor;
	99	+ $missing=2*$prev_known - $tab['sosaCount'];
	100	+ $gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
101	101
102		- $generation_stats[$gen] = array(
103		- 'gen_min_birth' => $genY1,
104		- 'gen_max_birth' => $genY2,
105		- 'theoretical' => $gen_theoretical,
106		- 'known' => $tab['sosaCount'],
107		- 'perc_known' => $perc_sosa_count_theor,
108		- 'missing' => $missing,
109		- 'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
110		- 'total_known' => $tab['sosaTotalCount'],
111		- 'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
112		- 'different' => $gen_diff,
113		- 'perc_different' => Functions::safeDivision($gen_diff, $tab['sosaCount']),
114		- 'total_different' => $tab['diffSosaTotalCount'],
115		- 'pedi_collapse' => 1 - Functions::safeDivision($tab['diffSosaTotalCount'], $tab['sosaTotalCount'])
116		- );
	102	+ $generation_stats[$gen] = array(
	103	+ 'gen_min_birth' => $genY1,
	104	+ 'gen_max_birth' => $genY2,
	105	+ 'theoretical' => $gen_theoretical,
	106	+ 'known' => $tab['sosaCount'],
	107	+ 'perc_known' => $perc_sosa_count_theor,
	108	+ 'missing' => $missing,
	109	+ 'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
	110	+ 'total_known' => $tab['sosaTotalCount'],
	111	+ 'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
	112	+ 'different' => $gen_diff,
	113	+ 'perc_different' => Functions::safeDivision($gen_diff, $tab['sosaCount']),
	114	+ 'total_different' => $tab['diffSosaTotalCount'],
	115	+ 'pedi_collapse' => 1 - Functions::safeDivision($tab['diffSosaTotalCount'], $tab['sosaTotalCount'])
	116	+ );
117	117
118		- $gen_theoretical = $gen_theoretical * 2;
119		- $prev_known=$tab['sosaCount'];
120		- $prev_diff=$tab['diffSosaTotalCount'];
121		- }
	118	+ $gen_theoretical = $gen_theoretical * 2;
	119	+ $prev_known=$tab['sosaCount'];
	120	+ $prev_diff=$tab['diffSosaTotalCount'];
	121	+ }
122	122
123		- $view_bag->set('generation_stats', $generation_stats);
124		- $view_bag->set('equivalent_gen', $gen_equiv);
	123	+ $view_bag->set('generation_stats', $generation_stats);
	124	+ $view_bag->set('equivalent_gen', $gen_equiv);
125	125
126		- $view_bag->set('chart_img_g2', $this->htmlAncestorDispersionG2());
127		- $view_bag->set('chart_img_g3', $this->htmlAncestorDispersionG3());
	126	+ $view_bag->set('chart_img_g2', $this->htmlAncestorDispersionG2());
	127	+ $view_bag->set('chart_img_g3', $this->htmlAncestorDispersionG3());
128	128
129		- }
	129	+ }
130	130
131		- ViewFactory::make('SosaStats', $this, $controller, $view_bag)->render();
132		- }
	131	+ ViewFactory::make('SosaStats', $this, $controller, $view_bag)->render();
	132	+ }
133	133
134		- /**
135		- * Returns HTML code for a graph showing the dispersion of ancestors across father & mother
136		- * @return string HTML code
137		- */
138		- private function htmlAncestorDispersionG2()
139		- {
140		- $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
141		- if(count($ancestorsDispGen2) == 0) return;
	134	+ /**
	135	+ * Returns HTML code for a graph showing the dispersion of ancestors across father & mother
	136	+ * @return string HTML code
	137	+ */
	138	+ private function htmlAncestorDispersionG2()
	139	+ {
	140	+ $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
	141	+ if(count($ancestorsDispGen2) == 0) return;
142	142
143		- $size = '600x300';
	143	+ $size = '600x300';
144	144
145		- $total = array_sum($ancestorsDispGen2);
146		- $father_count = isset($ancestorsDispGen2[1]) ? $ancestorsDispGen2[1] : 0;
147		- $father = array (
148		- 'color' => '84beff',
149		- 'count' => $father_count,
150		- 'perc' => Functions::safeDivision($father_count, $total),
151		- 'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')
152		- );
153		- $mother_count = isset($ancestorsDispGen2[2]) ? $ancestorsDispGen2[2] : 0;
154		- $mother = array (
155		- 'color' => 'ffd1dc',
156		- 'count' => $mother_count,
157		- 'perc' => Functions::safeDivision($mother_count, $total),
158		- 'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
159		- );
160		- $shared_count = isset($ancestorsDispGen2[-1]) ? $ancestorsDispGen2[-1] : 0;
161		- $shared = array (
162		- 'color' => '777777',
163		- 'count' => $shared_count,
164		- 'perc' => Functions::safeDivision($shared_count, $total),
165		- 'name' => I18N::translate('Shared')
166		- );
	145	+ $total = array_sum($ancestorsDispGen2);
	146	+ $father_count = isset($ancestorsDispGen2[1]) ? $ancestorsDispGen2[1] : 0;
	147	+ $father = array (
	148	+ 'color' => '84beff',
	149	+ 'count' => $father_count,
	150	+ 'perc' => Functions::safeDivision($father_count, $total),
	151	+ 'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')
	152	+ );
	153	+ $mother_count = isset($ancestorsDispGen2[2]) ? $ancestorsDispGen2[2] : 0;
	154	+ $mother = array (
	155	+ 'color' => 'ffd1dc',
	156	+ 'count' => $mother_count,
	157	+ 'perc' => Functions::safeDivision($mother_count, $total),
	158	+ 'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
	159	+ );
	160	+ $shared_count = isset($ancestorsDispGen2[-1]) ? $ancestorsDispGen2[-1] : 0;
	161	+ $shared = array (
	162	+ 'color' => '777777',
	163	+ 'count' => $shared_count,
	164	+ 'perc' => Functions::safeDivision($shared_count, $total),
	165	+ 'name' => I18N::translate('Shared')
	166	+ );
167	167
168		- $chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
169		- $chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
170		- $chl =
171		- $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '\|' .
172		- $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '\|' .
173		- $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
174		- return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&chd=e:{$chd}&chs={$size}&chco={$father['color']},{$shared['color']},{$mother['color']}&chf=bg,s,ffffff00&chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
175		- }
	168	+ $chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
	169	+ $chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
	170	+ $chl =
	171	+ $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '\|' .
	172	+ $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '\|' .
	173	+ $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
	174	+ return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&chd=e:{$chd}&chs={$size}&chco={$father['color']},{$shared['color']},{$mother['color']}&chf=bg,s,ffffff00&chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
	175	+ }
176	176
177		- /**
178		- * Returns HTML code for a graph showing the dispersion of ancestors across grand-parents
179		- * @return string HTML code
180		- */
181		- private function htmlAncestorDispersionG3()
182		- {
183		- $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(3);
	177	+ /**
	178	+ * Returns HTML code for a graph showing the dispersion of ancestors across grand-parents
	179	+ * @return string HTML code
	180	+ */
	181	+ private function htmlAncestorDispersionG3()
	182	+ {
	183	+ $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(3);
184	184
185		- $size = '700x300';
	185	+ $size = '700x300';
186	186
187		- $color_motmot = 'ffd1dc';
188		- $color_motfat = 'b998a0';
189		- $color_fatfat = '577292';
190		- $color_fatmot = '84beff';
191		- $color_shared = '777777';
	187	+ $color_motmot = 'ffd1dc';
	188	+ $color_motfat = 'b998a0';
	189	+ $color_fatfat = '577292';
	190	+ $color_fatmot = '84beff';
	191	+ $color_shared = '777777';
192	192
193		- $total_fatfat = $ancestorsDispGen2[1] ?: 0;
194		- $total_fatmot = $ancestorsDispGen2[2] ?: 0;
195		- $total_motfat = $ancestorsDispGen2[4] ?: 0;
196		- $total_motmot = $ancestorsDispGen2[8] ?: 0;
197		- $total_sha = $ancestorsDispGen2[-1] ?: 0;
198		- $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
	193	+ $total_fatfat = $ancestorsDispGen2[1] ?: 0;
	194	+ $total_fatmot = $ancestorsDispGen2[2] ?: 0;
	195	+ $total_motfat = $ancestorsDispGen2[4] ?: 0;
	196	+ $total_motmot = $ancestorsDispGen2[8] ?: 0;
	197	+ $total_sha = $ancestorsDispGen2[-1] ?: 0;
	198	+ $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
199	199
200		- $chd = $this->arrayToExtendedEncoding(array(
201		- 4095 * $total_fatfat / $total,
202		- 4095 * $total_fatmot / $total,
203		- 4095 * $total_sha / $total,
204		- 4095 * $total_motfat / $total,
205		- 4095 * $total_motmot / $total
206		- ));
207		- $chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
208		- $chl =
209		- \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '\|' .
210		- \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '\|' .
211		- I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '\|' .
212		- \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '\|' .
213		- \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
214		- return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&chd=e:{$chd}&chs={$size}&chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&chf=bg,s,ffffff00&chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
215		- }
	200	+ $chd = $this->arrayToExtendedEncoding(array(
	201	+ 4095 * $total_fatfat / $total,
	202	+ 4095 * $total_fatmot / $total,
	203	+ 4095 * $total_sha / $total,
	204	+ 4095 * $total_motfat / $total,
	205	+ 4095 * $total_motmot / $total
	206	+ ));
	207	+ $chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
	208	+ $chl =
	209	+ \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '\|' .
	210	+ \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '\|' .
	211	+ I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '\|' .
	212	+ \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '\|' .
	213	+ \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
	214	+ return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&chd=e:{$chd}&chs={$size}&chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&chf=bg,s,ffffff00&chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
	215	+ }
216	216
217		- /**
218		- * Convert an array to Google Chart encoding
219		- * @param arrat $a Array to encode
220		- * @return string
221		- */
222		- private function arrayToExtendedEncoding($a) {
223		- $xencoding = WT_GOOGLE_CHART_ENCODING;
	217	+ /**
	218	+ * Convert an array to Google Chart encoding
	219	+ * @param arrat $a Array to encode
	220	+ * @return string
	221	+ */
	222	+ private function arrayToExtendedEncoding($a) {
	223	+ $xencoding = WT_GOOGLE_CHART_ENCODING;
224	224
225		- $encoding = '';
226		- foreach ($a as $value) {
227		- if ($value < 0) {
228		- $value = 0;
229		- }
230		- $first = (int) ($value / 64);
231		- $second = $value % 64;
232		- $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
233		- }
	225	+ $encoding = '';
	226	+ foreach ($a as $value) {
	227	+ if ($value < 0) {
	228	+ $value = 0;
	229	+ }
	230	+ $first = (int) ($value / 64);
	231	+ $second = $value % 64;
	232	+ $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
	233	+ }
234	234
235		- return $encoding;
236		- }
	235	+ return $encoding;
	236	+ }
237	237
238	238
239	239	}
240	240	\ No newline at end of file

		@@ -1,13 +1,13 @@ discard block
		block discarded – undo
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
		block discarded – undo
18	18	interface CustomSimpleTagManager {
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.

		@@ -1,13 +1,13 @@
		block discarded – undo
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;
12	12
13	13	use \Fisharebest\Webtrees as fw;

jon48 / webtrees-lib

Push — feature/code-analysis ( 1158f1...5e4834 )

Status

Category

Indentation +92 added lines, -92 removed lines patch added patch discarded remove patch

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

Indentation +72 added lines, -72 removed lines patch added patch discarded remove patch

Indentation +58 added lines, -58 removed lines patch added patch discarded remove patch

Indentation +177 added lines, -177 removed lines patch added patch discarded remove patch

Indentation +178 added lines, -178 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch