← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Entity/User.php

  • Committer: Dan Garner
  • Date: 2018-05-21 14:58:11 UTC
  • mfrom: (644.1.8)
  • mto: (614.1.6)
  • mto: This revision was merged to the branch mainline in revision 648.
  • Revision ID: git-v1:e7961b0ebe68a0c0bc5dd7b3abca007138b2cadd
Merge branch 'bugfix/1.8.10-pack1' into feature/r-graph

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Entity/User.php
829
829
                  Email = :email,
830
830
                  Retired = :retired,
831
831
                  userTypeId = :userTypeId,
832
 
                  loggedIn = :loggedIn,
833
832
                  newUserWizard = :newUserWizard,
834
833
                  CSPRNG = :CSPRNG,
835
834
                  `UserPassword` = :password,
849
848
            'email' => $this->email,
850
849
            'homePageId' => $this->homePageId,
851
850
            'retired' => $this->retired,
852
 
            'loggedIn' => $this->loggedIn,
853
851
            'newUserWizard' => $this->newUserWizard,
854
852
            'CSPRNG' => $this->CSPRNG,
855
853
            'password' => $this->password,
902
900
    public function touch()
903
901
    {
904
902
        // This needs to happen on a separate connection
905
 
        $this->getStore()->update('UPDATE `user` SET lastAccessed = :time, loggedIn = :loggedIn  WHERE userId = :userId', [
 
903
        $this->getStore()->update('UPDATE `user` SET lastAccessed = :time WHERE userId = :userId', [
906
904
            'userId' => $this->userId,
907
 
            'loggedIn' => $this->loggedIn,
908
905
            'time' => date("Y-m-d H:i:s")
909
906
        ]);
910
907
    }