jon48 / webtrees-lib

src/Webtrees/Module/WelcomeBlock/Views/WelcomeBlockView.php

Indentation +32 added lines, -32 removed lines

@@ -24,16 +24,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        /** @var \Fisharebest\Webtrees\Individual $indi */
-        $indi = $this->data->get('indi');
+	protected function renderContent() {        
+		/** @var \Fisharebest\Webtrees\Individual $indi */
+		$indi = $this->data->get('indi');
         
-        /** @var \Fisharebest\Webtrees\Tree $tree */
-        $tree = $this->data->get('tree');
+		/** @var \Fisharebest\Webtrees\Tree $tree */
+		$tree = $this->data->get('tree');
                 
-        //Welcome section - gedcom title, date, statistics - based on gedcom_block        
-        $content = 
-            '<table>
+		//Welcome section - gedcom title, date, statistics - based on gedcom_block        
+		$content = 
+			'<table>
                 <tr>
                     <td>
                         <a href="pedigree.php?rootid=' . $indi->getXref() . '&amp;ged=' . $tree->getNameUrl() . '">
@@ -46,33 +46,33 @@ 
                         </a>
                     </td>';
         
-        if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) {
-            $content .= '
+		if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) {
+			$content .= '
                     <td>
                         <a href="' . WT_LOGIN_URL . '?action=register">
                             <i class="icon-user_add"></i><br>'.I18N::translate('Request new user account').'
                         </a>
                     </td>';
-        }
-        $content .= '
+		}
+		$content .= '
                 </tr>
             </table>';
         
-        // Piwik Statistics        
-        if ($this->data->get('piwik_enabled', false)){
-            $content .= '
+		// Piwik Statistics        
+		if ($this->data->get('piwik_enabled', false)){
+			$content .= '
                 <div class="center">
                     <div id="piwik_stats">
                         <i class="icon-loading-small"></i>&nbsp;' . I18N::translate('Retrieving Piwik statistics...') . '
                     </div>
                 </div>';
-        }
+		}
         
-        $content .=  '<hr />';
+		$content .=  '<hr />';
         
-        // Login section - based on login_block
-        if (Auth::check()) {
-            $content .= '
+		// Login section - based on login_block
+		if (Auth::check()) {
+			$content .= '
             <div class="center">
                 <form method="post" action="logout.php" name="logoutform" onsubmit="return true;">
                     <br>
@@ -82,14 +82,14 @@ 
                     <br><br>
                 </form>
             </div>';
-        } else {
-            $content .= '
+		} else {
+			$content .= '
             <div id="maj-login-box">
                 <form id="maj-login-form" name="maj-login-form" method="post" action="'.WT_LOGIN_URL.'">
 					<input type="hidden" name="action" value="login">
 				    <div>
 					    <label for="maj-username">'. I18N::translate('Username').
-							    '<input type="text" id="maj-username" name="username" class="formField">
+								'<input type="text" id="maj-username" name="username" class="formField">
 						</label>
 					</div>
 					<div>
@@ -103,17 +103,17 @@ 
 					<div>
 						<a href="#" id="maj-passwd_click">'. I18N::translate('Request new password').'</a>
 					</div>';
-            if (Site::getPreference('USE_REGISTRATION_MODULE')) {
-                $content.= '
+			if (Site::getPreference('USE_REGISTRATION_MODULE')) {
+				$content.= '
                     <div>
                         <a href="'.WT_LOGIN_URL.'?action=register">'. I18N::translate('Request new user account').'</a>
                     </div>';
-            }
-            $content.= '
+			}
+			$content.= '
                 </form>'; // close "login-form"
              
-            // hidden New Password block
-            $content.= '
+			// hidden New Password block
+			$content.= '
                 <div id="maj-new_passwd">
                     <form id="maj-new_passwd_form" name="new_passwd_form" action="'.WT_LOGIN_URL.'" method="post">
                         <input type="hidden" name="time" value="">
@@ -130,10 +130,10 @@ 
                     </form>
                 </div>
             </div>';//"login-box"
-        }
+		}
         
-        return $content;
-    }
+		return $content;
+	}
     
 
 }

Spacing +16 added lines, -16 removed lines

@@ -36,20 +36,20 @@ 
             '<table>
                 <tr>
                     <td>
-                        <a href="pedigree.php?rootid=' . $indi->getXref() . '&amp;ged=' . $tree->getNameUrl() . '">
-                            <i class="icon-pedigree"></i><br>' . I18N::translate('Default chart') . '
+                        <a href="pedigree.php?rootid=' . $indi->getXref().'&amp;ged='.$tree->getNameUrl().'">
+                            <i class="icon-pedigree"></i><br>' . I18N::translate('Default chart').'
                         </a>
                     </td>
                     <td>
-                        <a href="individual.php?pid=' . $indi->getXref() . '&amp;ged=' . $tree->getNameUrl() . '">
-                            <i class="icon-indis"></i><br>' . I18N::translate('Default individual') . '
+                        <a href="individual.php?pid=' . $indi->getXref().'&amp;ged='.$tree->getNameUrl().'">
+                            <i class="icon-indis"></i><br>' . I18N::translate('Default individual').'
                         </a>
                     </td>';
         
         if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) {
             $content .= '
                     <td>
-                        <a href="' . WT_LOGIN_URL . '?action=register">
+                        <a href="' . WT_LOGIN_URL.'?action=register">
                             <i class="icon-user_add"></i><br>'.I18N::translate('Request new user account').'
                         </a>
                     </td>';
@@ -59,16 +59,16 @@ 
             </table>';
         
         // Piwik Statistics        
-        if ($this->data->get('piwik_enabled', false)){
+        if ($this->data->get('piwik_enabled', false)) {
             $content .= '
                 <div class="center">
                     <div id="piwik_stats">
-                        <i class="icon-loading-small"></i>&nbsp;' . I18N::translate('Retrieving Piwik statistics...') . '
+                        <i class="icon-loading-small"></i>&nbsp;' . I18N::translate('Retrieving Piwik statistics...').'
                     </div>
                 </div>';
         }
         
-        $content .=  '<hr />';
+        $content .= '<hr />';
         
         // Login section - based on login_block
         if (Auth::check()) {
@@ -76,7 +76,7 @@ 
             <div class="center">
                 <form method="post" action="logout.php" name="logoutform" onsubmit="return true;">
                     <br>
-                    <a href="edituser.php" class="name2">' . I18N::translate('Logged in as ') . ' ' . Auth::user()->getRealNameHtml() . '</a>
+                    <a href="edituser.php" class="name2">' . I18N::translate('Logged in as ').' '.Auth::user()->getRealNameHtml().'</a>
                     <br><br>
                     <input type="submit" value="'.I18N::translate('Logout').'">
                     <br><br>
@@ -98,34 +98,34 @@ 
 						</label>
 					</div>
 					<div>
-						<input type="submit" value="'. I18N::translate('Login'). '">
+						<input type="submit" value="'. I18N::translate('Login').'">
 					</div>
 					<div>
 						<a href="#" id="maj-passwd_click">'. I18N::translate('Request new password').'</a>
 					</div>';
             if (Site::getPreference('USE_REGISTRATION_MODULE')) {
-                $content.= '
+                $content .= '
                     <div>
-                        <a href="'.WT_LOGIN_URL.'?action=register">'. I18N::translate('Request new user account').'</a>
+                        <a href="'.WT_LOGIN_URL.'?action=register">'.I18N::translate('Request new user account').'</a>
                     </div>';
             }
-            $content.= '
+            $content .= '
                 </form>'; // close "login-form"
              
             // hidden New Password block
-            $content.= '
+            $content .= '
                 <div id="maj-new_passwd">
                     <form id="maj-new_passwd_form" name="new_passwd_form" action="'.WT_LOGIN_URL.'" method="post">
                         <input type="hidden" name="time" value="">
                         <input type="hidden" name="action" value="requestpw">
                         <h4>'. I18N::translate('Lost password request').'</h4>
                         <div>
-                            <label for="maj-new_passwd_username">'. I18N::translate('Username or email address') . '
+                            <label for="maj-new_passwd_username">'. I18N::translate('Username or email address').'
                                 <input type="text" id="maj-new_passwd_username" name="new_passwd_username" value="">
                             </label>
         				</div>
         				<div>
-                            <input type="submit" value="'. I18N::translate('Continue'). '">
+                            <input type="submit" value="'. I18N::translate('Continue').'">
                         </div>
                     </form>
                 </div>

src/Webtrees/Module/WelcomeBlock/Views/PiwikStatsView.php

Indentation +13 added lines, -13 removed lines

@@ -22,20 +22,20 @@
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {    
-        if($this->data->get('has_stats', false)) {
-            $html = I18N::translate('%1$s visits since the beginning of %2$s<br>(%3$s today)' ,
-                '<span class="odometer">' . I18N::number($this->data->get('visits_year')) . '</span>',
-                date('Y'),
-                '<span class="odometer">' . I18N::number($this->data->get('visits_today')) . '</span>'
-                );
-        }
-        else {
-            $html = I18N::translate('No statistics could be retrieved from Piwik.');
-        }
+	protected function renderContent() {    
+		if($this->data->get('has_stats', false)) {
+			$html = I18N::translate('%1$s visits since the beginning of %2$s<br>(%3$s today)' ,
+				'<span class="odometer">' . I18N::number($this->data->get('visits_year')) . '</span>',
+				date('Y'),
+				'<span class="odometer">' . I18N::number($this->data->get('visits_today')) . '</span>'
+				);
+		}
+		else {
+			$html = I18N::translate('No statistics could be retrieved from Piwik.');
+		}
         
-        return $html;
-    }
+		return $html;
+	}
     
 
 }

Spacing +4 added lines, -4 removed lines

@@ -23,11 +23,11 @@
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
     protected function renderContent() {    
-        if($this->data->get('has_stats', false)) {
-            $html = I18N::translate('%1$s visits since the beginning of %2$s<br>(%3$s today)' ,
-                '<span class="odometer">' . I18N::number($this->data->get('visits_year')) . '</span>',
+        if ($this->data->get('has_stats', false)) {
+            $html = I18N::translate('%1$s visits since the beginning of %2$s<br>(%3$s today)',
+                '<span class="odometer">'.I18N::number($this->data->get('visits_year')).'</span>',
                 date('Y'),
-                '<span class="odometer">' . I18N::number($this->data->get('visits_today')) . '</span>'
+                '<span class="odometer">'.I18N::number($this->data->get('visits_today')).'</span>'
                 );
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
                 date('Y'),
                 '<span class="odometer">' . I18N::number($this->data->get('visits_today')) . '</span>'
                 );
-        }
-        else {
+        } else {
             $html = I18N::translate('No statistics could be retrieved from Piwik.');
         }
         

src/Webtrees/Module/WelcomeBlock/Views/WelcomeBlockConfigView.php

Indentation +21 added lines, -21 removed lines

@@ -23,51 +23,51 @@
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {     
+	protected function renderContent() {     
         
-        return '
+		return '
             <tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Enable Piwik Statistics') .
-                // Ideally, would like to add helpLink, but this does not work for modules...
-                // FunctionsPrint::helpLink('piwik_enabled', $this->getName());
-                '</td>
+				I18N::translate('Enable Piwik Statistics') .
+				// Ideally, would like to add helpLink, but this does not work for modules...
+				// FunctionsPrint::helpLink('piwik_enabled', $this->getName());
+				'</td>
                 <td class="optionbox">' .
-                FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) .
-                '</td>
+				FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) .
+				'</td>
             </tr>' .
             
-            '<tr>
+			'<tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Piwik URL') .
-                '</td>
+				I18N::translate('Piwik URL') .
+				'</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_url" size="45" value="' . 
-                    $this->data->get('piwik_url', '') . '" />
+					$this->data->get('piwik_url', '') . '" />
                 </td>
             </tr>' .
             
-            '<tr>
+			'<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Token') .
-                '</td>
+					I18N::translate('Piwik Token') .
+				'</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_token" size="45" value="' . 
-                    $this->data->get('piwik_token', '') . '" />
+					$this->data->get('piwik_token', '') . '" />
                 </td>
             </tr>' .
             
-            '<tr>
+			'<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Site ID') .
-                '</td>
+					I18N::translate('Piwik Site ID') .
+				'</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_siteid" size="4" value="' . 
-                    $this->data->get('piwik_siteid', '') . '" />
+					$this->data->get('piwik_siteid', '') . '" />
                 </td>
             </tr>' ;
         
-    }
+	}
     
 
 }

Spacing +8 added lines, -8 removed lines

@@ -28,42 +28,42 @@
         return '
             <tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Enable Piwik Statistics') .
+                I18N::translate('Enable Piwik Statistics').
                 // Ideally, would like to add helpLink, but this does not work for modules...
                 // FunctionsPrint::helpLink('piwik_enabled', $this->getName());
                 '</td>
                 <td class="optionbox">' .
-                FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) .
+                FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')).
                 '</td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Piwik URL') .
+                I18N::translate('Piwik URL').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_url" size="45" value="' . 
-                    $this->data->get('piwik_url', '') . '" />
+                    $this->data->get('piwik_url', '').'" />
                 </td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Token') .
+                    I18N::translate('Piwik Token').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_token" size="45" value="' . 
-                    $this->data->get('piwik_token', '') . '" />
+                    $this->data->get('piwik_token', '').'" />
                 </td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Site ID') .
+                    I18N::translate('Piwik Site ID').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_siteid" size="4" value="' . 
-                    $this->data->get('piwik_siteid', '') . '" />
+                    $this->data->get('piwik_siteid', '').'" />
                 </td>
             </tr>' ;
         

src/Webtrees/Module/WelcomeBlock/WelcomeBlockController.php

Indentation +65 added lines, -65 removed lines

@@ -28,30 +28,30 @@ 
 class WelcomeBlockController extends MvcController
 {   
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * WelcomeBlock@index
-     * 
-     * @param PageController $parent_controller
-     * @param Tree $tree
-     * @param string $block_id
-     * @param string $template
-     * @return $string
-     */
-    public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
-        $view_bag = new ViewBag();
+	/**
+	 * WelcomeBlock@index
+	 * 
+	 * @param PageController $parent_controller
+	 * @param Tree $tree
+	 * @param string $block_id
+	 * @param string $template
+	 * @return $string
+	 */
+	public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
+		$view_bag = new ViewBag();
         
-        if($parent_controller && $tree) {
+		if($parent_controller && $tree) {
         
-            $view_bag->set('tree', $tree);
-            $view_bag->set('indi', $parent_controller->getSignificantIndividual());
+			$view_bag->set('tree', $tree);
+			$view_bag->set('indi', $parent_controller->getSignificantIndividual());
         
-            $id = $this->module->getName().$block_id;
-            $class = $this->module->getName().'_block';
-            $parent_controller->addInlineJavascript('
+			$id = $this->module->getName().$block_id;
+			$class = $this->module->getName().'_block';
+			$parent_controller->addInlineJavascript('
                 jQuery("#maj-new_passwd").hide();
                 jQuery("#maj-passwd_click").click(function()
                 {
@@ -62,62 +62,62 @@ 
     				  });
     			');
     
-            if (Auth::isAdmin()) {
-                $title='<a class="icon-admin" title="'.I18N::translate('Configure').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
-            } else {
-                $title='';
-            }
-            $title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
+			if (Auth::isAdmin()) {
+				$title='<a class="icon-admin" title="'.I18N::translate('Configure').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
+			} else {
+				$title='';
+			}
+			$title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
     
-            $piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
-            $view_bag->set('piwik_enabled', $piwik_enabled);
-            if($piwik_enabled) {
-                $parent_controller->addInlineJavascript(
-                    '$("#piwik_stats")
+			$piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
+			$view_bag->set('piwik_enabled', $piwik_enabled);
+			if($piwik_enabled) {
+				$parent_controller->addInlineJavascript(
+					'$("#piwik_stats")
                         .load("module.php?mod='.$this->module->getName().'&mod_action=Piwik&block_id='.$block_id.'");'
-                );
-            }
+				);
+			}
     
-            $content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
+			$content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
             
-            if ($template) {
-                return Theme::theme()->formatBlock($id, $title, $class, $content);
-            } else {
-                return $content;
-            }
-        }
-    }
+			if ($template) {
+				return Theme::theme()->formatBlock($id, $title, $class, $content);
+			} else {
+				return $content;
+			}
+		}
+	}
     
     
     
-    /**
-     * WelcomeBlock@config
-     * 
-     * @param string $block_id
-     */
-    public function config($block_id) {
+	/**
+	 * WelcomeBlock@config
+	 * 
+	 * @param string $block_id
+	 */
+	public function config($block_id) {
 
-        if (Filter::postBool('save') && Filter::checkCsrf()) {
-            $this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
-            $this->module->setBlockSetting($block_id, 'piwik_url', trim(Filter::postUrl('piwik_url')));
-            $this->module->setBlockSetting($block_id, 'piwik_siteid', trim(Filter::post('piwik_siteid')));
-            $this->module->setBlockSetting($block_id, 'piwik_token', trim(Filter::post('piwik_token')));
-            exit;
-        }
+		if (Filter::postBool('save') && Filter::checkCsrf()) {
+			$this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
+			$this->module->setBlockSetting($block_id, 'piwik_url', trim(Filter::postUrl('piwik_url')));
+			$this->module->setBlockSetting($block_id, 'piwik_siteid', trim(Filter::post('piwik_siteid')));
+			$this->module->setBlockSetting($block_id, 'piwik_token', trim(Filter::post('piwik_token')));
+			exit;
+		}
         
-        $view_bag = new ViewBag();
+		$view_bag = new ViewBag();
         
-        // Is Piwik Statistic Enabled ?
-        $view_bag->set('piwik_enabled', $this->module->getBlockSetting($block_id, 'piwik_enabled', '0'));
-        //Piwik Root Url
-        $view_bag->set('piwik_url', $this->module->getBlockSetting($block_id, 'piwik_url', ''));
-        // Piwik token
-        $view_bag->set('piwik_token', $this->module->getBlockSetting($block_id, 'piwik_token', ''));
-        // Piwik side id
-        $view_bag->set('piwik_siteid', $this->module->getBlockSetting($block_id, 'piwik_siteid', ''));
+		// Is Piwik Statistic Enabled ?
+		$view_bag->set('piwik_enabled', $this->module->getBlockSetting($block_id, 'piwik_enabled', '0'));
+		//Piwik Root Url
+		$view_bag->set('piwik_url', $this->module->getBlockSetting($block_id, 'piwik_url', ''));
+		// Piwik token
+		$view_bag->set('piwik_token', $this->module->getBlockSetting($block_id, 'piwik_token', ''));
+		// Piwik side id
+		$view_bag->set('piwik_siteid', $this->module->getBlockSetting($block_id, 'piwik_siteid', ''));
         
-        ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->renderPartial();
-    }
+		ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->renderPartial();
+	}
     
     
     

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
     public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
         $view_bag = new ViewBag();
         
-        if($parent_controller && $tree) {
+        if ($parent_controller && $tree) {
         
             $view_bag->set('tree', $tree);
             $view_bag->set('indi', $parent_controller->getSignificantIndividual());
@@ -63,22 +63,22 @@ 
     			');
     
             if (Auth::isAdmin()) {
-                $title='<a class="icon-admin" title="'.I18N::translate('Configure').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
+                $title = '<a class="icon-admin" title="'.I18N::translate('Configure').'" href="block_edit.php?block_id='.$block_id.'&amp;ged='.$tree->getNameHtml().'&amp;ctype=gedcom"></a>';
             } else {
-                $title='';
+                $title = '';
             }
-            $title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
+            $title .= '<span dir="auto">'.$tree->getTitleHtml().'</span>';
     
             $piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
             $view_bag->set('piwik_enabled', $piwik_enabled);
-            if($piwik_enabled) {
+            if ($piwik_enabled) {
                 $parent_controller->addInlineJavascript(
                     '$("#piwik_stats")
                         .load("module.php?mod='.$this->module->getName().'&mod_action=Piwik&block_id='.$block_id.'");'
                 );
             }
     
-            $content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
+            $content = ViewFactory::make('WelcomeBlock', $this, new BaseController(), $view_bag)->getHtmlPartial();   
             
             if ($template) {
                 return Theme::theme()->formatBlock($id, $title, $class, $content);

src/Webtrees/Module/GeoDispersionModule.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,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=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -83,7 +83,7 @@ 
     public function getProvider() {
         global $WT_TREE;
         
-        if(!$this->provider) {
+        if (!$this->provider) {
             $this->provider = new GeoAnalysisProvider($WT_TREE);
         }
         return $this->provider;

Indentation +54 added lines, -54 removed lines

@@ -24,82 +24,82 @@
 class GeoDispersionModule extends AbstractModule implements ModuleConfigInterface, DependentInterface {
     
 	// How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\GeoDispersion\Schema';
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\GeoDispersion\Schema';
     
-    /** @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';
         
-    /**
-     * GeoDispersion analysis provider
-     * @var \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider $provider
-     */
-    protected $provider;
+	/**
+	 * GeoDispersion analysis provider
+	 * @var \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Hooks” module */ I18N::translate('Geographical Dispersion');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Hooks” module */ I18N::translate('Geographical Dispersion');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Hooks” module */ I18N::translate('Display the geographical dispersion of the root person’s Sosa ancestors.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Hooks” module */ I18N::translate('Display the geographical dispersion of the root person’s Sosa ancestors.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@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);
+	}
     
-    /**
-     * {@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=AdminConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
-     */
-    public function validatePrerequisites() {
-        return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
+	 */
+	public function validatePrerequisites() {
+		return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
+	}
     
 	/**
 	 * Get the GeoAnalysis Provider (initialise it if not done yet).
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider
 	 */
-    public function getProvider() {
-        global $WT_TREE;
+	public function getProvider() {
+		global $WT_TREE;
         
-        if(!$this->provider) {
-            $this->provider = new GeoAnalysisProvider($WT_TREE);
-        }
-        return $this->provider;
-    }
+		if(!$this->provider) {
+			$this->provider = new GeoAnalysisProvider($WT_TREE);
+		}
+		return $this->provider;
+	}
 	
 	/**
 	 * Set the GeoAnalysis Provider.
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider
 	 */
-    public function setProvider(GeoAnalysisProvider $provider) {
-        $this->provider = $provider;
-    }
+	public function setProvider(GeoAnalysisProvider $provider) {
+		$this->provider = $provider;
+	}
     
 
 }

src/Webtrees/Controller/JsonController.php

Indentation +33 added lines, -33 removed lines

@@ -17,41 +17,41 @@
  */
 class JsonController extends BaseController {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
-     */
-    public function pageHeader() {        
-        header('Content-Type: application/json');
-        header('Cache-Control: no-cache, must-revalidate');
-        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-        // We've displayed the header - display the footer automatically
-        register_shutdown_function(array($this, 'pageFooter'));
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
+	 */
+	public function pageHeader() {        
+		header('Content-Type: application/json');
+		header('Cache-Control: no-cache, must-revalidate');
+		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+		// We've displayed the header - display the footer automatically
+		register_shutdown_function(array($this, 'pageFooter'));
         
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
-     */
-    public function pageFooter() {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
+	 */
+	public function pageFooter() {
+		return $this;
+	}
     
-    /**
-     * Restrict access.
-     *
-     * @param bool $condition
-     *
-     * @return $this
-     */
-    public function restrictAccess($condition) {
-        if ($condition !== true) {
-            http_response_code(403);
-            exit;
-        }
+	/**
+	 * Restrict access.
+	 *
+	 * @param bool $condition
+	 *
+	 * @return $this
+	 */
+	public function restrictAccess($condition) {
+		if ($condition !== true) {
+			http_response_code(403);
+			exit;
+		}
     
-        return $this;
-    }
+		return $this;
+	}
 }

src/Webtrees/Fact.php

Indentation +15 added lines, -15 removed lines

@@ -34,26 +34,26 @@
 	protected $fact; 
 	
 	/**
-	* Contructor for the decorator
-	*
-	* @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
-	*/
+	 * Contructor for the decorator
+	 *
+	 * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
+	 */
 	public function __construct(\Fisharebest\Webtrees\Fact $fact_in){
 		$this->fact = $fact_in;
 	}
 	
 	/**
-	* Check if a fact has a date and is sourced
-	* Values:
-	* 		- 0, if no date is found for the fact
-	* 		- -1, if the date is not precise
-	* 		- -2, if the date is precise, but no source is found
-	* 		- 1, if the date is precise, and a source is found
-	* 		- 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage)
-	* 		- 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date
-	*
-	* @return int Level of sources
-	*/
+	 * Check if a fact has a date and is sourced
+	 * Values:
+	 * 		- 0, if no date is found for the fact
+	 * 		- -1, if the date is not precise
+	 * 		- -2, if the date is precise, but no source is found
+	 * 		- 1, if the date is precise, and a source is found
+	 * 		- 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage)
+	 * 		- 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date
+	 *
+	 * @return int Level of sources
+	 */
 	public function isSourced(){
 		$isSourced=0;
 		$date = $this->fact->getDate(false);

Spacing +13 added lines, -13 removed lines

@@ -38,7 +38,7 @@ 
 	*
 	* @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
 	*/
-	public function __construct(\Fisharebest\Webtrees\Fact $fact_in){
+	public function __construct(\Fisharebest\Webtrees\Fact $fact_in) {
 		$this->fact = $fact_in;
 	}
 	
@@ -54,22 +54,22 @@ 
 	*
 	* @return int Level of sources
 	*/
-	public function isSourced(){
-		$isSourced=0;
+	public function isSourced() {
+		$isSourced = 0;
 		$date = $this->fact->getDate(false);
-		if($date->isOK()) {
-			$isSourced=-1;
-			if($date->qual1=='' && $date->minimumJulianDay() == $date->maximumJulianDay()){
-				$isSourced=-2;
+		if ($date->isOK()) {
+			$isSourced = -1;
+			if ($date->qual1 == '' && $date->minimumJulianDay() == $date->maximumJulianDay()) {
+				$isSourced = -2;
 				$citations = $this->fact->getCitations();
-				foreach($citations as $citation){
-					$isSourced=max($isSourced, 1);
-					if(preg_match('/3 _ACT (.*)/', $citation) ){
- 						$isSourced=max($isSourced, 2);
+				foreach ($citations as $citation) {
+					$isSourced = max($isSourced, 1);
+					if (preg_match('/3 _ACT (.*)/', $citation)) {
+ 						$isSourced = max($isSourced, 2);
  						preg_match_all("/4 DATE (.*)/", $citation, $datessource, PREG_SET_ORDER);
- 						foreach($datessource as $daterec){
+ 						foreach ($datessource as $daterec) {
  							$datesource = new Date($daterec[1]);
- 							if(abs($datesource->julianDay() - $date->julianDay()) < self::DATE_PRECISION_MARGIN){
+ 							if (abs($datesource->julianDay() - $date->julianDay()) < self::DATE_PRECISION_MARGIN) {
  								$isSourced = max($isSourced, 3); //If this level increases, do not forget to change the constant MAX_IS_SOURCED_LEVEL
  							}
  						}

src/Webtrees/Cache.php

Indentation +14 added lines, -14 removed lines

@@ -16,10 +16,10 @@ 
  */
 class Cache{
 	
-    /**
-     * Underlying Zend Cache object
-     * @var \Zend_Cache_Core|\Zend_Cache_FrontEnd $cache
-     */
+	/**
+	 * Underlying Zend Cache object
+	 * @var \Zend_Cache_Core|\Zend_Cache_FrontEnd $cache
+	 */
 	protected $cache=null;
 	
 	/**
@@ -41,11 +41,11 @@ 
 	 */
 	protected static function getInstance()
 	{
-	    if (null === static::$instance) {
-	        static::$instance = new static();
-	    }
+		if (null === static::$instance) {
+			static::$instance = new static();
+		}
 	
-	    return static::$instance;
+		return static::$instance;
 	}
 	
 	/**
@@ -91,7 +91,7 @@ 
 	 * @return string Cached key name
 	 */
 	protected function getKeyName($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		$mod_name = 'myartjaub';
 		if($mod != null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
@@ -117,7 +117,7 @@ 
 	 * @return bool True is cached
 	 */
 	public static function isCached($value, AbstractModule $mod = null) {
-	    self::getInstance()->isCachedI($value, $mod);
+		self::getInstance()->isCachedI($value, $mod);
 	}
 	
 	/**
@@ -140,7 +140,7 @@ 
 	 * @return unknown_type Cached value
 	 */
 	public static function get($value, AbstractModule $mod = null){
-	    self::getInstance()->getI($value, $mod);
+		self::getInstance()->getI($value, $mod);
 	}
 	
 	/**
@@ -166,7 +166,7 @@ 
 	 * @return unknown_type Cached value
 	 */
 	public static function save($value, $data, AbstractModule $mod = null){
-	    self::getInstance()->saveI($value, $data, $mod);
+		self::getInstance()->saveI($value, $data, $mod);
 	}
 	
 	/**
@@ -174,7 +174,7 @@ 
 	 *
 	 */
 	public function cleanI(){
-	    $this->checkInit();
+		$this->checkInit();
 		$this->cache->clean();
 	}
 	
@@ -182,7 +182,7 @@ 
 	 * Static invocation of the *clean* method.
 	 */
 	public static function clean() {
-	    self::getInstance()->cleanI();
+		self::getInstance()->cleanI();
 	}
 	
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -14,13 +14,13 @@ 
 /**
  * Cache component to speed up some potential data retrievals
  */
-class Cache{
+class Cache {
 	
     /**
      * Underlying Zend Cache object
      * @var \Zend_Cache_Core|\Zend_Cache_FrontEnd $cache
      */
-	protected $cache=null;
+	protected $cache = null;
 	
 	/**
 	 * Defines whether the cache has been initialised
@@ -54,7 +54,7 @@ 
 	 */
 	protected function init() {	
 		// The translation libraries only work with a cache.
-		$cache_options=array('automatic_serialization'=>true);
+		$cache_options = array('automatic_serialization'=>true);
 	
 		if (ini_get('apc.enabled')) {
 			 $this->cache = \Zend_Cache::factory('Core', 'Apc', $cache_options, array());
@@ -79,8 +79,8 @@ 
 	 * Initiliase the Cache if not done.
 	 *
 	 */
-	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+	protected function checkInit() {
+		if (!$this->is_init) $this->init();
 	}
 	
 	/**
@@ -90,10 +90,10 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return string Cached key name
 	 */
-	protected function getKeyName($value, AbstractModule $mod = null){
+	protected function getKeyName($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if ($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
 	}
 
@@ -127,7 +127,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return unknown_type Cached value
 	 */
-	public function getI($value, AbstractModule $mod = null){
+	public function getI($value, AbstractModule $mod = null) {
 		$this->checkInit();
 		return $this->cache->load($this->getKeyName($value, $mod));
 	}
@@ -139,7 +139,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return unknown_type Cached value
 	 */
-	public static function get($value, AbstractModule $mod = null){
+	public static function get($value, AbstractModule $mod = null) {
 	    self::getInstance()->getI($value, $mod);
 	}
 	
@@ -151,7 +151,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return unknown_type Cached value
 	 */
-	public function saveI($value, $data, AbstractModule $mod = null){
+	public function saveI($value, $data, AbstractModule $mod = null) {
 		$this->checkInit();
 		$this->cache->save($data, $this->getKeyName($value, $mod));
 		return $this->get($value, $mod);
@@ -165,7 +165,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return unknown_type Cached value
 	 */
-	public static function save($value, $data, AbstractModule $mod = null){
+	public static function save($value, $data, AbstractModule $mod = null) {
 	    self::getInstance()->saveI($value, $data, $mod);
 	}
 	
@@ -173,7 +173,7 @@ 
 	 * Clean the cache
 	 *
 	 */
-	public function cleanI(){
+	public function cleanI() {
 	    $this->checkInit();
 		$this->cache->clean();
 	}

Braces +6 added lines, -2 removed lines

@@ -80,7 +80,9 @@ 
 	 *
 	 */
 	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+		if(!$this->is_init) {
+			$this->init();
+		}
 	}
 	
 	/**
@@ -93,7 +95,9 @@ 
 	protected function getKeyName($value, AbstractModule $mod = null){
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if($mod !== null) {
+			$mod_name = $mod->getName();
+		}
 		return $mod_name.'_'.$value;
 	}
 

Doc Comments +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
 	 *
 	 * @param string $value Value name
 	 * @param AbstractModule $mod Calling module
-	 * @return bool True is cached
+	 * @return boolean|null True is cached
 	 */
 	public static function isCached($value, AbstractModule $mod = null) {
 	    self::getInstance()->isCachedI($value, $mod);
@@ -149,7 +149,7 @@ 
 	 * @param string $value Value name
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
-	 * @return mixed Cached value
+	 * @return unknown_type|null Cached value
 	 */
 	public function saveI($value, $data, AbstractModule $mod = null){
 		$this->checkInit();

src/Webtrees/Mvc/Controller/MvcControllerInterface.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
  */
 interface MvcControllerInterface {
     
-    /**
-     * Return the module attached to this controller.
-     * 
-     * @return \Fisharebest\Webtrees\Module\AbstractModule
-     */
-    function getModule();
+	/**
+	 * Return the module attached to this controller.
+	 * 
+	 * @return \Fisharebest\Webtrees\Module\AbstractModule
+	 */
+	function getModule();
     
 }
  
\ No newline at end of file