jon48 / webtrees-lib

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/Hook/HookInterfaces/CustomSimpleTagManagerInterface.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;
 
 /**
@@ -18,12 +18,12 @@ 
 interface CustomSimpleTagManagerInterface {
 
 
-    /**
-     * Returns the list of expected tags, classified by type of records.
-     *
-     * @return array List of expected tags
-     */
-    public function hGetExpectedTags();
+	/**
+	 * Returns the list of expected tags, classified by type of records.
+	 *
+	 * @return array List of expected tags
+	 */
+	public function hGetExpectedTags();
     
 	/**
 	 * Return the HTML code to be display for this tag.

src/Webtrees/Mvc/View/AbstractView.php

Indentation +48 added lines, -48 removed lines

@@ -15,66 +15,66 @@
  */
 abstract class AbstractView {
     
-    /**
-     * Reference controller
-     * @var \Fisharebest\Webtrees\Controller\BaseController $ctrl
-     */
-    protected $ctrl;
+	/**
+	 * Reference controller
+	 * @var \Fisharebest\Webtrees\Controller\BaseController $ctrl
+	 */
+	protected $ctrl;
     
-    /**
-     * Structure containing the data of the view
-     * @var ViewBag $data
-     */
-    protected $data;
+	/**
+	 * Structure containing the data of the view
+	 * @var ViewBag $data
+	 */
+	protected $data;
     
-    /**
-     * Constructor 
-     * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl Controller
-     * @param ViewBag $data ViewBag holding view data
-     */
-    public function __construct(\Fisharebest\Webtrees\Controller\BaseController $ctrl, ViewBag $data) {
-        $this->ctrl = $ctrl;
-        $this->data = $data;
-    }
+	/**
+	 * Constructor 
+	 * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl Controller
+	 * @param ViewBag $data ViewBag holding view data
+	 */
+	public function __construct(\Fisharebest\Webtrees\Controller\BaseController $ctrl, ViewBag $data) {
+		$this->ctrl = $ctrl;
+		$this->data = $data;
+	}
     
-    /**
-     * Render the view to the page, including header.
-     * 
-     * @throws \Exception
-     */
-    public function render() {
+	/**
+	 * Render the view to the page, including header.
+	 * 
+	 * @throws \Exception
+	 */
+	public function render() {
 		global $controller;
 		
-        if(!$this->ctrl) throw new \Exception('Controller not initialised');
+		if(!$this->ctrl) throw new \Exception('Controller not initialised');
         
 		$controller = $this->ctrl;
-        $this->ctrl->pageHeader();
+		$this->ctrl->pageHeader();
         
-        echo $this->renderContent();
-    }
+		echo $this->renderContent();
+	}
     
-    /**
-     * Render the view to the page, without any header
-     */
-    public function renderPartial() {
-        echo $this->getHtmlPartial();
-    }
+	/**
+	 * Render the view to the page, without any header
+	 */
+	public function renderPartial() {
+		echo $this->getHtmlPartial();
+	}
     
-    /**
-     * Return the HTML code generated by the view, without any header
-     */
-    public function getHtmlPartial() {
-        ob_start();
-        $html_render = $this->renderContent();
-        $html_buffer = ob_get_clean();        
+	/**
+	 * Return the HTML code generated by the view, without any header
+	 */
+	public function getHtmlPartial() {
+		ob_start();
+		$html_render = $this->renderContent();
+		$html_buffer = ob_get_clean();        
         
-        return empty($html_render) ? $html_buffer : $html_render;
-    }
+		return empty($html_render) ? $html_buffer : $html_render;
+	}
     
-    /**
-     * Abstract method containing the details of the view.
-     */
-    abstract protected function renderContent();
+	/**
+	 * Abstract method containing the details of the view.
+	 */
+	abstract protected function renderContent();
     
 }
  
\ No newline at end of file

src/Webtrees/Family.php

Indentation +4 added lines, -4 removed lines

@@ -40,10 +40,10 @@
 	}
 	
 	/**
-	* Check if this family's marriages are sourced
-	*
-	* @return int Level of sources
-	* */
+	 * Check if this family's marriages are sourced
+	 *
+	 * @return int Level of sources
+	 * */
 	function isMarriageSourced(){
 		if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
 		$this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC');

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

src/Webtrees/Functions/Functions.php

Indentation +16 added lines, -16 removed lines

@@ -135,7 +135,7 @@ 
 	 * @return boolean
 	 */
 	public static function isEncryptionCompatible() {
-	    return function_exists('mcrypt_encrypt') && function_exists('mcrypt_encrypt') && function_exists('mcrypt_decrypt');
+		return function_exists('mcrypt_encrypt') && function_exists('mcrypt_encrypt') && function_exists('mcrypt_decrypt');
 	}
 	
 	/**	  
@@ -146,8 +146,8 @@ 
 	 * @return string Encrypted and encoded text
 	 */
 	public static function encryptToSafeBase64($data){
-	    if(!self::isEncryptionCompatible())
-	        throw new \Exception('MCrypt PHP extension is required to use encryption.');
+		if(!self::isEncryptionCompatible())
+			throw new \Exception('MCrypt PHP extension is required to use encryption.');
 	    
 		$key = 'STANDARDKEYIFNOSERVER';
 		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
@@ -169,8 +169,8 @@ 
 	 * @return string Decrypted text
 	 */
 	public static function decryptFromSafeBase64($encrypted){
-	    if(!self::isEncryptionCompatible())
-	        throw new \Exception('MCrypt PHP extension is required to use encryption.');
+		if(!self::isEncryptionCompatible())
+			throw new \Exception('MCrypt PHP extension is required to use encryption.');
 	    
 		$key = 'STANDARDKEYIFNOSERVER';
 		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
@@ -197,7 +197,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;
 	}
@@ -262,20 +262,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;
 	}
 		
 }

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;
+	}
     
 
 }

src/Webtrees/Module/WelcomeBlock/WelcomeBlockController.php

Indentation +67 added lines, -67 removed lines

@@ -29,30 +29,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()
                 {
@@ -63,65 +63,65 @@ 
     				  });
     			');
     
-            if (Auth::isAdmin()) {
-                $title='<a class="icon-admin" title="'.I18N::translate('Preferences').'" 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('Preferences').'" 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 = null) {
+	/**
+	 * WelcomeBlock@config
+	 * 
+	 * @param string $block_id
+	 */
+	public function config($block_id = null) {
         
-        if(empty($block_id)) throw new MvcException(404);
+		if(empty($block_id)) throw new MvcException(404);
 
-        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'))); 
-            Cache::delete('piwikCountYear', $this->module);          
-            throw new MvcException(200); // Use this instead of 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'))); 
+			Cache::delete('piwikCountYear', $this->module);          
+			throw new MvcException(200); // Use this instead of 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', ''));
         
-        return ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->getHtmlPartial();
-    }
+		return ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->getHtmlPartial();
+	}