jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisListView.php

Indentation +5 added lines, -5 removed lines

@@ -23,15 +23,15 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        ?>                
+	protected function renderContent() {        
+		?>                
         <div id="maj-geodisp-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
 			if($this->data->get('has_list', false)) { 
-    		    $galist = $this->data->get('geoanalysislist');
-    		?>
+				$galist = $this->data->get('geoanalysislist');
+			?>
     		
     		<p class="center"><?php echo I18N::translate('Choose a geographical dispersion analysis:'); ?><p>
 			
@@ -58,7 +58,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/Views/AbstractGeoAnalysisTabGeneralView.php

Indentation +15 added lines, -15 removed lines

@@ -25,27 +25,27 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        $nb_found = $this->data->get('stats_gen_nb_found');
-        $nb_other = $this->data->get('stats_gen_nb_other');
-        $nb_unknown = $this->data->get('stats_gen_nb_unknown');
-        $perc_known = Functions::safeDivision($nb_found - $nb_other, $nb_found + $nb_unknown);
+	protected function renderContent() {
+		$nb_found = $this->data->get('stats_gen_nb_found');
+		$nb_other = $this->data->get('stats_gen_nb_other');
+		$nb_unknown = $this->data->get('stats_gen_nb_unknown');
+		$perc_known = Functions::safeDivision($nb_found - $nb_other, $nb_found + $nb_unknown);
 
-        $html = '<div id="geodispersion_summary">
+		$html = '<div id="geodispersion_summary">
         	<div class="maj-table center">
         		<div class="maj-row">
         			<div class="label">' . I18N::translate('Places found'). '</div>
         			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_found - $nb_other, I18N::percentage($perc_known)). '</div>
         		</div>';
-        if($nb_other > 0){
-            $perc_other = Functions::safeDivision($nb_other, $nb_found + $nb_unknown);
-            $html .=
-        		'<div class="maj-row">
+		if($nb_other > 0){
+			$perc_other = Functions::safeDivision($nb_other, $nb_found + $nb_unknown);
+			$html .=
+				'<div class="maj-row">
         			<div class="label">' . I18N::translate('Other places'). '</div>
         			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_other, I18N::percentage($perc_other)). '</div>
         		</div>';
-        }
-        $html .= '<div class="maj-row">
+		}
+		$html .= '<div class="maj-row">
         			<div class="label">' . I18N::translate('Places not found'). '</div>
         			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_unknown, I18N::percentage(1 - $perc_known)). '</div>
         		</div>
@@ -56,8 +56,8 @@ 
 		' . $this->htmlAnalysisData(). '
 		</div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
 	/**
 	 * Returns HTML code to display the analysis data, under the appropriate format.
@@ -65,7 +65,7 @@ 
 	 * @return string HTML Code for analysis display
 	 * @abstract
 	 */
-    protected abstract function htmlAnalysisData();        
+	protected abstract function htmlAnalysisData();        
     
 }
  
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTabGeneralTableView.php

Indentation +27 added lines, -27 removed lines

@@ -22,44 +22,44 @@
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisTabGeneralView::htmlAnalysisData()
 	 */
-    protected function htmlAnalysisData() {
-        $results = $this->data->get('results');
-        $analysis_level = $this->data->get('analysis_level');
+	protected function htmlAnalysisData() {
+		$results = $this->data->get('results');
+		$analysis_level = $this->data->get('analysis_level');
         
-        $nb_found = $this->data->get('stats_gen_nb_found');
-        $nb_other = $this->data->get('stats_gen_nb_other');
+		$nb_found = $this->data->get('stats_gen_nb_found');
+		$nb_other = $this->data->get('stats_gen_nb_other');
         
-        $i=1;
-        $previous_nb=0;        
+		$i=1;
+		$previous_nb=0;        
         
-        $html='<div class="maj-table center">';        
-        foreach($results as $place => $nb){
-            $perc = Functions::safeDivision($nb, $nb_found - $nb_other);
-            if($nb!=$previous_nb){
-                $j= I18N::number($i);
-            }
-            else{
-                $j='&nbsp;';
-            }
+		$html='<div class="maj-table center">';        
+		foreach($results as $place => $nb){
+			$perc = Functions::safeDivision($nb, $nb_found - $nb_other);
+			if($nb!=$previous_nb){
+				$j= I18N::number($i);
+			}
+			else{
+				$j='&nbsp;';
+			}
             	
-            $levels = array_map('trim',explode(',', $place));
-            $placename = $levels[$analysis_level-1];
-            if($placename == '' && $analysis_level > 1) $placename = I18N::translate('Unknown (%s)', $levels[$analysis_level-2]);
-            $html.=
-            '<div class="maj-row">
+			$levels = array_map('trim',explode(',', $place));
+			$placename = $levels[$analysis_level-1];
+			if($placename == '' && $analysis_level > 1) $placename = I18N::translate('Unknown (%s)', $levels[$analysis_level-2]);
+			$html.=
+			'<div class="maj-row">
                 <div class="label"><strong>'.$j.'</strong></div>
                 <div class="label">'.$placename.'</div>
                 <div class="value">'.I18N::translate('%d',$nb).'</div>
                 <div class="value">'.I18N::percentage($perc,1).'</div>
              </div>';
-            $i++;
-            $previous_nb=$nb;
-        }
+			$i++;
+			$previous_nb=$nb;
+		}
         
-        $html.='</div>';
+		$html.='</div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/Certificates/Model/CertificateProviderInterface.php

Indentation +32 added lines, -32 removed lines

@@ -17,41 +17,41 @@
  */
 interface CertificateProviderInterface  {
     
-    /**
-     * Returns the certificates directory path as it is really (within the firewall directory).
-     *
-     * @return string Real certificates directory path
-     */
-    function getRealCertificatesDirectory();
+	/**
+	 * Returns the certificates directory path as it is really (within the firewall directory).
+	 *
+	 * @return string Real certificates directory path
+	 */
+	function getRealCertificatesDirectory();
     
-    /**
-     * Returns an array of the folders (cities) in the certificate directory.
-     * Cities name are UTF8 encoded.
-     *
-     * @return array Array of cities name
-     */
-    function getCitiesList();
+	/**
+	 * Returns an array of the folders (cities) in the certificate directory.
+	 * Cities name are UTF8 encoded.
+	 *
+	 * @return array Array of cities name
+	 */
+	function getCitiesList();
     
-    /**
-     * Returns the list of available certificates for a specified city.
-     * Format of the list :
-     * < file name , date of the certificate , type of certificate , name of the certificate >
-     * Data are UTF8 encoded.
-     *
-     * @param string $selCity City to look in
-     * @return array List of certificates
-     */
-    function getCertificatesList($selCity);
+	/**
+	 * Returns the list of available certificates for a specified city.
+	 * Format of the list :
+	 * < file name , date of the certificate , type of certificate , name of the certificate >
+	 * Data are UTF8 encoded.
+	 *
+	 * @param string $selCity City to look in
+	 * @return array List of certificates
+	 */
+	function getCertificatesList($selCity);
     
-    /**
-     * Return the list of certificates from a city $city and containing the characters $contains
-     *
-     * @param string $city City to search in
-     * @param string $contains Characters to match
-     * @param string $limit Maximum number of results
-     * @return array Array of matching certificates
-     */
-    function getCertificatesListBeginWith($city, $contains, $limit);
+	/**
+	 * Return the list of certificates from a city $city and containing the characters $contains
+	 *
+	 * @param string $city City to search in
+	 * @param string $contains Characters to match
+	 * @param string $limit Maximum number of results
+	 * @return array Array of matching certificates
+	 */
+	function getCertificatesListBeginWith($city, $contains, $limit);
     
 }
 

src/Webtrees/Module/Certificates/Model/Certificate.php

Indentation +41 added lines, -41 removed lines

@@ -35,12 +35,12 @@ 
  */
 class Certificate extends Media {
     
-    const URL_PREFIX  = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
+	const URL_PREFIX  = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
 		
-    /** @var string The "TITL" value from the GEDCOM 
-     * This is a tweak to overcome the private level from the parent object...
-     */
-    protected $title = '';
+	/** @var string The "TITL" value from the GEDCOM 
+	 * This is a tweak to overcome the private level from the parent object...
+	 */
+	protected $title = '';
     
 	/**
 	 * Certificate provider
@@ -80,7 +80,7 @@ 
 	 * @param CertificateProviderInterface $provider
 	 */
 	public function __construct($data, Tree $tree, CertificateProviderInterface $provider) {
-	    $this->provider = $provider;
+		$this->provider = $provider;
 		// Data is only the file name
 		$data = str_replace("\\", '/', $data);
 		$xref = Functions::encryptToSafeBase64($data);
@@ -165,7 +165,7 @@ 
 	 * @see \Fisharebest\Webtrees\Media::getTitle()
 	 */
 	public function getTitle() {
-	    return $this->title;
+		return $this->title;
 	}
 	
 	/**
@@ -241,26 +241,26 @@ 
 	 	$module = Module::getModuleByName(Constants::MODULE_MAJ_CERTIF_NAME);
 	 	
 	 	if($module) {
-    		$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
-    		$sid= Filter::get('sid', WT_REGEX_XREF);	
+			$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
+			$sid= Filter::get('sid', WT_REGEX_XREF);	
     	
-    		if($sid){
-    			$this->source = Source::getInstance($sid, $this->tree);
-    		}
-    		else{
-    			$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
-    		}
+			if($sid){
+				$this->source = Source::getInstance($sid, $this->tree);
+			}
+			else{
+				$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
+			}
     		
-    		if($this->source) {
-    			$wmtext = '©';
-    			$repofact = $this->source->getFirstFact('REPO');
-    			if($repofact) {
-    				$repo = $repofact->getTarget();
-    				if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
-    			}
-    			$wmtext .= $this->source->getFullName();			
-    		}	
-    		return $wmtext;
+			if($this->source) {
+				$wmtext = '©';
+				$repofact = $this->source->getFirstFact('REPO');
+				if($repofact) {
+					$repo = $repofact->getTarget();
+					if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
+				}
+				$wmtext .= $this->source->getFullName();			
+			}	
+			return $wmtext;
 	 	}
 	 	return '';
 	}
@@ -323,8 +323,8 @@ 
 				' FROM `##individuals`'.
 				' WHERE i_file= :gedcom_id AND i_gedcom LIKE :gedcom')
 		->execute(array(
-		    'gedcom_id' => $this->tree->getTreeId(),
-		    'gedcom' => '%_ACT '.$this->getFilename().'%'		    
+			'gedcom_id' => $this->tree->getTreeId(),
+			'gedcom' => '%_ACT '.$this->getFilename().'%'		    
 		))->fetchAll();
 		
 		$list = array();
@@ -347,8 +347,8 @@ 
 				' FROM `##families`'.
 				' WHERE f_file= :gedcom_id AND f_gedcom LIKE :gedcom')
 		->execute(array(
-		    'gedcom_id' => $this->tree->getTreeId(),
-		    'gedcom' => '%_ACT '.$this->getFilename().'%'		    
+			'gedcom_id' => $this->tree->getTreeId(),
+			'gedcom' => '%_ACT '.$this->getFilename().'%'		    
 		))->fetchAll();
 		
 		$list = array();
@@ -375,25 +375,25 @@ 
 				'SELECT i_gedcom AS gedrec FROM `##individuals`'.
 				' WHERE i_file=:gedcom_id AND i_gedcom LIKE :gedcom')
 		  ->execute(array(
-		      'gedcom_id' => $this->tree->getTreeId(), 
-		      'gedcom' => '%_ACT '.$this->getFilename().'%'		      
+			  'gedcom_id' => $this->tree->getTreeId(), 
+			  'gedcom' => '%_ACT '.$this->getFilename().'%'		      
 		  ))->fetchOne();
 		if(!$ged){
 			$ged = Database::prepare(
 					'SELECT f_gedcom AS gedrec FROM `##families`'.
 					' WHERE f_file=:gedcom_id AND f_gedcom LIKE :gedcom')
-			     ->execute(array(
-			         'gedcom_id' => $this->tree->getTreeId(), 
-			         'gedcom' => '%_ACT '.$this->getFilename().'%'			         
-			     ))->fetchOne();
+				 ->execute(array(
+					 'gedcom_id' => $this->tree->getTreeId(), 
+					 'gedcom' => '%_ACT '.$this->getFilename().'%'			         
+				 ))->fetchOne();
 			if(!$ged){
 				$ged = Database::prepare(
-				    'SELECT o_gedcom AS gedrec FROM `##other`'.
-				    ' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
-				    ->execute(array(
-				        'gedcom_id' => $this->tree->getTreeId(),
-				        'gedcom' => '%_ACT '.$this->getFilename().'%'				        
-				    ))->fetchOne();
+					'SELECT o_gedcom AS gedrec FROM `##other`'.
+					' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
+					->execute(array(
+						'gedcom_id' => $this->tree->getTreeId(),
+						'gedcom' => '%_ACT '.$this->getFilename().'%'				        
+					))->fetchOne();
 			}
 		}
 		//If a record has been found, parse it to find the source reference.

src/Webtrees/Module/Certificates/Views/CertificateView.php

Indentation +8 added lines, -8 removed lines

@@ -25,17 +25,17 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        ?>                
+	protected function renderContent() {
+		?>                
         <div id="maj-cert-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
     		<?php if($this->data->get('has_certif', false)) { 
-    		    /** @var Certificate $certificate   */
-    		  $certificate = $this->data->get('certificate');
-    		  $has_linked_indis = $this->data->get('has_linked_indis', false);
-    		  $has_linked_fams = $this->data->get('has_linked_fams', false);
-    		?>
+				/** @var Certificate $certificate   */
+			  $certificate = $this->data->get('certificate');
+			  $has_linked_indis = $this->data->get('has_linked_indis', false);
+			  $has_linked_fams = $this->data->get('has_linked_fams', false);
+			?>
     		<div id="certificate-details">
         		<h3>
         			<?php echo $certificate->getCity(); ?>
@@ -86,7 +86,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/Certificates/Views/AdminConfigView.php

Indentation +5 added lines, -5 removed lines

@@ -26,11 +26,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var AbstractModule $module  */
-        $module = $this->data->get('module');        
-        ?>        
+		/** @var AbstractModule $module  */
+		$module = $this->data->get('module');        
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -186,7 +186,7 @@ 
         </form>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/Certificates/Views/CertificatesListView.php

Indentation +13 added lines, -13 removed lines

@@ -25,12 +25,12 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        $cities = $this->data->get('cities');
-        $selected_city = $this->data->get('selected_city');
+		$cities = $this->data->get('cities');
+		$selected_city = $this->data->get('selected_city');
         
-        ?>                
+		?>                
         <div id="maj-cert-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
@@ -61,8 +61,8 @@ 
     				</thead>
     				<tbody>
     				<?php foreach ($this->data->get('certificate_list') as $certificate) { 
-    				    /** @var \MyArtJaub\Webtrees\Module\Certificates\Model\Certificate $certificate */
-    				    ?>
+						/** @var \MyArtJaub\Webtrees\Module\Certificates\Model\Certificate $certificate */
+						?>
     					<tr>
     						<!-- Certificate date -->
     						<?php if($date = $certificate->getCertificateDate()) { ?>
@@ -76,12 +76,12 @@ 
     						<td><?php echo Filter::escapeHtml($certificate->getCertificateType() ?: '');  ?></td>
     						<!--  Certificate Name -->
     						<?php 
-    						$name = $certificate->getCertificateDetails() ?: '';
-    						$sortname = "";
-    						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
-    						if($ct_names > 0) $sortname = $match[1].'_';
-    						$sortname .= $name;
-    						?>
+							$name = $certificate->getCertificateDetails() ?: '';
+							$sortname = "";
+							$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
+							if($ct_names > 0) $sortname = $match[1].'_';
+							$sortname .= $name;
+							?>
     						<td><?php echo Filter::escapeHtml($sortname); ?></td>
     						<td>
     							<a href="<?php echo $certificate->getHtmlUrl(); ?>"><?php echo Filter::escapeHtml($name); ?></a>
@@ -95,7 +95,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/WelcomeBlock/PiwikController.php

Indentation +58 added lines, -58 removed lines

@@ -23,74 +23,74 @@
  */
 class PiwikController extends MvcController
 {   
-    /**
-     * Retrieve the number of visitors from Piwik, for a given period.
-     * 
-     * @param string $block_id
-     * @param string $period
-     * @param (null|int) Number of visits
-     */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+	/**
+	 * Retrieve the number of visitors from Piwik, for a given period.
+	 * 
+	 * @param string $block_id
+	 * @param string $period
+	 * @param (null|int) Number of visits
+	 */
+	private function getNumberOfVisitsPiwik($block_id, $period='year'){
     
-        $piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
-        $piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
-        $piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
+		$piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
+		$piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
+		$piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
-            $piwik_token && strlen($piwik_token)            
-            ) 
-        {        
-            // calling Piwik REST API
-            $url = $piwik_url;
-            $url .= '?module=API&method=VisitsSummary.getVisits';
-            $url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
-            $url .= '&format=PHP';
-            $url .= '&token_auth='.$piwik_token;
+		if($piwik_url && strlen($piwik_url) > 0 &&
+			$piwik_siteid  && strlen($piwik_siteid) > 0 &&
+			$piwik_token && strlen($piwik_token)            
+			) 
+		{        
+			// calling Piwik REST API
+			$url = $piwik_url;
+			$url .= '?module=API&method=VisitsSummary.getVisits';
+			$url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
+			$url .= '&format=PHP';
+			$url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
-                $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
-            }
-        }
+			if($fetched = File::fetchUrl($url)) {
+				$content = @unserialize($fetched);
+				if(is_numeric($content)) return $content;
+			}
+		}
     
-        return null;
-    }
+		return null;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * Piwik@index
-     */
-    public function index() {  
+	/**
+	 * Piwik@index
+	 */
+	public function index() {  
         
-        $ctrl = new AjaxController();
+		$ctrl = new AjaxController();
         
-        $data = new ViewBag();
-        $data->set('has_stats', false);
+		$data = new ViewBag();
+		$data->set('has_stats', false);
         
-        $block_id = Filter::get('block_id');        
-        if($block_id){
-            if(Cache::isCached('piwikCountYear', $this->module)) {
-                $visitCountYear = Cache::get('piwikCountYear', $this->module);
-            }
-            else{
-                $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
-                Cache::save('piwikCountYear', $visitCountYear, $this->module);
-            }
-            if($visitCountYear){
-                $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+		$block_id = Filter::get('block_id');        
+		if($block_id){
+			if(Cache::isCached('piwikCountYear', $this->module)) {
+				$visitCountYear = Cache::get('piwikCountYear', $this->module);
+			}
+			else{
+				$visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
+				Cache::save('piwikCountYear', $visitCountYear, $this->module);
+			}
+			if($visitCountYear){
+				$visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
+				$visitCountYear = max( 0, $visitCountYear);
                 
-                $data->set('has_stats', true);
-                $data->set('visits_today', $visitCountToday);
-                $data->set('visits_year', $visitCountYear + $visitCountToday);                
-            }
-        }
+				$data->set('has_stats', true);
+				$data->set('visits_today', $visitCountToday);
+				$data->set('visits_year', $visitCountYear + $visitCountToday);                
+			}
+		}
         
-        ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
-    }
+		ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
+	}
     
 }
\ No newline at end of file