jon48 / webtrees-lib

src/Webtrees/Hook/HookInterfaces/PageHeaderExtenderInterface.php

Indentation +14 added lines, -14 removed lines

@@ -1,13 +1,13 @@ 
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <dev@jaubart.com>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <dev@jaubart.com>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
 
 /**
@@ -15,12 +15,12 @@ 
  */
 interface PageHeaderExtenderInterface {
 		
-    /**
-     * Get HTML code for extending the header of a page.
-     * 
-     * @return string HTML code extension
-     */
-    public function hPrintHeader();
+	/**
+	 * Get HTML code for extending the header of a page.
+	 * 
+	 * @return string HTML code extension
+	 */
+	public function hPrintHeader();
 	
 }
 

src/Webtrees/Hook/HookInterfaces/PageFooterExtenderInterface.php

Indentation +14 added lines, -14 removed lines

@@ -1,13 +1,13 @@ 
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <dev@jaubart.com>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <dev@jaubart.com>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
 
 /**
@@ -15,12 +15,12 @@ 
  */
 interface PageFooterExtenderInterface {
 		
-    /**
-     * Get HTML code for extending the footer of a page.
-     * 
-     * @return string HTML code extension
-     */
-    public function hPrintFooter();
+	/**
+	 * Get HTML code for extending the footer of a page.
+	 * 
+	 * @return string HTML code extension
+	 */
+	public function hPrintFooter();
 	
 }
 

src/Webtrees/Hook/HookInterfaces/IndividualHeaderExtenderInterface.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <dev@jaubart.com>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <dev@jaubart.com>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook\HookInterfaces;
 
 use Fisharebest\Webtrees\Controller\IndividualController;

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

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();
-		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/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 a 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 a 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 a 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 a 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('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') . '</a>
+                    <a href="edituser.php" class="name2">' . I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">'.Auth::user()->getRealNameHtml().'</a>').'</a>
                     <br><br>
                     <input type="submit" value="'.I18N::translate('sign out').'">
                     <br><br>
@@ -98,34 +98,34 @@ 
 						</label>
 					</div>
 					<div>
-						<input type="submit" value="'. I18N::translate('sign in'). '">
+						<input type="submit" value="'. I18N::translate('sign in').'">
 					</div>
 					<div>
 						<a href="#" id="maj-passwd_click">'. I18N::translate('Request a new password').'</a>
 					</div>';
             if (Site::getPreference('USE_REGISTRATION_MODULE')) {
-                $content.= '
+                $content .= '
                     <div>
-                        <a href="'.WT_LOGIN_URL.'?action=register">'. I18N::translate('Request a new user account').'</a>
+                        <a href="'.WT_LOGIN_URL.'?action=register">'.I18N::translate('Request a 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>