jon48 / webtrees-lib

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

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>' . 
-                    I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') .
+                    I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">'.Auth::user()->getRealNameHtml().'</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>

src/Webtrees/Module/WelcomeBlock/PiwikController.php

Spacing +11 added lines, -11 removed lines

@@ -30,14 +30,14 @@ 
      * @param string $period
      * @param (null|int) Number of visits
      */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+    private function getNumberOfVisitsPiwik($block_id, $period = 'year') {
     
         $piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
         $piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
         $piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
+        if ($piwik_url && strlen($piwik_url) > 0 &&
+            $piwik_siteid && strlen($piwik_siteid) > 0 &&
             $piwik_token && strlen($piwik_token)            
             ) 
         {        
@@ -48,9 +48,9 @@ 
             $url .= '&format=PHP';
             $url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
+            if ($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if (is_numeric($content)) return $content;
             }
         }
     
@@ -72,20 +72,20 @@ 
         $data->set('has_stats', false);
         
         $block_id = Filter::get('block_id');        
-        if($block_id){
+        if ($block_id) {
             $cached_item = Cache::get('piwikCountYear', $this->module);
             $visitCountYear = $cached_item->get();
-            if(!$cached_item->isHit()) {
+            if (!$cached_item->isHit()) {
                 $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
-                if(!is_null($visitCountYear)) {
-                    $cached_item->expiresAt(new \DateTime('tomorrow'));  // Expires the next day at midnight
+                if (!is_null($visitCountYear)) {
+                    $cached_item->expiresAt(new \DateTime('tomorrow')); // Expires the next day at midnight
                     Cache::save($cached_item, $visitCountYear);
                 }
             }
             
-            if($visitCountYear){
+            if ($visitCountYear) {
                 $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+                $visitCountYear = max(0, $visitCountYear);
                 
                 $data->set('has_stats', true);
                 $data->set('visits_today', $visitCountToday);