Merge branch 'dev' of git://github.com/infinitas/infinitas into dev

infinitas · Jan 5, 2010 · 1dd216a · 1dd216a
2 parents e892334 + 1a0cdc3
commit 1dd216a
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/infinitas/core/controllers/components/cron.php b/infinitas/core/controllers/components/cron.php
@@ -31,7 +31,7 @@
 
 class CronComponent extends Object
 {
-    var $controller;
+    var $Controller;
     var $components = array( 'RequestHandler' );
 
     /**
@@ -94,23 +94,29 @@ class CronComponent extends Object
      * @var array $jobs
      * jobs to be executed by cron.
      */
-    var $jobs;
+    var $jobs = array();
 
+    /**
+     * Controllers initialize function.
+     */
+	function initialize(&$controller, $settings = array()) {
+		$this->Controller =& $controller;
+		$writeDir = APP . 'libs' . DS . 'cronjobs' . DS;
+		$settings = array_merge(array('cronTab' => $writeDir . 'crontab.txt', 'writeDir' => $writeDir),	$settings);
+    	$this->_set($settings);
+    }
+
     /**
      * Controllers startup function.
      */
     function startup( &$controller )
     {
-        $this->cronTab = APP.'libs'.DS.'cronjobs'.DS.'crontab.txt'; //Modify this if you want
-        $this->writeDir = APP.'libs'.DS.'cronjobs'.DS; //Modify this if you want
         if ( !defined( 'CRON_INTERVAL' ) )
         {
             define( 'CRON_INTERVAL', 1 ); //Modify this if you want. this is the time interval betwen each run of this script
             // Dependig on how much traffic you have in your controller's component caller.
         }
 
-        $this->jobs = array();
-
         if ( !defined( 'CRON_MINUTE' ) )
         {
             define( 'CRON_MINUTE', 1 );
@@ -151,7 +157,6 @@ function startup( &$controller )
             define( 'CRON_CRONLINE', 20 );
         }
 
-        $this->controller = $controller;
     }
 
     /**
@@ -412,12 +417,12 @@ function _runJob( $job )
             $this->_logMessage( "  Last scheduled: " . date( "r", $lastScheduled ) );
             if ( $this->debug )
             {
-                @$this->controller->requestAction( $job[CRON_CMD] );
+                @$this->Controller->requestAction( $job[CRON_CMD] );
                 debug( 'Fue llamada la accion ' . $job[CRON_CMD] );
             }
             else
             {
-                @$this->controller->requestAction( $job[CRON_CMD] );
+                @$this->Controller->requestAction( $job[CRON_CMD] );
             }
             $this->_markLastRun( $job[CRON_CMD] );
             $this->_logMessage( "Completed	" . $job[CRON_CRONLINE] );