diff --git a/README.md b/README.md
index e7647aa51851ac20d13f18a259d0dec5fdf489db..54c978e190ae2ea6073f1a6fcc2156e47f258765 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@
QUIQQER Cron (Aufgaben)
========
-Cron Package erweitert QUIQQER um eine Aufgaben Verwaltung.
+Cron Paket erweitert QUIQQER um eine Aufgaben Verwaltung.
Crons sind sich wiederhohlende Aufgaben.
Jedes Plugin kann eigene Crons / Tasks zur Verfügung stellen
mit dem Cron Manager können diese Tasks in intervallen ausgeführt werden.
-Packetname:
+Paketname:
quiqqer/cron
diff --git a/ajax/add.php b/ajax/add.php
index c6f3a16a4ffda49d570045ff068bf51363e1434d..5bfee78a573cbdfe32d0228b7306571cd4d9cd05 100644
--- a/ajax/add.php
+++ b/ajax/add.php
@@ -11,23 +11,15 @@
* @param String $dayOfWeek
* @param string $params
*/
-function package_quiqqer_cron_ajax_add(
- $cron,
- $min,
- $hour,
- $day,
- $month,
- $dayOfWeek,
- $params
-) {
- $params = json_decode($params, true);
- $Manager = new QUI\Cron\Manager();
- $Manager->add($cron, $min, $hour, $day, $month, $dayOfWeek, $params);
-}
-
-QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_add',
+ function ($cron, $min, $hour, $day, $month, $dayOfWeek, $params) {
+ $params = json_decode($params, true);
+
+ $Manager = new QUI\Cron\Manager();
+ $Manager->add($cron, $min, $hour, $day, $month, $dayOfWeek, $params);
+ },
array('cron', 'min', 'hour', 'day', 'month', 'dayOfWeek', 'params'),
'Permission::checkAdminUser'
);
diff --git a/ajax/cron/activate.php b/ajax/cron/activate.php
index 25f4fbcc68353539e5f3d518befa59c2af4cda27..b63c131bec74396f6fc7762f789ffb8c4e54cfb0 100644
--- a/ajax/cron/activate.php
+++ b/ajax/cron/activate.php
@@ -3,16 +3,14 @@
/**
* activate a cron
*
- * @param Integer $cronId - Cron-ID
+ * @param integer $cronId - Cron-ID
*/
-function package_quiqqer_cron_ajax_cron_activate($cronId)
-{
- $Manager = new \QUI\Cron\Manager();
- $Manager->activateCron($cronId);
-}
-
-\QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_cron_activate',
+ function ($cronId) {
+ $Manager = new QUI\Cron\Manager();
+ $Manager->activateCron($cronId);
+ },
array('cronId'),
'Permission::checkAdminUser'
);
diff --git a/ajax/cron/deactivate.php b/ajax/cron/deactivate.php
index a9e04bad0f71300f2c9596bb205fa94a5006351b..acccbf28e67a77e7910a42d2c8cc1ced6d793145 100644
--- a/ajax/cron/deactivate.php
+++ b/ajax/cron/deactivate.php
@@ -3,16 +3,14 @@
/**
* deactivate a cron
*
- * @param Integer $cronId - Cron-ID
+ * @param integer $cronId - Cron-ID
*/
-function package_quiqqer_cron_ajax_cron_deactivate($cronId)
-{
- $Manager = new \QUI\Cron\Manager();
- $Manager->deactivateCron($cronId);
-}
-
-\QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_cron_deactivate',
+ function ($cronId) {
+ $Manager = new QUI\Cron\Manager();
+ $Manager->deactivateCron($cronId);
+ },
array('cronId'),
'Permission::checkAdminUser'
);
diff --git a/ajax/cron/executeCron.php b/ajax/cron/executeCron.php
index 845210be15543a37dae1abf5323c9744c8e30ee7..4b88984744bfc099d8d4ea4f77d904edcc67e478 100644
--- a/ajax/cron/executeCron.php
+++ b/ajax/cron/executeCron.php
@@ -3,16 +3,14 @@
/**
* deactivate a cron
*
- * @param Integer $cronId - Cron-ID
+ * @param integer $cronId - Cron-ID
*/
-function package_quiqqer_cron_ajax_cron_executeCron($cronId)
-{
- $Manager = new \QUI\Cron\Manager();
- $Manager->executeCron($cronId);
-}
-
-\QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_cron_executeCron',
+ function ($cronId) {
+ $Manager = new QUI\Cron\Manager();
+ $Manager->executeCron($cronId);
+ },
array('cronId'),
'Permission::checkAdminUser'
);
diff --git a/ajax/cron/get.php b/ajax/cron/get.php
index cfd4ddfe4e113823d949ad392630f1a26d79f290..39bc1c02e5d7a337fb61287c74b877b14b8a92ca 100644
--- a/ajax/cron/get.php
+++ b/ajax/cron/get.php
@@ -3,19 +3,17 @@
/**
* activate a cron
*
- * @param Integer $cronId - Cron-ID
+ * @param integer $cronId - Cron-ID
*
* @return array
*/
-function package_quiqqer_cron_ajax_cron_get($cronId)
-{
- $Manager = new \QUI\Cron\Manager();
-
- return $Manager->getCronById($cronId);
-}
-
-\QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_cron_get',
+ function ($cronId) {
+ $Manager = new QUI\Cron\Manager();
+
+ return $Manager->getCronById($cronId);
+ },
array('cronId'),
'Permission::checkAdminUser'
);
diff --git a/ajax/cron/toggle.php b/ajax/cron/toggle.php
index 03f0e5807bb07eac970e29d72ffec3216171dcd8..5828e28617e80474f324e214761cf7e8a8f653c6 100644
--- a/ajax/cron/toggle.php
+++ b/ajax/cron/toggle.php
@@ -3,28 +3,26 @@
/**
* Toggle the status of a cron
*
- * @param Integer $cronId
+ * @param integer $cronId
*
* @throws \QUI\Exception
*/
-function package_quiqqer_cron_ajax_cron_toggle($cronId)
-{
- $Manager = new \QUI\Cron\Manager();
- $data = $Manager->getCronById($cronId);
-
- if (!$data) {
- throw new \QUI\Exception('Cron not exists', 404);
- }
+QUI::$Ajax->registerFunction(
+ 'package_quiqqer_cron_ajax_cron_toggle',
+ function ($cronId) {
+ $Manager = new QUI\Cron\Manager();
+ $data = $Manager->getCronById($cronId);
- if ($data['active'] == 1) {
- $Manager->deactivateCron($cronId);
- } else {
- $Manager->activateCron($cronId);
- }
-}
+ if (!$data) {
+ throw new QUI\Exception('Cron not exists', 404);
+ }
-\QUI::$Ajax->register(
- 'package_quiqqer_cron_ajax_cron_toggle',
+ if ($data['active'] == 1) {
+ $Manager->deactivateCron($cronId);
+ } else {
+ $Manager->activateCron($cronId);
+ }
+ },
array('cronId'),
'Permission::checkAdminUser'
);
diff --git a/ajax/delete.php b/ajax/delete.php
index 241f951e87e99524070d34acaf81acafd526fd9d..9c852f526d1663497124936023c0b1fb7acabd4f 100644
--- a/ajax/delete.php
+++ b/ajax/delete.php
@@ -5,16 +5,15 @@
*
* @param string $ids - json array
*/
-function package_quiqqer_cron_ajax_delete($ids)
-{
- $ids = json_decode($ids, true);
- $Manager = new \QUI\Cron\Manager();
- $Manager->deleteCronIds($ids);
-}
-
-\QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_delete',
+ function ($ids) {
+ $ids = json_decode($ids, true);
+ $Manager = new QUI\Cron\Manager();
+
+ $Manager->deleteCronIds($ids);
+ },
array('ids'),
'Permission::checkAdminUser'
);
diff --git a/ajax/edit.php b/ajax/edit.php
index 7c8af1434d48c0393b8a9f4c59b63e51975204b3..42b80ba344e3f1337543a3a1856f5dbe2fd67817 100644
--- a/ajax/edit.php
+++ b/ajax/edit.php
@@ -12,24 +12,15 @@
* @param String $dayOfWeek
* @param String $params
*/
-function package_quiqqer_cron_ajax_edit(
- $cronId,
- $cron,
- $min,
- $hour,
- $day,
- $month,
- $dayOfWeek,
- $params
-) {
- $params = json_decode($params, true);
- $Manager = new QUI\Cron\Manager();
- $Manager->edit($cronId, $cron, $min, $hour, $day, $month, $dayOfWeek, $params);
-}
-
-QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_edit',
+ function ($cronId, $cron, $min, $hour, $day, $month, $dayOfWeek, $params) {
+ $params = json_decode($params, true);
+
+ $Manager = new QUI\Cron\Manager();
+ $Manager->edit($cronId, $cron, $min, $hour, $day, $month, $dayOfWeek, $params);
+ },
array('cronId', 'cron', 'min', 'hour', 'day', 'month', 'dayOfWeek', 'params'),
'Permission::checkAdminUser'
);
diff --git a/ajax/execute.php b/ajax/execute.php
index b7a5bde2ad298362e6ffe5c3d14b8ceb66082beb..7988fa931e524b0455d28886c3c763a9e08f55d7 100644
--- a/ajax/execute.php
+++ b/ajax/execute.php
@@ -3,23 +3,22 @@
/**
* Execute the cron list
*/
-function package_quiqqer_cron_ajax_execute()
-{
- try {
- $Manager = new QUI\Cron\Manager();
- $Manager->execute();
- } catch (QUI\Exception $Exception) {
- QUI\System\Log::addError(
- 'package_quiqqer_cron_ajax_execute() :: ' . $Exception->getMessage()
- );
- }
+QUI::$Ajax->registerFunction(
+ 'package_quiqqer_cron_ajax_execute',
+ function () {
+ try {
+ $Manager = new QUI\Cron\Manager();
+ $Manager->execute();
- QUI::getMessagesHandler()->clear();
-}
+ } catch (QUI\Exception $Exception) {
+ QUI\System\Log::addError(
+ 'package_quiqqer_cron_ajax_execute() :: ' . $Exception->getMessage()
+ );
+ }
-QUI::$Ajax->register(
- 'package_quiqqer_cron_ajax_execute',
+ QUI::getMessagesHandler()->clear();
+ },
false,
'Permission::checkAdminUser'
);
diff --git a/ajax/getAvailableCrons.php b/ajax/getAvailableCrons.php
index 88e1b77dad8490faef7673707533ff9534e9c8d4..38da8faa90632410751a68d3d55c5d4afa7ed845 100644
--- a/ajax/getAvailableCrons.php
+++ b/ajax/getAvailableCrons.php
@@ -5,15 +5,13 @@
*
* @return array
*/
-function package_quiqqer_cron_ajax_getAvailableCrons()
-{
- $CronManager = new \QUI\Cron\Manager();
-
- return $CronManager->getAvailableCrons();
-}
-
-\QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_getAvailableCrons',
+ function () {
+ $CronManager = new QUI\Cron\Manager();
+
+ return $CronManager->getAvailableCrons();
+ },
false,
'Permission::checkAdminUser'
);
diff --git a/ajax/getList.php b/ajax/getList.php
index 524491f73f43a5f80a39af3e0a861853039695b1..fd9a9524bf0f0a3ebc088e09c6b36326db7182f9 100644
--- a/ajax/getList.php
+++ b/ajax/getList.php
@@ -5,15 +5,13 @@
*
* @return array
*/
-function package_quiqqer_cron_ajax_getList()
-{
- $CronManager = new QUI\Cron\Manager();
- return $CronManager->getList();
-}
-
-QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_getList',
+ function () {
+ $CronManager = new QUI\Cron\Manager();
+ return $CronManager->getList();
+ },
false,
'Permission::checkAdminUser'
);
diff --git a/ajax/history/get.php b/ajax/history/get.php
index 6d2df155df447482c6afd263f4be9b5d113ebe4a..21ee5dbe8341060c3650b8e8a666b794b99b3394 100644
--- a/ajax/history/get.php
+++ b/ajax/history/get.php
@@ -2,21 +2,22 @@
/**
* return the cron history
+ *
+ * @param {array} $params - filter params
+ * @return array
*/
-function package_quiqqer_cron_ajax_history_get($params)
-{
- $CronManager = new \QUI\Cron\Manager();
- $params = json_decode($params, true);
-
- return array(
- 'page' => (int)$params['page'],
- 'data' => $CronManager->getHistoryList($params),
- 'total' => $CronManager->getHistoryCount()
- );
-}
-
-\QUI::$Ajax->register(
+QUI::$Ajax->registerFunction(
'package_quiqqer_cron_ajax_history_get',
+ function ($params) {
+ $CronManager = new QUI\Cron\Manager();
+ $params = json_decode($params, true);
+
+ return array(
+ 'page' => (int)$params['page'],
+ 'data' => $CronManager->getHistoryList($params),
+ 'total' => $CronManager->getHistoryCount()
+ );
+ },
array('params'),
'Permission::checkAdminUser'
);
diff --git a/composer.json b/composer.json
index 70f87b6e5aa5adbceba4c465d446583dc6fdb108..be9e7736c065b0713a5589181357fbabd1692e42 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
"autoload": {
"psr-0" : {
- "QUI" : "lib/"
+ "QUI" : "src/"
}
}
}
diff --git a/events.xml b/events.xml
index c9df22e1d01d83e63f5987bb93e29e8c50838d29..bd16d5686cbbcb241f0e474cdcab7fb3ed11fc04 100644
--- a/events.xml
+++ b/events.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<events>
- <event on="onAdminLoad" fire="\QUI\Cron\Events::onAdminLoad" />
- <event on="onAdminLoadFooter" fire="\QUI\Cron\Events::adminLoadFooter" />
+ <event on="onAdminLoad" fire="\QUI\Cron\EventHandler::onAdminLoad" />
+ <event on="onAdminLoadFooter" fire="\QUI\Cron\EventHandler::adminLoadFooter" />
</events>
\ No newline at end of file
diff --git a/lib/QUI/Cron/Console.php b/src/QUI/Cron/Console.php
similarity index 99%
rename from lib/QUI/Cron/Console.php
rename to src/QUI/Cron/Console.php
index b77deb87490f9596860019594c4879beccda41f3..6f43a1fc3bfd8b79fb03d2667a18113cdb53354b 100644
--- a/lib/QUI/Cron/Console.php
+++ b/src/QUI/Cron/Console.php
@@ -11,7 +11,7 @@ use QUI;
/**
* Cron Console Manager
*
- * @author www.namerobot.com (Henning Leutz)
+ * @author www.pcsg.de (Henning Leutz)
*/
class Console extends QUI\System\Console\Tool
{
diff --git a/lib/QUI/Cron/Events.php b/src/QUI/Cron/EventHandler.php
similarity index 70%
rename from lib/QUI/Cron/Events.php
rename to src/QUI/Cron/EventHandler.php
index 26a62253ae74bce86958fffe3c4deb2584d0f502..f61eed9c6145fbdf856143c1bcbb87c5f3d8e7a0 100644
--- a/lib/QUI/Cron/Events.php
+++ b/src/QUI/Cron/EventHandler.php
@@ -11,55 +11,53 @@ use QUI;
/**
* Cron Main Events
*
- * @author www.namerobot.com (Henning Leutz)
+ * @author www.pcsg.de (Henning Leutz)
*/
-
-class Events
+class EventHandler
{
/**
* event : on admin header loaded
*/
- static function onAdminLoad()
+ public static function onAdminLoad()
{
- if ( !defined( 'ADMIN' ) ) {
+ if (!defined('ADMIN')) {
return;
}
- if ( !ADMIN ) {
+ if (!ADMIN) {
return;
}
$User = QUI::getUserBySession();
- if ( !$User->isSU() ) {
+ if (!$User->isSU()) {
return;
}
- $Package = QUI::getPackageManager()->getInstalledPackage( 'quiqqer/cron' );
+ $Package = QUI::getPackageManager()->getInstalledPackage('quiqqer/cron');
$Config = $Package->getConfig();
// send admin info
- if ( !$Config->get( 'settings', 'showAdminMessageIfCronNotRun' ) ) {
+ if (!$Config->get('settings', 'showAdminMessageIfCronNotRun')) {
return;
}
// check last cron execution
$CronManager = new Manager();
$result = $CronManager->getHistoryList(array(
- 'page' => 1,
+ 'page' => 1,
'perPage' => 1
));
- if ( !isset( $result[ 0 ] ) )
- {
+ if (!isset($result[0])) {
self::sendAdminInfoCronError();
return;
}
- $date = strtotime( $result[ 0 ][ 'lastexec' ] );
+ $date = strtotime($result[0]['lastexec']);
// in 24h no cron??
- if ( time() - 86400 > $date ) {
+ if (time() - 86400 > $date) {
self::sendAdminInfoCronError();
}
}
@@ -67,14 +65,13 @@ class Events
/**
* event : on admin loaded -> footer output
*/
- static function adminLoadFooter()
+ public static function adminLoadFooter()
{
- $Package = QUI::getPackageManager()->getInstalledPackage( 'quiqqer/cron' );
+ $Package = QUI::getPackageManager()->getInstalledPackage('quiqqer/cron');
$Config = $Package->getConfig();
// execute cron ?
- if ( $Config->get( 'settings', 'executeOnAdminLogin' ) )
- {
+ if ($Config->get('settings', 'executeOnAdminLogin')) {
echo '
<script>window.addEvent("load", function()
{
@@ -96,11 +93,11 @@ class Events
* send a message to the user, maybe an error in the crons exist
* last 24h was no cron sended
*/
- static function sendAdminInfoCronError()
+ public static function sendAdminInfoCronError()
{
QUI::getMessagesHandler()->sendAttention(
QUI::getUserBySession(),
- QUI::getLocale()->get( 'quiqqer/cron', 'message.cron.admin.info.24h' )
+ QUI::getLocale()->get('quiqqer/cron', 'message.cron.admin.info.24h')
);
}
}
diff --git a/lib/QUI/Cron/Manager.php b/src/QUI/Cron/Manager.php
similarity index 87%
rename from lib/QUI/Cron/Manager.php
rename to src/QUI/Cron/Manager.php
index ef8dc5f4696beeb6a0ad629d81c3353194a38834..f247899b31c4d85c14e72ded7735339ad1b1ffdb 100644
--- a/lib/QUI/Cron/Manager.php
+++ b/src/QUI/Cron/Manager.php
@@ -23,13 +23,14 @@ class Manager
/**
* Add a cron
*
- * @param String $cron - Name of the Cron
- * @param String $min - On which minute should it start
- * @param String $hour - On which hour should it start
- * @param String $day - On which day should it start
- * @param String $month - On which month should it start
- * @param String $dayOfWeek - day of week (0 - 6) (0 to 6 are Sunday to Saturday, or use names; 7 is Sunday, the same as 0)
- * @param Array $params - Cron Parameter
+ * @param string $cron - Name of the Cron
+ * @param string $min - On which minute should it start
+ * @param string $hour - On which hour should it start
+ * @param string $day - On which day should it start
+ * @param string $month - On which month should it start
+ * @param string $dayOfWeek - day of week (0 - 6) (0 to 6 are Sunday to Saturday,
+ * or use names; 7 is Sunday, the same as 0)
+ * @param array $params - Cron Parameter
*
* @throws QUI\Exception
*/
@@ -37,7 +38,7 @@ class Manager
{
Permission::checkPermission('quiqqer.cron.add');
- if (!$this->_cronExists($cron)) {
+ if (!$this->cronExists($cron)) {
throw new QUI\Exception(
QUI::getLocale()->get('quiqqer/cron', 'exception.cron.1001'),
1001
@@ -73,14 +74,14 @@ class Manager
/**
* Edit the cron
*
- * @param String $cron - Name of the Cron
- * @param Integer $cronId
- * @param String $min
- * @param String $hour
- * @param String $day
- * @param String $month
- * @param String $dayOfWeek
- * @param Array $params
+ * @param string $cron - Name of the Cron
+ * @param integer $cronId
+ * @param string $min
+ * @param string $hour
+ * @param string $day
+ * @param string $month
+ * @param string $dayOfWeek
+ * @param array $params
*
* @throws QUI\Exception
*/
@@ -96,7 +97,7 @@ class Manager
) {
Permission::checkPermission('quiqqer.cron.edit');
- if (!$this->_cronExists($cron)) {
+ if (!$this->cronExists($cron)) {
throw new QUI\Exception(
QUI::getLocale()->get('quiqqer/cron', 'exception.cron.1002'),
1002
@@ -139,7 +140,7 @@ class Manager
/**
* activate a cron in the cron list
*
- * @param Integer $cronId - ID of the cron
+ * @param integer $cronId - ID of the cron
*/
public function activateCron($cronId)
{
@@ -155,7 +156,7 @@ class Manager
/**
* deactivate a cron in the cron list
*
- * @param Integer $cronId - ID of the cron
+ * @param integer $cronId - ID of the cron
*/
public function deactivateCron($cronId)
{
@@ -171,7 +172,7 @@ class Manager
/**
* Delete the crons
*
- * @param Array $ids - Array of the Cron-Ids
+ * @param array $ids - Array of the Cron-Ids
*/
public function deleteCronIds($ids)
{
@@ -250,7 +251,7 @@ class Manager
/**
* Execute a cron
*
- * @param Integer $cronId - ID of the cron
+ * @param integer $cronId - ID of the cron
*
* @return \QUI\Cron\Manager
* @throws QUI\Exception
@@ -290,7 +291,7 @@ class Manager
)
);
- QUI::getDataBase()->insert(self::TableHistory(), array(
+ QUI::getDataBase()->insert(self::tableHistory(), array(
'cronid' => $cronId,
'lastexec' => date('Y-m-d H:i:s'),
'uid' => QUI::getUserBySession()->getId()
@@ -309,7 +310,7 @@ class Manager
/**
* Return the Crons which are available and from other Plugins provided
*
- * @return Array
+ * @return array
*/
public function getAvailableCrons()
{
@@ -338,9 +339,9 @@ class Manager
/**
* Return the data of a inserted cron
*
- * @param Integer $cronId - ID of the Cron
+ * @param integer $cronId - ID of the Cron
*
- * @return Array|false - Cron Data
+ * @return array|false - Cron Data
*/
public function getCronById($cronId)
{
@@ -363,9 +364,9 @@ class Manager
* Return the data of a specific cron from the available cron list
* This cron is not in the cron list
*
- * @param String $cron - Name of the Cron
+ * @param string $cron - Name of the Cron
*
- * @return Array|false - Cron Data
+ * @return array|false - Cron Data
*/
public function getCronData($cron)
{
@@ -399,7 +400,7 @@ class Manager
}
$data = QUI::getDataBase()->fetch(array(
- 'from' => self::TableHistory(),
+ 'from' => self::tableHistory(),
'limit' => $limit,
'order' => $order
));
@@ -430,7 +431,6 @@ class Manager
$entry['username'] = $Users->get($entry['uid'])->getName();
} catch (QUI\Exception $Exception) {
-
}
$result[] = $entry;
@@ -442,12 +442,12 @@ class Manager
/**
* Return the history count, how many history entries exist
*
- * @return Integer
+ * @return integer
*/
public function getHistoryCount()
{
$result = QUI::getDataBase()->fetch(array(
- 'from' => self::TableHistory(),
+ 'from' => self::tableHistory(),
'count' => 'id'
));
@@ -457,7 +457,7 @@ class Manager
/**
* Return the cron list
*
- * @return Array
+ * @return array
*/
public function getList()
{
@@ -473,7 +473,7 @@ class Manager
*
* @return Bool
*/
- protected function _cronExists($cron)
+ protected function cronExists($cron)
{
return $this->getCronData($cron) === false ? false : true;
}
@@ -485,9 +485,9 @@ class Manager
/**
* Return the cron tabe
*
- * @return String
+ * @return string
*/
- static function Table()
+ public static function TABLE()
{
return QUI_DB_PRFX . 'cron';
}
@@ -495,9 +495,9 @@ class Manager
/**
* Return the cron tabe
*
- * @return String
+ * @return string
*/
- static function TableHistory()
+ public static function tableHistory()
{
return QUI_DB_PRFX . 'cron_history';
}
@@ -505,11 +505,11 @@ class Manager
/**
* Return the Crons from a XML File
*
- * @param String $file
+ * @param string $file
*
- * @return Array
+ * @return array
*/
- static function getCronsFromFile($file)
+ public static function getCronsFromFile($file)
{
if (!file_exists($file)) {
return array();
@@ -554,6 +554,7 @@ class Manager
if ($Params->length) {
foreach ($Params as $Param) {
+ /* @var $Param \DOMElement */
$params[] = array(
'name' => $Param->getAttribute('name'),
'type' => $Param->getAttribute('type')
@@ -577,7 +578,7 @@ class Manager
*
* @param String $message - Message
*/
- static function log($message)
+ public static function log($message)
{
QUI\System\Log::addInfo($message, array(), 'cron');
}
diff --git a/lib/QUI/Cron/QuiqqerCrons.php b/src/QUI/Cron/QuiqqerCrons.php
similarity index 91%
rename from lib/QUI/Cron/QuiqqerCrons.php
rename to src/QUI/Cron/QuiqqerCrons.php
index a0d1a1e58fc70653665815f9d7616b6aac5ff4be..83737ea762bbf23f7090e99ed9d7f8198cb97931 100644
--- a/lib/QUI/Cron/QuiqqerCrons.php
+++ b/src/QUI/Cron/QuiqqerCrons.php
@@ -18,7 +18,7 @@ class QuiqqerCrons
/**
* Clear the temp folder
*/
- static function clearTempFolder()
+ public static function clearTempFolder()
{
$Temp = QUI::getTemp();
$Temp->clear();
@@ -27,7 +27,7 @@ class QuiqqerCrons
/**
* Clear complete cache
*/
- static function clearCache()
+ public static function clearCache()
{
QUI\Cache\Manager::clearAll();
}
@@ -35,7 +35,7 @@ class QuiqqerCrons
/**
* Purge the cache
*/
- static function purgeCache()
+ public static function purgeCache()
{
QUI\Cache\Manager::purge();
}
@@ -43,7 +43,7 @@ class QuiqqerCrons
/**
* Clear the media cache of the administration
*/
- static function clearAdminMediaCache()
+ public static function clearAdminMediaCache()
{
QUI\Utils\System\File::unlink(VAR_DIR . 'cache/admin/media/');
}
@@ -52,12 +52,12 @@ class QuiqqerCrons
* Check project sites release dates
* Activate or deactivate sites
*
- * @param Array $params - Cron Parameter
+ * @param array $params - Cron Parameter
* @param \QUI\Cron\Manager $CronManager
*
* @throws QUI\Exception
*/
- static function realeaseDate($params, $CronManager)
+ public static function realeaseDate($params, $CronManager)
{
if (!isset($params['project'])) {
throw new QUI\Exception('Need a project parameter to search release dates');
@@ -159,7 +159,7 @@ class QuiqqerCrons
* @param array $params
* @param \QUI\Cron\Manager $CronManager
*/
- static function mailQueue($params, $CronManager)
+ public static function mailQueue($params, $CronManager)
{
$MailQueue = new QUI\Mail\Queue();
@@ -167,4 +167,4 @@ class QuiqqerCrons
$MailQueue->send();
}
}
-}
\ No newline at end of file
+}