Merge branch 'dev'

mcdado · Aug 21, 2015 · 7026788 · 7026788
2 parents b9a4dd3 + 901a9ee
commit 7026788
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/classes/CronJobsForms.php b/classes/CronJobsForms.php
@@ -353,7 +353,7 @@ protected static function getDaysofWeekFormOptions()
  $data = array(array('id' => '-1', 'name' => self::$module->l('Every day of the week', 'CronJobsForms')));
 
  for ($day = 1; $day <= 7; $day += 1)
- $data[] = array('id' => $day, 'name' => self::$module->l(date('l', mktime(0, 0, 0, 0, $day))));
+ $data[] = array('id' => $day, 'name' => self::$module->l(date('l', strtotime('Sunday +' . $day . ' days'))));
 
  return $data;
  }

diff --git a/controllers/admin/AdminCronJobsController.php b/controllers/admin/AdminCronJobsController.php
@@ -63,7 +63,7 @@ protected function runModulesCrons()
 
  if ($module == false)
  {
- Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.$this->name.' WHERE `id_cronjob` = \''.(int)$cron['id_cronjob'].'\'');
+ Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.$this->module->name.' WHERE `id_cronjob` = \''.(int)$cron['id_cronjob'].'\'');
  break;
  }
  elseif ($this->shouldBeExecuted($cron) == true)
@@ -100,7 +100,7 @@ protected function shouldBeExecuted($cron)
  $hour = ($cron['hour'] == -1) ? date('H') : $cron['hour'];
  $day = ($cron['day'] == -1) ? date('d') : $cron['day'];
  $month = ($cron['month'] == -1) ? date('m') : $cron['month'];
- $day_of_week = ($cron['day_of_week'] == -1) ? date('D') : date('D', strtotime('Sunday +'.($cron['day_of_week'] - 1).' days'));
+ $day_of_week = ($cron['day_of_week'] == -1) ? date('D') : date('D', strtotime('Sunday +' . $cron['day_of_week'] . ' days'));
 
  $day = date('Y').'-'.str_pad($month, 2, '0', STR_PAD_LEFT).'-'.str_pad($day, 2, '0', STR_PAD_LEFT);
  $execution = $day_of_week.' '.$day.' '.str_pad($hour, 2, '0', STR_PAD_LEFT);