jon48 / webtrees-lib

src/Webtrees/Module/AdminTasks/Model/AbstractTask.php

Spacing +20 added lines, -20 removed lines

@@ -80,7 +80,7 @@ 
 	 * @param string $file Filename containing the task object
 	 * @param TaskProviderInterface $provider Provider for tasks
      */
-    public function __construct($file, TaskProviderInterface $provider = null){
+    public function __construct($file, TaskProviderInterface $provider = null) {
         $this->name = trim(basename($file, '.php'));
 		$this->provider = $provider;
     }
@@ -90,7 +90,7 @@ 
      *
      * @return TaskProviderInterface 
      */
-    public function getProvider(){
+    public function getProvider() {
         return $this->provider;
     }
     
@@ -100,7 +100,7 @@ 
      * @param TaskProviderInterface $provider
      * @return self Enable method-chaining
      */
-    public function setProvider(TaskProviderInterface $provider){
+    public function setProvider(TaskProviderInterface $provider) {
         $this->provider = $provider;
         return $this;
     }
@@ -115,7 +115,7 @@ 
      * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
      * @param bool $is_running Indicates if the task is currently running
      */
-    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
+    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running) {
         $this->is_enabled = $is_enabled;
         $this->last_updated = $last_updated;
         $this->last_result = $last_result;
@@ -129,7 +129,7 @@ 
      *
      * @return string
      */
-    public function getName(){
+    public function getName() {
         return $this->name;
     }
     
@@ -139,7 +139,7 @@ 
      *
      * @return boolean True if enabled
      */
-    public function isEnabled(){
+    public function isEnabled() {
         return $this->is_enabled;
     }
     
@@ -148,7 +148,7 @@ 
      *
      * @return \DateTime
      */
-    public function getLastUpdated(){
+    public function getLastUpdated() {
         return $this->last_updated;
     }
     
@@ -157,7 +157,7 @@ 
      *
      * @return bool
      */
-    public function isLastRunSuccess(){
+    public function isLastRunSuccess() {
         return $this->last_result;
     }
     
@@ -166,7 +166,7 @@ 
      *
      * @return int
      */
-    public function getFrequency(){
+    public function getFrequency() {
         return $this->frequency;
     }
 	
@@ -176,7 +176,7 @@ 
 	 * @param int $frequency
      * @return self Enable method-chaining
      */
-    public function setFrequency($frequency){
+    public function setFrequency($frequency) {
         $this->frequency = $frequency;
 		return $this;
     }
@@ -186,7 +186,7 @@ 
      *
      * @return int
      */
-    public function getRemainingOccurrences(){
+    public function getRemainingOccurrences() {
         return $this->nb_occurrences;
     }
 	
@@ -196,7 +196,7 @@ 
 	 * @param int $nb_occur
      * @return self Enable method-chaining
      */
-    public function setRemainingOccurrences($nb_occur){
+    public function setRemainingOccurrences($nb_occur) {
         $this->nb_occurrences = $nb_occur;
 		return $this;
     }
@@ -206,7 +206,7 @@ 
      *
      * @return bool
      */
-    public function isRunning(){
+    public function isRunning() {
         return $this->is_running;
     }
     
@@ -235,7 +235,7 @@ 
 	 * @return bool
 	 */
 	public function save() {
-	    if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
+	    if (!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
 		return $this->provider->updateTask($this);
 	}
 	
@@ -243,23 +243,23 @@ 
      * Execute the task, default skeleton
      *
      */
-    public function execute(){
+    public function execute() {
     
-        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
+        if ($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
             $this->is_running = false;
     
-        if(!$this->is_running){
+        if (!$this->is_running) {
             $this->last_result = false;
             $this->is_running = true;
             $this->save();
     
             Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
             $this->last_result = $this->executeSteps();
-            if($this->last_result){
+            if ($this->last_result) {
                 $this->last_updated = new \DateTime();
-                if($this->nb_occurrences > 0){
+                if ($this->nb_occurrences > 0) {
                     $this->nb_occurrences--;
-                    if($this->nb_occurrences == 0) $this->is_enabled = false;
+                    if ($this->nb_occurrences == 0) $this->is_enabled = false;
                 }
             }
             $this->is_running = false;

src/Webtrees/Controller/IndividualController.php

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param \Fisharebest\Webtrees\Controller\IndividualController $ctrl_individual_in The Individual Controller to extend
 	 */
-	public function __construct(fw\Controller\IndividualController $ctrl_individual_in){
+	public function __construct(fw\Controller\IndividualController $ctrl_individual_in) {
 		$this->ctrl_individual = $ctrl_individual_in;
 		$this->dindi = new mw\Individual($this->ctrl_individual->getSignificantIndividual());
 	}
@@ -43,7 +43,7 @@ 
 	 * 
 	 * @uses \MyArtJaub\Webtrees\Hook\Hook
 	 */
-	public function printHeaderExtensions(){
+	public function printHeaderExtensions() {
 		$hook_extend_indi_header_left = new mw\Hook\Hook('hExtendIndiHeaderLeft');
 		$hook_extend_indi_header_right = new mw\Hook\Hook('hExtendIndiHeaderRight');
 		$hook_extend_indi_header_left = $hook_extend_indi_header_left->execute($this->ctrl_individual);
@@ -52,7 +52,7 @@ 
 		echo '<div id="indi_perso_header">',
 			'<div id="indi_perso_header_left">';
 		foreach ($hook_extend_indi_header_left as $div) {
-			if(count($div)==2){
+			if (count($div) == 2) {
 				echo '<div id="', $div[0], '" class="indi_perso_header_left_div">',
 					$div[1], '</div>';
 			}
@@ -60,7 +60,7 @@ 
 		echo '</div>',
 			'<div id="indi_perso_header_right">';
 		foreach ($hook_extend_indi_header_right as $div) {
-			if(count($div)==2){
+			if (count($div) == 2) {
 				echo '<div id="', $div[0], '" class="indi_perso_header_right_div">',
 					$div[1], '</div>';
 			}
@@ -75,7 +75,7 @@ 
 	 *
 	 * @uses \MyArtJaub\Webtrees\Hook\Hook
 	 */
-	public function printHeaderExtraIcons(){
+	public function printHeaderExtraIcons() {
 		$hook_extend_indi_header_icons = new Hook('hExtendIndiHeaderIcons');
 		$hook_extend_indi_header_icons = $hook_extend_indi_header_icons->execute($this->ctrl_individual);
 		

src/Webtrees/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Spacing +24 added lines, -24 removed lines

@@ -42,7 +42,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getDefaultFrequency()
 	 */
     public function getDefaultFrequency() {
-		return 10080;  // = 1 week = 7 * 24 * 60 min
+		return 10080; // = 1 week = 7 * 24 * 60 min
 	}
     
 	/**
@@ -55,9 +55,9 @@ 
 		
 		// Get the number of days to take into account, either last 7 days or since last check
 		$interval_sincelast = 0;
-		if($this->last_updated){
+		if ($this->last_updated) {
 			$tmpInt = $this->last_updated->diff(new \DateTime('now'), true);
-			$interval_sincelast = ( $tmpInt->days * 24  + $tmpInt->h ) * 60 + $tmpInt->i;
+			$interval_sincelast = ($tmpInt->days * 24 + $tmpInt->h) * 60 + $tmpInt->i;
 		}
 		
 		$interval = max($this->frequency, $interval_sincelast);
@@ -66,17 +66,17 @@ 
         // Check for updates
         $latest_version_txt = Functions::fetchLatestVersion();
         if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-        	list($latest_version, , $download_url) = explode('|', $latest_version_txt);
+        	list($latest_version,, $download_url) = explode('|', $latest_version_txt);
         } else {
         	// Cannot determine the latest version
-        	list($latest_version, , $download_url) = explode('|', '||');
+        	list($latest_version,, $download_url) = explode('|', '||');
         }
 		
 		// Users statistics
 		$warnusers = 0;
 		$nverusers = 0;
 		$applusers = 0;
-		foreach(User::all() as $user) {
+		foreach (User::all() as $user) {
 			if (((date("U") - (int)$user->getPreference('reg_timestamp')) > 604800) && !$user->getPreference('verified')) {
 				$warnusers++;
 			}
@@ -90,20 +90,20 @@ 
 		
 		// Tree specifics checks
 		$one_tree_done = false;
-		foreach(Tree::getAll() as $tree){
+		foreach (Tree::getAll() as $tree) {
 			$isTreeEnabled = $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED');
-			if((is_null($isTreeEnabled) || $isTreeEnabled) && $webmaster = User::find($tree->getPreference('WEBMASTER_USER_ID'))){
+			if ((is_null($isTreeEnabled) || $isTreeEnabled) && $webmaster = User::find($tree->getPreference('WEBMASTER_USER_ID'))) {
 				I18N::init($webmaster->getPreference('language'));
 				
 				$subject = I18N::translate('Health Check Report').' - '.I18N::translate('Tree %s', $tree->getTitle());
 				$message = 
-					I18N::translate('Health Check Report for the last %d days', $nbdays). Mail::EOL. Mail::EOL.
+					I18N::translate('Health Check Report for the last %d days', $nbdays).Mail::EOL.Mail::EOL.
 					I18N::translate('Tree %s', $tree->getTitle()).Mail::EOL.
 					'=========================================='.Mail::EOL.Mail::EOL;
 				
 				// News
 				$message_version = '';
-				if($latest_version && version_compare(WT_VERSION, $latest_version)<0){
+				if ($latest_version && version_compare(WT_VERSION, $latest_version) < 0) {
 					$message_version = I18N::translate('News').Mail::EOL.
 							'-------------'.Mail::EOL.
 							I18N::translate('A new version of *webtrees* is available: %s. Upgrade as soon as possible.', $latest_version).Mail::EOL.
@@ -119,7 +119,7 @@ 
 						I18N::translate('Not verified by the user')."\t\t".$applusers.Mail::EOL.
 						I18N::translate('Not approved by an administrator')."\t".$nverusers.Mail::EOL.
 						Mail::EOL;
-				$message  .= $message_users;
+				$message .= $message_users;
 								
 				// Statistics tree:				
 				$stats = new Stats($tree);
@@ -159,7 +159,7 @@ 
 							' AND log_time >= DATE_ADD( NOW(), INTERVAL - :nb_days DAY)'.
 							' GROUP BY log_message, gedcom_id'.
 							' ORDER BY lastoccurred DESC';
-				$errors=Database::prepare($sql)->execute(array(
+				$errors = Database::prepare($sql)->execute(array(
 					'log_type' => Log::TYPE_ERROR, 
 					'gedcom_id' => $tree->getTreeId(), 
 					'nb_days' => $nbdays
@@ -175,7 +175,7 @@ 
 					$tmp_message .= str_replace("\n", "\n\t\t\t\t\t\t", $error->log_message).Mail::EOL;
 					$nb_errors += $error->nblogs;
 				}
-				if($nb_errors > 0){
+				if ($nb_errors > 0) {
 					$message .= I18N::translate('Errors [%d]', $nb_errors).Mail::EOL.
 						'-------------'.Mail::EOL.
 						WT_BASE_URL.'admin_site_logs.php'.Mail::EOL.
@@ -186,12 +186,12 @@ 
 						str_repeat('-', $nb_char_count_title)."\t".str_repeat('-', $nb_char_type)."\t".str_repeat('-', 20)."\t".str_repeat('-', strlen(I18N::translate('Error'))).Mail::EOL.
 						$tmp_message.Mail::EOL;
 				}
-				else{
+				else {
 					$message .= I18N::translate('No errors', $nb_errors).Mail::EOL.Mail::EOL;
 				}
 				
 				$tmpres = true;
-				if($webmaster->getPreference('contactmethod') !== 'messaging' 
+				if ($webmaster->getPreference('contactmethod') !== 'messaging' 
 						&& $webmaster->getPreference('contactmethod') !== 'none') {
 					$tmpres = Mail::systemMessage($tree, $webmaster, $subject, $message);
 				}		
@@ -213,24 +213,24 @@ 
 		$html = '
 			<div class="form-group">
     			<label class="control-label col-sm-3"> '.
-    				I18N::translate('Enable healthcheck emails for') .
+    				I18N::translate('Enable healthcheck emails for').
     			'</label>
     			<div class="col-sm-9">';
 
-		foreach(Tree::getAll() as $tree){
-			if(Auth::isManager($tree)){	
+		foreach (Tree::getAll() as $tree) {
+			if (Auth::isManager($tree)) {	
 			    $html .= '<div class="form-group row">
 			        <span class="col-sm-3 control-label">' .
-			             $tree->getTitle() .
+			             $tree->getTitle().
 					'</span>
 					 <div class="col-sm-2">';
-				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
+				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_'.$tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
 				$html .= '</div></div>';
 			}
 		}
 		
 		$html .= '	<p class="small text-muted">'.
-    					I18N::translate('Enable the health check emails for each of the selected trees.') .
+    					I18N::translate('Enable the health check emails for each of the selected trees.').
     				'</p>
     			</div>
     		</div>';
@@ -244,9 +244,9 @@ 
 	 */
 	public function saveConfig() {
 		try {
-			foreach(Tree::getAll() as $tree){		
-				if(Auth::isManager($tree)){
-					$tree_enabled = Filter::postInteger('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), 0, 1);
+			foreach (Tree::getAll() as $tree) {		
+				if (Auth::isManager($tree)) {
+					$tree_enabled = Filter::postInteger('HEALTHCHECK_ENABLED_'.$tree->getTreeId(), 0, 1);
 					$tree->setPreference('MAJ_AT_'.$this->getName().'_ENABLED', $tree_enabled);
 				}
 			}

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

Spacing +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
 		    ' majat_name 		    VARCHAR(32)                      NOT NULL,'.
 		    ' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
 		    ' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
-		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 means error, 1 is success
-		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
+		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.// 0 means error, 1 is success
+		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.// In min, Default every week
 		    ' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
 		    ' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
 		    ' PRIMARY KEY (majat_name)'.

src/Webtrees/Mvc/Dispatcher.php

Spacing +8 added lines, -8 removed lines

@@ -49,10 +49,10 @@ 
     public function handle(fw\Module\AbstractModule $module, $request) {
 		
 		$fq_modclass_name = get_class($module);
-		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\';
+		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')).'\\';
 		
-		$args = explode( '@', $request, 2);
-		switch(count($args)) {
+		$args = explode('@', $request, 2);
+		switch (count($args)) {
 			case 1:
 				$ctrl_name = $args[0];
 				$method = 'index';
@@ -64,16 +64,16 @@ 
 				break;
 		}
 		
-		$ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller';
-		if(class_exists($ctrl_class) 
+		$ctrl_class = $ctrl_namespace.$ctrl_name.'Controller';
+		if (class_exists($ctrl_class) 
 		    && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
-			&& $ctrl = new $ctrl_class($module) ) {
-			if(method_exists($ctrl, $method)) {
+			&& $ctrl = new $ctrl_class($module)) {
+			if (method_exists($ctrl, $method)) {
 			    try {
 			        call_user_func_array(array($ctrl, $method), array());
 			    }
 			    catch (MvcException $ex) {
-			        if(!headers_sent()) {
+			        if (!headers_sent()) {
 			            http_response_code($ex->getHttpCode());
 			        }
 			        echo $ex->getMessage();			        

src/Webtrees/Mvc/MvcException.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 class MvcException extends \Exception {
 
     /** @var int[] $VALID_HTTP List of valid HTTP codes */
-    protected static $VALID_HTTP =  array(
+    protected static $VALID_HTTP = array(
         100, 101,
         200, 201, 202, 203, 204, 205, 206,
         300, 301, 302, 303, 304, 305, 306, 307,
@@ -58,9 +58,9 @@ 
      * @throws InvalidArgumentException Thrown if not valid Http code
      */
     public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
+        if (!in_array($http_code, self::$VALID_HTTP))
             throw new \InvalidArgumentException('Invalid HTTP code');
-        $this->http_code= $http_code;
+        $this->http_code = $http_code;
     }   
 
 }

src/Webtrees/Module/Sosa/Views/SosaConfigView.php

Spacing +3 added lines, -3 removed lines

@@ -47,13 +47,13 @@
         			<div class="value">
         				<?php 
         				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				        $root_indi = $users[0]['rootid'];  ?>
+        				    if (count($users) == 1) {
+        				        $root_indi = $users[0]['rootid']; ?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
         					</label>
-        				<?php  } else if(count($users) > 1) { ?>
+        				<?php  } else if (count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
         					   $root_indi = $users[0]['rootid'];

src/Webtrees/Cache.php

Spacing +15 added lines, -15 removed lines

@@ -20,13 +20,13 @@ 
 /**
  * Cache component to speed up some potential data retrievals
  */
-class Cache{
+class Cache {
 	
     /**
      * Underlying Cache object
      * @var CacheItemPoolInterface $cache
      */
-	protected $cache=null;
+	protected $cache = null;
 	
 	/**
 	 * Defines whether the cache has been initialised
@@ -59,7 +59,7 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
+	    if (Apc::isAvailable()) {
 		    $driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
@@ -83,8 +83,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();
 	}
 	
 	/**
@@ -94,10 +94,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;
 	}
 	
@@ -108,7 +108,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public function getI($value, AbstractModule $mod = null){
+	public function getI($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
@@ -120,7 +120,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public static function get($value, AbstractModule $mod = null){
+	public static function get($value, AbstractModule $mod = null) {
 	    return self::getInstance()->getI($value, $mod);
 	}
 	
@@ -131,11 +131,11 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public function saveI($value, $data, AbstractModule $mod = null){
+	public function saveI($value, $data, AbstractModule $mod = null) {
 		$this->checkInit();
 		
 		$item = $value;
-		if(!($value instanceof CacheItemInterface)) {
+		if (!($value instanceof CacheItemInterface)) {
 		    $item = new \Stash\Item();
     		$item->setKey($this->getKeyName($value, $mod));
 		}		
@@ -150,7 +150,7 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public static function save($value, $data, AbstractModule $mod = null){
+	public static function save($value, $data, AbstractModule $mod = null) {
 	    self::getInstance()->saveI($value, $data, $mod);
 	}
 	
@@ -161,7 +161,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public function deleteI($value, AbstractModule $mod = null){
+	public function deleteI($value, AbstractModule $mod = null) {
 	    $this->checkInit();	
 	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
@@ -173,7 +173,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public static function delete($value, AbstractModule $mod = null){
+	public static function delete($value, AbstractModule $mod = null) {
 	    return self::getInstance()->deleteI($value, $mod);
 	}
 	
@@ -181,7 +181,7 @@ 
 	 * Clean the cache
 	 *
 	 */
-	public function cleanI(){
+	public function cleanI() {
 	    $this->checkInit();
 		$this->cache->clear();
 	}

src/Webtrees/Functions/FunctionsPrintLists.php

Spacing +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
         $surn = str_replace('@N.N.', 'AAAA', $surn);
 
         return array(
-            $surn . 'AAAA' . $givn,
-            $givn . 'AAAA' . $surn,
+            $surn.'AAAA'.$givn,
+            $givn.'AAAA'.$surn,
         );
     }