jon48 / webtrees-lib

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

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 {

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

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

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;

src/Webtrees/Fact.php

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/Mvc/Dispatcher.php

Spacing +7 added lines, -7 removed lines

@@ -50,10 +50,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';
@@ -65,11 +65,11 @@ 
 				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)) {
 				call_user_func_array(array($ctrl, $method), array());
 			}
 			 else {

src/Webtrees/Mvc/View/ViewFactory.php

Spacing +5 added lines, -5 removed lines

@@ -53,13 +53,13 @@
      */
     public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
     {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+        if (!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
+        if (!$ctrl) throw new \Exception('Base Controller not defined');
+        if (!$view_name) throw new \Exception('View not defined');
         
         $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
-        $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+        $view_class = $mvc_ctrl_refl->getNamespaceName().'\\Views\\'.$view_name.'View';       
+        if (!class_exists($view_class)) throw new \Exception('View does not exist');
         
         return new $view_class($ctrl, $data);
     }

src/Webtrees/Mvc/View/AbstractView.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     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();

src/Webtrees/Mvc/View/ViewBag.php

Spacing +3 added lines, -3 removed lines

@@ -73,8 +73,8 @@ 
      * @param bool $override
      */
     public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
+        if (is_null($key)) return;
+        if (!$override && array_key_exists($key, $this->data)) return;
         $this->data[$key] = $value;        
     }
     
@@ -107,7 +107,7 @@ 
      * @param string $key
      */
     public function __unset($key) {
-        unset($this->data[$key]);;
+        unset($this->data[$key]); ;
     }
     
 }