jon48 / webtrees-lib

src/Webtrees/Constants.php

Indentation +10 added lines, -10 removed lines

@@ -14,17 +14,17 @@ 
  */
 class Constants {
     
-    const LIB_NAMESPACE = __NAMESPACE__;
+	const LIB_NAMESPACE = __NAMESPACE__;
 	
-    /** Internal name of the Certificates Module
-     * @var string
-     */
-    const MODULE_MAJ_CERTIF_NAME = 'myartjaub_certificates';
+	/** Internal name of the Certificates Module
+	 * @var string
+	 */
+	const MODULE_MAJ_CERTIF_NAME = 'myartjaub_certificates';
     
-    /** Internal name of the GeoDispersion Module
-     * @var string
-     */
-    const MODULE_MAJ_GEODISP_NAME = 'myartjaub_geodispersion';
+	/** Internal name of the GeoDispersion Module
+	 * @var string
+	 */
+	const MODULE_MAJ_GEODISP_NAME = 'myartjaub_geodispersion';
     
 	/** Internal name of the Hooks Module
 	 * @var string
@@ -61,7 +61,7 @@ 
 	 * @return string $WT_RAPHAEL_JS_URL
 	 */
 	public static function WT_RAPHAEL_JS_URL() {
-	    return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js';
+		return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js';
 	}
 		
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @return string $WT_RAPHAEL_JS_URL
 	 */
 	public static function WT_RAPHAEL_JS_URL() {
-	    return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js';
+	    return WT_STATIC_URL.'packages/raphael-2.1.4/raphael-min.js';
 	}
 		
 }
\ No newline at end of file

src/Webtrees/Module/ModuleMenuItemInterface.php

Indentation +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@
  */
 interface ModuleMenuItemInterface
 {
-    /**
-     * Returns a menu item for the module.
-     * 
-     * @param \Fisharebest\Webtrees\Tree|null $tree
-     * @param mixed $reference
-     */
-    public function getMenu(\Fisharebest\Webtrees\Tree $tree, $reference);
+	/**
+	 * Returns a menu item for the module.
+	 * 
+	 * @param \Fisharebest\Webtrees\Tree|null $tree
+	 * @param mixed $reference
+	 */
+	public function getMenu(\Fisharebest\Webtrees\Tree $tree, $reference);
 }
\ No newline at end of file

src/Webtrees/Module/Hooks/Schema/Migration0.php

Indentation +9 added lines, -9 removed lines

@@ -23,17 +23,17 @@
 
 		Database::exec(
 		   "CREATE TABLE IF NOT EXISTS `##maj_hooks` (".
-	       " majh_id       			INTEGER AUTO_INCREMENT NOT NULL,".
-	       " majh_hook_function		VARCHAR(32)            NOT NULL,".
+		   " majh_id       			INTEGER AUTO_INCREMENT NOT NULL,".
+		   " majh_hook_function		VARCHAR(32)            NOT NULL,".
 		   " majh_hook_context      VARCHAR(32)            NOT NULL DEFAULT 'all',".
-	       " majh_module_name		VARCHAR(32)            NOT NULL,".
-	       " majh_module_priority	INTEGER            	   NOT NULL DEFAULT 99,".
-	       " majh_status      		ENUM('enabled', 'disabled') NOT NULL DEFAULT 'enabled',".		   
-	       " PRIMARY KEY (majh_id),".
-	       " UNIQUE KEY `##maj_hooks_uk` (majh_hook_function, majh_hook_context, majh_module_name),".
-	       " FOREIGN KEY `##module_name_fk1` (majh_module_name)".
+		   " majh_module_name		VARCHAR(32)            NOT NULL,".
+		   " majh_module_priority	INTEGER            	   NOT NULL DEFAULT 99,".
+		   " majh_status      		ENUM('enabled', 'disabled') NOT NULL DEFAULT 'enabled',".		   
+		   " PRIMARY KEY (majh_id),".
+		   " UNIQUE KEY `##maj_hooks_uk` (majh_hook_function, majh_hook_context, majh_module_name),".
+		   " FOREIGN KEY `##module_name_fk1` (majh_module_name)".
 		   " REFERENCES `##module` (module_name) ON DELETE CASCADE ON UPDATE CASCADE".
-	       ") COLLATE utf8_unicode_ci ENGINE=InnoDB"
+		   ") COLLATE utf8_unicode_ci ENGINE=InnoDB"
 		);
 	}
 }

src/Webtrees/Module/Hooks/Views/AdminConfigView.php

Indentation +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        $table_id = $this->data->get('table_id');
+		$table_id = $this->data->get('table_id');
         
-        ?>        
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -79,7 +79,7 @@ 
 		</div>	
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -60,13 +60,13 @@
 							?>
 							<tr>
 								<td>
-									<input type="hidden" name="hook-<?php echo $hook->id;?>" value="yes" >
-									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status)=='enabled'); ?>
+									<input type="hidden" name="hook-<?php echo $hook->id; ?>" value="yes" >
+									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status) == 'enabled'); ?>
 								</td>
-								<td><?php echo (($hook->status)=='enabled'); ?></td>
+								<td><?php echo (($hook->status) == 'enabled'); ?></td>
 								<td><?php echo $hook->hook; ?></td>
 								<td><?php echo $hook->context; ?></td>
-								<td><?php if($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
+								<td><?php if ($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
 								<td><input type="text" class="center" size="2" value="<?php echo $hook->priority; ?>" name="moduleorder-<?php echo $hook->id; ?>" /></td>
 								<td><?php echo $hook->priority; ?></td>
 							</tr>

Braces +4 added lines, -1 removed lines

@@ -66,7 +66,10 @@
 								<td><?php echo (($hook->status)=='enabled'); ?></td>
 								<td><?php echo $hook->hook; ?></td>
 								<td><?php echo $hook->context; ?></td>
-								<td><?php if($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
+								<td><?php if($mod = Module::getModuleByName($hook->module)) {
+	echo $mod->getTitle();
+}
+?></td>
 								<td><input type="text" class="center" size="2" value="<?php echo $hook->priority; ?>" name="moduleorder-<?php echo $hook->id; ?>" /></td>
 								<td><?php echo $hook->priority; ?></td>
 							</tr>

src/Webtrees/Module/ModuleManager.php

Indentation +52 added lines, -52 removed lines

@@ -49,62 +49,62 @@
 	}
 	
 	/**
-     * Protected constructor.
-     */
-    protected function __construct()
-    {
-    	$this->modules_list = array();
-    }
+	 * Protected constructor.
+	 */
+	protected function __construct()
+	{
+		$this->modules_list = array();
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational()
-     */
-    public function isOperational($moduleName) {
-    	if(!array_key_exists($moduleName, $this->modules_list)) {
-    		if($module = fw\Module::getModuleByName($moduleName)) {
-    			if($module instanceof DependentInterface) {
-    				if($module->validatePrerequisites()) {
-    					$this->modules_list[$moduleName] = TRUE;
-    					return true;
-    				} else {
-    					// Do not cache the result,
-    					// as they could change by the next call to the method
-    					return false;
-    				}
-    			}
-    			else {
-    				$this->modules_list[$moduleName] = TRUE;
-    				return true;
-    			}
-    		}
-    		else {
-    			$this->modules_list[$moduleName] = FALSE;
-    		}
-    	}
-    	return $this->modules_list[$moduleName];
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational()
+	 */
+	public function isOperational($moduleName) {
+		if(!array_key_exists($moduleName, $this->modules_list)) {
+			if($module = fw\Module::getModuleByName($moduleName)) {
+				if($module instanceof DependentInterface) {
+					if($module->validatePrerequisites()) {
+						$this->modules_list[$moduleName] = TRUE;
+						return true;
+					} else {
+						// Do not cache the result,
+						// as they could change by the next call to the method
+						return false;
+					}
+				}
+				else {
+					$this->modules_list[$moduleName] = TRUE;
+					return true;
+				}
+			}
+			else {
+				$this->modules_list[$moduleName] = FALSE;
+			}
+		}
+		return $this->modules_list[$moduleName];
     	
-    }
+	}
     
 
-    /**
-     * Private clone method to prevent cloning of the instance of the
-     * *ModuleManager* instance.
-     *
-     * @return void
-     */
-    private function __clone()
-    {
-    }
+	/**
+	 * Private clone method to prevent cloning of the instance of the
+	 * *ModuleManager* instance.
+	 *
+	 * @return void
+	 */
+	private function __clone()
+	{
+	}
 
-    /**
-     * Private unserialize method to prevent unserializing of the *ModuleManager*
-     * instance.
-     *
-     * @return void
-     */
-    private function __wakeup()
-    {
-    }
+	/**
+	 * Private unserialize method to prevent unserializing of the *ModuleManager*
+	 * instance.
+	 *
+	 * @return void
+	 */
+	private function __wakeup()
+	{
+	}
     
 }

Spacing +4 added lines, -4 removed lines

@@ -61,10 +61,10 @@
      * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational()
      */
     public function isOperational($moduleName) {
-    	if(!array_key_exists($moduleName, $this->modules_list)) {
-    		if($module = fw\Module::getModuleByName($moduleName)) {
-    			if($module instanceof DependentInterface) {
-    				if($module->validatePrerequisites()) {
+    	if (!array_key_exists($moduleName, $this->modules_list)) {
+    		if ($module = fw\Module::getModuleByName($moduleName)) {
+    			if ($module instanceof DependentInterface) {
+    				if ($module->validatePrerequisites()) {
     					$this->modules_list[$moduleName] = TRUE;
     					return true;
     				} else {

Braces +2 added lines, -4 removed lines

@@ -72,13 +72,11 @@
     					// as they could change by the next call to the method
     					return false;
     				}
-    			}
-    			else {
+    			} else {
     				$this->modules_list[$moduleName] = TRUE;
     				return true;
     			}
-    		}
-    		else {
+    		} else {
     			$this->modules_list[$moduleName] = FALSE;
     		}
     	}

src/Webtrees/Module/MiscExtensions/Views/AdminConfigView.php

Indentation +8 added lines, -8 removed lines

@@ -28,15 +28,15 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        if (Module::getModuleByName('ckeditor')) {
-            CkeditorModule::enableEditor($this->ctrl);
-        }
+		if (Module::getModuleByName('ckeditor')) {
+			CkeditorModule::enableEditor($this->ctrl);
+		}
         
-        /** @var AbstractModule $module  */
-        $module = $this->data->get('module');        
-        ?>        
+		/** @var AbstractModule $module  */
+		$module = $this->data->get('module');        
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -187,7 +187,7 @@ 
         </form>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Place.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 			$index = str_replace('%', '', $match2);
 			if(is_numeric($index) && $index >0 && $index <= $nbLevels){
 				$displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace);
-			}
-			else{
+			} else{
 				$displayPlace = str_replace($match2, '' , $displayPlace);
 			}
 		}

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
 	 *
 	 * @param \Fisharebest\Webtrees\Place $place_in The Place to extend
 	 */
-	public function __construct(\Fisharebest\Webtrees\Place $place){
+	public function __construct(\Fisharebest\Webtrees\Place $place) {
 		$this->place = $place;
 	}
 
@@ -39,9 +39,9 @@ 
 	 * @param \Fisharebest\Webtrees\Tree $tree
 	 * @return \MyArtJaub\Webtrees\Place|null Instance of \MyArtJaub\Webtrees\Place, if relevant
 	 */
-	public static function getIntance($place_str, Tree $tree){
+	public static function getIntance($place_str, Tree $tree) {
 		$dplace = null;
-		if(is_string($place_str) && strlen($place_str) > 0){
+		if (is_string($place_str) && strlen($place_str) > 0) {
 			$dplace = new Place(new \Fisharebest\Webtrees\Place($place_str, $tree));
 		}
 		return $dplace;
@@ -52,7 +52,7 @@ 
 	 *
 	 * @return \Fisharebest\Webtrees\Place Embedded place record
 	 */
-	public function getDerivedPlace(){
+	public function getDerivedPlace() {
 		return $this->place;
 	}
 	
@@ -65,8 +65,8 @@ 
 	 * @param bool $anchor Option to print a link to placelist
 	 * @return string HTML code for formatted place
 	 */
-	public function htmlFormattedName($format, $anchor = false){		
-		$html='';
+	public function htmlFormattedName($format, $anchor = false) {		
+		$html = '';
 		
 		$levels = array_map('trim', explode(',', $this->place->getGedcomName()));
 		$nbLevels = count($levels);
@@ -74,15 +74,15 @@ 
 		preg_match_all('/%[^%]/', $displayPlace, $matches);
 		foreach ($matches[0] as $match2) {
 			$index = str_replace('%', '', $match2);
-			if(is_numeric($index) && $index >0 && $index <= $nbLevels){
-				$displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace);
+			if (is_numeric($index) && $index > 0 && $index <= $nbLevels) {
+				$displayPlace = str_replace($match2, $levels[$index - 1], $displayPlace);
 			}
-			else{
-				$displayPlace = str_replace($match2, '' , $displayPlace);
+			else {
+				$displayPlace = str_replace($match2, '', $displayPlace);
 			}
 		}
 		if ($anchor && !Auth::isSearchEngine()) {
-			$html .='<a href="' . $this->place->getURL() . '">' . $displayPlace . '</a>';
+			$html .= '<a href="'.$this->place->getURL().'">'.$displayPlace.'</a>';
 		} else {
 			$html .= $displayPlace;
 		}

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

src/Webtrees/Mvc/Controller/MvcController.php

Indentation +20 added lines, -20 removed lines

@@ -17,28 +17,28 @@
  */
 class MvcController implements MvcControllerInterface 
 {
-    /**
-     * Reference module
-     * @var Fisharebest\Webtrees\Module\AbstractModule $module
-     */
-    protected $module;
+	/**
+	 * Reference module
+	 * @var Fisharebest\Webtrees\Module\AbstractModule $module
+	 */
+	protected $module;
     
-    /**
-     * Constructor for MvcController
-     * 
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        $this->module = $module;
-    }
+	/**
+	 * Constructor for MvcController
+	 * 
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		$this->module = $module;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface::getModule()
-     */
-    public function getModule() {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface::getModule()
+	 */
+	public function getModule() {
+		return $this->module;
+	}
         
 }
  
\ No newline at end of file