GEANT / CAT

web/lib/admin/domain/SilverbulletUser.php

Spacing +30 added lines, -30 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletUser extends PersistentEntity{
+class SilverbulletUser extends PersistentEntity {
     
     const LEVEL_GREEN = 0;
     const LEVEL_YELLOW = 1;
@@ -89,14 +89,14 @@ 
      * @param int $profileId
      * @param string $username
      */
-    public function __construct($profileId, $username){
+    public function __construct($profileId, $username) {
         parent::__construct(self::TABLE, self::TYPE_INST);
         $this->setAttributeType(self::PROFILEID, Attribute::TYPE_INTEGER);
         
         $this->set(self::PROFILEID, $profileId);
         $this->set(self::USERNAME, $username);
         //$this->set(self::EXPIRY, 'NOW() + INTERVAL 1 WEEK');
-        $this->defaultUserExpiry = date('Y-m-d H:i:s',strtotime("today"));
+        $this->defaultUserExpiry = date('Y-m-d H:i:s', strtotime("today"));
         //$this->set(self::EXPIRY, $this->defaultUserExpiry);
     }
     
@@ -105,7 +105,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::validate()
      */
-    public function validate(){
+    public function validate() {
         return (
                 !empty($this->get(self::PROFILEID))
         );
@@ -116,11 +116,11 @@ 
      * 
      * @param string $date Takes any string value that can passed to strtotime() function.
      */
-    public function setExpiry($date){
+    public function setExpiry($date) {
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
-        if($tokenExpiry > $this->defaultUserExpiry){
+        if ($tokenExpiry > $this->defaultUserExpiry) {
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else {
             $this->clear();
         }
     }
@@ -128,8 +128,8 @@ 
     /**
      * 
      */
-    public function makeAcknowledged(){
-        $this->set(self::LAST_ACKNOWLEDGE, date('Y-m-d H:i:s',strtotime("now")));
+    public function makeAcknowledged() {
+        $this->set(self::LAST_ACKNOWLEDGE, date('Y-m-d H:i:s', strtotime("now")));
     }
     
     /**
@@ -137,14 +137,14 @@ 
      * 
      * @return int One of the following constants LEVEL_GREEN, LEVEL_YELLOW, LEVEL_RED.
      */
-    public function getAcknowledgeLevel(){
+    public function getAcknowledgeLevel() {
         $max = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $days = $this->getAcknowledgeDays();
-        if($days <= $max * 0.2 && $days > $max * 0.1){
+        if ($days <= $max * 0.2 && $days > $max * 0.1) {
             return self::LEVEL_YELLOW;
-        }elseif ($days <= $max * 0.1){
+        }elseif ($days <= $max * 0.1) {
             return self::LEVEL_RED;
-        }else{
+        } else {
             return self::LEVEL_GREEN;
         }
     }
@@ -154,7 +154,7 @@ 
      * 
      * @return number Number of days from 0 to maximum period.
      */
-    public function getAcknowledgeDays(){
+    public function getAcknowledgeDays() {
         $max = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $lastAcknowledge = strtotime($this->get(self::LAST_ACKNOWLEDGE));
         $now = strtotime('now');
@@ -162,11 +162,11 @@ 
         return $days > 0 ? $days : 0;
     }
     
-    public function getProfileId(){
+    public function getProfileId() {
         return $this->get(self::PROFILEID);
     }
     
-    public function getUsername(){
+    public function getUsername() {
         return $this->get(self::USERNAME);
     }
     
@@ -174,7 +174,7 @@ 
      * 
      * @return boolean
      */
-    public function isExpired(){
+    public function isExpired() {
         $expiryTime = strtotime($this->get(self::EXPIRY));
         $currentTime = time();
         return $currentTime > $expiryTime;
@@ -184,7 +184,7 @@ 
      *
      * @return string
      */
-    public function getExpiry(){
+    public function getExpiry() {
         return date('Y-m-d', strtotime($this->get(self::EXPIRY)));
     }
     
@@ -192,7 +192,7 @@ 
      * 
      * @return \web\lib\admin\domain\SilverbulletCertificate
      */
-    public function getCertificates(){
+    public function getCertificates() {
         return $this->certificates;
     }
 
@@ -200,7 +200,7 @@ 
      *
      * @return \web\lib\admin\domain\SilverbulletInvitation
      */
-    public function getInvitations(){
+    public function getInvitations() {
         return $this->invitations;
     }
     
@@ -208,7 +208,7 @@ 
      * 
      * @return boolean
      */
-    public function hasCertificates(){
+    public function hasCertificates() {
         return count($this->certificates) > 0;
     }
     
@@ -216,10 +216,10 @@ 
      *
      * @return boolean
      */
-    public function hasActiveCertificates(){
+    public function hasActiveCertificates() {
         $count = 0;
         foreach ($this->certificates as $certificate) {
-            if(!$certificate->isExpired() && !$certificate->isRevoked()){
+            if (!$certificate->isExpired() && !$certificate->isRevoked()) {
                 $count++;
             }
         }
@@ -231,14 +231,14 @@ 
      * 
      * @param boolean $isDeactivated
      */
-    public function setDeactivated($isDeactivated, $profile){
+    public function setDeactivated($isDeactivated, $profile) {
         $this->set(self::DEACTIVATION_STATUS, $isDeactivated ? self::INACTIVE : self::ACTIVE);
-        if($isDeactivated){
+        if ($isDeactivated) {
             $this->set(self::DEACTIVATION_TIME, date('Y-m-d H:i:s', strtotime("now")));
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else {
             $this->set(self::DEACTIVATION_TIME, '2000-01-01 00:00:00');
         }
     }
@@ -247,7 +247,7 @@ 
      * 
      * @return boolean
      */
-    public function isDeactivated(){
+    public function isDeactivated() {
         return $this->get(self::DEACTIVATION_STATUS) == self::INACTIVE;
     }
     
@@ -256,7 +256,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = parent::load();
         $this->certificates = SilverbulletCertificate::getList($this, $searchAttribute);
         $this->invitations = SilverbulletInvitation::getList($this);
@@ -268,7 +268,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::delete()
      */
-    public function delete(){
+    public function delete() {
         $state = parent::delete();
         foreach ($this->certificates as $certificate) {
             $certificate->delete();
@@ -284,7 +284,7 @@ 
      * @param integer $userId
      * @return \web\lib\admin\domain\SilverbulletUser
      */
-    public static function prepare($userId){
+    public static function prepare($userId) {
         $instance = new SilverbulletUser(null, '');
         $instance->set(self::ID, $userId);
         return $instance;

Braces +4 added lines, -4 removed lines

@@ -120,7 +120,7 @@ 
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
         if($tokenExpiry > $this->defaultUserExpiry){
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else{
             $this->clear();
         }
     }
@@ -142,9 +142,9 @@ 
         $days = $this->getAcknowledgeDays();
         if($days <= $max * 0.2 && $days > $max * 0.1){
             return self::LEVEL_YELLOW;
-        }elseif ($days <= $max * 0.1){
+        } elseif ($days <= $max * 0.1){
             return self::LEVEL_RED;
-        }else{
+        } else{
             return self::LEVEL_GREEN;
         }
     }
@@ -238,7 +238,7 @@ 
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else{
             $this->set(self::DEACTIVATION_TIME, '2000-01-01 00:00:00');
         }
     }