jon48 / webtrees-lib

src/Webtrees/Constants.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @return string $WT_RAPHAEL_JS_URL
 	 */
 	public static function WT_RAPHAEL_JS_URL() {
-	    return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js';
+	    return WT_STATIC_URL.'packages/raphael-2.1.4/raphael-min.js';
 	}
 		
 }
\ No newline at end of file

src/Webtrees/Module/Sosa/Schema/Migration0.php

Spacing +11 added lines, -11 removed lines

@@ -22,17 +22,17 @@
 	public function upgrade() {
 
 		Database::exec(
-		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' .
-	        ' majs_gedcom_id      INTEGER 	        NOT NULL,' .
-		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,' . 
-		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,' . // Allow to calculate sosa on 64 generations
-            ' majs_i_id           VARCHAR(20)	    NOT NULL,' .	
-            ' majs_gen            TINYINT			NULL,' .
-            ' majs_birth_year	  SMALLINT			NULL,' .
-            ' majs_death_year	  SMALLINT			NULL,' .
-            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' .
-		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' .
-		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' .			
+		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` ('.
+	        ' majs_gedcom_id      INTEGER 	        NOT NULL,'.
+		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,'. 
+		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,'.// Allow to calculate sosa on 64 generations
+            ' majs_i_id           VARCHAR(20)	    NOT NULL,'.	
+            ' majs_gen            TINYINT			NULL,'.
+            ' majs_birth_year	  SMALLINT			NULL,'.
+            ' majs_death_year	  SMALLINT			NULL,'.
+            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),'.
+		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,'.
+		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE'.			
 		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}

src/Webtrees/Module/Sosa/Views/SosaListView.php

Spacing +14 added lines, -14 removed lines

@@ -28,11 +28,11 @@ 
         <div id="maj-sosa-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
-			<?php  if($this->data->get('is_setup')) { 
+			<?php  if ($this->data->get('is_setup')) { 
 			    $selectedgen = $this->data->get('generation');
 			    $this->renderSosaHeader();
-			    if($this->data->get('has_sosa') ) {
-			         if($selectedgen > 0) {
+			    if ($this->data->get('has_sosa')) {
+			         if ($selectedgen > 0) {
 			        ?>
 			<div id="sosalist-tabs">
 				<ul>
@@ -75,9 +75,9 @@ 
         ?>
         
     	<form method="get" name="setgen" action="module.php">
-			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>">
-			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action');?>">
-			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged');?>">
+			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module'); ?>">
+			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action'); ?>">
+			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged'); ?>">
 			<div class="maj-table">
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Choose generation') ?></div>
@@ -85,9 +85,9 @@ 
 				<div class="maj-row">
 					<div class="value">
 						<select name="gen">							
-						<?php for($i=$this->data->get('min_gen'); $i <= $max_gen;$i++) {?>
+						<?php for ($i = $this->data->get('min_gen'); $i <= $max_gen; $i++) {?>
 							<option value="<?php echo $i; ?>"
-							<?php if($selectedgen && $selectedgen==$i) { ?> selected="true" <?php } ?>
+							<?php if ($selectedgen && $selectedgen == $i) { ?> selected="true" <?php } ?>
                 			><?php echo I18N::translate('Generation %d', $i); ?>
                 			</option>
                 		<?php } ?>
@@ -95,21 +95,21 @@ 
                 	</div>
                 </div>
       		</div>
-      		<input type="submit" value="<?php echo I18N::translate('Show');?>" />
+      		<input type="submit" value="<?php echo I18N::translate('Show'); ?>" />
       		<br />
       	</form>
-      	<?php if($selectedgen > 0) { ?>
+      	<?php if ($selectedgen > 0) { ?>
 		<h4>
-			<?php if($selectedgen > $this->data->get('min_gen')) { ?>
-			<a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen-1; ?>">
+			<?php if ($selectedgen > $this->data->get('min_gen')) { ?>
+			<a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen - 1; ?>">
 				<i class="icon-ldarrow" title="<?php echo I18N::translate('Previous generation'); ?>" ></i>
 			</a>
 			&nbsp;&nbsp;
 			<?php } ?>
 			<?php echo I18N::translate('Generation %d', $selectedgen); ?>
-			<?php if($selectedgen < $max_gen) { ?>
+			<?php if ($selectedgen < $max_gen) { ?>
 			&nbsp;&nbsp;
-			<a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen+1; ?>">
+			<a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen + 1; ?>">
 				<i class="icon-rdarrow" title="<?php echo I18N::translate('Next generation'); ?>" ></i>
 			</a>
 			<?php } ?>

src/Webtrees/Module/Sosa/Views/SosaComputeResultView.php

Spacing +2 added lines, -2 removed lines

@@ -25,14 +25,14 @@
 	 */
     protected function renderContent() {        
         
-        if($this->data->get('is_success', false)) {
+        if ($this->data->get('is_success', false)) {
         ?>        
         	<i class="icon-maj-success" title="<?php echo I18N::translate('Success'); ?>"></i>&nbsp;
         	<?php echo I18N::translate('Success'); ?>
         <?php } else { ?>
 			<i class="icon-maj-error" title="<?php echo I18N::translate('Error'); ?>"></i>&nbsp;
 			<?php echo I18N::translate('Error'); ?>
-			<?php if($error = $this->data->get('error')) { echo '&nbsp;-&nbsp;' . $error; }
+			<?php if ($error = $this->data->get('error')) { echo '&nbsp;-&nbsp;'.$error; }
         }
     }
     

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

Spacing +4 added lines, -4 removed lines

@@ -60,13 +60,13 @@
 							?>
 							<tr>
 								<td>
-									<input type="hidden" name="hook-<?php echo $hook->id;?>" value="yes" >
-									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status)=='enabled'); ?>
+									<input type="hidden" name="hook-<?php echo $hook->id; ?>" value="yes" >
+									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status) == 'enabled'); ?>
 								</td>
-								<td><?php echo (($hook->status)=='enabled'); ?></td>
+								<td><?php echo (($hook->status) == 'enabled'); ?></td>
 								<td><?php echo $hook->hook; ?></td>
 								<td><?php echo $hook->context; ?></td>
-								<td><?php if($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
+								<td><?php if ($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
 								<td><input type="text" class="center" size="2" value="<?php echo $hook->priority; ?>" name="moduleorder-<?php echo $hook->id; ?>" /></td>
 								<td><?php echo $hook->priority; ?></td>
 							</tr>

src/Webtrees/Module/ModuleManager.php

Spacing +4 added lines, -4 removed lines

@@ -61,10 +61,10 @@
      * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational()
      */
     public function isOperational($moduleName) {
-    	if(!array_key_exists($moduleName, $this->modules_list)) {
-    		if($module = fw\Module::getModuleByName($moduleName)) {
-    			if($module instanceof DependentInterface) {
-    				if($module->validatePrerequisites()) {
+    	if (!array_key_exists($moduleName, $this->modules_list)) {
+    		if ($module = fw\Module::getModuleByName($moduleName)) {
+    			if ($module instanceof DependentInterface) {
+    				if ($module->validatePrerequisites()) {
     					$this->modules_list[$moduleName] = TRUE;
     					return true;
     				} else {

src/Webtrees/Module/GeoDispersion/Model/GeoDisplayOptions.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 	 *
      * @return (OutlineMap|null)
      */
-    public function getMap(){
+    public function getMap() {
         return $this->map;
     }
     
@@ -64,7 +64,7 @@ 
 	 *
 	 * @return int
 	 */
-    public function getMapLevel(){
+    public function getMapLevel() {
         return $this->map_level;
     }
     
@@ -84,7 +84,7 @@ 
 	 *
 	 * @return bool
 	 */
-    public function isUsingFlags(){
+    public function isUsingFlags() {
         return $this->use_flags;
     }
     
@@ -104,7 +104,7 @@ 
 	 *
 	 * @return int
 	 */
-    public function getMaxDetailsInGen(){
+    public function getMaxDetailsInGen() {
         return $this->max_details_in_gen;
     }
     

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

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
-			if($this->data->get('has_analysis', false)) { 
+			if ($this->data->get('has_analysis', false)) { 
 			    /** @var GeoAnalysis $ga  */
     		    $ga = $this->data->get('geoanalysis');
     		?>

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

Spacing +30 added lines, -31 removed lines

@@ -38,39 +38,38 @@ 
         '<div id="geodispersion_gen">
         	<table id="geodispersion_gentable" class="center">';
             
-        foreach($results_by_gen as $gen => $genData){
+        foreach ($results_by_gen as $gen => $genData) {
             $html .= 
             '<tr>
                 <td class="descriptionbox">' .
                     I18N::translate("Generation %s", I18N::number($gen)).
                     ($display_all_places ? '<br />' : ' ').
-                    I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']),1)) . 
+                    I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']), 1)). 
                 '</td>
                  <td class="optionbox left">'.
                     ($display_all_places ? 
-                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
-                        $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
-                     ) .
+                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) : $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
+                     ).
                 '</ditdv>
             </tr>';
         }       
         
-        $html.= 
+        $html .= 
             '</table>
             <div class="left">
-                <strong>' . I18N::translate('Interpretation help:') . '</strong>
+                <strong>' . I18N::translate('Interpretation help:').'</strong>
                 <br />'.
-                I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.') . 
+                I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.'). 
                 '<br />';
-        if(!is_null($max_details_gen) && $max_details_gen == 0){
+        if (!is_null($max_details_gen) && $max_details_gen == 0) {
             $html .= I18N::translate('<strong><em>Place</em> or <em>Flag</em> aa (bb %%)</strong>: The first number indicates the total number of ancestors born in this place, the percentage relates this count to the total number of found places. No percentage means it is less than 10%%.').'<br />';
             $html .= I18N::translate('If any, the darker area indicates the number of unknown places within the generation or places outside the analysed area, and its percentage compared to the number of ancestors. No percentage means it is less than 10%%.');
         }
-        else{
+        else {
             $html .= I18N::translate('<strong><em>Place</em> [aa - bb %%]</strong>: The first number indicates the total number of ancestors born in this place, the percentage compares this count to the total number of found places.').'<br />';
             $html .= I18N::translate('Only the %d more frequent places for each generation are displayed.', $max_details_gen);
         }
-        $html.= 
+        $html .= 
             '</div>
         </div>';
         
@@ -92,25 +91,25 @@ 
         
         $sum_gen = $data['sum'];
         $unknownother = $data['unknown'] + $data['other'];
-        foreach($data['places'] as $placename=> $dataplace){
-            $levels = array_map('trim',explode(',', $placename));
+        foreach ($data['places'] as $placename=> $dataplace) {
+            $levels = array_map('trim', explode(',', $placename));
             $content = '';
-            if(isset($dataplace['flag'])){
-                $content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
+            if (isset($dataplace['flag'])) {
+                $content .= '<td class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']).'</td><td>';
             }
-            else{
-                $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span><br/>';
+            else {
+                $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level - 1].'</span><br/>';
             }
             $count = $dataplace['count'];
             $content .= I18N::number($count);
             $perc = Functions::safeDivision($count, $sum_gen + $unknownother);
-            $perc2= Functions::safeDivision($count, $sum_gen);
-            if($perc2>=0.1) 
-                $content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
+            $perc2 = Functions::safeDivision($count, $sum_gen);
+            if ($perc2 >= 0.1) 
+                $content .= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
             $content .= '</td>';
                
             $html .= '
-                <td class="geodispersion_rowitem" width="'.max(round(100*$perc, 0),1).'%">
+                <td class="geodispersion_rowitem" width="'.max(round(100 * $perc, 0), 1).'%">
                     <table>
                         <tr>
                             <td>
@@ -123,11 +122,11 @@ 
                 </td>';
         }
         
-        if($unknownother>0){
-            $perc= Functions::safeDivision($unknownother, $sum_gen + $unknownother);
-            $html .='<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
-            if($perc>=0.1) $html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
-            $html .='</td>';
+        if ($unknownother > 0) {
+            $perc = Functions::safeDivision($unknownother, $sum_gen + $unknownother);
+            $html .= '<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
+            if ($perc >= 0.1) $html .= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
+            $html .= '</td>';
         }
         
         $html .= 
@@ -148,12 +147,12 @@ 
         $sum_gen = $data['sum'];
         $other = $data['other'];
         
-        foreach($data['places'] as $placename => $count) {
-            if($placename != 'other'){
-                $levels = array_map('trim',explode(',', $placename));
-                $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span>';
+        foreach ($data['places'] as $placename => $count) {
+            if ($placename != 'other') {
+                $levels = array_map('trim', explode(',', $placename));
+                $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level - 1].'</span>';
             }
-            else{
+            else {
                 $placename = I18N::translate('Other places');
             }
             $tmp_places[] = I18N::translate('<strong>%s</strong> [%d - %s]', $placename, $count, I18N::percentage(Functions::safeDivision($count, $sum_gen + $other), 1));