Revert "Execute cronjobs as a System user"

This reverts commit e238e424c32af42111917051efb4fa5fdede0742.

diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
index 2fe27817f5da5f34d25433303a60905a20a7dfc2..beb4276969548ffac459588cc2c04c541c4bd451 100644 (file)
--- a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
@@ -113,98 +113,87 @@ class CronjobAction extends AbstractDatabaseObjectAction implements IToggleActio
        public function execute() {
                $return = array();
                
-               // switch session owner to 'system' during execution of cronjobs
-               $actualUser = WCF::getUser();
-               WCF::getSession()->changeUser(new User(null, array('userID' => 0, 'username' => 'System')), true);
-               WCF::getSession()->disableUpdate();
+               foreach ($this->objects as $key => $cronjob) {
+                       // mark them as pending
+                       $cronjob->update(array('state' => Cronjob::PENDING));
+               }
                
-               try {
-                       foreach ($this->objects as $key => $cronjob) {
-                               // mark them as pending
-                               $cronjob->update(array('state' => Cronjob::PENDING));
+               foreach ($this->objects as $cronjob) {
+                       // it now time for executing
+                       $cronjob->update(array('state' => Cronjob::EXECUTING));
+                       $className = $cronjob->className;
+                       $executable = new $className();
+                       
+                       // execute cronjob
+                       $exception = null;
+                       try {
+                               $executable->execute(new Cronjob($cronjob->cronjobID));
                        }
+                       catch (\Exception $exception) { }
                        
-                       foreach ($this->objects as $cronjob) {
-                               // it now time for executing
-                               $cronjob->update(array('state' => Cronjob::EXECUTING));
-                               $className = $cronjob->className;
-                               $executable = new $className();
-                               
-                               // execute cronjob
-                               $exception = null;
-                               try {
-                                       $executable->execute(new Cronjob($cronjob->cronjobID));
-                               }
-                               catch (\Exception $exception) { }
-                               
-                               CronjobLogEditor::create(array(
-                                       'cronjobID' => $cronjob->cronjobID,
-                                       'execTime' => TIME_NOW,
-                                       'success' => ($exception ? 0 : 1),
-                                       'error' => ($exception ? $exception->getMessage() : '')
-                               ));
-                               
-                               // calculate next exec-time
-                               $nextExec = $cronjob->getNextExec();
-                               $data = array(
-                                       'lastExec' => TIME_NOW,
-                                       'nextExec' => $nextExec,
-                                       'afterNextExec' => $cronjob->getNextExec(($nextExec + 120))
-                               );
-                               
-                               // cronjob failed
-                               if ($exception) {
-                                       if ($cronjob->failCount < Cronjob::MAX_FAIL_COUNT) {
-                                               $data['failCount'] = $cronjob->failCount + 1;
-                                       }
-                                       
-                                       // cronjob failed too often: disable it
-                                       if ($cronjob->failCount + 1 == Cronjob::MAX_FAIL_COUNT) {
-                                               $data['isDisabled'] = 1;
-                                       }
-                               }
-                               // if no error: reset fail counter
-                               else {
-                                       $data['failCount'] = 0;
-                                       
-                                       // if cronjob has been disabled because of too many
-                                       // failed executions, enable it again
-                                       if ($cronjob->failCount == Cronjob::MAX_FAIL_COUNT && $cronjob->isDisabled) {
-                                               $data['isDisabled'] = 0;
-                                       }
+                       CronjobLogEditor::create(array(
+                               'cronjobID' => $cronjob->cronjobID,
+                               'execTime' => TIME_NOW,
+                               'success' => ($exception ? 0 : 1),
+                               'error' => ($exception ? $exception->getMessage() : '')
+                       ));
+                       
+                       // calculate next exec-time
+                       $nextExec = $cronjob->getNextExec();
+                       $data = array(
+                               'lastExec' => TIME_NOW,
+                               'nextExec' => $nextExec, 
+                               'afterNextExec' => $cronjob->getNextExec(($nextExec + 120))
+                       );
+                       
+                       // cronjob failed
+                       if ($exception) {
+                               if ($cronjob->failCount < Cronjob::MAX_FAIL_COUNT) {
+                                       $data['failCount'] = $cronjob->failCount + 1;
                                }
                                
-                               $cronjob->update($data);
-                               
-                               // build the return value
-                               if ($exception === null && !$cronjob->isDisabled) {
-                                       $dateTime = DateUtil::getDateTimeByTimestamp($nextExec);
-                                       $return[$cronjob->cronjobID] = array(
-                                               'time' => $nextExec,
-                                               'formatted' => str_replace(
-                                                       '%time%',
-                                                       DateUtil::format($dateTime, DateUtil::TIME_FORMAT),
-                                                       str_replace(
-                                                               '%date%',
-                                                               DateUtil::format($dateTime, DateUtil::DATE_FORMAT),
-                                                               WCF::getLanguage()->get('wcf.date.dateTimeFormat')
-                                                       )
-                                               )
-                                       );
+                               // cronjob failed too often: disable it
+                               if ($cronjob->failCount + 1 == Cronjob::MAX_FAIL_COUNT) {
+                                       $data['isDisabled'] = 1;
                                }
+                       }
+                       // if no error: reset fail counter
+                       else {
+                               $data['failCount'] = 0;
                                
-                               // we are finished
-                               $cronjob->update(array('state' => Cronjob::READY));
-                               
-                               // throw exception again to show error message
-                               if ($exception) {
-                                       throw $exception;
+                               // if cronjob has been disabled because of too many
+                               // failed executions, enable it again
+                               if ($cronjob->failCount == Cronjob::MAX_FAIL_COUNT && $cronjob->isDisabled) {
+                                       $data['isDisabled'] = 0;
                                }
                        }
-               } 
-               finally {
-                       // switch session back to the actual user 
-                       WCF::getSession()->changeUser($actualUser, true);
+                       
+                       $cronjob->update($data);
+                       
+                       // build the return value
+                       if ($exception === null && !$cronjob->isDisabled) {
+                               $dateTime = DateUtil::getDateTimeByTimestamp($nextExec);
+                               $return[$cronjob->cronjobID] = array(
+                                       'time' => $nextExec,
+                                       'formatted' => str_replace(
+                                               '%time%', 
+                                               DateUtil::format($dateTime, DateUtil::TIME_FORMAT), 
+                                               str_replace(
+                                                       '%date%', 
+                                                       DateUtil::format($dateTime, DateUtil::DATE_FORMAT), 
+                                                       WCF::getLanguage()->get('wcf.date.dateTimeFormat')
+                                               )
+                                       )
+                               );
+                       }
+                       
+                       // we are finished
+                       $cronjob->update(array('state' => Cronjob::READY));
+                       
+                       // throw exception again to show error message
+                       if ($exception) {
+                               throw $exception;
+                       }
                }
                
                return $return;

diff --git a/wcfsetup/install/files/lib/system/cli/command/CronjobCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/CronjobCLICommand.class.php
index 035485b407322a00e50c8a84d00df57175e5b186..5b78d316e474ee78b3102720ac6d6d4a92b2f1a4 100644 (file)
--- a/wcfsetup/install/files/lib/system/cli/command/CronjobCLICommand.class.php
+++ b/wcfsetup/install/files/lib/system/cli/command/CronjobCLICommand.class.php
@@ -1,8 +1,6 @@
 <?php
 namespace wcf\system\cli\command;
-use wcf\data\user\User;
 use wcf\system\cronjob\CronjobScheduler;
-use wcf\system\WCF;
 use Zend\Console\Exception\RuntimeException as ArgvException;
 use Zend\Console\Getopt as ArgvParser;
 
@@ -42,18 +40,7 @@ class CronjobCLICommand implements IArgumentedCLICommand {
                        throw new ArgvException('', $this->getUsage());
                }
                
-               // switch session owner to 'system' during execution of cronjobs
-               $actualUser = WCF::getUser();
-               WCF::getSession()->changeUser(new User(null, array('userID' => 0, 'username' => 'System')), true);
-               WCF::getSession()->disableUpdate();
-               
-               try {
-                       CronjobScheduler::getInstance()->executeCronjobs();
-               }
-               finally {
-                       // switch session back to the actual user 
-                       WCF::getSession()->changeUser($actualUser, true);
-               }
+               CronjobScheduler::getInstance()->executeCronjobs();
        }
        
        /**