From 4f90860001e1529fa288218933477de563b0bcaf Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Wed, 8 Aug 2012 23:39:30 +0200
Subject: Add initial version of backgroundjobs library

---
 lib/backgroundjobs/regulartask.php   |  52 +++++++++++++++++
 lib/backgroundjobs/scheduledtask.php | 106 ++++++++++++++++++++++++++++++++++
 lib/backgroundjobs/worker.php        | 109 +++++++++++++++++++++++++++++++++++
 3 files changed, 267 insertions(+)
 create mode 100644 lib/backgroundjobs/regulartask.php
 create mode 100644 lib/backgroundjobs/scheduledtask.php
 create mode 100644 lib/backgroundjobs/worker.php

diff --git a/lib/backgroundjobs/regulartask.php b/lib/backgroundjobs/regulartask.php
new file mode 100644
index 00000000000..38c1255d766
--- /dev/null
+++ b/lib/backgroundjobs/regulartask.php
@@ -0,0 +1,52 @@
+<?php
+/**
+* ownCloud - Background Job
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * This class manages the regular tasks.
+ */
+class OC_Backgroundjobs_RegularTask{
+	static private $registered = array();
+
+	/**
+	 * @brief creates a regular task
+	 * @param $klass class name
+	 * @param $method method name
+	 * @return true
+	 */
+	static public function create( $klass, $method ){
+		// Create the data structure
+		self::$registered["$klass-$method"] = array( $klass, $method );
+
+		// No chance for failure ;-)
+		return true;
+	}
+
+	/**
+	 * @brief gets all regular tasks
+	 * @return associative array
+	 *
+	 * key is string "$klass-$method", value is array( $klass, $method )
+	 */
+	static public function all(){
+		return self::$registered;
+	}
+}
diff --git a/lib/backgroundjobs/scheduledtask.php b/lib/backgroundjobs/scheduledtask.php
new file mode 100644
index 00000000000..48a863c9068
--- /dev/null
+++ b/lib/backgroundjobs/scheduledtask.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+* ownCloud - Background Job
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * This class manages our scheduled tasks.
+ */
+class OC_Backgroundjobs_ScheduledTask{
+	/**
+	 * @brief Gets one scheduled task
+	 * @param $id ID of the task
+	 * @return associative array
+	 */
+	public static function find( $id ){
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$result = $stmt->execute(array($id));
+		return $result->fetchRow();
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks
+	 * @return array with associative arrays
+	 */
+	public static function all(){
+		// Array for objects
+		$return = array();
+
+		// Get Data
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks' );
+		$result = $stmt->execute(array());
+		while( $row = $result->fetchRow()){
+			$return[] = $row;
+		}
+
+		// Und weg damit
+		return $return;
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks of a specific app
+	 * @param $app app name
+	 * @return array with associative arrays
+	 */
+	public static function whereAppIs( $app ){
+		// Array for objects
+		$return = array();
+
+		// Get Data
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE app = ?' );
+		$result = $stmt->execute(array($app));
+		while( $row = $result->fetchRow()){
+			$return[] = $row;
+		}
+
+		// Und weg damit
+		return $return;
+	}
+
+	/**
+	 * @brief schedules a task
+	 * @param $app app name
+	 * @param $klass class name
+	 * @param $method method name
+	 * @param $parameters all useful data as text
+	 * @return id of task
+	 */
+	public static function add( $task, $klass, $method, $parameters ){
+		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*scheduledtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
+		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
+
+		return OC_DB::insertid();
+	}
+
+	/**
+	 * @brief deletes a scheduled task
+	 * @param $id id of task
+	 * @return true/false
+	 *
+	 * Deletes a report
+	 */
+	public static function delete( $id ){
+		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$result = $stmt->execute(array($id));
+
+		return true;
+	}
+}
diff --git a/lib/backgroundjobs/worker.php b/lib/backgroundjobs/worker.php
new file mode 100644
index 00000000000..0a99c80ebdf
--- /dev/null
+++ b/lib/backgroundjobs/worker.php
@@ -0,0 +1,109 @@
+<?php
+/**
+* ownCloud - Background Job
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * This class does the dirty work.
+ * 
+ * TODO: locking in doAllSteps
+ */
+class OC_Backgroundjobs_Worker{
+	/**
+	 * @brief executes all tasks
+	 * @return boolean
+	 *
+	 * This method executes all regular tasks and then all scheduled tasks.
+	 * This method should be called by cli scripts that do not let the user
+	 * wait.
+	 */
+	public static function doAllSteps(){
+		// Do our regular work
+		$regular_tasks = OC_Backgroundjobs_RegularTask::all();
+		foreach( $regular_tasks as $key => $value ){
+			call_user_func( $value );
+		}
+
+		// Do our scheduled tasks
+		$scheduled_tasks = OC_Backgroundjobs_ScheduledTask::all();
+		foreach( $scheduled_tasks as $task ){
+			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
+			OC_Backgroundjobs_ScheduledTask::delete( $task['id'] );
+		}
+		
+		return true;
+	}
+
+	/**
+	 * @brief does a single task
+	 * @return boolean
+	 *
+	 * This method executes one task. It saves the last state and continues
+	 * with the next step. This method should be used by webcron and ajax
+	 * services.
+	 */
+	public static function doWebStep(){
+		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+		
+		if( $laststep == 'regular_tasks' ){
+			// get last app
+			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
+
+			// What's the next step?
+			$regular_tasks = OC_Backgroundjobs_RegularTask::all();
+			ksort( $regular_tasks );
+			$done = false;
+			
+			// search for next background job
+			foreach( $regular_tasks as $key => $value ){
+				if( strcmp( $lasttask, $key ) > 0 ){
+					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
+					$done = true;
+					call_user_func( $value );
+					break;
+				}
+			}
+
+			if( $done == false ){
+				// Next time load scheduled tasks
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
+			}
+		}
+		else{
+			$tasks = OC_Backgroundjobs_ScheduledTask::all();
+			if( length( $tasks )){
+				$task = $tasks[0];
+				// delete job before we execute it. This prevents endless loops
+				// of failing jobs.
+				OC_Backgroundjobs_ScheduledTask::delete($task['id']);
+
+				// execute job
+				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
+			}
+			else{
+				// Next time load scheduled tasks
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
+			}
+		}
+		
+		return true;
+	}
+}
-- 
cgit v1.2.3


From 6025d2ebc33da1fe2e3cd97b6ad28989c3a60812 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Wed, 8 Aug 2012 23:59:30 +0200
Subject: Rename Backgroundjobs to BackgroundJob

---
 lib/backgroundjobs/regulartask.php   |  4 ++--
 lib/backgroundjobs/scheduledtask.php |  3 +--
 lib/backgroundjobs/worker.php        | 14 +++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/backgroundjobs/regulartask.php b/lib/backgroundjobs/regulartask.php
index 38c1255d766..5c416fcdb0e 100644
--- a/lib/backgroundjobs/regulartask.php
+++ b/lib/backgroundjobs/regulartask.php
@@ -23,7 +23,7 @@
 /**
  * This class manages the regular tasks.
  */
-class OC_Backgroundjobs_RegularTask{
+class OC_BackgroundJob_RegularTask{
 	static private $registered = array();
 
 	/**
@@ -32,7 +32,7 @@ class OC_Backgroundjobs_RegularTask{
 	 * @param $method method name
 	 * @return true
 	 */
-	static public function create( $klass, $method ){
+	static public function register( $klass, $method ){
 		// Create the data structure
 		self::$registered["$klass-$method"] = array( $klass, $method );
 
diff --git a/lib/backgroundjobs/scheduledtask.php b/lib/backgroundjobs/scheduledtask.php
index 48a863c9068..5a2166175c7 100644
--- a/lib/backgroundjobs/scheduledtask.php
+++ b/lib/backgroundjobs/scheduledtask.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
 * ownCloud - Background Job
 *
@@ -24,7 +23,7 @@
 /**
  * This class manages our scheduled tasks.
  */
-class OC_Backgroundjobs_ScheduledTask{
+class OC_BackgroundJob_ScheduledTask{
 	/**
 	 * @brief Gets one scheduled task
 	 * @param $id ID of the task
diff --git a/lib/backgroundjobs/worker.php b/lib/backgroundjobs/worker.php
index 0a99c80ebdf..9709882978b 100644
--- a/lib/backgroundjobs/worker.php
+++ b/lib/backgroundjobs/worker.php
@@ -25,7 +25,7 @@
  * 
  * TODO: locking in doAllSteps
  */
-class OC_Backgroundjobs_Worker{
+class OC_BackgroundJob_Worker{
 	/**
 	 * @brief executes all tasks
 	 * @return boolean
@@ -36,16 +36,16 @@ class OC_Backgroundjobs_Worker{
 	 */
 	public static function doAllSteps(){
 		// Do our regular work
-		$regular_tasks = OC_Backgroundjobs_RegularTask::all();
+		$regular_tasks = OC_BackgroundJob_RegularTask::all();
 		foreach( $regular_tasks as $key => $value ){
 			call_user_func( $value );
 		}
 
 		// Do our scheduled tasks
-		$scheduled_tasks = OC_Backgroundjobs_ScheduledTask::all();
+		$scheduled_tasks = OC_BackgroundJob_ScheduledTask::all();
 		foreach( $scheduled_tasks as $task ){
 			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-			OC_Backgroundjobs_ScheduledTask::delete( $task['id'] );
+			OC_BackgroundJob_ScheduledTask::delete( $task['id'] );
 		}
 		
 		return true;
@@ -67,7 +67,7 @@ class OC_Backgroundjobs_Worker{
 			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
 
 			// What's the next step?
-			$regular_tasks = OC_Backgroundjobs_RegularTask::all();
+			$regular_tasks = OC_BackgroundJob_RegularTask::all();
 			ksort( $regular_tasks );
 			$done = false;
 			
@@ -87,12 +87,12 @@ class OC_Backgroundjobs_Worker{
 			}
 		}
 		else{
-			$tasks = OC_Backgroundjobs_ScheduledTask::all();
+			$tasks = OC_BackgroundJob_ScheduledTask::all();
 			if( length( $tasks )){
 				$task = $tasks[0];
 				// delete job before we execute it. This prevents endless loops
 				// of failing jobs.
-				OC_Backgroundjobs_ScheduledTask::delete($task['id']);
+				OC_BackgroundJob_ScheduledTask::delete($task['id']);
 
 				// execute job
 				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-- 
cgit v1.2.3


From 443e19822460df2c831fc3c52bb181d2a7606e92 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:00:12 +0200
Subject: Renaming backgroundjobs on file system as well

---
 lib/backgroundjob/regulartask.php    |  52 +++++++++++++++++
 lib/backgroundjob/scheduledtask.php  | 105 +++++++++++++++++++++++++++++++++
 lib/backgroundjob/worker.php         | 109 +++++++++++++++++++++++++++++++++++
 lib/backgroundjobs/regulartask.php   |  52 -----------------
 lib/backgroundjobs/scheduledtask.php | 105 ---------------------------------
 lib/backgroundjobs/worker.php        | 109 -----------------------------------
 6 files changed, 266 insertions(+), 266 deletions(-)
 create mode 100644 lib/backgroundjob/regulartask.php
 create mode 100644 lib/backgroundjob/scheduledtask.php
 create mode 100644 lib/backgroundjob/worker.php
 delete mode 100644 lib/backgroundjobs/regulartask.php
 delete mode 100644 lib/backgroundjobs/scheduledtask.php
 delete mode 100644 lib/backgroundjobs/worker.php

diff --git a/lib/backgroundjob/regulartask.php b/lib/backgroundjob/regulartask.php
new file mode 100644
index 00000000000..5c416fcdb0e
--- /dev/null
+++ b/lib/backgroundjob/regulartask.php
@@ -0,0 +1,52 @@
+<?php
+/**
+* ownCloud - Background Job
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * This class manages the regular tasks.
+ */
+class OC_BackgroundJob_RegularTask{
+	static private $registered = array();
+
+	/**
+	 * @brief creates a regular task
+	 * @param $klass class name
+	 * @param $method method name
+	 * @return true
+	 */
+	static public function register( $klass, $method ){
+		// Create the data structure
+		self::$registered["$klass-$method"] = array( $klass, $method );
+
+		// No chance for failure ;-)
+		return true;
+	}
+
+	/**
+	 * @brief gets all regular tasks
+	 * @return associative array
+	 *
+	 * key is string "$klass-$method", value is array( $klass, $method )
+	 */
+	static public function all(){
+		return self::$registered;
+	}
+}
diff --git a/lib/backgroundjob/scheduledtask.php b/lib/backgroundjob/scheduledtask.php
new file mode 100644
index 00000000000..5a2166175c7
--- /dev/null
+++ b/lib/backgroundjob/scheduledtask.php
@@ -0,0 +1,105 @@
+<?php
+/**
+* ownCloud - Background Job
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * This class manages our scheduled tasks.
+ */
+class OC_BackgroundJob_ScheduledTask{
+	/**
+	 * @brief Gets one scheduled task
+	 * @param $id ID of the task
+	 * @return associative array
+	 */
+	public static function find( $id ){
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$result = $stmt->execute(array($id));
+		return $result->fetchRow();
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks
+	 * @return array with associative arrays
+	 */
+	public static function all(){
+		// Array for objects
+		$return = array();
+
+		// Get Data
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks' );
+		$result = $stmt->execute(array());
+		while( $row = $result->fetchRow()){
+			$return[] = $row;
+		}
+
+		// Und weg damit
+		return $return;
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks of a specific app
+	 * @param $app app name
+	 * @return array with associative arrays
+	 */
+	public static function whereAppIs( $app ){
+		// Array for objects
+		$return = array();
+
+		// Get Data
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE app = ?' );
+		$result = $stmt->execute(array($app));
+		while( $row = $result->fetchRow()){
+			$return[] = $row;
+		}
+
+		// Und weg damit
+		return $return;
+	}
+
+	/**
+	 * @brief schedules a task
+	 * @param $app app name
+	 * @param $klass class name
+	 * @param $method method name
+	 * @param $parameters all useful data as text
+	 * @return id of task
+	 */
+	public static function add( $task, $klass, $method, $parameters ){
+		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*scheduledtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
+		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
+
+		return OC_DB::insertid();
+	}
+
+	/**
+	 * @brief deletes a scheduled task
+	 * @param $id id of task
+	 * @return true/false
+	 *
+	 * Deletes a report
+	 */
+	public static function delete( $id ){
+		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$result = $stmt->execute(array($id));
+
+		return true;
+	}
+}
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
new file mode 100644
index 00000000000..9709882978b
--- /dev/null
+++ b/lib/backgroundjob/worker.php
@@ -0,0 +1,109 @@
+<?php
+/**
+* ownCloud - Background Job
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * This class does the dirty work.
+ * 
+ * TODO: locking in doAllSteps
+ */
+class OC_BackgroundJob_Worker{
+	/**
+	 * @brief executes all tasks
+	 * @return boolean
+	 *
+	 * This method executes all regular tasks and then all scheduled tasks.
+	 * This method should be called by cli scripts that do not let the user
+	 * wait.
+	 */
+	public static function doAllSteps(){
+		// Do our regular work
+		$regular_tasks = OC_BackgroundJob_RegularTask::all();
+		foreach( $regular_tasks as $key => $value ){
+			call_user_func( $value );
+		}
+
+		// Do our scheduled tasks
+		$scheduled_tasks = OC_BackgroundJob_ScheduledTask::all();
+		foreach( $scheduled_tasks as $task ){
+			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
+			OC_BackgroundJob_ScheduledTask::delete( $task['id'] );
+		}
+		
+		return true;
+	}
+
+	/**
+	 * @brief does a single task
+	 * @return boolean
+	 *
+	 * This method executes one task. It saves the last state and continues
+	 * with the next step. This method should be used by webcron and ajax
+	 * services.
+	 */
+	public static function doWebStep(){
+		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+		
+		if( $laststep == 'regular_tasks' ){
+			// get last app
+			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
+
+			// What's the next step?
+			$regular_tasks = OC_BackgroundJob_RegularTask::all();
+			ksort( $regular_tasks );
+			$done = false;
+			
+			// search for next background job
+			foreach( $regular_tasks as $key => $value ){
+				if( strcmp( $lasttask, $key ) > 0 ){
+					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
+					$done = true;
+					call_user_func( $value );
+					break;
+				}
+			}
+
+			if( $done == false ){
+				// Next time load scheduled tasks
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
+			}
+		}
+		else{
+			$tasks = OC_BackgroundJob_ScheduledTask::all();
+			if( length( $tasks )){
+				$task = $tasks[0];
+				// delete job before we execute it. This prevents endless loops
+				// of failing jobs.
+				OC_BackgroundJob_ScheduledTask::delete($task['id']);
+
+				// execute job
+				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
+			}
+			else{
+				// Next time load scheduled tasks
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
+			}
+		}
+		
+		return true;
+	}
+}
diff --git a/lib/backgroundjobs/regulartask.php b/lib/backgroundjobs/regulartask.php
deleted file mode 100644
index 5c416fcdb0e..00000000000
--- a/lib/backgroundjobs/regulartask.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-* ownCloud - Background Job
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class manages the regular tasks.
- */
-class OC_BackgroundJob_RegularTask{
-	static private $registered = array();
-
-	/**
-	 * @brief creates a regular task
-	 * @param $klass class name
-	 * @param $method method name
-	 * @return true
-	 */
-	static public function register( $klass, $method ){
-		// Create the data structure
-		self::$registered["$klass-$method"] = array( $klass, $method );
-
-		// No chance for failure ;-)
-		return true;
-	}
-
-	/**
-	 * @brief gets all regular tasks
-	 * @return associative array
-	 *
-	 * key is string "$klass-$method", value is array( $klass, $method )
-	 */
-	static public function all(){
-		return self::$registered;
-	}
-}
diff --git a/lib/backgroundjobs/scheduledtask.php b/lib/backgroundjobs/scheduledtask.php
deleted file mode 100644
index 5a2166175c7..00000000000
--- a/lib/backgroundjobs/scheduledtask.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
-* ownCloud - Background Job
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class manages our scheduled tasks.
- */
-class OC_BackgroundJob_ScheduledTask{
-	/**
-	 * @brief Gets one scheduled task
-	 * @param $id ID of the task
-	 * @return associative array
-	 */
-	public static function find( $id ){
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE id = ?' );
-		$result = $stmt->execute(array($id));
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief Gets all scheduled tasks
-	 * @return array with associative arrays
-	 */
-	public static function all(){
-		// Array for objects
-		$return = array();
-
-		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks' );
-		$result = $stmt->execute(array());
-		while( $row = $result->fetchRow()){
-			$return[] = $row;
-		}
-
-		// Und weg damit
-		return $return;
-	}
-
-	/**
-	 * @brief Gets all scheduled tasks of a specific app
-	 * @param $app app name
-	 * @return array with associative arrays
-	 */
-	public static function whereAppIs( $app ){
-		// Array for objects
-		$return = array();
-
-		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE app = ?' );
-		$result = $stmt->execute(array($app));
-		while( $row = $result->fetchRow()){
-			$return[] = $row;
-		}
-
-		// Und weg damit
-		return $return;
-	}
-
-	/**
-	 * @brief schedules a task
-	 * @param $app app name
-	 * @param $klass class name
-	 * @param $method method name
-	 * @param $parameters all useful data as text
-	 * @return id of task
-	 */
-	public static function add( $task, $klass, $method, $parameters ){
-		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*scheduledtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
-		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
-
-		return OC_DB::insertid();
-	}
-
-	/**
-	 * @brief deletes a scheduled task
-	 * @param $id id of task
-	 * @return true/false
-	 *
-	 * Deletes a report
-	 */
-	public static function delete( $id ){
-		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*scheduledtasks WHERE id = ?' );
-		$result = $stmt->execute(array($id));
-
-		return true;
-	}
-}
diff --git a/lib/backgroundjobs/worker.php b/lib/backgroundjobs/worker.php
deleted file mode 100644
index 9709882978b..00000000000
--- a/lib/backgroundjobs/worker.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
-* ownCloud - Background Job
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class does the dirty work.
- * 
- * TODO: locking in doAllSteps
- */
-class OC_BackgroundJob_Worker{
-	/**
-	 * @brief executes all tasks
-	 * @return boolean
-	 *
-	 * This method executes all regular tasks and then all scheduled tasks.
-	 * This method should be called by cli scripts that do not let the user
-	 * wait.
-	 */
-	public static function doAllSteps(){
-		// Do our regular work
-		$regular_tasks = OC_BackgroundJob_RegularTask::all();
-		foreach( $regular_tasks as $key => $value ){
-			call_user_func( $value );
-		}
-
-		// Do our scheduled tasks
-		$scheduled_tasks = OC_BackgroundJob_ScheduledTask::all();
-		foreach( $scheduled_tasks as $task ){
-			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-			OC_BackgroundJob_ScheduledTask::delete( $task['id'] );
-		}
-		
-		return true;
-	}
-
-	/**
-	 * @brief does a single task
-	 * @return boolean
-	 *
-	 * This method executes one task. It saves the last state and continues
-	 * with the next step. This method should be used by webcron and ajax
-	 * services.
-	 */
-	public static function doWebStep(){
-		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-		
-		if( $laststep == 'regular_tasks' ){
-			// get last app
-			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
-
-			// What's the next step?
-			$regular_tasks = OC_BackgroundJob_RegularTask::all();
-			ksort( $regular_tasks );
-			$done = false;
-			
-			// search for next background job
-			foreach( $regular_tasks as $key => $value ){
-				if( strcmp( $lasttask, $key ) > 0 ){
-					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
-					$done = true;
-					call_user_func( $value );
-					break;
-				}
-			}
-
-			if( $done == false ){
-				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
-			}
-		}
-		else{
-			$tasks = OC_BackgroundJob_ScheduledTask::all();
-			if( length( $tasks )){
-				$task = $tasks[0];
-				// delete job before we execute it. This prevents endless loops
-				// of failing jobs.
-				OC_BackgroundJob_ScheduledTask::delete($task['id']);
-
-				// execute job
-				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-			}
-			else{
-				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
-			}
-		}
-		
-		return true;
-	}
-}
-- 
cgit v1.2.3


From 088b3ea0bcd60ddc9d6854321e4ca502f874c5f9 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:01:06 +0200
Subject: Add public interface to background jobs

---
 lib/public/backgroundjob.php | 116 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 lib/public/backgroundjob.php

diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
new file mode 100644
index 00000000000..ac863634540
--- /dev/null
+++ b/lib/public/backgroundjob.php
@@ -0,0 +1,116 @@
+<?php
+/**
+* ownCloud
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * Public interface of ownCloud forbackground jobs.
+ */
+
+// use OCP namespace for all classes that are considered public. 
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP;
+
+/**
+ * This class provides functions to manage backgroundjobs in ownCloud
+ *
+ * There are two kind of background jobs in ownCloud: regular tasks and
+ * scheduled tasks.
+ *
+ * Regular tasks have to be registered in appinfo.php and
+ * will run on a regular base. Fetching news could be a task that should run
+ * frequently.
+ *
+ * Scheduled tasks have to be registered each time you want to execute them.
+ * An example of the scheduled task would be the creation of the thumbnail. As
+ * soon as the user uploads a picture the gallery app registers the scheduled
+ * task "create thumbnail" and saves the path in the parameter. As soon as the
+ * task is done it will be deleted from the list.
+ */
+class Backgroundjob {
+	/**
+	 * @brief creates a regular task
+	 * @param $klass class name
+	 * @param $method method name
+	 * @return true
+	 */
+	public static function addRegularTask( $klass, $method ){
+		return \OC_BackgroundJob_RegularTask::register( $klass, $method );
+	}
+
+	/**
+	 * @brief gets all regular tasks
+	 * @return associative array
+	 *
+	 * key is string "$klass-$method", value is array( $klass, $method )
+	 */
+	static public function allRegularTasks(){
+		return \OC_BackgroundJob_RegularTask::all();
+	}
+
+	/**
+	 * @brief Gets one scheduled task
+	 * @param $id ID of the task
+	 * @return associative array
+	 */
+	public static function findScheduledTask( $id ){
+		return \OC_BackgroundJob_ScheduledTask::find( $id );
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks
+	 * @return array with associative arrays
+	 */
+	public static function allScheduledTasks(){
+		return \OC_BackgroundJob_ScheduledTask::all();
+	}
+
+	/**
+	 * @brief Gets all scheduled tasks of a specific app
+	 * @param $app app name
+	 * @return array with associative arrays
+	 */
+	public static function scheduledTaskWhereAppIs( $app ){
+		return \OC_BackgroundJob_ScheduledTask::whereAppIs( $app );
+	}
+
+	/**
+	 * @brief schedules a task
+	 * @param $app app name
+	 * @param $klass class name
+	 * @param $method method name
+	 * @param $parameters all useful data as text
+	 * @return id of task
+	 */
+	public static function addScheduledTask( $task, $klass, $method, $parameters ){
+		return \OC_BackgroundJob_ScheduledTask::add( $task, $klass, $method, $parameters );
+	}
+
+	/**
+	 * @brief deletes a scheduled task
+	 * @param $id id of task
+	 * @return true/false
+	 *
+	 * Deletes a report
+	 */
+	public static function deleteScheduledTask( $id ){
+		return \OC_BackgroundJob_ScheduledTask::delete( $id );
+	}
+}
-- 
cgit v1.2.3


From 4107273a790ec53880b70b944faa9db5b142c15b Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:46:50 +0200
Subject: fix license text

---
 lib/backgroundjob/regulartask.php   |  2 +-
 lib/backgroundjob/scheduledtask.php |  2 +-
 lib/backgroundjob/worker.php        | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/backgroundjob/regulartask.php b/lib/backgroundjob/regulartask.php
index 5c416fcdb0e..53bd4eb5e9b 100644
--- a/lib/backgroundjob/regulartask.php
+++ b/lib/backgroundjob/regulartask.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
diff --git a/lib/backgroundjob/scheduledtask.php b/lib/backgroundjob/scheduledtask.php
index 5a2166175c7..47f332a204a 100644
--- a/lib/backgroundjob/scheduledtask.php
+++ b/lib/backgroundjob/scheduledtask.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 9709882978b..23757529ad8 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* ownCloud - Background Job
+* ownCloud
 *
 * @author Jakob Sack
 * @copyright 2012 Jakob Sack owncloud@jakobsack.de
@@ -59,12 +59,12 @@ class OC_BackgroundJob_Worker{
 	 * with the next step. This method should be used by webcron and ajax
 	 * services.
 	 */
-	public static function doWebStep(){
-		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+	public static function doNextStep(){
+		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjob_step', 'regular_tasks' );
 		
 		if( $laststep == 'regular_tasks' ){
 			// get last app
-			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
+			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjob_task', '' );
 
 			// What's the next step?
 			$regular_tasks = OC_BackgroundJob_RegularTask::all();
@@ -74,7 +74,7 @@ class OC_BackgroundJob_Worker{
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
 				if( strcmp( $lasttask, $key ) > 0 ){
-					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
+					OC_Appconfig::getValue( 'core', 'backgroundjob_task', $key );
 					$done = true;
 					call_user_func( $value );
 					break;
@@ -83,7 +83,7 @@ class OC_BackgroundJob_Worker{
 
 			if( $done == false ){
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'scheduled_tasks' );
 			}
 		}
 		else{
@@ -99,8 +99,8 @@ class OC_BackgroundJob_Worker{
 			}
 			else{
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'regular_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjob_task', '' );
 			}
 		}
 		
-- 
cgit v1.2.3


From 14cbb8724c65491daaacc4717be020f6340fb829 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:48:36 +0200
Subject: Add "cron.php" for background jobs. It is named cron.php because more
 people will recognize the purpose of the file then.

---
 cron.php | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 cron.php

diff --git a/cron.php b/cron.php
new file mode 100644
index 00000000000..fd46174f2bd
--- /dev/null
+++ b/cron.php
@@ -0,0 +1,51 @@
+<?php
+/**
+* ownCloud
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+$RUNTIME_NOSETUPFS = true;
+require_once('lib/base.php');
+
+$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'web' );
+if( OC::$CLI ){
+	if( $appmode == 'web' ){
+		OC_Appconfig::setValue( 'core', 'backgroundjob_mode', 'cron' );
+	}
+
+	// check if backgroundjobs is still running
+	$pid = OC_Appconfig::getValue( 'core', 'backgroundjob_pid', false );
+	if( $pid !== false ){
+		// FIXME: check if $pid is still alive (*nix/mswin). if so then exit
+	}
+	// save pid
+	OC_Appconfig::setValue( 'core', 'backgroundjob_pid', getmypid());
+
+	// Work
+	OC_BackgroundJob_Worker::doAllSteps();
+}
+else{
+	if( $appmode == 'web' ){
+		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
+		exit();
+	}
+	OC_BackgroundJob_Worker::doNextStep();
+	OC_JSON::success();
+}
+exit();
-- 
cgit v1.2.3


From 7fa896971ffaac5daa5efd7408f58c67ec56f493 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 00:58:54 +0200
Subject: JavaScript file for activating web cron

---
 core/js/backgroundjobs.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 core/js/backgroundjobs.js

diff --git a/core/js/backgroundjobs.js b/core/js/backgroundjobs.js
new file mode 100644
index 00000000000..4a558a66b4b
--- /dev/null
+++ b/core/js/backgroundjobs.js
@@ -0,0 +1,25 @@
+/**
+* ownCloud
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+// start worker once page has loaded
+$(document).ready(function(){
+	$.get( OC.webroot+'/cron.php' );
+});
-- 
cgit v1.2.3


From 13a0818fec4ac758fb050764fb33d90c74200cfe Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 01:02:05 +0200
Subject: Be more precise regarding backgroundjobs mode

---
 cron.php     | 6 +++---
 lib/base.php | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cron.php b/cron.php
index fd46174f2bd..2bcaaff9fd9 100644
--- a/cron.php
+++ b/cron.php
@@ -23,9 +23,9 @@
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
-$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'web' );
+$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' );
 if( OC::$CLI ){
-	if( $appmode == 'web' ){
+	if( $appmode != 'cron' ){
 		OC_Appconfig::setValue( 'core', 'backgroundjob_mode', 'cron' );
 	}
 
@@ -41,7 +41,7 @@ if( OC::$CLI ){
 	OC_BackgroundJob_Worker::doAllSteps();
 }
 else{
-	if( $appmode == 'web' ){
+	if( $appmode == 'cron' ){
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
 		exit();
 	}
diff --git a/lib/base.php b/lib/base.php
index c3887dec2f8..090d05cdbae 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -227,11 +227,17 @@ class OC{
 		OC_Util::addScript( "jquery.infieldlabel.min" );
 		OC_Util::addScript( "jquery-tipsy" );
 		OC_Util::addScript( "oc-dialogs" );
+		OC_Util::addScript( "backgroundjobs" );
 		OC_Util::addScript( "js" );
 		OC_Util::addScript( "eventsource" );
 		OC_Util::addScript( "config" );
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search','result');
+
+		if( OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' ) == 'ajax' ){
+			OC_Util::addScript( 'backgroundjobs' );
+		}
+		
 		OC_Util::addStyle( "styles" );
 		OC_Util::addStyle( "multiselect" );
 		OC_Util::addStyle( "jquery-ui-1.8.16.custom" );
-- 
cgit v1.2.3


From 37ee88aa6d6470bdb0e500fc94fe75042453fbb7 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 01:29:15 +0200
Subject: Fixed bug in OC_BackgroundJob_Worker

---
 lib/backgroundjob/worker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 23757529ad8..7514a16b696 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -88,7 +88,7 @@ class OC_BackgroundJob_Worker{
 		}
 		else{
 			$tasks = OC_BackgroundJob_ScheduledTask::all();
-			if( length( $tasks )){
+			if( count( $tasks )){
 				$task = $tasks[0];
 				// delete job before we execute it. This prevents endless loops
 				// of failing jobs.
-- 
cgit v1.2.3


From 889f0a1c6df51c5b6495445809143940ad17c327 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 10:40:39 +0200
Subject: rename appconfig keys for backgroundjobs

---
 cron.php                     |  8 ++++----
 lib/backgroundjob/worker.php | 12 ++++++------
 lib/base.php                 |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cron.php b/cron.php
index 2bcaaff9fd9..9d7e396d61e 100644
--- a/cron.php
+++ b/cron.php
@@ -23,19 +23,19 @@
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
-$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' );
+$appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
 if( OC::$CLI ){
 	if( $appmode != 'cron' ){
-		OC_Appconfig::setValue( 'core', 'backgroundjob_mode', 'cron' );
+		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
 	}
 
 	// check if backgroundjobs is still running
-	$pid = OC_Appconfig::getValue( 'core', 'backgroundjob_pid', false );
+	$pid = OC_Appconfig::getValue( 'core', 'backgroundjobs_pid', false );
 	if( $pid !== false ){
 		// FIXME: check if $pid is still alive (*nix/mswin). if so then exit
 	}
 	// save pid
-	OC_Appconfig::setValue( 'core', 'backgroundjob_pid', getmypid());
+	OC_Appconfig::setValue( 'core', 'backgroundjobs_pid', getmypid());
 
 	// Work
 	OC_BackgroundJob_Worker::doAllSteps();
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 7514a16b696..799fa5306c6 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -60,11 +60,11 @@ class OC_BackgroundJob_Worker{
 	 * services.
 	 */
 	public static function doNextStep(){
-		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjob_step', 'regular_tasks' );
+		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
 		
 		if( $laststep == 'regular_tasks' ){
 			// get last app
-			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjob_task', '' );
+			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
 
 			// What's the next step?
 			$regular_tasks = OC_BackgroundJob_RegularTask::all();
@@ -74,7 +74,7 @@ class OC_BackgroundJob_Worker{
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
 				if( strcmp( $lasttask, $key ) > 0 ){
-					OC_Appconfig::getValue( 'core', 'backgroundjob_task', $key );
+					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
 					$done = true;
 					call_user_func( $value );
 					break;
@@ -83,7 +83,7 @@ class OC_BackgroundJob_Worker{
 
 			if( $done == false ){
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'scheduled_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
 			}
 		}
 		else{
@@ -99,8 +99,8 @@ class OC_BackgroundJob_Worker{
 			}
 			else{
 				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjob_step', 'regular_tasks' );
-				OC_Appconfig::setValue( 'core', 'backgroundjob_task', '' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
 			}
 		}
 		
diff --git a/lib/base.php b/lib/base.php
index 090d05cdbae..ee80294dd92 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -234,7 +234,7 @@ class OC{
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search','result');
 
-		if( OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' ) == 'ajax' ){
+		if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){
 			OC_Util::addScript( 'backgroundjobs' );
 		}
 		
-- 
cgit v1.2.3


From 1ce2cd73ffd9c76912f8ba03809a5b347cec38a9 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 10:41:10 +0200
Subject: Add first version of backgroundjobs settings

---
 settings/ajax/setbackgroundjobsmode.php | 28 ++++++++++++++++++++++++++++
 settings/js/admin.js                    |  8 +++++++-
 settings/templates/admin.php            | 13 +++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 settings/ajax/setbackgroundjobsmode.php

diff --git a/settings/ajax/setbackgroundjobsmode.php b/settings/ajax/setbackgroundjobsmode.php
new file mode 100644
index 00000000000..454b3caa5bf
--- /dev/null
+++ b/settings/ajax/setbackgroundjobsmode.php
@@ -0,0 +1,28 @@
+<?php
+/**
+* ownCloud
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+OC_Util::checkAdminUser();
+OCP\JSON::callCheck();
+
+OC_Appconfig::setValue( 'core', 'backgroundjob_mode', $_POST['mode'] );
+
+echo 'true';
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 4f295ab6f5d..409594a4b94 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -3,5 +3,11 @@ $(document).ready(function(){
 		$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() },function(){
 			OC.Log.reload();
 		} );
-	})
+	});
+
+	$('#backgroundjobs input').change(function(){
+		if($(this).attr('checked')){
+			$.post(OC.filePath('settings','ajax','setbackgroundjobsmode.php'), { mode: $(this).val() });
+		}
+	});
 });
\ No newline at end of file
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 60b9732d7f4..318bfbbe196 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -24,6 +24,19 @@ if(!$_['htaccessworking']) {
 <?php foreach($_['forms'] as $form){
 	echo $form;
 };?>
+
+<fieldset class="personalblock" id="backgroundjobs">
+	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
+	<input type="radio" name="mode" value="none" id="backgroundjobs_none">
+	<label for="backgroundjobs_none">None</label><br />
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax">
+	<label for="backgroundjobs_ajax">AJAX</label><br />
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron">
+	<label for="backgroundjobs_webcron">Webcron</label><br />
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron">
+	<label for="backgroundjobs_cron">Cron</label><br />
+</fieldset>
+
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Log');?></strong></legend>
 	Log level: <select name='loglevel' id='loglevel'>
-- 
cgit v1.2.3


From ceda0ae0525d66417b4cf8e39e8cedbcbd5f6258 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 19:04:04 +0200
Subject: Backgroundjobs: rename ScheduledTask to QueuedTask

---
 lib/backgroundjob/scheduledtask.php | 25 ++++++++++-----------
 lib/backgroundjob/worker.php        | 20 ++++++++---------
 lib/public/backgroundjob.php        | 45 +++++++++++++++++++------------------
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/lib/backgroundjob/scheduledtask.php b/lib/backgroundjob/scheduledtask.php
index 47f332a204a..da5d4ddc694 100644
--- a/lib/backgroundjob/scheduledtask.php
+++ b/lib/backgroundjob/scheduledtask.php
@@ -21,22 +21,22 @@
 */
 
 /**
- * This class manages our scheduled tasks.
+ * This class manages our queued tasks.
  */
-class OC_BackgroundJob_ScheduledTask{
+class OC_BackgroundJob_QueuedTask{
 	/**
-	 * @brief Gets one scheduled task
+	 * @brief Gets one queued task
 	 * @param $id ID of the task
 	 * @return associative array
 	 */
 	public static function find( $id ){
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE id = ?' );
 		$result = $stmt->execute(array($id));
 		return $result->fetchRow();
 	}
 
 	/**
-	 * @brief Gets all scheduled tasks
+	 * @brief Gets all queued tasks
 	 * @return array with associative arrays
 	 */
 	public static function all(){
@@ -44,18 +44,17 @@ class OC_BackgroundJob_ScheduledTask{
 		$return = array();
 
 		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks' );
 		$result = $stmt->execute(array());
 		while( $row = $result->fetchRow()){
 			$return[] = $row;
 		}
 
-		// Und weg damit
 		return $return;
 	}
 
 	/**
-	 * @brief Gets all scheduled tasks of a specific app
+	 * @brief Gets all queued tasks of a specific app
 	 * @param $app app name
 	 * @return array with associative arrays
 	 */
@@ -64,7 +63,7 @@ class OC_BackgroundJob_ScheduledTask{
 		$return = array();
 
 		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*scheduledtasks WHERE app = ?' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE app = ?' );
 		$result = $stmt->execute(array($app));
 		while( $row = $result->fetchRow()){
 			$return[] = $row;
@@ -75,7 +74,7 @@ class OC_BackgroundJob_ScheduledTask{
 	}
 
 	/**
-	 * @brief schedules a task
+	 * @brief queues a task
 	 * @param $app app name
 	 * @param $klass class name
 	 * @param $method method name
@@ -83,21 +82,21 @@ class OC_BackgroundJob_ScheduledTask{
 	 * @return id of task
 	 */
 	public static function add( $task, $klass, $method, $parameters ){
-		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*scheduledtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
+		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*queuedtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
 		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
 
 		return OC_DB::insertid();
 	}
 
 	/**
-	 * @brief deletes a scheduled task
+	 * @brief deletes a queued task
 	 * @param $id id of task
 	 * @return true/false
 	 *
 	 * Deletes a report
 	 */
 	public static function delete( $id ){
-		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*scheduledtasks WHERE id = ?' );
+		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*queuedtasks WHERE id = ?' );
 		$result = $stmt->execute(array($id));
 
 		return true;
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 799fa5306c6..0acbb9d3217 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -30,7 +30,7 @@ class OC_BackgroundJob_Worker{
 	 * @brief executes all tasks
 	 * @return boolean
 	 *
-	 * This method executes all regular tasks and then all scheduled tasks.
+	 * This method executes all regular tasks and then all queued tasks.
 	 * This method should be called by cli scripts that do not let the user
 	 * wait.
 	 */
@@ -41,11 +41,11 @@ class OC_BackgroundJob_Worker{
 			call_user_func( $value );
 		}
 
-		// Do our scheduled tasks
-		$scheduled_tasks = OC_BackgroundJob_ScheduledTask::all();
-		foreach( $scheduled_tasks as $task ){
+		// Do our queued tasks
+		$queued_tasks = OC_BackgroundJob_QueuedTask::all();
+		foreach( $queued_tasks as $task ){
 			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-			OC_BackgroundJob_ScheduledTask::delete( $task['id'] );
+			OC_BackgroundJob_QueuedTask::delete( $task['id'] );
 		}
 		
 		return true;
@@ -82,23 +82,23 @@ class OC_BackgroundJob_Worker{
 			}
 
 			if( $done == false ){
-				// Next time load scheduled tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'scheduled_tasks' );
+				// Next time load queued tasks
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'queued_tasks' );
 			}
 		}
 		else{
-			$tasks = OC_BackgroundJob_ScheduledTask::all();
+			$tasks = OC_BackgroundJob_QueuedTask::all();
 			if( count( $tasks )){
 				$task = $tasks[0];
 				// delete job before we execute it. This prevents endless loops
 				// of failing jobs.
-				OC_BackgroundJob_ScheduledTask::delete($task['id']);
+				OC_BackgroundJob_QueuedTask::delete($task['id']);
 
 				// execute job
 				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 			}
 			else{
-				// Next time load scheduled tasks
+				// Next time load queued tasks
 				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
 				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
 			}
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index ac863634540..72f4557eb1a 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -32,19 +32,20 @@ namespace OCP;
  * This class provides functions to manage backgroundjobs in ownCloud
  *
  * There are two kind of background jobs in ownCloud: regular tasks and
- * scheduled tasks.
+ * queued tasks.
  *
  * Regular tasks have to be registered in appinfo.php and
  * will run on a regular base. Fetching news could be a task that should run
  * frequently.
  *
- * Scheduled tasks have to be registered each time you want to execute them.
- * An example of the scheduled task would be the creation of the thumbnail. As
- * soon as the user uploads a picture the gallery app registers the scheduled
- * task "create thumbnail" and saves the path in the parameter. As soon as the
- * task is done it will be deleted from the list.
+ * Queued tasks have to be registered each time you want to execute them.
+ * An example of the queued task would be the creation of the thumbnail. As
+ * soon as the user uploads a picture the gallery app registers the queued
+ * task "create thumbnail" and saves the path in the parameter instead of doing
+ * the work right away. This makes the app more responsive. As soon as the task 
+ * is done it will be deleted from the list.
  */
-class Backgroundjob {
+class BackgroundJob {
 	/**
 	 * @brief creates a regular task
 	 * @param $klass class name
@@ -66,51 +67,51 @@ class Backgroundjob {
 	}
 
 	/**
-	 * @brief Gets one scheduled task
+	 * @brief Gets one queued task
 	 * @param $id ID of the task
 	 * @return associative array
 	 */
-	public static function findScheduledTask( $id ){
-		return \OC_BackgroundJob_ScheduledTask::find( $id );
+	public static function findQueuedTask( $id ){
+		return \OC_BackgroundJob_QueuedTask::find( $id );
 	}
 
 	/**
-	 * @brief Gets all scheduled tasks
+	 * @brief Gets all queued tasks
 	 * @return array with associative arrays
 	 */
-	public static function allScheduledTasks(){
-		return \OC_BackgroundJob_ScheduledTask::all();
+	public static function allQueuedTasks(){
+		return \OC_BackgroundJob_QueuedTask::all();
 	}
 
 	/**
-	 * @brief Gets all scheduled tasks of a specific app
+	 * @brief Gets all queued tasks of a specific app
 	 * @param $app app name
 	 * @return array with associative arrays
 	 */
-	public static function scheduledTaskWhereAppIs( $app ){
-		return \OC_BackgroundJob_ScheduledTask::whereAppIs( $app );
+	public static function queuedTaskWhereAppIs( $app ){
+		return \OC_BackgroundJob_QueuedTask::whereAppIs( $app );
 	}
 
 	/**
-	 * @brief schedules a task
+	 * @brief queues a task
 	 * @param $app app name
 	 * @param $klass class name
 	 * @param $method method name
 	 * @param $parameters all useful data as text
 	 * @return id of task
 	 */
-	public static function addScheduledTask( $task, $klass, $method, $parameters ){
-		return \OC_BackgroundJob_ScheduledTask::add( $task, $klass, $method, $parameters );
+	public static function addQueuedTask( $task, $klass, $method, $parameters ){
+		return \OC_BackgroundJob_QueuedTask::add( $task, $klass, $method, $parameters );
 	}
 
 	/**
-	 * @brief deletes a scheduled task
+	 * @brief deletes a queued task
 	 * @param $id id of task
 	 * @return true/false
 	 *
 	 * Deletes a report
 	 */
-	public static function deleteScheduledTask( $id ){
-		return \OC_BackgroundJob_ScheduledTask::delete( $id );
+	public static function deleteQueuedTask( $id ){
+		return \OC_BackgroundJob_QueuedTask::delete( $id );
 	}
 }
-- 
cgit v1.2.3


From 28c1ec19eaab548d080407e956c4909fe7bc07ab Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 19:26:49 +0200
Subject: BackgroundJob: forgot to rename file

---
 lib/backgroundjob/queuedtask.php    | 104 ++++++++++++++++++++++++++++++++++++
 lib/backgroundjob/scheduledtask.php | 104 ------------------------------------
 2 files changed, 104 insertions(+), 104 deletions(-)
 create mode 100644 lib/backgroundjob/queuedtask.php
 delete mode 100644 lib/backgroundjob/scheduledtask.php

diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php
new file mode 100644
index 00000000000..da5d4ddc694
--- /dev/null
+++ b/lib/backgroundjob/queuedtask.php
@@ -0,0 +1,104 @@
+<?php
+/**
+* ownCloud
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * This class manages our queued tasks.
+ */
+class OC_BackgroundJob_QueuedTask{
+	/**
+	 * @brief Gets one queued task
+	 * @param $id ID of the task
+	 * @return associative array
+	 */
+	public static function find( $id ){
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE id = ?' );
+		$result = $stmt->execute(array($id));
+		return $result->fetchRow();
+	}
+
+	/**
+	 * @brief Gets all queued tasks
+	 * @return array with associative arrays
+	 */
+	public static function all(){
+		// Array for objects
+		$return = array();
+
+		// Get Data
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks' );
+		$result = $stmt->execute(array());
+		while( $row = $result->fetchRow()){
+			$return[] = $row;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * @brief Gets all queued tasks of a specific app
+	 * @param $app app name
+	 * @return array with associative arrays
+	 */
+	public static function whereAppIs( $app ){
+		// Array for objects
+		$return = array();
+
+		// Get Data
+		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE app = ?' );
+		$result = $stmt->execute(array($app));
+		while( $row = $result->fetchRow()){
+			$return[] = $row;
+		}
+
+		// Und weg damit
+		return $return;
+	}
+
+	/**
+	 * @brief queues a task
+	 * @param $app app name
+	 * @param $klass class name
+	 * @param $method method name
+	 * @param $parameters all useful data as text
+	 * @return id of task
+	 */
+	public static function add( $task, $klass, $method, $parameters ){
+		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*queuedtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
+		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
+
+		return OC_DB::insertid();
+	}
+
+	/**
+	 * @brief deletes a queued task
+	 * @param $id id of task
+	 * @return true/false
+	 *
+	 * Deletes a report
+	 */
+	public static function delete( $id ){
+		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*queuedtasks WHERE id = ?' );
+		$result = $stmt->execute(array($id));
+
+		return true;
+	}
+}
diff --git a/lib/backgroundjob/scheduledtask.php b/lib/backgroundjob/scheduledtask.php
deleted file mode 100644
index da5d4ddc694..00000000000
--- a/lib/backgroundjob/scheduledtask.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class manages our queued tasks.
- */
-class OC_BackgroundJob_QueuedTask{
-	/**
-	 * @brief Gets one queued task
-	 * @param $id ID of the task
-	 * @return associative array
-	 */
-	public static function find( $id ){
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE id = ?' );
-		$result = $stmt->execute(array($id));
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief Gets all queued tasks
-	 * @return array with associative arrays
-	 */
-	public static function all(){
-		// Array for objects
-		$return = array();
-
-		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks' );
-		$result = $stmt->execute(array());
-		while( $row = $result->fetchRow()){
-			$return[] = $row;
-		}
-
-		return $return;
-	}
-
-	/**
-	 * @brief Gets all queued tasks of a specific app
-	 * @param $app app name
-	 * @return array with associative arrays
-	 */
-	public static function whereAppIs( $app ){
-		// Array for objects
-		$return = array();
-
-		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE app = ?' );
-		$result = $stmt->execute(array($app));
-		while( $row = $result->fetchRow()){
-			$return[] = $row;
-		}
-
-		// Und weg damit
-		return $return;
-	}
-
-	/**
-	 * @brief queues a task
-	 * @param $app app name
-	 * @param $klass class name
-	 * @param $method method name
-	 * @param $parameters all useful data as text
-	 * @return id of task
-	 */
-	public static function add( $task, $klass, $method, $parameters ){
-		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*queuedtasks (app, klass, method, parameters) VALUES(?,?,?,?)' );
-		$result = $stmt->execute(array($app, $klass, $method, $parameters, time));
-
-		return OC_DB::insertid();
-	}
-
-	/**
-	 * @brief deletes a queued task
-	 * @param $id id of task
-	 * @return true/false
-	 *
-	 * Deletes a report
-	 */
-	public static function delete( $id ){
-		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*queuedtasks WHERE id = ?' );
-		$result = $stmt->execute(array($id));
-
-		return true;
-	}
-}
-- 
cgit v1.2.3


From 2b5f005547e920c8071782f975ac98d81475f45a Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 21:29:45 +0200
Subject: Backgroundjobs: Forgot to require lib/base.php

---
 settings/ajax/setbackgroundjobsmode.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/settings/ajax/setbackgroundjobsmode.php b/settings/ajax/setbackgroundjobsmode.php
index 454b3caa5bf..0ff14376e6e 100644
--- a/settings/ajax/setbackgroundjobsmode.php
+++ b/settings/ajax/setbackgroundjobsmode.php
@@ -20,6 +20,9 @@
 *
 */
 
+// Init owncloud
+require_once('../../lib/base.php');
+
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-- 
cgit v1.2.3


From a6a1f892f06e23a405d14d5e0b3eb843c0154909 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 22:07:18 +0200
Subject: BackgroundJobs: fix bug

---
 lib/backgroundjob/worker.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 0acbb9d3217..8a58a76e3a4 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -73,8 +73,8 @@ class OC_BackgroundJob_Worker{
 			
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
-				if( strcmp( $lasttask, $key ) > 0 ){
-					OC_Appconfig::getValue( 'core', 'backgroundjobs_task', $key );
+				if( strcmp( $key, $lasttask ) > 0 ){
+					OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
 					$done = true;
 					call_user_func( $value );
 					break;
-- 
cgit v1.2.3


From 66511469e04fdf17dfc45711ad98518fab94a712 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 22:22:43 +0200
Subject: Backgroundjobs: Improve error handling in cron.php

---
 cron.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cron.php b/cron.php
index 9d7e396d61e..646e37e4c1c 100644
--- a/cron.php
+++ b/cron.php
@@ -20,11 +20,26 @@
 *
 */
 
+function handleCliShutdown() {
+	$error = error_get_last();
+	if($error !== NULL){
+		echo 'Unexpected error!'.PHP_EOL;
+	}
+}
+
+function handleWebShutdown(){
+	$error = error_get_last();
+	if($error !== NULL){
+		OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
+	}
+}
+
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
 $appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
 if( OC::$CLI ){
+	register_shutdown_function('handleCliShutdown');
 	if( $appmode != 'cron' ){
 		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
 	}
@@ -41,6 +56,7 @@ if( OC::$CLI ){
 	OC_BackgroundJob_Worker::doAllSteps();
 }
 else{
+	register_shutdown_function('handleWebShutdown');
 	if( $appmode == 'cron' ){
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
 		exit();
-- 
cgit v1.2.3


From f46fdfd814de7a43af94cad1dcf456e65350f254 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 22:30:11 +0200
Subject: Backgroundjobs: Add reset counter in worker

---
 lib/backgroundjob/worker.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 8a58a76e3a4..b4f0429b319 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -36,16 +36,25 @@ class OC_BackgroundJob_Worker{
 	 */
 	public static function doAllSteps(){
 		// Do our regular work
+		$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
+
 		$regular_tasks = OC_BackgroundJob_RegularTask::all();
+		ksort( $regular_tasks );
 		foreach( $regular_tasks as $key => $value ){
-			call_user_func( $value );
+			if( strcmp( $key, $lasttask ) > 0 ){
+				// Set "restart here" config value
+				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
+				call_user_func( $value );
+			}
 		}
+		// Reset "start here" config value
+		OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
 
 		// Do our queued tasks
 		$queued_tasks = OC_BackgroundJob_QueuedTask::all();
 		foreach( $queued_tasks as $task ){
-			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 			OC_BackgroundJob_QueuedTask::delete( $task['id'] );
+			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 		}
 		
 		return true;
-- 
cgit v1.2.3


From 7b3c35107d95b3b3ea391e0131ae794411a97128 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 23:49:20 +0200
Subject: Error handling works better now

---
 cron.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/cron.php b/cron.php
index 646e37e4c1c..cb01152360b 100644
--- a/cron.php
+++ b/cron.php
@@ -20,17 +20,19 @@
 *
 */
 
-function handleCliShutdown() {
-	$error = error_get_last();
-	if($error !== NULL){
-		echo 'Unexpected error!'.PHP_EOL;
-	}
+// Unfortunately we need this class for shutdown function
+class my_temporary_cron_class {
+	public static $sent = false;
 }
 
-function handleWebShutdown(){
-	$error = error_get_last();
-	if($error !== NULL){
-		OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
+function handleUnexpectedShutdown() {
+	if( !my_temporary_cron_class::$sent ){
+		if( OC::$CLI ){
+			echo 'Unexpected error!'.PHP_EOL;
+		}
+		else{
+			OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
+		}
 	}
 }
 
@@ -59,9 +61,11 @@ else{
 	register_shutdown_function('handleWebShutdown');
 	if( $appmode == 'cron' ){
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
-		exit();
 	}
-	OC_BackgroundJob_Worker::doNextStep();
-	OC_JSON::success();
+	else{
+		OC_BackgroundJob_Worker::doNextStep();
+		OC_JSON::success();
+	}
 }
+my_temporary_cron_class::$sent = true;
 exit();
-- 
cgit v1.2.3


From 831ec985dbdfa4cc401241dd33c59606f9e9b3e9 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Thu, 9 Aug 2012 23:52:48 +0200
Subject: Backgroundjobs: fix stupid bug

---
 cron.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cron.php b/cron.php
index cb01152360b..c52a5035091 100644
--- a/cron.php
+++ b/cron.php
@@ -39,9 +39,11 @@ function handleUnexpectedShutdown() {
 $RUNTIME_NOSETUPFS = true;
 require_once('lib/base.php');
 
+// Handle unexpected errors
+register_shutdown_function('handleUnexpectedShutdown');
+
 $appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
 if( OC::$CLI ){
-	register_shutdown_function('handleCliShutdown');
 	if( $appmode != 'cron' ){
 		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
 	}
@@ -58,7 +60,6 @@ if( OC::$CLI ){
 	OC_BackgroundJob_Worker::doAllSteps();
 }
 else{
-	register_shutdown_function('handleWebShutdown');
 	if( $appmode == 'cron' ){
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
 	}
-- 
cgit v1.2.3


From 595591a460c9956e0908c89dd90bf79e5c86aee2 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 01:30:08 +0200
Subject: Backgroundjobs: Add table to db_structure.xml

---
 db_structure.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/db_structure.xml b/db_structure.xml
index f6dedab0a13..5a783d41a9c 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -506,6 +506,58 @@
 
  </table>
 
+ <table>
+
+  <name>*dbprefix*queuedtasks</name>
+
+  <declaration>
+
+   <field>
+    <name>id</name>
+    <type>integer</type>
+    <default>0</default>
+    <notnull>true</notnull>
+    <autoincrement>1</autoincrement>
+    <unsigned>true</unsigned>
+    <length>4</length>
+   </field>
+
+   <field>
+    <name>app</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>255</length>
+   </field>
+
+   <field>
+    <name>klass</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>255</length>
+   </field>
+
+   <field>
+    <name>method</name>
+    <type>text</type>
+    <default></default>
+    <notnull>true</notnull>
+    <length>255</length>
+   </field>
+
+   <field>
+    <name>parameters</name>
+    <type>clob</type>
+    <notnull>true</notnull>
+   </field>
+
+
+
+  </declaration>
+
+ </table>
+
  <table>
 
   <name>*dbprefix*users</name>
-- 
cgit v1.2.3


From 7055d2aa2be1a9eadc3f0abb31adc5b1e91de119 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 01:36:33 +0200
Subject: Backgroundjobs: improve admin form

---
 settings/admin.php           | 1 +
 settings/templates/admin.php | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index bf8e03c13c8..6909e02d14f 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -29,6 +29,7 @@ $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries',$entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking',$htaccessworking);
+$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 318bfbbe196..af724f134bf 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -27,13 +27,13 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="none" id="backgroundjobs_none">
+	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjob_mode'] == "none" ){ echo 'checked="checked"' } ?>>
 	<label for="backgroundjobs_none">None</label><br />
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax">
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjob_mode'] == "ajax" ){ echo 'checked="checked"' } ?>>
 	<label for="backgroundjobs_ajax">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron">
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjob_mode'] == "webcron" ){ echo 'checked="checked"' } ?>>
 	<label for="backgroundjobs_webcron">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron">
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjob_mode'] == "cron" ){ echo 'checked="checked"' } ?>>
 	<label for="backgroundjobs_cron">Cron</label><br />
 </fieldset>
 
-- 
cgit v1.2.3


From 7c766cdfe05d02bd896d73d30defec76d6844570 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 01:42:30 +0200
Subject: Backgroundjobs: fix bugs in template

---
 settings/templates/admin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index af724f134bf..31a7a3dcc10 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -27,13 +27,13 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjob_mode'] == "none" ){ echo 'checked="checked"' } ?>>
+	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjob_mode'] == "none" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_none">None</label><br />
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjob_mode'] == "ajax" ){ echo 'checked="checked"' } ?>>
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjob_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_ajax">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjob_mode'] == "webcron" ){ echo 'checked="checked"' } ?>>
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjob_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_webcron">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjob_mode'] == "cron" ){ echo 'checked="checked"' } ?>>
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjob_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_cron">Cron</label><br />
 </fieldset>
 
-- 
cgit v1.2.3


From 9ad31e5f81ad5ec899101a67451843dd8f080340 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 01:44:38 +0200
Subject: Backgroundjobs: use correct var name in template

---
 settings/templates/admin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 31a7a3dcc10..93707394270 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -27,13 +27,13 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjob_mode'] == "none" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="none" id="backgroundjobs_none" <?php if( $_['backgroundjobs_mode'] == "none" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_none">None</label><br />
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjob_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_ajax">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjob_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_webcron">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjob_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_cron">Cron</label><br />
 </fieldset>
 
-- 
cgit v1.2.3