Browse Source

[Schedule] Remove useless code and clean up

Thanks Apollo dev
spaghetti 7 years ago
parent
commit
daa111dfb0
1 changed files with 13 additions and 13 deletions
  1. 13
    13
      sections/schedule/index.php

+ 13
- 13
sections/schedule/index.php View File

16
 $AS = check_perms('admin_schedule');
16
 $AS = check_perms('admin_schedule');
17
 
17
 
18
 function run_all_in($Dir) {
18
 function run_all_in($Dir) {
19
-  $Tasks = array_diff(scandir(SERVER_ROOT.'/sections/schedule/'.$Dir, 1), array('.', '..'));
19
+  $Tasks = array_diff(scandir(SERVER_ROOT.'/sections/schedule/'.$Dir, 1), ['.', '..']);
20
   extract($GLOBALS);
20
   extract($GLOBALS);
21
   foreach ($Tasks as $Task) {
21
   foreach ($Tasks as $Task) {
22
     $TimeStart = microtime(true);
22
     $TimeStart = microtime(true);
37
   echo '<div class="box">';
37
   echo '<div class="box">';
38
 }
38
 }
39
 
39
 
40
+$ASBreak = $AS ? "<br>" : "\n";
41
+
40
 $DB->query("
42
 $DB->query("
41
   SELECT NextHour, NextDay, NextBiWeekly
43
   SELECT NextHour, NextDay, NextBiWeekly
42
   FROM schedule");
44
   FROM schedule");
43
 list($Hour, $Day, $BiWeek) = $DB->next_record();
45
 list($Hour, $Day, $BiWeek) = $DB->next_record();
44
 
46
 
45
-$NextHour = date('H', time(date('H') + 1, 0, 0, date('m'), date('d'), date('Y')));
46
-$NextDay = date('d', time(0, 0, 0, date('m'), date('d') + 1, date('Y')));
47
+$NextHour = date('H');
48
+$NextDay = date('d');
47
 $NextBiWeek = (date('d') < 22 && date('d') >= 8) ? 22 : 8;
49
 $NextBiWeek = (date('d') < 22 && date('d') >= 8) ? 22 : 8;
48
 
50
 
49
 $DB->query("
51
 $DB->query("
50
   UPDATE schedule
52
   UPDATE schedule
51
   SET NextHour = $NextHour, NextDay = $NextDay, NextBiWeekly = $NextBiWeek");
53
   SET NextHour = $NextHour, NextDay = $NextDay, NextBiWeekly = $NextBiWeek");
52
 
54
 
53
-$sqltime = sqltime();
54
-
55
-echo "$sqltime".($AS?"<br>":"\n");
55
+echo date('Y-m-d H:i:s').$ASBreak;
56
 
56
 
57
 //-------------- Run every time ------------------------------------------//
57
 //-------------- Run every time ------------------------------------------//
58
 if (!(isset($_GET['notevery']) && $_GET['notevery'])) {
58
 if (!(isset($_GET['notevery']) && $_GET['notevery'])) {
59
   run_all_in('every');
59
   run_all_in('every');
60
-  echo "Ran every-time functions".($AS?'<br>':"\n");
60
+  echo "Ran every-time functions".$ASBreak;
61
 }
61
 }
62
 
62
 
63
 //-------------- Run every hour ------------------------------------------//
63
 //-------------- Run every hour ------------------------------------------//
64
 if ($Hour != $NextHour || (isset($_GET['runhour']) && $_GET['runhour'])) {
64
 if ($Hour != $NextHour || (isset($_GET['runhour']) && $_GET['runhour'])) {
65
   run_all_in('hourly');
65
   run_all_in('hourly');
66
-  echo "Ran hourly functions".($AS?'<br>':"\n");
66
+  echo "Ran hourly functions".$ASBreak;
67
 }
67
 }
68
 
68
 
69
 //-------------- Run every day -------------------------------------------//
69
 //-------------- Run every day -------------------------------------------//
70
 if ($Day != $NextDay || (isset($_GET['runday']) && $_GET['runday'])) {
70
 if ($Day != $NextDay || (isset($_GET['runday']) && $_GET['runday'])) {
71
   run_all_in('daily');
71
   run_all_in('daily');
72
-  echo "Ran daily functions".($AS?'<br>':"\n");
72
+  echo "Ran daily functions".$ASBreak;
73
 }
73
 }
74
 
74
 
75
 //-------------- Run every week -------------------------------------------//
75
 //-------------- Run every week -------------------------------------------//
76
 if (($Day != $NextDay && date('w') == 0) || (isset($_GET['runweek']) && $_GET['runweek'])) {
76
 if (($Day != $NextDay && date('w') == 0) || (isset($_GET['runweek']) && $_GET['runweek'])) {
77
   run_all_in('weekly');
77
   run_all_in('weekly');
78
-  echo "Ran weekly functions".($AS?'<br>':"\n");
78
+  echo "Ran weekly functions".$ASBreak;
79
 }
79
 }
80
 
80
 
81
 //--------------- Run twice per month -------------------------------------//
81
 //--------------- Run twice per month -------------------------------------//
82
 if ($BiWeek != $NextBiWeek || (isset($_GET['runbiweek']) && $_GET['runbiweek'])) {
82
 if ($BiWeek != $NextBiWeek || (isset($_GET['runbiweek']) && $_GET['runbiweek'])) {
83
   run_all_in('biweekly');
83
   run_all_in('biweekly');
84
-  echo "Ran bi-weekly functions".($AS?'<br>':"\n");
84
+  echo "Ran bi-weekly functions".$ASBreak;
85
 }
85
 }
86
 
86
 
87
 //---------------- Run every month -----------------------------------------//
87
 //---------------- Run every month -----------------------------------------//
88
 if (($BiWeek != $NextBiWeek && $BiWeek == 8) || (isset($_GET['runmonth']) && $_GET['runmonth'])) {
88
 if (($BiWeek != $NextBiWeek && $BiWeek == 8) || (isset($_GET['runmonth']) && $_GET['runmonth'])) {
89
   run_all_in('monthly');
89
   run_all_in('monthly');
90
-  echo "Ran monthly functions".($AS?'<br>':"\n");
90
+  echo "Ran monthly functions".$ASBreak;
91
 }
91
 }
92
 
92
 
93
 //---------------- Run on request ------------------------------------------//
93
 //---------------- Run on request ------------------------------------------//
94
 if (isset($_GET['runmanual']) && $_GET['runmanual']) {
94
 if (isset($_GET['runmanual']) && $_GET['runmanual']) {
95
   run_all_in('manually');
95
   run_all_in('manually');
96
-  echo "Ran manual functions".($AS?'<br>':"\n");
96
+  echo "Ran manual functions".$ASBreak;
97
 }
97
 }
98
 
98
 
99
 if ($AS) {
99
 if ($AS) {

Loading…
Cancel
Save