From b1a6a5a3991cec5cd08873b01376e45d0b247f18 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 14 Nov 2013 09:05:33 -0500 Subject: [PATCH] Cleaning up code to match coding guidelines --- server/cron.php | 56 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/server/cron.php b/server/cron.php index ce7a26f..7a43d04 100644 --- a/server/cron.php +++ b/server/cron.php @@ -29,8 +29,8 @@ */ define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"])); -require(SCRIPT_PATH."/lib/config.inc.php"); -require(SCRIPT_PATH."/lib/app.inc.php"); +require SCRIPT_PATH."/lib/config.inc.php"; +require SCRIPT_PATH."/lib/app.inc.php"; set_time_limit(0); ini_set('error_reporting', E_ALL & ~E_NOTICE); @@ -50,38 +50,38 @@ $files = array(); $d = opendir($path); while($f = readdir($d)) { - $file_path = $path . '/' . $f; - if($f === '.' || $f === '..' || !is_file($file_path)) continue; - if(substr($f, strrpos($f, '.')) !== '.php') continue; - $files[] = $f; + $file_path = $path . '/' . $f; + if($f === '.' || $f === '..' || !is_file($file_path)) continue; + if(substr($f, strrpos($f, '.')) !== '.php') continue; + $files[] = $f; } closedir($d); // sort in alphabetical order, so we can use prefixes like 000-xxx sort($files); - + foreach($files as $f) { - $name = substr($f, 0, strpos($f, '.')); - if(preg_match('/^\d+\-(.*)$/', $name, $match)) $name = $match[1]; // strip numerical prefix from file name - - include($path . '/' . $f); - $class_name = 'cronjob_' . $name; - - if(class_exists($class_name, false)) { - $cronjob = new $class_name(); - if(get_parent_class($cronjob) !== 'cronjob') { - print 'Invalid class ' . $class_name . ' not extending class cronjob (' . get_parent_class($cronjob) . ')!' . "\n"; - unset($cronjob); - continue; - } - print 'Included ' . $class_name . ' from ' . $file_path . ' -> will now run job.' . "\n"; - - $cronjob->run(); - - print 'run job (' . $class_name . ') done.' . "\n"; - - unset($cronjob); - } + $name = substr($f, 0, strpos($f, '.')); + if(preg_match('/^\d+\-(.*)$/', $name, $match)) $name = $match[1]; // strip numerical prefix from file name + + include $path . '/' . $f; + $class_name = 'cronjob_' . $name; + + if(class_exists($class_name, false)) { + $cronjob = new $class_name(); + if(get_parent_class($cronjob) !== 'cronjob') { + print 'Invalid class ' . $class_name . ' not extending class cronjob (' . get_parent_class($cronjob) . ')!' . "\n"; + unset($cronjob); + continue; + } + print 'Included ' . $class_name . ' from ' . $file_path . ' -> will now run job.' . "\n"; + + $cronjob->run(); + + print 'run job (' . $class_name . ') done.' . "\n"; + + unset($cronjob); + } } unset($files); -- Gitblit v1.9.1