Changeset 874 for trunk/Modules/User

Timestamp:

Apr 6, 2020, 11:56:19 PM (5 years ago)

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

Location:

trunk/Modules/User

Files:

• User.php (modified) (1 diff)
• UserList.php (modified) (2 diffs)
• UserModel.php (modified) (14 diffs)
• UserPage.php (modified) (5 diffs)

trunk/Modules/User/User.php

@@ -301 +301 @@
       //   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>';
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/User/UserList.php

@@ -10 +10 @@
   {
     if (!$this->System->User->CheckPermission('User', 'ShowList'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User`');
@@ -52 +52 @@
     $Output .= $PageList['Output'];
 
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/User/UserModel.php

@@ -30 +30 @@
   function Hash($Password, $Salt)
   {
-    return (sha1(sha1($Password).$Salt));
+    return sha1(sha1($Password).$Salt);
   }
 
   function Verify($Password, $Salt, $StoredHash)
   {
-    return ($this->Hash($Password, $Salt) == $StoredHash);
+    return $this->Hash($Password, $Salt) == $StoredHash;
   }
 
@@ -177 +177 @@
       }
     }
-    return ($Result);
+    return $Result;
   }
 
@@ -195 +195 @@
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
-    return ($Output);
+    return $Output;
   }
 
@@ -231 +231 @@
       }
     } else $Result = USER_NOT_REGISTRED;
-    return ($Result);
+    return $Result;
   }
 
@@ -240 +240 @@
     $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();
-    return (USER_LOGGED_OUT);
+    return USER_LOGGED_OUT;
   }
 
@@ -271 +271 @@
       $Result[$DbRow['Description']][$DbRow['Title']] = $Value;
     }
-    return ($Result);
+    return $Result;
   }
 
@@ -296 +296 @@
       {
         if ($DbRow['AssignedGroup'] != '')
-        if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return (true);
+        if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return true;
       }
     }
@@ -314 +314 @@
     if ($PermissionExists)
     {
-      return ($this->PermissionGroupCacheOp[$GroupId.','.$OperationId]);
-    }
-    return (false);
+      return $this->PermissionGroupCacheOp[$GroupId.','.$OperationId];
+    }
+    return false;
   }
 
@@ -327 +327 @@
       $DbRow = $DbResult->fetch_assoc();
       $ModuleId = $DbRow['Id'];
-    } else return (false);
+    } else return false;
 
     // First try to check cache
@@ -358 +358 @@
       // Check user-operation relation
       $DbResult = $this->Database->select('PermissionUserAssignment', '*', $UserCondition.' AND (`AssignedOperation`="'.$OperationId.'")');
-      if ($DbResult->num_rows > 0) return (true);
+      if ($DbResult->num_rows > 0) return true;
 
       // Check user-group relation
@@ -364 +364 @@
       while ($DbRow = $DbResult->fetch_array())
       {
-       if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return (true);
-      }
-      return (false);
-    } else return (false);
+       if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return true;
+      }
+      return false;
+    } else return false;
   }
 
@@ -394 +394 @@
       $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
     } else $Output = USER_PASSWORD_RECOVERY_FAIL;
-    return ($Output);
+    return $Output;
   }
 
@@ -414 +414 @@
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
-    return ($Output);
+    return $Output;
   }
 
@@ -425 +425 @@
       $User = new User($this->System);
       $User->User = array('Id' => $DbRow['User']);
-      return ($User->CheckPermission($Module, $Operation));
-    } else return (false);
+      return $User->CheckPermission($Module, $Operation);
+    } else return false;
   }
 }

trunk/Modules/User/UserPage.php

@@ -12 +12 @@
       foreach ($Menu as $Item)
         $Title .= '<div class="Action">'.$Item.'</div>';
-    return ('<div class="Panel"><div class="Title">'.$Title.'</div><div class="Content">'.$Content.'</div></div>');
+    return '<div class="Panel"><div class="Title">'.$Title.'</div><div class="Content">'.$Content.'</div></div>';
   }
 
@@ -50 +50 @@
     $Output .= $PageList['Output'];
 
-    return ($Output);
+    return $Output;
   }
 
@@ -85 +85 @@
       $Output .= '</td></tr></table></div>';
     } else $Output .= $this->SystemMessage('Oprávnění', 'Nejste přihlášen');
-    return ($Output);
+    return $Output;
   }
 
@@ -213 +213 @@
       } else $Output = $this->ShowMain();
     } else $Output = $this->ShowMain();
-    return ($Output);
+    return $Output;
   }
 
@@ -219 +219 @@
   {
     $Output = 'Nebyla vybrána akce';
-    return ($Output);
+    return $Output;
   }
 }