jon48 / webtrees-lib

src/Webtrees/Module/Certificates/AdminConfigController.php

Indentation +56 added lines, -56 removed lines

@@ -29,75 +29,75 @@
  */
 class AdminConfigController extends MvcController
 {
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	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'));
+			$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')) {
-                $this->module->setSetting('MAJ_WM_DEFAULT', $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')) {
-                $this->module->setSetting('MAJ_WM_FONT_MAXSIZE', $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) {
-                $this->module->setSetting('MAJ_WM_FONT_COLOR', $MAJ_WM_FONT_COLOR);
-            }
+			// 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) {
+				$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') . '/');
-            if (substr($MAJ_CERT_ROOTDIR, 0, 1) === '/') {
-                $MAJ_CERT_ROOTDIR = substr($MAJ_CERT_ROOTDIR, 1);
-            }
+			// Only accept valid folders for 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)) {
-                    $this->module->setSetting('MAJ_CERT_ROOTDIR', $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');
-                } 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');
-                }
-            }
+			if ($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)) {
+					$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');
+				} 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 preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
+			FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
             
-            return;
-        }
-    }
+			return;
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {        
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {        
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('module', $this->module);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('module', $this->module);
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
         
 }
\ No newline at end of file

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();

Braces +3 added lines, -1 removed lines

@@ -85,7 +85,9 @@
      */
     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/MiscExtensions/AdminConfigController.php

Indentation +37 added lines, -37 removed lines

@@ -27,52 +27,52 @@
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {    
-        if(Auth::isAdmin()){
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {    
+		if(Auth::isAdmin()){
     
-            $this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
+			$this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
             
-            $this->module->setSetting('MAJ_ADD_HTML_HEADER', Filter::postInteger('MAJ_ADD_HTML_HEADER', 0, 1));
-            $this->module->setSetting('MAJ_SHOW_HTML_HEADER', Filter::postInteger('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
-            $this->module->setSetting('MAJ_HTML_HEADER', Filter::post('MAJ_HTML_HEADER'));
+			$this->module->setSetting('MAJ_ADD_HTML_HEADER', Filter::postInteger('MAJ_ADD_HTML_HEADER', 0, 1));
+			$this->module->setSetting('MAJ_SHOW_HTML_HEADER', Filter::postInteger('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
+			$this->module->setSetting('MAJ_HTML_HEADER', Filter::post('MAJ_HTML_HEADER'));
             
-            $this->module->setSetting('MAJ_ADD_HTML_FOOTER', Filter::postInteger('MAJ_ADD_HTML_FOOTER', 0, 1));
-            $this->module->setSetting('MAJ_SHOW_HTML_FOOTER', Filter::postInteger('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
-            $this->module->setSetting('MAJ_HTML_FOOTER', Filter::post('MAJ_HTML_FOOTER'));
+			$this->module->setSetting('MAJ_ADD_HTML_FOOTER', Filter::postInteger('MAJ_ADD_HTML_FOOTER', 0, 1));
+			$this->module->setSetting('MAJ_SHOW_HTML_FOOTER', Filter::postInteger('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
+			$this->module->setSetting('MAJ_HTML_FOOTER', Filter::post('MAJ_HTML_FOOTER'));
             
-            $this->module->setSetting('MAJ_DISPLAY_CNIL', Filter::postInteger('MAJ_DISPLAY_CNIL', 0, 1));
-            $this->module->setSetting('MAJ_CNIL_REFERENCE', Filter::post('MAJ_CNIL_REFERENCE'));
+			$this->module->setSetting('MAJ_DISPLAY_CNIL', Filter::postInteger('MAJ_DISPLAY_CNIL', 0, 1));
+			$this->module->setSetting('MAJ_CNIL_REFERENCE', Filter::post('MAJ_CNIL_REFERENCE'));
                 
-            FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
+			FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
     
-            return;
-        }
-    }
+			return;
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
             
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('module', $this->module);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('module', $this->module);
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
 }
\ No newline at end of file

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();

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
      */
     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');
         }

Braces +15 added lines, -6 removed lines

@@ -115,7 +115,9 @@ 
         $sid=null;
         
         if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($wt_tree)){
-            if (!$srec || strlen($srec) == 0) return $html;
+            if (!$srec || strlen($srec) == 0) {
+            	return $html;
+            }
             	
             $certificate = null;
             $subrecords = explode("\n", $srec);
@@ -129,11 +131,14 @@ 
                 $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())
-                $html = $this->getDisplay_ACT($certificate, $sid);
+            if($certificate && $certificate->canShow()) {
+                            $html = $this->getDisplay_ACT($certificate, $sid);
+            }
                 	
         }
         return $html;
@@ -161,7 +166,9 @@ 
         $html = '';
         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;
@@ -189,7 +196,9 @@ 
 				$html .= '<select id="certifCity'.$element_id.'" class="_CITY">';
 				foreach ($tabCities as $cities){
 					$selectedCity='';
-					if($certificate && $cities== $certificate->getCity()) $selectedCity='selected="true"';
+					if($certificate && $cities== $certificate->getCity()) {
+						$selectedCity='selected="true"';
+					}
 					$html .= '<option value="'.$cities.'" '.$selectedCity.' />'.$cities.'</option>';
 				}
 				$html .= '</select>';

Indentation +176 added lines, -176 removed lines

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

src/Webtrees/Module/Sosa/SosaConfigController.php

Indentation +108 added lines, -108 removed lines

@@ -30,63 +30,63 @@ 
  */
 class SosaConfigController extends MvcController
 {      
-    /**
-     * Check if the user can update the sosa ancestors list
-     * 
-     * @return bool
-     */
-    protected function canUpdate() {        
-        $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
-        return Auth::check() && 
-            ( 
-                $user_id == Auth::user()->getUserId() ||        // Allow update for yourself
-                ($user_id == -1 && Auth::isManager(Globals::getTree()))   // Allow a manager to update the default user
-             );
-    }
+	/**
+	 * Check if the user can update the sosa ancestors list
+	 * 
+	 * @return bool
+	 */
+	protected function canUpdate() {        
+		$user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
+		return Auth::check() && 
+			( 
+				$user_id == Auth::user()->getUserId() ||        // Allow update for yourself
+				($user_id == -1 && Auth::isManager(Globals::getTree()))   // Allow a manager to update the default user
+			 );
+	}
     
-    /**
-     * Saves Sosa's user preferences (root individual for the user).
-     * 
-     * @param BaseController $controller
-     * @return bool True is saving successfull
-     */
-    protected function update(BaseController $controller) {
-        $wt_tree = Globals::getTree();
-        if($this->canUpdate() && Filter::checkCsrf()) 
-        {            
-            $indi = Individual::getInstance(Filter::post('rootid'), $wt_tree);
-            $user = User::find(Filter::postInteger('userid', -1));
+	/**
+	 * Saves Sosa's user preferences (root individual for the user).
+	 * 
+	 * @param BaseController $controller
+	 * @return bool True is saving successfull
+	 */
+	protected function update(BaseController $controller) {
+		$wt_tree = Globals::getTree();
+		if($this->canUpdate() && Filter::checkCsrf()) 
+		{            
+			$indi = Individual::getInstance(Filter::post('rootid'), $wt_tree);
+			$user = User::find(Filter::postInteger('userid', -1));
             
-            if($user  && $indi) {
-                $wt_tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
-                $controller->addInlineJavascript('
+			if($user  && $indi) {
+				$wt_tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
+				$controller->addInlineJavascript('
                     $( document ).ready(function() {
                         majComputeSosa('.$user->getUserId().');
                     });');
-                FlashMessages::addMessage(I18N::translate('The preferences have been updated.'));
-                return true;
-            }
-        }
-        FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger');
-        return false;
-    }
+				FlashMessages::addMessage(I18N::translate('The preferences have been updated.'));
+				return true;
+			}
+		}
+		FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger');
+		return false;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaConfig@index
-     */
-    public function index() {
-        $wt_tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Sosa Configuration'))
-        ->restrictAccess(Auth::check())
-        ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-        ->addInlineJavascript('autocomplete();')
-        ->addInlineJavascript('
+	/**
+	 * SosaConfig@index
+	 */
+	public function index() {
+		$wt_tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Sosa Configuration'))
+		->restrictAccess(Auth::check())
+		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+		->addInlineJavascript('autocomplete();')
+		->addInlineJavascript('
             $( document ).ready(function() {
                 $("#bt_sosa_compute").click(function() {
                     majComputeSosa($("#maj_sosa_input_userid, #maj-sosa-config-select option:selected").val());
@@ -103,80 +103,80 @@ 
                   });
             }');
         
-        $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+		$action = Filter::post('action');
+		if($action === 'update') $this->update($controller);
         
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $controller->getPageTitle());
-        $view_bag->set('tree', $wt_tree);
-        $view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$wt_tree->getNameUrl());
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $controller->getPageTitle());
+		$view_bag->set('tree', $wt_tree);
+		$view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$wt_tree->getNameUrl());
         
-        $users_root = array();
-        $users_js_array = 'var users_array = [];';
-        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();
+		$users_js_array = 'var users_array = [];';
+		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 . '";';
             
-            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 . '";';
-            }
-        }
-        $view_bag->set('users_settings', $users_root);       
+			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 . '";';
+			}
+		}
+		$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]);
                 });
              ');
         
-        ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render();   
-    }
+		ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render();   
+	}
     
-    /**
-     * SosaConfig@computeAll
-     */
-    public function computeAll() {        
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->canUpdate());
+	/**
+	 * SosaConfig@computeAll
+	 */
+	public function computeAll() {        
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->canUpdate());
         
-        $view_bag = new ViewBag();
-        $view_bag->set('is_success', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('is_success', false);
         
-        $user = User::find(Filter::getInteger('userid', -1));
-        if($user) {
-            $calculator = new SosaCalculator(Globals::getTree(), $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
-        }
-        ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
-    }
+		$user = User::find(Filter::getInteger('userid', -1));
+		if($user) {
+			$calculator = new SosaCalculator(Globals::getTree(), $user);
+			if($calculator->computeAll()) $view_bag->set('is_success', true);
+		}
+		ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
+	}
     
-    /**
-     * SosaConfig@computePartial
-     */
-    public function computePartial() {
-        $wt_tree = Globals::getTree();
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->canUpdate());
+	/**
+	 * SosaConfig@computePartial
+	 */
+	public function computePartial() {
+		$wt_tree = Globals::getTree();
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->canUpdate());
     
-        $view_bag = new ViewBag();
-        $view_bag->set('is_success', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('is_success', false);
     
-        $user = User::find(Filter::getInteger('userid', -1));
-        $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $wt_tree);
+		$user = User::find(Filter::getInteger('userid', -1));
+		$indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $wt_tree);
         
-        if($user && $indi) {
-            $calculator = new SosaCalculator($wt_tree, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
-            $view_bag->set('error', I18N::translate('Non existing individual'));
-        }
+		if($user && $indi) {
+			$calculator = new SosaCalculator($wt_tree, $user);
+			if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
+		}
+		else {
+			$view_bag->set('error', I18N::translate('Non existing individual'));
+		}
             
-        ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
-    }
+		ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
+	}
     
 }
\ No newline at end of file

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'));

Braces +10 added lines, -5 removed lines

@@ -104,7 +104,9 @@ 
             }');
         
         $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());
@@ -149,7 +151,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         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();
     }
@@ -170,9 +174,10 @@ 
         
         if($user && $indi) {
             $calculator = new SosaCalculator($wt_tree, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
+            if($calculator->computeFromIndividual($indi)) {
+            	$view_bag->set('is_success', true);
+            }
+        } else {
             $view_bag->set('error', I18N::translate('Non existing individual'));
         }
             

src/Webtrees/Module/SosaModule.php

Spacing +15 added lines, -15 removed lines

@@ -81,7 +81,7 @@ 
     public function getConfigLink() {
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=SosaConfig';
     }
     
     /**********
@@ -103,17 +103,17 @@ 
     public function getMenu() { 
         $wt_tree = Globals::getTree();
         $menu = null;
-        if(ModuleManager::getInstance()->isOperational($this->getName())) {
+        if (ModuleManager::getInstance()->isOperational($this->getName())) {
             
-            $root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $wt_tree->getNameUrl() . '&';
-            $sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
+            $root_url = 'module.php?mod='.$this->getName().'&ged='.$wt_tree->getNameUrl().'&';
+            $sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url.'mod_action=SosaStats', 'menu-maj-sosa-stats');
             
             $menu = clone $sosa_stat_menu;
             $menu->setClass('menu-maj-sosa');
             
             $submenus = array_filter(array(
-                new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
-                new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
+                new Menu(I18N::translate('Sosa Ancestors'), $root_url.'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
+                new Menu(I18N::translate('Missing Ancestors'), $root_url.'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
                 $sosa_stat_menu                
             ));
             
@@ -122,12 +122,12 @@ 
                 && $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
                 )
             {
-                if(count($ga_list) > 0) {
-                    $submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $wt_tree->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
+                if (count($ga_list) > 0) {
+                    $submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod='.Constants::MODULE_MAJ_GEODISP_NAME.'&ged='.$wt_tree->getNameUrl().'&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
                 }
             }
             
-            if(Auth::check()) {
+            if (Auth::check()) {
                 $submenus[] = new Menu(
                     I18N::translate('Sosa Configuration'),
                     $this->getConfigLink(),
@@ -144,7 +144,7 @@ 
                     ->addInlineJavascript('
                         function majComputeSosaFromIndi(){
                             if($("#computesosadlg").length == 0) {
-                                $("body").append("<div id=\"computesosadlg\" title=\"'. I18N::translate('Sosas computation') .'\"><div id=\"sosaloadingarea\"></div></div>");
+                                $("body").append("<div id=\"computesosadlg\" title=\"'. I18N::translate('Sosas computation').'\"><div id=\"sosaloadingarea\"></div></div>");
                             }
 	                        $("#computesosadlg").dialog({
                                 modal: true,
@@ -153,7 +153,7 @@ 
 		                        open: function(event, ui) {
 			                        $("button.ui-dialog-titlebar-close").hide();
                                     $("#sosaloadingarea").empty().html("<i class=\"icon-loading-small\"></i>");
-			                        $("#sosaloadingarea").load("module.php?mod=' . $this->getName() . '&mod_action=SosaConfig@computePartial&ged='. $wt_tree->getNameUrl() .'&userid='.Auth::user()->getUserId().'&pid=' . $controller->getSignificantIndividual()->getXref() . '", 
+			                        $("#sosaloadingarea").load("module.php?mod=' . $this->getName().'&mod_action=SosaConfig@computePartial&ged='.$wt_tree->getNameUrl().'&userid='.Auth::user()->getUserId().'&pid='.$controller->getSignificantIndividual()->getXref().'", 
 					                   function(){
 						                  $("button.ui-dialog-titlebar-close").show();
                                           setTimeout(function(){
@@ -203,7 +203,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
      */
     public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
+        if ($ctrlIndi) {
             $dindi = new Individual($ctrlIndi->getSignificantIndividual());
             return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
         }
@@ -221,9 +221,9 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
      */
     public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
+        if ($ctrlIndi) {
             $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
+            return array('indi-header-sosa', FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
         }
         return '';
     }
@@ -233,7 +233,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
      */
     public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') {
-        if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
+        if ($grec instanceof \Fisharebest\Webtrees\Individual) { // Only apply to individuals
             $dindi = new Individual($grec);
             return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, $size);
         }

Indentation +164 added lines, -164 removed lines

@@ -32,116 +32,116 @@ 
  * Sosa Module.
  */
 class SosaModule 
-    extends AbstractModule 
-    implements  ModuleMenuInterface, 
-                ModuleConfigInterface,
-                HookSubscriberInterface,
-                IndividualHeaderExtenderInterface,
-                RecordNameTextExtenderInterface
+	extends AbstractModule 
+	implements  ModuleMenuInterface, 
+				ModuleConfigInterface,
+				HookSubscriberInterface,
+				IndividualHeaderExtenderInterface,
+				RecordNameTextExtenderInterface
 {
-    // How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 2;
-    const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Sosa\Schema';
+	// How to update the database schema for this module
+	const SCHEMA_TARGET_VERSION   = 2;
+	const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Sosa\Schema';
 
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
-    }
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
-    }
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**********
+	/**********
      * ModuleConfigInterface
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
+	}
     
-    /**********
+	/**********
      * ModuleMenuInterface
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
-     */
-    public function defaultMenuOrder() {
-        return 5;
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
-     */
-    public function getMenu() { 
-        $wt_tree = Globals::getTree();
-        $menu = null;
-        if(ModuleManager::getInstance()->isOperational($this->getName())) {
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
+	 */
+	public function defaultMenuOrder() {
+		return 5;
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
+	 */
+	public function getMenu() { 
+		$wt_tree = Globals::getTree();
+		$menu = null;
+		if(ModuleManager::getInstance()->isOperational($this->getName())) {
             
-            $root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $wt_tree->getNameUrl() . '&';
-            $sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
+			$root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $wt_tree->getNameUrl() . '&';
+			$sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
             
-            $menu = clone $sosa_stat_menu;
-            $menu->setClass('menu-maj-sosa');
+			$menu = clone $sosa_stat_menu;
+			$menu->setClass('menu-maj-sosa');
             
-            $submenus = array_filter(array(
-                new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
-                new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
-                $sosa_stat_menu                
-            ));
+			$submenus = array_filter(array(
+				new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
+				new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
+				$sosa_stat_menu                
+			));
             
 
-            if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_GEODISP_NAME)
-                && $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
-                )
-            {
-                if(count($ga_list) > 0) {
-                    $submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $wt_tree->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
-                }
-            }
+			if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_GEODISP_NAME)
+				&& $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
+				)
+			{
+				if(count($ga_list) > 0) {
+					$submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $wt_tree->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
+				}
+			}
             
-            if(Auth::check()) {
-                $submenus[] = new Menu(
-                    I18N::translate('Sosa Configuration'),
-                    $this->getConfigLink(),
-                    'menu-maj-sosa-configuration',
-                    array('rel' => 'nofollow'));
-            }
+			if(Auth::check()) {
+				$submenus[] = new Menu(
+					I18N::translate('Sosa Configuration'),
+					$this->getConfigLink(),
+					'menu-maj-sosa-configuration',
+					array('rel' => 'nofollow'));
+			}
                         
-            //-- recompute Sosa submenu
-            $controller = Globals::getController();
-            if (!empty($controller) && $controller instanceof IndividualController 
-                && Auth::check() && $wt_tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID')
-                ) {
-                $controller
-                    ->addInlineJavascript('
+			//-- recompute Sosa submenu
+			$controller = Globals::getController();
+			if (!empty($controller) && $controller instanceof IndividualController 
+				&& Auth::check() && $wt_tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID')
+				) {
+				$controller
+					->addInlineJavascript('
                         function majComputeSosaFromIndi(){
                             if($("#computesosadlg").length == 0) {
                                 $("body").append("<div id=\"computesosadlg\" title=\"'. I18N::translate('Sosas computation') .'\"><div id=\"sosaloadingarea\"></div></div>");
@@ -164,87 +164,87 @@ 
 	                         });	
                         }');
                 	
-                $submenus[] = new Menu(
-                    I18N::translate('Complete Sosas'), 
-                    '#', 
-                    'menu-maj-sosa-recompute', 
-                    array(
-                        'rel' => 'nofollow',
-                        'onclick' => 'return majComputeSosaFromIndi();'
-                    ));
-            }
+				$submenus[] = new Menu(
+					I18N::translate('Complete Sosas'), 
+					'#', 
+					'menu-maj-sosa-recompute', 
+					array(
+						'rel' => 'nofollow',
+						'onclick' => 'return majComputeSosaFromIndi();'
+					));
+			}
             
-        }
+		}
         
-        $menu->setSubmenus($submenus);
+		$menu->setSubmenus($submenus);
         
-        return $menu;
+		return $menu;
         
-    }
+	}
     
-    /**********
+	/**********
      * Hooks
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */    
-    public function getSubscribedHooks() {
-        return array(
-            'hExtendIndiHeaderIcons' => 20,
-            'hExtendIndiHeaderRight' => 20,
-            'hRecordNameAppend' => 20
-        );
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
-     */
-    public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
-            $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
-     */
-    public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
-     */
-    public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
-            $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
-     */
-    public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') {
-        if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
-            $dindi = new Individual($grec);
-            return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, $size);
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
-     */
-    public function hRecordNamePrepend(GedcomRecord $grec, $size) {}
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */    
+	public function getSubscribedHooks() {
+		return array(
+			'hExtendIndiHeaderIcons' => 20,
+			'hExtendIndiHeaderRight' => 20,
+			'hRecordNameAppend' => 20
+		);
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
+	 */
+	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
+	 */
+	public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { }
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
+	 */
+	public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
+	 */
+	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') {
+		if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
+			$dindi = new Individual($grec);
+			return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, $size);
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
+	 */
+	public function hRecordNamePrepend(GedcomRecord $grec, $size) {}
     
     
     

src/Webtrees/Module/Hooks/AdminConfigController.php

Indentation +73 added lines, -73 removed lines

@@ -30,87 +30,87 @@ 
  */
 class AdminConfigController extends MvcController
 {
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {
-        if(Auth::isAdmin()){
-            $ihooks = HookProvider::getInstance()->getInstalledHooks();
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {
+		if(Auth::isAdmin()){
+			$ihooks = HookProvider::getInstance()->getInstalledHooks();
             	
-            $module_names= Database::prepare(
-                "SELECT module_name FROM `##module` WHERE status='disabled'"
-            )->fetchOneColumn();
+			$module_names= Database::prepare(
+				"SELECT module_name FROM `##module` WHERE status='disabled'"
+			)->fetchOneColumn();
             	
-            if($ihooks !== null){
-                foreach ($ihooks as $ihook => $params) {
-                    if(Filter::post('hook-' . $params['id']) === 'yes') {                    
-                        $array_hook = explode('#', $ihook);
-                        //Update status
-                        $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
-                        $previous_status = $params['status'];
-                        if ($new_status !== null) {
-                            $new_status= $new_status ? 'enabled' : 'disabled';
-                            if($new_status != $previous_status){
-                                $chook = new Hook($array_hook[1], $array_hook[2]);
-                                switch($new_status){
-                                    case 'enabled':
-                                        $chook->enable($array_hook[0]);
-                                        break;
-                                    case 'disabled':
-                                        $chook->disable($array_hook[0]);
-                                        break;
-                                    default:
-                                        break;
-                                }
-                            }
-                        }
+			if($ihooks !== null){
+				foreach ($ihooks as $ihook => $params) {
+					if(Filter::post('hook-' . $params['id']) === 'yes') {                    
+						$array_hook = explode('#', $ihook);
+						//Update status
+						$new_status= Filter::postBool('status-' . $params['id']);
+						if(in_array($array_hook[0], $module_names)) $new_status = false;
+						$previous_status = $params['status'];
+						if ($new_status !== null) {
+							$new_status= $new_status ? 'enabled' : 'disabled';
+							if($new_status != $previous_status){
+								$chook = new Hook($array_hook[1], $array_hook[2]);
+								switch($new_status){
+									case 'enabled':
+										$chook->enable($array_hook[0]);
+										break;
+									case 'disabled':
+										$chook->disable($array_hook[0]);
+										break;
+									default:
+										break;
+								}
+							}
+						}
                         
-                        //Update priority
-                        $new_priority = Filter::postInteger("moduleorder-{$params['id']}");
-                        $previous_priority = $params['priority'];
-                        if ($new_priority !== null) {
-                            if($new_priority != $previous_priority){
-                                $chook = new Hook($array_hook[1], $array_hook[2]);
-                                $chook->setPriority($array_hook[0], $new_priority);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+						//Update priority
+						$new_priority = Filter::postInteger("moduleorder-{$params['id']}");
+						$previous_priority = $params['priority'];
+						if ($new_priority !== null) {
+							if($new_priority != $previous_priority){
+								$chook = new Hook($array_hook[1], $array_hook[2]);
+								$chook->setPriority($array_hook[0], $new_priority);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {            
-        HookProvider::getInstance()->updateHooks();
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {            
+		HookProvider::getInstance()->updateHooks();
         
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
         
-        $table_id = 'table-installedhooks-' . Uuid::uuid4();
+		$table_id = 'table-installedhooks-' . Uuid::uuid4();
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('table_id', $table_id);
-        $view_bag->set('hook_list', HookProvider::getInstance()->getRawInstalledHooks());
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('table_id', $table_id);
+		$view_bag->set('hook_list', HookProvider::getInstance()->getRawInstalledHooks());
         
-        $ctrl
-        ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-        ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-        ->addInlineJavascript('
+		$ctrl
+		->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+		->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+		->addInlineJavascript('
 		  	jQuery(document).ready(function() {
 				jQuery("#'.$table_id.'").dataTable( {
 					'.I18N::datatablesI18N().',		
@@ -130,7 +130,7 @@ 
 			});
 		');
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
         
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -34,26 +34,26 @@ 
      * Manage updates sent from the AdminConfig@index form.
      */
     protected function update() {
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
             $ihooks = HookProvider::getInstance()->getInstalledHooks();
             	
-            $module_names= Database::prepare(
+            $module_names = Database::prepare(
                 "SELECT module_name FROM `##module` WHERE status='disabled'"
             )->fetchOneColumn();
             	
-            if($ihooks !== null){
+            if ($ihooks !== null) {
                 foreach ($ihooks as $ihook => $params) {
-                    if(Filter::post('hook-' . $params['id']) === 'yes') {                    
+                    if (Filter::post('hook-'.$params['id']) === 'yes') {                    
                         $array_hook = explode('#', $ihook);
                         //Update status
-                        $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
+                        $new_status = Filter::postBool('status-'.$params['id']);
+                        if (in_array($array_hook[0], $module_names)) $new_status = false;
                         $previous_status = $params['status'];
                         if ($new_status !== null) {
-                            $new_status= $new_status ? 'enabled' : 'disabled';
-                            if($new_status != $previous_status){
+                            $new_status = $new_status ? 'enabled' : 'disabled';
+                            if ($new_status != $previous_status) {
                                 $chook = new Hook($array_hook[1], $array_hook[2]);
-                                switch($new_status){
+                                switch ($new_status) {
                                     case 'enabled':
                                         $chook->enable($array_hook[0]);
                                         break;
@@ -70,7 +70,7 @@ 
                         $new_priority = Filter::postInteger("moduleorder-{$params['id']}");
                         $previous_priority = $params['priority'];
                         if ($new_priority !== null) {
-                            if($new_priority != $previous_priority){
+                            if ($new_priority != $previous_priority) {
                                 $chook = new Hook($array_hook[1], $array_hook[2]);
                                 $chook->setPriority($array_hook[0], $new_priority);
                             }
@@ -92,7 +92,7 @@ 
         HookProvider::getInstance()->updateHooks();
         
         $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();
@@ -100,7 +100,7 @@ 
             ->restrictAccess(Auth::isAdmin())
             ->setPageTitle($this->module->getTitle());
         
-        $table_id = 'table-installedhooks-' . Uuid::uuid4();
+        $table_id = 'table-installedhooks-'.Uuid::uuid4();
 
         $view_bag = new ViewBag();
         $view_bag->set('title', $ctrl->getPageTitle());

Braces +6 added lines, -2 removed lines

@@ -47,7 +47,9 @@ 
                         $array_hook = explode('#', $ihook);
                         //Update status
                         $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
+                        if(in_array($array_hook[0], $module_names)) {
+                        	$new_status = false;
+                        }
                         $previous_status = $params['status'];
                         if ($new_status !== null) {
                             $new_status= $new_status ? 'enabled' : 'disabled';
@@ -92,7 +94,9 @@ 
         HookProvider::getInstance()->updateHooks();
         
         $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/MiscExtensionsModule.php

Indentation +72 added lines, -72 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -63,7 +63,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';
     }
     
     /**
@@ -92,19 +92,19 @@ 
 	    $res = '';
 	    $dindi = new Individual($ctrlIndi->getSignificantIndividual());
 	    $titles = $dindi->getTitles();
-	    if(count($titles)>0){
+	    if (count($titles) > 0) {
 	        $res = '
 	            <dl>
 	               <dt class="label">'.I18N::translate('Titles').'</dt>';
-            foreach($titles as $title=>$props){
+            foreach ($titles as $title=>$props) {
                 $res .= 
-                    '<dd class="field">' . $title. ' ' .
-                    FunctionsPrint::getListFromArray($props) .
+                    '<dd class="field">'.$title.' '.
+                    FunctionsPrint::getListFromArray($props).
                     '</dd>';
             }
-            $res .=  '</dl>';
+            $res .= '</dl>';
         }
-	    return array( 'indi-header-titles' , $res);	    
+	    return array('indi-header-titles', $res);	    
 	}
 	
 	/**
@@ -119,8 +119,8 @@ 
 	 */
 	public function hPrintHeader() {
 	    $html = '';
-	    if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
-	        if(Auth::accessLevel(Globals::getTree()) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
+	    if ($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1) {
+	        if (Auth::accessLevel(Globals::getTree()) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE) && !Filter::getBool('noheader')) {
 	            $html .= $this->getSetting('MAJ_HTML_HEADER', '');
 	        }
 	    }	
@@ -134,11 +134,11 @@ 
 	public function hPrintFooter() {
 	    $wt_tree = Globals::getTree();
 	    $html = '';
-	    if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
+	    if ($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1) {
 	        $html .= '<br/>';
 	        $html .= '<div class="center">';
 	        $cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
-	        if($cnil_ref != ''){
+	        if ($cnil_ref != '') {
 	            $html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
 	        }
 	        $html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.',
@@ -146,8 +146,8 @@ 
 	        $html .= '</div>';
 	    }
 	    
-	    if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
-	        if(Auth::accessLevel($wt_tree) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
+	    if ($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1) {
+	        if (Auth::accessLevel($wt_tree) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE) && !Filter::getBool('nofooter')) {
 	            $html .= $this->getSetting('MAJ_HTML_FOOTER', '');
 	        }
 	    }

src/Webtrees/Globals.php

Indentation +36 added lines, -36 removed lines

@@ -16,48 +16,48 @@
  */
 class Globals {
     
-    /**
-     * Get global $WT_TREE variable.
-     * 
-     * @return \Fisharebest\Webtrees\Tree
-     */
-    public static function getTree() {
-        global $WT_TREE;
+	/**
+	 * Get global $WT_TREE variable.
+	 * 
+	 * @return \Fisharebest\Webtrees\Tree
+	 */
+	public static function getTree() {
+		global $WT_TREE;
         
-        return $WT_TREE;
-    }
+		return $WT_TREE;
+	}
     
-    /**
-     * Check whether the visitor is a bot.
-     * 
-     * @return boolean
-     */
-    public static function isSearchSpider() {
-        global $SEARCH_SPIDER;
+	/**
+	 * Check whether the visitor is a bot.
+	 * 
+	 * @return boolean
+	 */
+	public static function isSearchSpider() {
+		global $SEARCH_SPIDER;
         
-        return $SEARCH_SPIDER;
-    }
+		return $SEARCH_SPIDER;
+	}
     
-    /**
-     * Get the current controller.
-     * 
-     * @return \Fisharebest\Webtrees\BaseController
-     */
-    public static function getController() {
-        global $controller;
+	/**
+	 * Get the current controller.
+	 * 
+	 * @return \Fisharebest\Webtrees\BaseController
+	 */
+	public static function getController() {
+		global $controller;
         
-        return $controller;
-    }
+		return $controller;
+	}
     
-    /**
-     * Get the global facts
-     * 
-     * @return array
-     */
-    public static function getGlobalFacts() {
-        global $global_facts;
+	/**
+	 * Get the global facts
+	 * 
+	 * @return array
+	 */
+	public static function getGlobalFacts() {
+		global $global_facts;
         
-        return $global_facts;
-    }
+		return $global_facts;
+	}
     
 }

src/Webtrees/Functions/Functions.php

Indentation +24 added lines, -24 removed lines

@@ -129,11 +129,11 @@ 
 	 * @return string Encryption key
 	 */
 	protected static function getBase64EncryptionKey() {	    
-	    $key = 'STANDARDKEYIFNOSERVER';
-	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
-	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		$key = 'STANDARDKEYIFNOSERVER';
+		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
+			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
 	    
-	    return $key;
+		return $key;
 	}
 	
 	/**	  
@@ -172,20 +172,20 @@ 
 			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
 		
 		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
-		    throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+			throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
 
-	    $nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
-	    $ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
+		$nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
+		$ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
         
-        $decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, self::getBase64EncryptionKey());
+		$decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, self::getBase64EncryptionKey());
 		
-        if($decrypted === false) {
-            throw new \InvalidArgumentException('The message has been tampered with in transit.');
-        }
+		if($decrypted === false) {
+			throw new \InvalidArgumentException('The message has been tampered with in transit.');
+		}
         
-        //sodium_memzero($encrypted);   // Requires PHP 7.2
+		//sodium_memzero($encrypted);   // Requires PHP 7.2
         
-        return $decrypted;
+		return $decrypted;
 	}
 	
 	/**
@@ -196,7 +196,7 @@ 
 	 */
 	public static function encodeFileSystemToUtf8($string){
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+			return iconv('cp1252', 'utf-8//IGNORE',$string);
 		}
 		return $string;
 	}
@@ -261,20 +261,20 @@ 
 	 * @return boolean|string Is supported?
 	 */
 	public static function isImageTypeSupported($reqtype) {
-	    $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');
-	    $reqtype = strtolower($reqtype);
+		$supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');
+		$reqtype = strtolower($reqtype);
 	
-	    if (empty($supportByGD[$reqtype])) {
-	        return false;
-	    }
+		if (empty($supportByGD[$reqtype])) {
+			return false;
+		}
 	
-	    $type = $supportByGD[$reqtype];
+		$type = $supportByGD[$reqtype];
 	
-	    if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) {
-	        return $type;
-	    }
+		if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) {
+			return $type;
+		}
 	
-	    return false;
+		return false;
 	}
 		
 }

Spacing +24 added lines, -24 removed lines

@@ -32,9 +32,9 @@ 
 	 *
 	 * @param string $text Text to display
 	 */
-	static public function promptAlert($text){
+	static public function promptAlert($text) {
 		echo '<script>';
-		echo 'alert("',fw\Filter::escapeHtml($text),'")';
+		echo 'alert("', fw\Filter::escapeHtml($text), '")';
 		echo '</script>';
 	}
 	
@@ -47,7 +47,7 @@ 
 	 * @return float Result of the safe division
 	 */
 	public static function safeDivision($num, $denom, $default = 0) {
-		if($denom && $denom!=0){
+		if ($denom && $denom != 0) {
 			return $num / $denom;
 		}
 		return $default;
@@ -61,7 +61,7 @@ 
 	 * @param float $default Default value if denominator null or 0
 	 * @return float Percentage
 	 */
-	public static function getPercentage($num, $denom, $default = 0){
+	public static function getPercentage($num, $denom, $default = 0) {
 		return 100 * self::safeDivision($num, $denom, $default);
 	}
 	
@@ -72,8 +72,8 @@ 
 	 * @param int $target	The final max width/height
 	 * @return array array of ($width, $height). One of them must be $target
 	 */
-	static public function getResizedImageSize($file, $target=25){
-		list($width, $height, , ) = getimagesize($file);
+	static public function getResizedImageSize($file, $target = 25) {
+		list($width, $height,,) = getimagesize($file);
 		$max = max($width, $height);
 		$rapp = $target / $max;
 		$width = intval($rapp * $width);
@@ -103,21 +103,21 @@ 
 	 * @param int $length Length of the token, default to 32
 	 * @return string Random token
 	 */
-	public static function generateRandomToken($length=32) {
+	public static function generateRandomToken($length = 32) {
 		$chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
 		$len_chars = count($chars);
 		$token = '';
 		
 		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+			$token .= $chars[mt_rand(0, $len_chars - 1)];
 		
 		# Number of 32 char chunks
-		$chunks = ceil( strlen($token) / 32 );
+		$chunks = ceil(strlen($token) / 32);
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ($i = 1; $i <= $chunks; $i++)
+			$md5token .= md5(substr($token, $i * 32 - 32, 32));
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -130,7 +130,7 @@ 
 	 */
 	protected static function getBase64EncryptionKey() {	    
 	    $key = 'STANDARDKEYIFNOSERVER';
-	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
+	    if (!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
 	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
 	    
 	    return $key;
@@ -143,7 +143,7 @@ 
 	 * @param string $data Text to encrypt
 	 * @return string Encrypted and encoded text
 	 */
-	public static function encryptToSafeBase64($data){		
+	public static function encryptToSafeBase64($data) {		
 		$nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);	
 		$id = sodium_crypto_secretbox($data, $nonce, self::getBase64EncryptionKey());
 		$encrypted = base64_encode($nonce.$id);
@@ -163,12 +163,12 @@ 
 	 * @param string $encrypted Text to decrypt
 	 * @return string Decrypted text
 	 */
-	public static function decryptFromSafeBase64($encrypted){
+	public static function decryptFromSafeBase64($encrypted) {
 		$encrypted = str_replace('-', '+', $encrypted);
 		$encrypted = str_replace('_', '/', $encrypted);
 		$encrypted = str_replace('*', '=', $encrypted);
 		$encrypted = base64_decode($encrypted);
-		if($encrypted === false)
+		if ($encrypted === false)
 			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
 		
 		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
@@ -179,7 +179,7 @@ 
         
         $decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, self::getBase64EncryptionKey());
 		
-        if($decrypted === false) {
+        if ($decrypted === false) {
             throw new \InvalidArgumentException('The message has been tampered with in transit.');
         }
         
@@ -194,9 +194,9 @@ 
 	 * @param string $string Filesystem encoded string to encode
 	 * @return string UTF-8 encoded string
 	 */
-	public static function encodeFileSystemToUtf8($string){
+	public static function encodeFileSystemToUtf8($string) {
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+		    return iconv('cp1252', 'utf-8//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -207,9 +207,9 @@ 
 	 * @param string $string UTF-8 encoded string to encode
 	 * @return string Filesystem encoded string
 	 */
-	public static function encodeUtf8ToFileSystem($string){
+	public static function encodeUtf8ToFileSystem($string) {
 		if (preg_match('//u', $string) && strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-			return iconv('utf-8', 'cp1252//IGNORE' ,  $string);
+			return iconv('utf-8', 'cp1252//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -222,7 +222,7 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if (strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
 		return false;
 	}
 	
@@ -234,7 +234,7 @@ 
 	 * @return array Array of month short names
 	 */
 	public static function getCalendarShortMonths($calendarId = 0) {
-		if(!isset(self::$calendarShortMonths[$calendarId])) {
+		if (!isset(self::$calendarShortMonths[$calendarId])) {
 			$calendar_info = cal_info($calendarId);
 			self::$calendarShortMonths[$calendarId] = $calendar_info['abbrevmonths'];
 		}		
@@ -247,8 +247,8 @@ 
 	 * @param int $sosa Sosa number
 	 * @return number
 	 */
-	public static function getGeneration($sosa){
-		return(int)log($sosa, 2)+1;
+	public static function getGeneration($sosa) {
+		return(int)log($sosa, 2) + 1;
 	}
 	
 	

Braces +18 added lines, -11 removed lines

@@ -108,16 +108,18 @@ 
 		$len_chars = count($chars);
 		$token = '';
 		
-		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		for ($i = 0; $i < $length; $i++) {
+					$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		}
 		
 		# Number of 32 char chunks
 		$chunks = ceil( strlen($token) / 32 );
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ( $i=1; $i<=$chunks; $i++ ) {
+					$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		}
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -130,8 +132,9 @@ 
 	 */
 	protected static function getBase64EncryptionKey() {	    
 	    $key = 'STANDARDKEYIFNOSERVER';
-	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
-	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE'))) {
+	    	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+	    }
 	    
 	    return $key;
 	}
@@ -168,11 +171,13 @@ 
 		$encrypted = str_replace('_', '/', $encrypted);
 		$encrypted = str_replace('*', '=', $encrypted);
 		$encrypted = base64_decode($encrypted);
-		if($encrypted === false)
-			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
+		if($encrypted === false) {
+					throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
+		}
 		
-		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
-		    throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES)) {
+				    throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		}
 
 	    $nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
 	    $ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
@@ -222,7 +227,9 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) {
+			return true;
+		}
 		return false;
 	}