jon48 / webtrees-lib

src/Webtrees/Module/Certificates/CertificateController.php

Spacing +15 added lines, -15 removed lines

@@ -69,7 +69,7 @@ 
         $cid = Filter::get('cid');
         
         $certificate = null;
-        if(!empty($cid) && strlen($cid) > 22){
+        if (!empty($cid) && strlen($cid) > 22) {
             $certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
         }
         
@@ -77,7 +77,7 @@ 
         $data->set('title', $controller->getPageTitle());
         
         $data->set('has_certif', false);
-        if($certificate) {
+        if ($certificate) {
             $controller->restrictAccess($certificate->canShow());
             $data->set('title', $certificate->getTitle());
             $data->set('has_certif', true);
@@ -85,10 +85,10 @@ 
             
             $data->set(
                 'url_certif_city', 
-                'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
-                    '&mod_action=Certificate@listAll' .
-                    '&ged=' . $tree->getNameUrl() .
-                    '&city=' . Functions::encryptToSafeBase64($certificate->getCity())
+                'module.php?mod='.Constants::MODULE_MAJ_CERTIF_NAME. 
+                    '&mod_action=Certificate@listAll'.
+                    '&ged='.$tree->getNameUrl().
+                    '&city='.Functions::encryptToSafeBase64($certificate->getCity())
             );
             
             $controller->addInlineJavascript('
@@ -102,12 +102,12 @@ 
             $linked_indis = $certificate->linkedIndividuals();
             $linked_fams = $certificate->linkedFamilies();
                         
-            if($linked_indis && count($linked_indis) > 0) {
+            if ($linked_indis && count($linked_indis) > 0) {
                 $data->set('has_linked_indis', true);
                 $data->set('linked_indis', $linked_indis);
             }
             
-            if(!empty($linked_fams)) {
+            if (!empty($linked_fams)) {
                 $data->set('has_linked_fams', true);
                 $data->set('linked_fams', $linked_fams);
             }
@@ -121,9 +121,9 @@ 
      */
     public function image() {
         $tree = Globals::getTree();
-        $cid   = Filter::get('cid');
+        $cid = Filter::get('cid');
         $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        if (!empty($cid)) $certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
         
         $imageBuilder = new ImageBuilder($certificate);
         
@@ -155,7 +155,7 @@ 
         
         $city = Filter::get('city');
         
-        if(!empty($city) && strlen($city) > 22){
+        if (!empty($city) && strlen($city) > 22) {
             $city = Functions::decryptFromSafeBase64($city);
             $controller->setPageTitle(I18N::translate('Certificates for %s', $city));
         }
@@ -170,11 +170,11 @@ 
         $data->set('selected_city', $city);
         
         $data->set('has_list', false);        
-        if(!empty($city)) {            
-            $table_id = 'table-certiflist-' . Uuid::uuid4();
+        if (!empty($city)) {            
+            $table_id = 'table-certiflist-'.Uuid::uuid4();
             
             $certif_list = $this->provider->getCertificatesList($city);            
-            if(!empty($certif_list)) {                
+            if (!empty($certif_list)) {                
                 $data->set('has_list', true);
                 $data->set('table_id', $table_id);
                 $data->set('certificate_list', $certif_list);
@@ -186,7 +186,7 @@ 
 				        jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                         
                         jQuery("#'.$table_id.'").dataTable( {
-        					dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+        					dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
     					    '.I18N::datatablesI18N().',
     					    jQueryUI: true,
         					autoWidth: false,

src/Webtrees/Module/Certificates/AdminConfigController.php

Spacing +10 added lines, -10 removed lines

@@ -34,39 +34,39 @@ 
      */
     protected function update() {
         
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
             
             $this->module->setSetting('MAJ_SHOW_CERT', Filter::post('MAJ_SHOW_CERT'));
             $this->module->setSetting('MAJ_SHOW_NO_WATERMARK', Filter::post('MAJ_SHOW_NO_WATERMARK'));
             
-            if($MAJ_WM_DEFAULT = Filter::post('MAJ_WM_DEFAULT')) {
+            if ($MAJ_WM_DEFAULT = Filter::post('MAJ_WM_DEFAULT')) {
                 $this->module->setSetting('MAJ_WM_DEFAULT', $MAJ_WM_DEFAULT);
             }
             
-            if($MAJ_WM_FONT_MAXSIZE = Filter::postInteger('MAJ_WM_FONT_MAXSIZE')) {
+            if ($MAJ_WM_FONT_MAXSIZE = Filter::postInteger('MAJ_WM_FONT_MAXSIZE')) {
                 $this->module->setSetting('MAJ_WM_FONT_MAXSIZE', $MAJ_WM_FONT_MAXSIZE);
             }
             
             // Only accept valid color for MAJ_WM_FONT_COLOR
             $MAJ_WM_FONT_COLOR = Filter::post('MAJ_WM_FONT_COLOR', '#([a-fA-F0-9]{3}){1,2}');            
-            if($MAJ_WM_FONT_COLOR) {
+            if ($MAJ_WM_FONT_COLOR) {
                 $this->module->setSetting('MAJ_WM_FONT_COLOR', $MAJ_WM_FONT_COLOR);
             }
             
             // Only accept valid folders for MAJ_CERT_ROOTDIR
-            $MAJ_CERT_ROOTDIR = preg_replace('/[\/\\\\]+/', '/', Filter::post('MAJ_CERT_ROOTDIR') . '/');
+            $MAJ_CERT_ROOTDIR = preg_replace('/[\/\\\\]+/', '/', Filter::post('MAJ_CERT_ROOTDIR').'/');
             if (substr($MAJ_CERT_ROOTDIR, 0, 1) === '/') {
                 $MAJ_CERT_ROOTDIR = substr($MAJ_CERT_ROOTDIR, 1);
             }
             
             if ($MAJ_CERT_ROOTDIR) {
-                if (is_dir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
+                if (is_dir(WT_DATA_DIR.$MAJ_CERT_ROOTDIR)) {
                     $this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
-                } elseif (File::mkdir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
+                } elseif (File::mkdir(WT_DATA_DIR.$MAJ_CERT_ROOTDIR)) {
                     $this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
-                    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'info');
+                    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR.$MAJ_CERT_ROOTDIR)), 'info');
                 } else {
-                    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'danger');
+                    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR.$MAJ_CERT_ROOTDIR)), 'danger');
                 }
             }
             
@@ -85,7 +85,7 @@ 
      */
     public function index() {        
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

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

Spacing +58 added lines, -58 removed lines

@@ -35,7 +35,7 @@ 
  */
 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...
@@ -95,8 +95,8 @@ 
 		
 		$match = null;
 		$ct = preg_match("/(?<year>\d{1,4})(\.(?<month>\d{1,2}))?(\.(?<day>\d{1,2}))?( (?<type>[A-Z]{1,2}) )?(?<details>.*)/", $this->title, $match);
-		if($ct > 0){
-			$monthId = (int) $match['month'];
+		if ($ct > 0) {
+			$monthId = (int)$match['month'];
 			$calendarShortMonths = Functions::getCalendarShortMonths();
 			$monthShortName = array_key_exists($monthId, $calendarShortMonths) ? $calendarShortMonths[$monthId] : $monthId;
 			$this->certDate = new Date($match['day'].' '.strtoupper($monthShortName).' '.$match['year']);
@@ -112,11 +112,11 @@ 
 	 * @see \Fisharebest\Webtrees\GedcomRecord::getInstance()
 	 */	
 	static public function getInstance($xref, Tree $tree, $gedcom = null, CertificateProviderInterface $provider = null) {
-		try{
+		try {
 			$certfile = Functions::decryptFromSafeBase64($xref);
 			
 			//NEED TO CHECK THAT !!!
-			if(Functions::isValidPath($certfile, true)) {
+			if (Functions::isValidPath($certfile, true)) {
 				return new Certificate($certfile, $tree, $provider);
 			}
 		}
@@ -153,8 +153,8 @@ 
 	 *
 	 * @param string|Source $xref
 	 */
-	public function setSource($xref){
-		if($xref instanceof Source){
+	public function setSource($xref) {
+		if ($xref instanceof Source) {
 			$this->source = $xref;
 		} else {
 			$this->source = Source::getInstance($xref, $this->tree);
@@ -174,7 +174,7 @@ 
 	 *
 	 * @return Date Certificate date
 	 */
-	public function getCertificateDate(){
+	public function getCertificateDate() {
 		return $this->certDate;
 	}
 	
@@ -183,7 +183,7 @@ 
 	 *
 	 * @return string Certificate date
 	 */
-	public function getCertificateType(){
+	public function getCertificateType() {
 		return $this->certType;
 	}
 	
@@ -192,7 +192,7 @@ 
 	 *
 	 * @return string Certificate details
 	 */
-	public function getCertificateDetails(){
+	public function getCertificateDetails() {
 		return $this->certDetails;
 	}
 	
@@ -201,9 +201,9 @@ 
 	 *
 	 * @return string|NULL Certificate city
 	 */
-	public function getCity(){
+	public function getCity() {
 		$chunks = explode('/', $this->getFilename(), 2);
-		if(count($chunks) > 1) return $chunks[0];
+		if (count($chunks) > 1) return $chunks[0];
 		return null;
 	}
 	
@@ -211,8 +211,8 @@ 
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\Media::getServerFilename()
 	 */
-	public function getServerFilename($which='main') {
-		$filename =  $this->provider->getRealCertificatesDirectory() . $this->getFilename();
+	public function getServerFilename($which = 'main') {
+		$filename = $this->provider->getRealCertificatesDirectory().$this->getFilename();
 		return Functions::encodeUtf8ToFileSystem($filename);
 	}
 	
@@ -223,11 +223,11 @@ 
 	public function getHtmlUrlDirect($which = 'main', $download = false) {
 		$sidstr = ($this->source) ? '&sid='.$this->source->getXref() : '';
 		return
-			'module.php?mod='. \MyArtJaub\Webtrees\Constants::MODULE_MAJ_CERTIF_NAME . 
-			'&mod_action=Certificate@image' . 
-			'&ged='. $this->tree->getNameUrl() .
-			'&cid=' . $this->getXref() . $sidstr .
-			'&cb=' . $this->getEtag($which);
+			'module.php?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_CERTIF_NAME. 
+			'&mod_action=Certificate@image'. 
+			'&ged='.$this->tree->getNameUrl().
+			'&cid='.$this->getXref().$sidstr.
+			'&cb='.$this->getEtag($which);
 	}
 	
 	/**
@@ -238,26 +238,26 @@ 
 	 *
 	 * @return string Watermark text
 	 */
-	 public function getWatermarkText(){	
+	 public function getWatermarkText() {	
 	 	$module = Module::getModuleByName(Constants::MODULE_MAJ_CERTIF_NAME);
 	 	
-	 	if($module) {
+	 	if ($module) {
     		$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
-    		$sid= Filter::get('sid', WT_REGEX_XREF);	
+    		$sid = Filter::get('sid', WT_REGEX_XREF);	
     	
-    		if($sid){
+    		if ($sid) {
     			$this->source = Source::getInstance($sid, $this->tree);
     		}
-    		else{
-    			$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
+    		else {
+    			$this->fetchALinkedSource(); // the method already attach the source to the Certificate object;
     		}
     		
-    		if($this->source) {
+    		if ($this->source) {
     			$wmtext = '&copy;';
     			$repofact = $this->source->getFirstFact('REPO');
-    			if($repofact) {
+    			if ($repofact) {
     				$repo = $repofact->getTarget();
-    				if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
+    				if ($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
     			}
     			$wmtext .= $this->source->getFullName();			
     		}	
@@ -279,45 +279,45 @@ 
 		
 		$script = '';
 		$controller = Globals::getController();
-		if($controller && !($controller instanceof IndividualController)){
+		if ($controller && !($controller instanceof IndividualController)) {
 			$controller->addInlineJavascript('$(document).ready(function() { '.$js.' });');
 		} else {
-			$script = '<script>' . $js . '</script>';
+			$script = '<script>'.$js.'</script>';
 		}
 		
 		if ($which == 'icon' || !file_exists($this->getServerFilename())) {
 			// Use an icon
 			$image =
-			'<i dir="auto" class="icon-maj-certificate margin-h-2"' .
-			' title="' . strip_tags($this->getFullName()) . '"' .
+			'<i dir="auto" class="icon-maj-certificate margin-h-2"'.
+			' title="'.strip_tags($this->getFullName()).'"'.
 			'></i>';
 		} else {
 			$imgsize = getimagesize($this->getServerFilename());
 			$image =
-			'<img' .
-			' class ="'. 'certif_image'					 	. '"' .
-			' dir="'   . 'auto'                           	. '"' . // For the tool-tip
-			' src="'   . $this->getHtmlUrlDirect() 			. '"' .
-			' alt="'   . strip_tags($this->getFullName()) 	. '"' .
-			' title="' . strip_tags($this->getFullName()) 	. '"' .
-			$imgsize[3] . // height="yyy" width="xxx"
+			'<img'.
+			' class ="'.'certif_image'.'"'.
+			' dir="'.'auto'.'"'.// For the tool-tip
+			' src="'.$this->getHtmlUrlDirect().'"'.
+			' alt="'.strip_tags($this->getFullName()).'"'.
+			' title="'.strip_tags($this->getFullName()).'"'.
+			$imgsize[3].// height="yyy" width="xxx"
 			'>';
 		}	
 		return
-		'<a' .
-		' class="'          . 'certgallery'                          . '"' .
-		' href="'           . $this->getHtmlUrlDirect()    		 . '"' .
-		' type="'           . $this->mimeType()                  . '"' .
-		' data-obje-url="'  . $this->getHtmlUrl()                . '"' .
-		' data-title="'     . strip_tags($this->getFullName())   . '"' .
-		'>' . $image . '</a>'.$script;
+		'<a'.
+		' class="'.'certgallery'.'"'.
+		' href="'.$this->getHtmlUrlDirect().'"'.
+		' type="'.$this->mimeType().'"'.
+		' data-obje-url="'.$this->getHtmlUrl().'"'.
+		' data-title="'.strip_tags($this->getFullName()).'"'.
+		'>'.$image.'</a>'.$script;
 	}
 	
 	/**
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\GedcomRecord::linkedIndividuals()
 	 */
-	public function linkedIndividuals($link = '_ACT'){
+	public function linkedIndividuals($link = '_ACT') {
 		$rows = Database::prepare(
 				'SELECT i_id AS xref, i_gedcom AS gedcom'.
 				' FROM `##individuals`'.
@@ -341,7 +341,7 @@ 
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\GedcomRecord::linkedFamilies()
 	 */
-	public function linkedFamilies($link = '_ACT'){
+	public function linkedFamilies($link = '_ACT') {
 		$rows = Database::prepare(
 				'SELECT f_id AS xref, f_gedcom AS gedcom'.
 				' FROM `##families`'.
@@ -366,7 +366,7 @@ 
 	 *
 	 * @return Source|NULL Linked source
 	 */
-	public function fetchALinkedSource(){		
+	public function fetchALinkedSource() {		
 		$sid = null;
 		
 		// Try to find in individual, then families, then other types of records. We are interested in the first available value.
@@ -378,7 +378,7 @@ 
 		      'gedcom_id' => $this->tree->getTreeId(), 
 		      'gedcom' => '%_ACT '.$this->getFilename().'%'		      
 		  ))->fetchOne();
-		if(!$ged){
+		if (!$ged) {
 			$ged = Database::prepare(
 					'SELECT f_gedcom AS gedrec FROM `##families`'.
 					' WHERE f_file=:gedcom_id AND f_gedcom LIKE :gedcom')
@@ -386,7 +386,7 @@ 
 			         'gedcom_id' => $this->tree->getTreeId(), 
 			         'gedcom' => '%_ACT '.$this->getFilename().'%'			         
 			     ))->fetchOne();
-			if(!$ged){
+			if (!$ged) {
 				$ged = Database::prepare(
 				    'SELECT o_gedcom AS gedrec FROM `##other`'.
 				    ' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
@@ -397,19 +397,19 @@ 
 			}
 		}
 		//If a record has been found, parse it to find the source reference.
-		if($ged){
+		if ($ged) {
 			$gedlines = explode("\n", $ged);
 			$level = 0;
 			$levelsource = -1;
-			$sid_tmp=null;
+			$sid_tmp = null;
 			$sourcefound = false;
-			foreach($gedlines as $gedline){
+			foreach ($gedlines as $gedline) {
 				// Get the level
 				$match = null;
 				if (!$sourcefound && preg_match('~^('.WT_REGEX_INTEGER.') ~', $gedline, $match)) {
 					$level = $match[1];
 					//If we are not any more within the context of a source, reset
-					if($level <= $levelsource){
+					if ($level <= $levelsource) {
 						$levelsource = -1;
 						$sid_tmp = null;
 					}
@@ -417,11 +417,11 @@ 
 					$match2 = null;
 					if (preg_match('~^'.$level.' SOUR @('.WT_REGEX_XREF.')@$~', $gedline, $match2)) {
 						$levelsource = $level;
-						$sid_tmp=$match2[1];
+						$sid_tmp = $match2[1];
 					}
 					// If the image has be found, get the source reference and exit.
 					$match3 = null;
-					if($levelsource>=0 && $sid_tmp && preg_match('~^'.$level.' _ACT '.preg_quote($this->getFilename()).'~', $gedline, $match3)){
+					if ($levelsource >= 0 && $sid_tmp && preg_match('~^'.$level.' _ACT '.preg_quote($this->getFilename()).'~', $gedline, $match3)) {
 						$sid = $sid_tmp;
 						$sourcefound = true;
 					}
@@ -429,7 +429,7 @@ 
 			}
 		}
 		
-		if($sid) $this->source = Source::getInstance($sid, $this->tree);
+		if ($sid) $this->source = Source::getInstance($sid, $this->tree);
 		
 		return $this->source;	
 	}

src/Webtrees/Module/MiscExtensions/AdminConfigController.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      * Manage updates sent from the AdminConfig@index form.
      */
     protected function update() {    
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
     
             $this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
             
@@ -61,7 +61,7 @@ 
      */
     public function index() {
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

src/Webtrees/Module/CertificatesModule.php

Spacing +22 added lines, -22 removed lines

@@ -77,7 +77,7 @@ 
      * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
      */
     public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -102,7 +102,7 @@ 
      */
     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'));
+        return new Menu($this->getTitle(), 'module.php?mod='.$this->getName().'&mod_action=Certificate@listAll&ged='.$tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
     }
     
     /**
@@ -111,10 +111,10 @@ 
      */
     public function hFactSourcePrepend($srec) {
         $wt_tree = Globals::getTree();
-        $html='';
-        $sid=null;
+        $html = '';
+        $sid = null;
         
-        if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($wt_tree)){
+        if ($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($wt_tree)) {
             if (!$srec || strlen($srec) == 0) return $html;
             	
             $certificate = null;
@@ -122,17 +122,17 @@ 
             $levelSOUR = substr($subrecords[0], 0, 1);
             $match = null;
             if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
-                $sid=$match[1];
+                $sid = $match[1];
             };
             $nb_subrecords = count($subrecords);
-            for ($i=0; $i < $nb_subrecords; $i++) {
+            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 ($tag == '_ACT') $certificate = new Certificate($text, $wt_tree, $this->getProvider());
             }
             	
-            if($certificate && $certificate->canShow())
+            if ($certificate && $certificate->canShow())
                 $html = $this->getDisplay_ACT($certificate, $sid);
                 	
         }
@@ -159,9 +159,9 @@ 
      */
     public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
         $html = '';
-        switch($tag){
+        switch ($tag) {
             case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+                if ($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
                 break;
         }
         return $html;
@@ -174,7 +174,7 @@ 
     public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {        
         $html = '';
 		
-		switch($tag){
+		switch ($tag) {
 			case '_ACT':
 				$element_id = Uuid::uuid4();
 				Globals::getController()
@@ -182,14 +182,14 @@ 
 					->addExternalJavascript(WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/js/autocomplete.js')
 					->addExternalJavascript(WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/js/updatecertificatevalues.js');
 				$certificate = null;
-				if($value){
+				if ($value) {
 					$certificate = new Certificate($value, Globals::getTree(), $this->getProvider());
 				}
 				$tabCities = $this->getProvider()->getCitiesList();
 				$html .= '<select id="certifCity'.$element_id.'" class="_CITY">';
-				foreach ($tabCities as $cities){
-					$selectedCity='';
-					if($certificate && $cities== $certificate->getCity()) $selectedCity='selected="true"';
+				foreach ($tabCities as $cities) {
+					$selectedCity = '';
+					if ($certificate && $cities == $certificate->getCity()) $selectedCity = 'selected="true"';
 					$html .= '<option value="'.$cities.'" '.$selectedCity.' />'.$cities.'</option>';
 				}
 				$html .= '</select>';
@@ -207,7 +207,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
      */
     public function hAddSimpleTag($context, $level) {
-        switch($context){
+        switch ($context) {
             case 'SOUR':
                 FunctionsEdit::addSimpleTag($level.' _ACT');
                 break;
@@ -219,7 +219,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
      */
     public function hHasHelpTextTag($tag) {
-        switch($tag){
+        switch ($tag) {
 			case '_ACT':
 				return true;
 		}
@@ -231,7 +231,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
      */
     public function hGetHelpTextTag($tag) {
-        switch($tag){
+        switch ($tag) {
             case '_ACT':
                 return array(
                 I18N::translate('Certificate'),
@@ -247,7 +247,7 @@ 
      * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
      */
     public function getProvider() {
-        if(!$this->provider) {
+        if (!$this->provider) {
             $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
             $this->provider = new CertificateFileProvider($root_path, Globals::getTree());
         }
@@ -261,9 +261,9 @@ 
      * @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){    
+    protected function getDisplay_ACT(Certificate $certificate, $sid = null) {    
         $html = '';
-        if($certificate){
+        if ($certificate) {
             $certificate->setSource($sid);
             $html = $certificate->displayImage('icon');
         }

src/Webtrees/Module/PatronymicLineage/LineageController.php

Spacing +6 added lines, -6 removed lines

@@ -98,14 +98,14 @@ 
             $this->show     = 'lineage'; // SURN list makes no sense here
         } elseif ($this->alpha) {
             $this->show_all = 'no';
-            $this->legend   = Filter::escapeHtml($this->alpha) . '…';
+            $this->legend   = Filter::escapeHtml($this->alpha).'…';
             $this->show     = Filter::get('show', 'surn|lineage', 'surn');
         } else {
             $this->show_all = 'no';
             $this->legend   = '…';
             $this->show     = 'none'; // Don't show lists until something is chosen
         }
-        $this->legend = '<span dir="auto">' . $this->legend . '</span>';
+        $this->legend = '<span dir="auto">'.$this->legend.'</span>';
           
     }
     
@@ -152,7 +152,7 @@ 
      */
     public function index() {
         $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Patronymic Lineages') . ' : ' . $this->legend);
+        $controller->setPageTitle(I18N::translate('Patronymic Lineages').' : '.$this->legend);
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -161,15 +161,15 @@ 
         $view_bag->set('surname', $this->surname);
         $view_bag->set('legend', $this->legend);
         $view_bag->set('show_all', $this->show_all);
-        if($this->isShowingSurnames()) {
+        if ($this->isShowingSurnames()) {
             $view_bag->set('issurnames', true);
             $view_bag->set('surnameslist', $this->getSurnamesList());
         }
-        if($this->isShowingLineages()) {
+        if ($this->isShowingLineages()) {
             $view_bag->set('islineages', true);
             $view_bag->set('lineages', $this->getLineages());
 
-            if ($this->show_all==='no') {
+            if ($this->show_all === 'no') {
             	$view_bag->set('table_title', I18N::translate('Individuals in %s lineages', $this->legend));
             }
             else {

src/Webtrees/Module/Sosa/SosaListController.php

Spacing +47 added lines, -47 removed lines

@@ -69,7 +69,7 @@ 
         $this->view_bag = new ViewBag();
         $this->view_bag->set('generation', $this->generation);
         $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
-        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
+        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0) > 0);
         
     }
     
@@ -89,14 +89,14 @@ 
 
         $this->view_bag->set('title', $wt_tree->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
+        if ($this->view_bag->get('is_setup', false)) {
             $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
             $this->view_bag->set('url_module', $this->module->getName());
             $this->view_bag->set('url_action', 'SosaList');
             $this->view_bag->set('url_ged', $wt_tree->getNameUrl()); 
             $this->view_bag->set('min_gen', 1);
             
-            if($this->view_bag->get('has_sosa', false)) {            
+            if ($this->view_bag->get('has_sosa', false)) {            
                 $controller->addInlineJavascript('
             		jQuery("#sosalist-tabs").tabs();
             		jQuery("#sosalist-tabs").css("visibility", "visible");
@@ -106,7 +106,7 @@ 
             			{
                             "mod" : "'.$this->module->getName().'",
                             "mod_action": "SosaList@sosalist",
-                            "ged" : "' . $wt_tree->getNameUrl(). '",
+                            "ged" : "' . $wt_tree->getNameUrl().'",
                             "type" : "indi",
                             "gen" : "'.$this->generation.'"
                         },
@@ -131,7 +131,7 @@ 
                         {
                             "mod" : "'.$this->module->getName().'",
                             "mod_action": "SosaList@sosalist",
-                            "ged" : "' . $wt_tree->getNameUrl(). '",
+                            "ged" : "' . $wt_tree->getNameUrl().'",
                             "type" : "fam",
                             "gen" : "'.$this->generation.'"
                         },
@@ -169,7 +169,7 @@ 
         
         $this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
+        if ($this->view_bag->get('is_setup', false)) {
             $this->view_bag->set('url_module', $this->module->getName());
             $this->view_bag->set('url_action', 'SosaList@missing');
             $this->view_bag->set('url_ged', $wt_tree->getNameUrl());
@@ -178,11 +178,11 @@ 
             $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
             $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
             
-            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
+            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation - 1));
             $this->view_bag->set('perc_sosa', $perc_sosa);
             
-            if($this->view_bag->get('has_missing', false)) {
-                $table_id = 'table-sosa-missing-' . Uuid::uuid4();
+            if ($this->view_bag->get('has_missing', false)) {
+                $table_id = 'table-sosa-missing-'.Uuid::uuid4();
                 $this->view_bag->set('table_id', $table_id);
                 
                 $controller
@@ -192,7 +192,7 @@ 
 				    jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                     
     				jQuery("#'.$table_id.'").dataTable( {
-                        dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+                        dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
     					'.I18N::datatablesI18N().',
     					jQueryUI: true,
     					autoWidth:false,
@@ -218,14 +218,14 @@ 
     					pagingType: "full_numbers"
     			   });
     			
-    				jQuery("#' . $table_id . '")
+    				jQuery("#' . $table_id.'")
     				/* Filter buttons in table header */
     				.on("click", "button[data-filter-column]", function() {
     					var btn = jQuery(this);
     					// De-activate the other buttons in this button group
     					btn.siblings().removeClass("ui-state-active");
     					// Apply (or clear) this filter
-    					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+    					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
     					if (btn.hasClass("ui-state-active")) {
     						btn.removeClass("ui-state-active");
     						col.search("").draw();
@@ -242,8 +242,8 @@ 
                 $unique_indis = array();
                 $sum_missing_different = 0;
                 $sum_missing_different_without_hidden = 0;
-                foreach($missing_list as $num => $missing_tab) {
-                    if(isset($unique_indis[$missing_tab['indi']])) {
+                foreach ($missing_list as $num => $missing_tab) {
+                    if (isset($unique_indis[$missing_tab['indi']])) {
                         unset($missing_list[$num]);
                         continue;
                     }
@@ -261,7 +261,7 @@ 
                 $this->view_bag->set('missing_list', $missing_list);
                 $this->view_bag->set('missing_diff_count', $sum_missing_different);
                 $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
-                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
+                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation - 2));
                 $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
             }            
         }
@@ -279,7 +279,7 @@ 
         $controller = new AjaxController();
         $controller->restrictAccess($this->generation > 0 || !is_null($type));
         
-        switch ($type){
+        switch ($type) {
             case 'indi':
                 $this->renderSosaListIndi($controller);
                 break;
@@ -301,9 +301,9 @@ 
         $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
         $this->view_bag->set('has_sosa', false);
         
-        if(count($listSosa) > 0) {
+        if (count($listSosa) > 0) {
             $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-indi-' . Uuid::uuid4();
+            $table_id = 'table-sosa-indi-'.Uuid::uuid4();
             $this->view_bag->set('table_id', $table_id);
                      
             $controller
@@ -313,8 +313,8 @@ 
                 jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
                 jQuery("#'.$table_id.'").dataTable( {
-					dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
-					' . I18N::datatablesI18N() . ',
+					dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
+					' . I18N::datatablesI18N().',
 					jQueryUI: true,
 					autoWidth: false,
 					processing: true,
@@ -343,7 +343,7 @@ 
 					pagingType: "full_numbers"
 			   });
             
-				jQuery("#' . $table_id . '")
+				jQuery("#' . $table_id.'")
 				/* Hide/show parents */
 				.on("click", ".btn-toggle-parents", function() {
 					jQuery(this).toggleClass("ui-state-active");
@@ -352,7 +352,7 @@ 
 				/* Hide/show statistics */
 				.on("click", ".btn-toggle-statistics", function() {
 					jQuery(this).toggleClass("ui-state-active");
-					jQuery("#indi_list_table-charts_' . $table_id . '").slideToggle();
+					jQuery("#indi_list_table-charts_' . $table_id.'").slideToggle();
 				})
 				/* Filter buttons in table header */
 				.on("click", "button[data-filter-column]", function() {
@@ -360,7 +360,7 @@ 
 					// De-activate the other buttons in this button group
 					btn.siblings().removeClass("ui-state-active");
 					// Apply (or clear) this filter
-					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
 					if (btn.hasClass("ui-state-active")) {
 						btn.removeClass("ui-state-active");
 						col.search("").draw();
@@ -395,30 +395,30 @@ 
             $nb_displayed = 0;
             
             Individual::load($wt_tree, $listSosa);
-            foreach($listSosa as $sosa => $pid) {
+            foreach ($listSosa as $sosa => $pid) {
                 $person = Individual::getInstance($pid, $wt_tree);
                 if (!$person || !$person->canShowName()) {
                     unset($listSosa[$sosa]);
                     continue;
                 }
                 $nb_displayed++;
-                if ($birth_dates=$person->getAllBirthDates()) {
+                if ($birth_dates = $person->getAllBirthDates()) {
                     if (
                         FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
                         !isset($unique_indis[$person->getXref()])
                         ) {
-                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
+                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
                 }
                 else {
-                    $birth_dates[0]=new Date('');
+                    $birth_dates[0] = new Date('');
                 }
                 if ($death_dates = $person->getAllDeathDates()) {
                     if (
                         FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
                         !isset($unique_indis[$person->getXref()])
                         ) {
-                        $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
+                        $deat_by_decade[(int)($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
                 }
                 else {
@@ -434,7 +434,7 @@ 
             $this->view_bag->set('sosa_list', $listSosa);   
             
             $this->view_bag->set('sosa_count', count($listSosa));
-            $this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
+            $this->view_bag->set('sosa_theo', pow(2, $this->generation - 1));
             $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
             
             $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
@@ -453,12 +453,12 @@ 
      */
     protected function renderFamSosaListIndi(AjaxController $controller) {
         $wt_tree = Globals::getTree();
-        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
+        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation); ;
         $this->view_bag->set('has_sosa', false);
         
-        if(count($listFamSosa) > 0) {
+        if (count($listFamSosa) > 0) {
             $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-fam-' . Uuid::uuid4();
+            $table_id = 'table-sosa-fam-'.Uuid::uuid4();
             $this->view_bag->set('table_id', $table_id);
              
             $controller
@@ -468,7 +468,7 @@ 
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
                 jQuery("#'.$table_id.'").dataTable( {
-					dom: \'<"H"<"filtersH_' . $table_id . '"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+					dom: \'<"H"<"filtersH_' . $table_id.'"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
                     '.I18N::datatablesI18N(array(16, 32, 64, 128, -1)).',
 					jQueryUI: true,
 					autoWidth: false,
@@ -495,7 +495,7 @@ 
 					pagingType: "full_numbers"
 			   });
 					
-				jQuery("#' . $table_id . '")
+				jQuery("#' . $table_id.'")
 				/* Hide/show parents */
 				.on("click", ".btn-toggle-parents", function() {
 					jQuery(this).toggleClass("ui-state-active");
@@ -504,7 +504,7 @@ 
 				/* Hide/show statistics */
 				.on("click",  ".btn-toggle-statistics", function() {
 					jQuery(this).toggleClass("ui-state-active");
-					jQuery("#fam_list_table-charts_' . $table_id . '").slideToggle();
+					jQuery("#fam_list_table-charts_' . $table_id.'").slideToggle();
 				})
 				/* Filter buttons in table header */
 				.on("click", "button[data-filter-column]", function() {
@@ -512,7 +512,7 @@ 
 					// De-activate the other buttons in this button group
 					btn.siblings().removeClass("ui-state-active");
 					// Apply (or clear) this filter
-					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
 					if (btn.hasClass("ui-state-active")) {
 						btn.removeClass("ui-state-active");
 						col.search("").draw();
@@ -532,29 +532,29 @@ 
             
             //-- init chart data
     		$marr_by_age = array();
-    		for ($age=0; $age<=$max_age; $age++) {
+    		for ($age = 0; $age <= $max_age; $age++) {
     			$marr_by_age[$age] = '';
     		}
     		$birt_by_decade = array();
     		$marr_by_decade = array();
-    		for ($year=1550; $year<2030; $year+=10) {
+    		for ($year = 1550; $year < 2030; $year += 10) {
     			$birt_by_decade[$year] = '';
     			$marr_by_decade[$year] = '';
     		}
     		
-            foreach($listFamSosa as $sosa => $fid) {
+            foreach ($listFamSosa as $sosa => $fid) {
                 $sfamily = Family::getInstance($fid, $wt_tree);
-                if(!$sfamily || !$sfamily->canShow()) {
+                if (!$sfamily || !$sfamily->canShow()) {
                     unset($listFamSosa[$sosa]);
                     continue;
                 }
-                $mdate=$sfamily->getMarriageDate();
+                $mdate = $sfamily->getMarriageDate();
                 
-                if( ($husb = $sfamily->getHusband()) && 
+                if (($husb = $sfamily->getHusband()) && 
                     ($hdate = $husb->getBirthDate()) && 
                     $hdate->isOK() && $mdate->isOK()) {
                     if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
-                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+                        $birt_by_decade[(int)($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
                     }
                     $hage = Date::getAge($hdate, $mdate, 0);
                     if ($hage >= 0 && $hage <= $max_age) {
@@ -562,11 +562,11 @@ 
                     }
                 }
                 
-                if(($wife = $sfamily->getWife()) &&
-                    ($wdate=$wife->getBirthDate()) &&
+                if (($wife = $sfamily->getWife()) &&
+                    ($wdate = $wife->getBirthDate()) &&
                     $wdate->isOK() && $mdate->isOK()) {
                     if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
-                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+                        $birt_by_decade[(int)($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
                     }
                     $wage = Date::getAge($wdate, $mdate, 0);
                     if ($wage >= 0 && $wage <= $max_age) {
@@ -575,7 +575,7 @@ 
                 }                
 
                 if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
-                    $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
+                    $marr_by_decade[(int)($mdate->gregorianYear() / 10) * 10] .= $husb->getSex().$wife->getSex();
                 }
                 
                 $listFamSosa[$sosa] = $sfamily;

src/Webtrees/Module/Sosa/SosaConfigController.php

Spacing +16 added lines, -16 removed lines

@@ -39,7 +39,7 @@ 
         $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
         return Auth::check() && 
             ( 
-                $user_id == Auth::user()->getUserId() ||        // Allow update for yourself
+                $user_id == Auth::user()->getUserId() || // Allow update for yourself
                 ($user_id == -1 && Auth::isManager(Globals::getTree()))   // Allow a manager to update the default user
              );
     }
@@ -52,12 +52,12 @@ 
      */
     protected function update(BaseController $controller) {
         $wt_tree = Globals::getTree();
-        if($this->canUpdate() && Filter::checkCsrf()) 
+        if ($this->canUpdate() && Filter::checkCsrf()) 
         {            
             $indi = Individual::getInstance(Filter::post('rootid'), $wt_tree);
             $user = User::find(Filter::postInteger('userid', -1));
             
-            if($user  && $indi) {
+            if ($user && $indi) {
                 $wt_tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
                 $controller->addInlineJavascript('
                     $( document ).ready(function() {
@@ -95,7 +95,7 @@ 
             
             function majComputeSosa(user_id) {
                 jQuery("#bt_sosa_compute").prop( "disabled", true );
-                jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i>&nbsp;'. I18N::translate('Computing...') .'");
+                jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i>&nbsp;'. I18N::translate('Computing...').'");
                 jQuery("#bt_sosa_computing").load(
 		          "module.php?mod='.$this->module->getName().'&mod_action=SosaConfig@computeAll&ged='.$wt_tree->getNameUrl().'&userid=" + user_id,
 		          function() {
@@ -104,7 +104,7 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if ($action === 'update') $this->update($controller);
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -113,21 +113,21 @@ 
         
         $users_root = array();
         $users_js_array = 'var users_array = [];';
-        if(Auth::check()) {
+        if (Auth::check()) {
             $root_id = $wt_tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-            $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
-            $users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
+            $users_root[] = array('user' => Auth::user(), 'rootid' => $root_id);
+            $users_js_array .= 'users_array["'.Auth::user()->getUserId().'"] = "'.$root_id.'";';
             
-            if(Auth::isManager($wt_tree)) {
+            if (Auth::isManager($wt_tree)) {
                 $default_user = User::find(-1);
                 $default_root_id = $wt_tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
-                $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
-                $users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
+                $users_root[] = array('user' => $default_user, 'rootid' => $default_root_id);
+                $users_js_array .= 'users_array["'.$default_user->getUserId().'"] = "'.$default_root_id.'";';
             }
         }
         $view_bag->set('users_settings', $users_root);       
         
-        $controller->addInlineJavascript($users_js_array . '            
+        $controller->addInlineJavascript($users_js_array.'            
                 $("#maj-sosa-config-select").change(function() {
                     $("#rootid").val(users_array[this.value]);
                 });
@@ -147,9 +147,9 @@ 
         $view_bag->set('is_success', false);
         
         $user = User::find(Filter::getInteger('userid', -1));
-        if($user) {
+        if ($user) {
             $calculator = new SosaCalculator(Globals::getTree(), $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if ($calculator->computeAll()) $view_bag->set('is_success', true);
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -168,9 +168,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $wt_tree);
         
-        if($user && $indi) {
+        if ($user && $indi) {
             $calculator = new SosaCalculator($wt_tree, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
+            if ($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
         }
         else {
             $view_bag->set('error', I18N::translate('Non existing individual'));

src/Webtrees/Module/Sosa/SosaStatsController.php

Spacing +33 added lines, -33 removed lines

@@ -61,7 +61,7 @@ 
         $view_bag->set('title', $controller->getPageTitle());
         $view_bag->set('is_setup', false);
         
-        if($this->sosa_provider->isSetup()) {
+        if ($this->sosa_provider->isSetup()) {
             $view_bag->set('is_setup', true);
             
             $view_bag->set('root_indi', $this->sosa_provider->getRootIndi());
@@ -82,23 +82,23 @@ 
             $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$wt_tree->getNameUrl().'&gen=');
             $view_bag->set('sosaanc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList&ged='.$wt_tree->getNameUrl().'&gen=');
             
-            $gen_theoretical=1;
-            $total_theoretical=0;
-            $prev_diff=0;
-            $prev_known=0.5;
-            $gen_equiv=0;            
+            $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'];
+            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;
+                $missing = 2 * $prev_known - $tab['sosaCount'];
+                $gen_diff = $tab['diffSosaTotalCount'] - $prev_diff;
                 
                 $generation_stats[$gen] = array(
                     'gen_min_birth' => $genY1,
@@ -107,7 +107,7 @@ 
                     'known' => $tab['sosaCount'],
                     'perc_known' => $perc_sosa_count_theor,
                     'missing' => $missing,
-                    'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
+                    '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,
@@ -117,8 +117,8 @@ 
                 );
                 
                 $gen_theoretical = $gen_theoretical * 2;
-                $prev_known=$tab['sosaCount'];
-                $prev_diff=$tab['diffSosaTotalCount'];
+                $prev_known = $tab['sosaCount'];
+                $prev_diff = $tab['diffSosaTotalCount'];
             }
             
             $view_bag->set('generation_stats', $generation_stats);
@@ -139,27 +139,27 @@ 
      private function htmlAncestorDispersionG2()
     {
         $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
-        if(count($ancestorsDispGen2) == 0) return;
+        if (count($ancestorsDispGen2) == 0) return;
         
         $size = '600x300';
         
         $total = array_sum($ancestorsDispGen2);
         $father_count = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
-        $father = array (
+        $father = array(
             'color' => '84beff', 
             'count' => $father_count, 
             'perc' => Functions::safeDivision($father_count, $total), 
             'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
         );
         $mother_count = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
-        $mother = array (
+        $mother = array(
             'color' => 'ffd1dc', 
             'count' => $mother_count, 
             'perc' => Functions::safeDivision($mother_count, $total),
             'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
         );
         $shared_count = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $shared = array (
+        $shared = array(
             'color' => '777777', 
             'count' => $shared_count, 
             'perc' => Functions::safeDivision($shared_count, $total),
@@ -169,10 +169,10 @@ 
         $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 . "\" />";
+             $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."\" />";
     }
     
     /**
@@ -196,7 +196,7 @@ 
         $total_motfat = array_key_exists(4, $ancestorsDispGen2) ? $ancestorsDispGen2[4] : 0;
         $total_motmot = array_key_exists(8, $ancestorsDispGen2) ? $ancestorsDispGen2[8] : 0;
         $total_sha = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
+        $total = $total_fatfat + $total_fatmot + $total_motfat + $total_motmot + $total_sha;
     
         $chd = $this->arrayToExtendedEncoding(array(
 	    4095 * Functions::safeDivision($total_fatfat, $total), 
@@ -207,12 +207,12 @@ 
         ));
         $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 . "\" />";
+            \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."\" />";
     }
 
     /**
@@ -228,9 +228,9 @@ 
             if ($value < 0) {
                 $value = 0;
             }
-            $first  = (int) ($value / 64);
+            $first  = (int)($value / 64);
             $second = $value % 64;
-            $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
+            $encoding .= $xencoding[(int)$first].$xencoding[(int)$second];
         }
     
         return $encoding;