From a8833bacfdfd67a51e01d1b7d767974326582977 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <yhu@isharkfly.com>
Date: Mon, 15 Nov 2010 14:12:36 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0=205.2=20=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E7=89=88=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1=20SVN=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

yuchenghu@hawebs.net


git-svn-id: https://svn.code.sf.net/p/hawebs/svn@584 a2543c7e-f6e9-4f8a-8bff-1ffc34733512
---
 .../VTConditionalExpression.inc               |  126 -
 .../VTEmailRecipientsTemplate.inc             |   29 -
 .../com_vtiger_workflow/VTEntityCache.inc     |   89 -
 .../VTEntityMethodManager.inc                 |   62 -
 .../com_vtiger_workflow/VTEventHandler.inc    |  127 -
 .../com_vtiger_workflow/VTJsonCondition.inc   |  112 -
 .../com_vtiger_workflow/VTSimpleTemplate.inc  |   96 -
 .../com_vtiger_workflow/VTTaskManager.inc     |  153 -
 .../com_vtiger_workflow/VTTaskQueue.inc       |   65 -
 .../VTWorkflowApplication.inc                 |   75 -
 .../com_vtiger_workflow/VTWorkflowManager.inc |  210 -
 .../VTWorkflowTemplateManager.inc             |  197 -
 .../com_vtiger_workflow/VTWorkflowUtils.php   |  132 -
 .../com_vtiger_workflowAjax.php               |   12 -
 .../com_vtiger_workflow/deletetask.php        |   45 -
 .../com_vtiger_workflow/deleteworkflow.php    |   44 -
 .../modules/com_vtiger_workflow/edittask.php  |  119 -
 .../com_vtiger_workflow/editworkflow.php      |   87 -
 .../com_vtiger_workflow/entitymethodjson.php  |   21 -
 .../com_vtiger_workflow/errormessage.php      |   12 -
 .../modules/com_vtiger_workflow/errorpage.php |   18 -
 .../modules/com_vtiger_workflow/include.inc   |   15 -
 .../include_webservices.php                   |   18 -
 .../language/en_us.lang.php                   |   44 -
 .../language/zh_cn.lang.php                   |   55 -
 .../com_vtiger_workflow/loadtemplates.php     |   26 -
 .../com_vtiger_workflow/modulefieldsjson.php  |   19 -
 .../com_vtiger_workflow/resources/add.png     |  Bin 763 -> 0 bytes
 .../resources/createeventtaskscript.js        |  106 -
 .../resources/createtodotaskscript.js         |   63 -
 .../resources/edittaskscript.js               |   51 -
 .../resources/editworkflowscript.js           |  499 ---
 .../resources/emailtaskscript.js              |  280 --
 .../resources/fieldvalidator.js               |   88 -
 .../resources/functional.js                   |  162 -
 .../resources/ico-workflow.png                |  Bin 1266 -> 0 bytes
 .../resources/jquery-1.2.6.js                 | 3549 -----------------
 .../resources/jquery.timepicker.js            |  119 -
 .../com_vtiger_workflow/resources/json2.js    |  263 --
 .../resources/parallelexecuter.js             |   18 -
 .../com_vtiger_workflow/resources/remove.png  |  Bin 198 -> 0 bytes
 .../com_vtiger_workflow/resources/style.css   |   80 -
 .../resources/vtigerwebservices.js            |  156 -
 .../resources/workflowlistscript.js           |  131 -
 .../com_vtiger_workflow/runtaskjob.php        |   58 -
 .../modules/com_vtiger_workflow/savetask.php  |   74 -
 .../com_vtiger_workflow/savetemplate.php      |   46 -
 .../com_vtiger_workflow/saveworkflow.php      |   68 -
 .../com_vtiger_workflow/sortfieldsjson.php    |   17 -
 .../modules/com_vtiger_workflow/tasklist.php  |   51 -
 .../tasks/VTCreateEntityTask.inc              |   18 -
 .../tasks/VTCreateEventTask.inc               |  146 -
 .../tasks/VTCreateTodoTask.inc                |  103 -
 .../com_vtiger_workflow/tasks/VTDummyTask.inc |   19 -
 .../com_vtiger_workflow/tasks/VTEmailTask.inc |   54 -
 .../tasks/VTEntityMethodTask.inc              |   22 -
 .../com_vtiger_workflow/tasks/VTSMSTask.inc   |   12 -
 .../templatesformodulejson.php                |   23 -
 .../com_vtiger_workflow/workflowlist.php      |   74 -
 59 files changed, 8358 deletions(-)
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTConditionalExpression.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTEmailRecipientsTemplate.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTEntityCache.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTEntityMethodManager.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTEventHandler.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTJsonCondition.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTSimpleTemplate.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTTaskManager.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTTaskQueue.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowApplication.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowManager.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowTemplateManager.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowUtils.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/com_vtiger_workflowAjax.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/deletetask.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/deleteworkflow.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/edittask.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/editworkflow.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/entitymethodjson.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/errormessage.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/errorpage.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/include.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/include_webservices.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/language/en_us.lang.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/language/zh_cn.lang.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/loadtemplates.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/modulefieldsjson.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/add.png
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/createeventtaskscript.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/createtodotaskscript.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/edittaskscript.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/editworkflowscript.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/emailtaskscript.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/fieldvalidator.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/functional.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/ico-workflow.png
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/jquery-1.2.6.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/jquery.timepicker.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/json2.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/parallelexecuter.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/remove.png
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/style.css
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/vtigerwebservices.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/resources/workflowlistscript.js
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/runtaskjob.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/savetask.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/savetemplate.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/saveworkflow.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/sortfieldsjson.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/tasklist.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateEventTask.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateTodoTask.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTDummyTask.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTEmailTask.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTEntityMethodTask.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTSMSTask.inc
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/templatesformodulejson.php
 delete mode 100644 oss/vtiger/trunk/modules/com_vtiger_workflow/workflowlist.php

diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTConditionalExpression.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTConditionalExpression.inc
deleted file mode 100644
index 9245c809..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTConditionalExpression.inc
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-	class VTConditionalExpression{
-		public function __construct($expression){
-			$parser = new VTConditionalParser($expression);
-			$this->expTree = $parser->parse();
-		}
-
-		public function evaluate($data){
-			$this->env=$data;
-			return $this->evalGate($this->expTree);
-		}
-		
-		private function evalGate($tree){
-			if(in_array($tree[0], array("and", "or"))){
-				switch($tree[0]){
-					case "and":
-						return $this->evalGate($tree[1]) and $this->evalGate($tree[2]);
-					case "or":
-						return $this->evalGate($tree[1]) or $this->evalGate($tree[2]);
-				}
-			}else{
-				return $this->evalCondition($tree);
-			}
-		}
-		
-		private function evalCondition($tree){
-			switch($tree[0]){
-				case "=":
-					return (int)$this->getVal($tree[1]) == (int)$this->getVal($tree[2]);
-			}
-		}
-		
-		private function getVal($node){
-			list($valueType, $value) = $node;
-			switch($valueType){
-				case "sym":
-					return $this->env[$value];
-				case "num":
-					return $value;
-			}
-		}
-	}
-	
-class VTParseFailed extends Exception { }
-	
-/**
- * This is a simple parser for conditional expressions used to trigger workflow actions.
- * 
- */
-class VTConditionalParser{
-	
-		
-	public function __construct($expr){
-		$this->tokens = $this->getTokens($expr);
-		$this->pos = 0;
-	}
-	
-	private function getTokens($expression){
-		preg_match_all('/and|or|\\d+|=|\\w+|\\(|\\)/',$expression, $matches, PREG_SET_ORDER);
-		$tokens=array();
-		foreach($matches as $arr){
-			$tokenVal = $arr[0];
-			if(in_array($tokenVal, array("and", "or", "=", "(", ")"))){
-				$tokenType = "op";
-			}else if(is_numeric($tokenVal)){
-				$tokenType = "num";
-			}else{
-				$tokenType = "sym";
-			}
-			$tokens[]=array($tokenType, $tokenVal);
-		}
-		return $tokens;
-	}
-	
-	
-	public function parse(){
-		$op =  array(
-			"and"=>array("op", "and"),
-			"or"=>array("op", "or"),
-			"="=>array("op", "="),
-			"("=>array("op", "("),
-			")"=>array("op", ")"));
-
-		if($this->peek()==$op['(']){
-			$this->nextToken();
-			$left = $this->parse();
-			if($this->nextToken()!= $op[')']){
-				throw new VTParseFailed();
-			}
-		}else{
-			$left = $this->cond();
-		}
-		if(sizeof($this->tokens)>$this->pos and in_array($this->peek(), array($op["and"], $op["or"]))){
-			$nt = $this->nextToken();
-			return array($nt[1], $left, $this->parse());
-		}else{
-			return $left;
-		}
-	}
-	
-	private function cond(){
-		$left = $this->nextToken();
-		$operator = $this->nextToken();
-		$right = $this->nextToken();
-		return array($operator[1], $left, $right);
-	}
-	
-	private function peek(){
-		return $this->tokens[$this->pos];
-	}
-	
-	private function nextToken(){
-		$this->pos+=1;
-		return $this->tokens[$this->pos - 1];
-	}
-}
-	
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEmailRecipientsTemplate.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEmailRecipientsTemplate.inc
deleted file mode 100644
index f3322175..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEmailRecipientsTemplate.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*+*******************************************************************************
- *  The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- *
- *********************************************************************************/
-
-require_once 'modules/com_vtiger_workflow/VTSimpleTemplate.inc';
-
-/**
- * Description of VTEmailRecipientsTemplate
- *
- * @author MAK
- */
-class VTEmailRecipientsTemplate extends VTSimpleTemplate {
-
-	public function __construct($templateString) {
-		parent::__construct($templateString);
-	}
-
-	protected function useValue($data, $fieldname) {
-		return !empty($data[$fieldname]) && $data['emailoptout'] == 0;
-	}
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEntityCache.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEntityCache.inc
deleted file mode 100644
index 98cd5e4f..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEntityCache.inc
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-
-class VTWorkflowEntity{
-	function __construct($user, $id){
-		$this->moduleName = null;
-		$this->id = $id;
-		$this->user = $user;
-		$data = vtws_retrieve($id, $user);
-		foreach($data as $key => $value){
-			if(is_string($value)){
-				$data[$key] = html_entity_decode($value, ENT_QUOTES, 'utf-8');
-			}
-		}
-		$this->data = $data;
-	}
-	/**
-	 * Get the data from the entity object as an array.
-	 *
-	 * @return An array representation of the module data.
-	 */
-	function getData(){
-		return $this->data;
-	}
-	
-	/**
-	 * Get the entity id.
-	 *
-	 * @return The entity id.
-	 */
-	function getId(){
-		return $this->data['id'];
-	}
-	
-	/**
-	 * Get the name of the module represented by the entity data object.
-	 *
-	 * @return The module name.
-	 */
-	function getModuleName(){
-		if($this->moduleName==null){
-			global $adb;
-			$wsId = $this->data['id'];
-			$parts = explode('x', $wsId);
-			$result = $adb->pquery('select name from vtiger_ws_entity where id=?', 
-						 array($parts[0]));
-			$rowData = $adb->raw_query_result_rowdata($result, 0);
-			$this->moduleName = $rowData['name'];
-		}
-		return $this->moduleName;
-	}
-	
-	function get($fieldName){
-		return $this->data[$fieldName];
-	}
-	
-	function set($fieldName, $value){
-
-		$this->data[$fieldName] = $value;
-	}
-
-	function save(){
-		vtws_update($this->data,$this->user);
-	}
-	
-}
-
-class VTEntityCache{
-	function __construct($user){
-		$this->user = $user;
-		$this->cache = array();
-	}
-	
-	function forId($id){
-		if($this->cache[$id]==null){
-			$data  = new VTWorkflowEntity($this->user, $id);
-			$this->cache[$id] = $data;
-		}
-		return $this->cache[$id];
-	}
-}
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEntityMethodManager.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEntityMethodManager.inc
deleted file mode 100644
index 9f1db19e..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEntityMethodManager.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*+*******************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ******************************************************************************/
-require_once("include/events/SqlResultIterator.inc");
-class VTEntityMethodManager{
-	
-	function __construct($adb){
-		$this->adb = $adb;
-	}
-	
-	
-	function addEntityMethod($moduleName, $methodName, $functionPath, $functionName){
-		$adb = $this->adb;
-		$id = $adb->getUniqueId("com_vtiger_workflowtasks_entitymethod");
-		$adb->pquery("insert into com_vtiger_workflowtasks_entitymethod (workflowtasks_entitymethod_id, module_name, function_path, function_name, method_name) values (?,?,?,?,?)", array($id, $moduleName, $functionPath, $functionName, $methodName));
-	}
-	
-	
-	
-	function executeMethod($entityData, $methodName){
-		$adb = $this->adb;
-		$moduleName = $entityData->getModuleName();
-		$result = $adb->pquery("select function_path, function_name from com_vtiger_workflowtasks_entitymethod where module_name=? and method_name=?", array($moduleName, $methodName));
-		if($adb->num_rows($result)!=0){
-			$data = $adb->raw_query_result_rowdata($result, 0);
-			$functionPath = $data['function_path'];
-			$functionName = $data['function_name'];
-			require_once($functionPath);
-			$functionName($entityData);
-		}
-	}
-	
-	function methodsForModule($moduleName){
-		$adb = $this->adb;
-		$result = $adb->pquery("select method_name from com_vtiger_workflowtasks_entitymethod where module_name=?", array($moduleName));
-		$it = new SqlResultIterator($adb, $result);
-		$methodNames = array();
-		foreach($it as $row){
-			$methodNames[] = $row->method_name;
-		}
-		return $methodNames;
-	}
-	/*
-	private function methodExists($object, $methodName){
-		$className = get_class($object);
-		$class = new ReflectionClass($className);
-		$methods = $class->getMethods();
-		foreach($methods as $method){
-			if($method->getName()==$methodName){
-				return true;
-			}
-		}
-		return false;
-	}*/
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEventHandler.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEventHandler.inc
deleted file mode 100644
index a450ccfb..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTEventHandler.inc
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('include/events/SqlResultIterator.inc');
-require_once('VTWorkflowManager.inc');
-require_once('VTTaskManager.inc');
-require_once('VTTaskQueue.inc');
-require_once('VTEntityCache.inc');
-
-require_once 'include/Webservices/Utils.php';
-require_once("modules/Users/Users.php");
-require_once("include/Webservices/VtigerCRMObject.php");
-require_once("include/Webservices/VtigerCRMObjectMeta.php");
-require_once("include/Webservices/DataTransform.php");
-require_once("include/Webservices/WebServiceError.php");
-require_once 'include/utils/utils.php';
-require_once 'include/Webservices/ModuleTypes.php';
-require_once('include/Webservices/Retrieve.php');
-require_once('include/Webservices/Update.php');
-require_once 'include/Webservices/WebserviceField.php';
-require_once 'include/Webservices/EntityMeta.php';
-require_once 'include/Webservices/VtigerWebserviceObject.php';
-require_once('VTWorkflowUtils.php');
-
-	/*
-	* VTEventHandler 
-	*/
-	class VTWorkflowEventHandler extends VTEventHandler{
-		/**
-		 * Push tasks to the task queue if the conditions are true
-		 * @param $entityData A VTEntityData object representing the entity.
-		 */
-		function handleEvent($eventName, $entityData){
-			$util = new VTWorkflowUtils();
-			$user = $util->adminUser();
-			global $adb;
-			$isNew = $entityData->isNew();
-			$entityCache = new VTEntityCache($user);
-			$wsModuleName = $util->toWSModuleName($entityData);
-			$wsId = vtws_getWebserviceEntityId($wsModuleName, 
-											   $entityData->getId());
-			$entityData = $entityCache->forId($wsId);
-			$data = $entityData->getData();
-			$wfs = new VTWorkflowManager($adb);
-			$workflows = $wfs->getWorkflowsForModule($entityData->getModuleName());
-			$tm = new VTTaskManager($adb);
-			$taskQueue = new VTTaskQueue($adb);
-			
-			foreach($workflows as $workflow){
-				switch($workflow->executionCondition){
-					case VTWorkflowManager::$ON_FIRST_SAVE:{
-						if($isNew){
-							$doEvaluate = true;
-						}else{
-							$doEvaluate = false;
-						}
-						break;
-					}
-					case VTWorkflowManager::$ONCE:{
-						$entity_id = vtws_getIdComponents($entityData->getId());
-						$entity_id = $entity_id[1];
-						$result = $adb->pquery("SELECT * FROM com_vtiger_workflow_activatedonce 
-							WHERE entity_id=? and workflow_id=?", array($entity_id, $workflow->id));
-						
-						//Changes
-						$result2=$adb->pquery("SELECT * FROM com_vtiger_workflowtasks 
-										INNER JOIN com_vtiger_workflowtask_queue
-										ON com_vtiger_workflowtasks.task_id= com_vtiger_workflowtask_queue.task_id
-										WHERE workflow_id=? AND entity_id=?",
-										array($workflow->id,$entity_id));
-						
-						if($adb->num_rows($result)===0 && $adb->num_rows($result2)===0){
-							$doEvaluate = true;
-						}else{
-							$doEvaluate = false;
-						}
-						break;
-					}
-					case VTWorkflowManager::$ON_EVERY_SAVE:{
-						$doEvaluate = true;
-						break;
-					}
-					case VTWorkflowManager::$ON_MODIFY:{
-						$doEvaluate = !($isNew);
-					    break;
-					}
-					default:{
-						throw new Exception("Should never come here! Execution Condition:".$workflow->executionCondition);
-					}
-					
-				}
-				if($doEvaluate && $workflow->evaluate($entityCache, $entityData->getId())){
-					if(VTWorkflowManager::$ONCE == $workflow->executionCondition) {
-						$entity_id = vtws_getIdComponents($entityData->getId());
-						$entity_id = $entity_id[1];						
-						$adb->pquery("INSERT INTO com_vtiger_workflow_activatedonce (entity_id, workflow_id)
-							VALUES (?,?)", array($entity_id, $workflow->id));
-					}
-					
-					$tasks = $tm->getTasksForWorkflow($workflow->id);
-					foreach($tasks as $task){
-						if($task->active) {
-							$trigger = $task->trigger;
-							if($trigger != null){
-								$delay = strtotime($data[$trigger['field']])+$trigger['days']*86400;
-							}else{
-								$delay = 0;
-							}
-							if($task->executeImmediately==true){
-								$task->doTask($entityData);
-							}else{
-								$taskQueue->queueTask($task->id,$entityData->getId(), $delay);
-							}
-						}
-					}
-				}
-			}
-			$util->revertUser();
-		}
-	}
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTJsonCondition.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTJsonCondition.inc
deleted file mode 100644
index 9e2fcda6..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTJsonCondition.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-	require_once("include/Zend/Json.php");
-
-	class VTJsonCondition{
-		function  __construct(){
-		}
-		
-		function evaluate($condition, $entityCache, $id){
-			$expr = Zend_Json::decode($condition);
-			$result=TRUE;
-			$data = $entityCache->forId($id)->getData();
-			
-			foreach($expr as $cond){
-				preg_match('/(\w+) : \((\w+)\) (\w+)/', $cond['fieldname'], $matches);
-				if(count($matches)==0){
-					$result = $this->checkCondition($data, $cond);
-				}else{
-					list($full,  $referenceField, $referenceModule, $fieldname) = $matches;
-					$referenceFieldId = $data[$referenceField];
-					if($referenceFieldId != 0){
-						$entity = $entityCache->forId($data[$referenceField]);
-						if($entity->getModuleName()==$referenceModule){
-							$entityData = $entity->getData();
-							$cond['fieldname'] = $fieldname;
-							$result = $this->checkCondition($entityData, $cond);
-						}else{
-							$result = false;
-						}
-					}else{
-						return false;
-					}
-				}
-				if($result==false){
-					return false;
-				}
-			}
-			return true;
-		}
-		function startsWith($str, $subStr){
-			$sl = strlen($str);
-			$ssl = strlen($subStr);
-			if($sl>=$ssl){
-				return substr_compare($str,$subStr,0, $ssl)==0;
-			}else{
-				return FALSE;
-			}
-		}
-
-		function endsWith($str, $subStr){
-			$sl = strlen($str);
-			$ssl = strlen($subStr);
-			if($sl>=$ssl){
-				return substr_compare($str,$subStr,$sl-$ssl, $ssl)==0;
-			}else{
-				return FALSE;
-			}
-		}
-		
-		
-		function checkCondition($data, $cond){
-			$condition = $cond['operation'];
-			$fieldValue=$data[$cond['fieldname']];
-			$value = html_entity_decode($cond['value']);
-			switch($condition){
-				case "equal to":
-					return $fieldValue == $value;
-				case "less than":
-					return $fieldValue < $value;
-				case "greater than":
-					return $fieldValue > $value;
-				case "does not equal":
-					return $fieldValue != $value;
-				case "less than or equal to":
-					return $fieldValue <= $value;
-				case "greater than or equal to":
-					return $fieldValue >= $value;
-				case "is":
-					if(preg_match('/([^:]+):boolean$/', $value, $match)){
-						$value = $match[1];
-						if($value=='true'){
-							return $fieldValue==='on' || $fieldValue===1 || $fieldValue==='1';
-						}else{
-							return $fieldValue==='off' || $fieldValue===0 || $fieldValue==='0' || $fieldValue==='';
-						}
-					}else{
-						return $fieldValue == $value;
-					}
-				case "contains":
-					return strpos($fieldValue, $value) !== FALSE;
-				case "does not contain":
-					return strpos($fieldValue, $value) === FALSE;
-				case "starts with":
-					return $this->startsWith($fieldValue,$value);
-				case "ends with":
-					return $this->endsWith($fieldValue, $value);
-				case "matches":
-					return preg_match($value, $fieldValue);
-				default:
-					//Unexpected condition
-					throw new Exception("Found an unexpected condition: ".$condition);
-			}
-		}
-	}
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTSimpleTemplate.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTSimpleTemplate.inc
deleted file mode 100644
index 7998d6f4..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTSimpleTemplate.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-class VTSimpleTemplate{
-	
-	function __construct($templateString){
-		$this->template = $templateString;
-	}
-	
-	function render($entityCache, $entityId){
-		$this->cache = $entityCache;
-		$this->parent = $this->cache->forId($entityId);
-		return $this->parseTemplate();
-	}
-	
-	private function matchHandler($match){
-		preg_match('/\((\w+) : \(([_\w]+)\) (\w+)\)/', $match[1], $matches);
-		if(count($matches)==0){
-			$fieldname = $match[1];
-			$data = $this->parent->getData();
-			if($this->useValue($data, $fieldname)){
-				$result = $data[$fieldname];
-			}else{
-				$result ='';
-			}
-		}else{
-			list($full, $referenceField, $referenceModule, $fieldname) = $matches;
-			if($referenceModule === '__VtigerMeta__'){
-				$result = $this->getMetaValue($fieldname);
-			}else{
-				$referenceId = $this->parent->get($referenceField);
-				if($referenceId==null){
-					$result="";
-				}else{
-					$entity = $this->cache->forId($referenceId);
-					if($referenceModule==="Users" && $entity->getModuleName()=="Groups"){
-						list($groupEntityId, $groupId) = vtws_getIdComponents($referenceId);
-						
-						require_once('include/utils/GetGroupUsers.php');
-						$ggu = new GetGroupUsers();
-						$ggu->getAllUsersInGroup($groupId);
-						
-						$users = $ggu->group_users;
-						$parts = Array();
-						foreach($users as $userId){
-							$refId = vtws_getWebserviceEntityId("Users", $userId);
-							$entity = $this->cache->forId($refId);
-							$data = $entity->getData();
-							if($this->useValue($data, $fieldname)){
-								$parts[] = $data[$fieldname];
-							}
-						}
-						$result = implode(",", $parts);
-					}if($entity->getModuleName()===$referenceModule){
-						$data = $entity->getData();
-						if($this->useValue($data, $fieldname)){
-							$result = $data[$fieldname];
-						}else{
-							$result = '';
-						}
-					}else{
-						$result = '';
-					}
-				}
-			}
-		}
-			if(!empty($result)){
-				$result .= ',';
-		}
-		return $result;						
-		
-	}
-
-	protected function useValue($data, $fieldname) {
-		return !empty($data[$fieldname]);
-	}
-
-	function parseTemplate(){
-		return preg_replace_callback('/\\$(\w+|\((\w+) : \(([_\w]+)\) (\w+)\))\s*,?/', array($this,"matchHandler"), $this->template);
-	}
-	
-	function getMetaValue($fieldname){
-		switch($fieldname){
-			case 'date': return getNewDisplayDate();
-			case 'time': return date('h-i-s');
-			default: '';
-		}
-	}
-}
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTTaskManager.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTTaskManager.inc
deleted file mode 100644
index 67532916..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTTaskManager.inc
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-
-	/**
-	 * Functionality to save and retrieve Tasks from the database.
-	 */
-	class VTTaskManager{
-		function __construct($adb){
-			$this->adb = $adb;
-		}
-		
-		/**
-		 * Save the task into the database.
-		 *
-		 * When a new task is saved for the first time a field is added to it called
-		 * id that stores the task id used in the database.
-		 *
-		 * @param $summary A summary of the task instance.
-		 * @param $task The task instance to save.
-		 * @return The id of the task 
-		 */
-		public function saveTask($task){
-			$adb = $this->adb;
-			if(is_numeric($task->id)){//How do I check whether a member exists in php?
-				$taskId = $task->id;
-				$adb->pquery("update com_vtiger_workflowtasks set summary=?, task=? where task_id=?", 
-							array($task->summary, serialize($task), $taskId));	
-				return $taskId;
-			}else{
-				$taskId = $adb->getUniqueID("com_vtiger_workflowtasks");
-				$task->id = $taskId;
-				$adb->pquery("insert into com_vtiger_workflowtasks 
-							(task_id, workflow_id, summary, task) 
-							values (?, ?, ?, ?)", 
-					array($taskId, $task->workflowId, $task->summary, serialize($task)));
-				return $taskId;
-			}
-		}
-		
-		public function deleteTask($taskId){
-			$adb = $this->adb;
-			$adb->pquery("delete from com_vtiger_workflowtasks where task_id=?", array($taskId));
-		}
-		
-		
-		/**
-		 * Create a new class instance
-		 */
-		public function createTask($taskType, $workflowId){
-			$taskClass = $taskType;
-			$this->requireTask($taskType);
-			$task = new $taskClass();
-			$task->workflowId=$workflowId;
-			$task->summary = "";
-			$task->active=true; 
-			return $task;
-		}
-		
-		
-		/**
-		 * Retrieve a task from the database
-		 *
-		 * @param $taskId The id of the task to retrieve.
-		 * @return The retrieved task.
-		 */
-		public function retrieveTask($taskId){
-			$adb = $this->adb;
-			$result = $adb->pquery("select task from com_vtiger_workflowtasks where task_id=?", array($taskId));
-			$data = $adb->raw_query_result_rowdata($result, 0);
-			$task = $data["task"];
-			return $this->unserializeTask($task);
-		}
-		
-		
-		/**
-		 *
-		 */
-		public function getTasksForWorkflow($workflowId){
-			$adb = $this->adb;
-			$result = $adb->pquery("select task from com_vtiger_workflowtasks 
-									where workflow_id=?", 
-				array($workflowId));
-			return $this->getTasksForResult($result);
-		}
-
-
-		/**
-		 * 
-		 */
-		public function unserializeTask($str){
-			$this->requireTask(self::taskName($str));
-			return unserialize($str);
-
-		}
-		/**
-		 *
-		 */
-		function getTasks(){
-			$adb = $this->adb;
-			$result = $adb->query("select task from com_vtiger_workflowtasks");
-			return $this->getTasksForResult($result);
-		}
-		
-		
-		function getTaskTypes(){
-			$taskTypes = array("VTEmailTask", "VTEntityMethodTask", "VTCreateTodoTask","VTCreateEventTask");
-			// Make SMSTask available if module is active
-			// TODO Generic way of handling this could be helpful
-			if(getTabid('SMSNotifier') && vtlib_isModuleActive('SMSNotifier')) {
-				$taskTypes [] = 'VTSMSTask'; 	
-			}				
-			return $taskTypes;
-		}
-		
-		private function getTasksForResult($result){
-			$adb = $this->adb;
-			$it = new SqlResultIterator($adb, $result);
-			$tasks = array();
-			foreach($it as $row){
-				$text = $row->task;
-				
-				$this->requireTask(self::taskName($text));
-				$tasks[] = unserialize($text);
-			}
-			return $tasks;
-		}
-		
-		private function taskName($serializedTask){
-			$matches = array();
-			preg_match ('/"([^"]+)"/', $serializedTask, $matches);
-			return $matches[1];
-		}
-		
-		private function requireTask($taskType){
-			require_once("tasks/".$taskType.".inc");
-		}
-		
-	}
-	
-	abstract class VTTask{
-		public abstract function doTask($data);
-		public abstract function getFieldNames();
-	}
-	
-	//require 'modules/Workflow/tasks/VTEmailTask.inc';
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTTaskQueue.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTTaskQueue.inc
deleted file mode 100644
index 0825c044..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTTaskQueue.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-	
-	/**
-	 * Time based Queue of tasks ready for execution.
-	 *
-	 */
-	class VTTaskQueue{
-		
-		public function __construct($adb){
-			$this->adb = $adb;
-		}
-		
-		/**
-		 * Queue a task for execution.
-		 *
-		 * @param $taskId The id of the task to queue
-		 * @param $entityId The id of the crm entity the task is assiciated with.
-		 * @param $when The time after which the task should be executed. This is 
-		 *        an optional value with a default value of 0.
-		 */
-		public function queueTask($taskId, $entityId, $when=0){
-			$adb = $this->adb;
-			$result = $adb->pquery("select * from com_vtiger_workflowtask_queue 
-				where task_id=? and entity_id=?", array($taskId, $entityId));
-			if($adb->num_rows($result)==1){
-				return false;
-			}else{
-				$adb->pquery("insert into com_vtiger_workflowtask_queue (task_id, entity_id, do_after) 
-						  	values (?,?,?)", array($taskId, $entityId, $when));
-				return true;
-			}
-		}
-		
-		
-		/**
-		 * Get a list of taskId/entityId pairs ready for execution.
-		 *
-		 * The method fetches task id/entity id where the when timestamp
-		 * is less than the current time when the method was called.
-		 *
-		 * @return A list of pairs of the form array(taskId, entityId)
-		 */
-		public function getReadyTasks(){
-			$adb = $this->adb;
-			$time = time();
-			$result = $adb->pquery("select task_id, entity_id from com_vtiger_workflowtask_queue where do_after<?", array($time));
-			$it =  new SqlResultIterator($adb, $result);
-			$arr = array();
-			foreach($it as $row){
-				$arr[]=array($row->task_id, $row->entity_id);
-			}
-			$adb->pquery("delete from com_vtiger_workflowtask_queue where do_after<?", array($time));
-			return $arr;
-		}
-		
-	}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowApplication.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowApplication.inc
deleted file mode 100644
index f254df21..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowApplication.inc
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-class VTWorkflowApplication{
-	function __construct($action){
-		global $_REQUEST;
-		$this->request;
-		$this->name = "com_vtiger_workflow";
-		$this->label = "Workflow";
-		$this->action = $action;
-		$this->returnUrl = $_SERVER["REQUEST_URI"];
-	}
-	
-	function currentUrl(){
-		// $req = $this->request;
-		// $url = "index.php?module={$this->name}&action={$this->action}";
-		// if($this->action=='editworkflow'){
-		// 	if(isset($req['workflow_id'])){
-		// 		$url.="&workflow_id=".$req['workflow_id'];
-		// 	}
-		// }else if($this->action=='edittask'){
-		// 	if(isset($req['task_id'])){
-		// 		$url.="&task_id=".$req['task_id'];
-		// 	}
-		// }
-		return $_SERVER["REQUEST_URI"];			
-	}
-	
-	function returnUrl(){
-		return $this->returnUrl;
-	}
-	
-	function listViewUrl(){
-		return "index.php?module={$this->name}&action=workflowlist";
-	}
-	
-	function editWorkflowUrl($id=null){
-		if($id!=null){
-			$idPart="&workflow_id=$id";
-		}
-		return "index.php?module={$this->name}&action=editworkflow$idPart&return_url=".urlencode($this->returnUrl());
-	}
-	
-	function deleteWorkflowUrl($id){
-		$idPart="&workflow_id=$id";
-		return "index.php?module={$this->name}&action=deleteworkflow$idPart&return_url=".urlencode($this->returnUrl());
-	}
-	
-	function editTaskUrl($id=null){
-		if($id!=null){
-			$idPart="&task_id=$id";
-		}
-		return "index.php?module={$this->name}&action=edittask$idPart&return_url=".urlencode($this->returnUrl());
-	}
-	
-	function deleteTaskUrl($id){
-		$idPart="&task_id=$id";
-		return "index.php?module={$this->name}&action=deletetask$idPart&return_url=".urlencode($this->returnUrl());
-	}
-
-	function setReturnUrl($returnUrl){
-		$this->returnUrl = $returnUrl;
-	}
-
-	function errorPageUrl($message){
-		return "index.php?module={$this->name}&action=errormessage&message=".urlencode($message);
-	}
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowManager.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowManager.inc
deleted file mode 100644
index 10293821..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowManager.inc
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-	require_once("VTJsonCondition.inc");
-	
-	class VTWorkflowManager{
-		
-		static $ON_FIRST_SAVE = 1;
-		static $ONCE = 2;
-		static $ON_EVERY_SAVE = 3;
-		static $ON_MODIFY = 4;
-			
-		
-		function __construct($adb){
-			$this->adb = $adb;
-		}
-		
-		function save($workflow){
-			$adb=$this->adb;
-			if(isset($workflow->id)){
-				$wf=$workflow;
-				$adb->pquery("update com_vtiger_workflows set
-								module_name=?, summary=?, test=?, execution_condition=?
-								where workflow_id=?", 
-					array($wf->moduleName, $wf->description, $wf->test, $wf->executionCondition, $wf->id));
-			}else{
-				$workflowId = $adb->getUniqueID("com_vtiger_workflows");
-				$workflow->id = $workflowId;
-				$wf=$workflow;
-				$adb->pquery("insert into com_vtiger_workflows 
-								(workflow_id, module_name, summary, test, execution_condition) 
-								values (?,?,?,?,?)", 
-					array($workflowId, $wf->moduleName, $wf->description, $wf->test,  $wf->executionCondition));
-			}
-		}
-		
-		
-		function getWorkflows(){
-			$adb=$this->adb;
-			
-			$result=$adb->getColumnNames("com_vtiger_workflows");
-			if(in_array("defaultworkflow",$result)){
-				$result = $adb->query("select workflow_id, module_name, summary, test, execution_condition,defaultworkflow 
-									from com_vtiger_workflows ");
-			}else{
-				
-				$result = $adb->query("select workflow_id, module_name, summary, test, execution_condition 
-									from com_vtiger_workflows");
-			}						
-			return $this->getWorkflowsForResult($result);
-			
-		}
-		
-		function getWorkflowsForModule($moduleName){
-			$adb=$this->adb;
-						
-			
-			//my changes	
-			$result=$adb->getColumnNames("com_vtiger_workflows");
-			if(in_array(defaultworkflow,$result)){
-				$result = $adb->pquery("select workflow_id, module_name, summary, test, execution_condition,defaultworkflow 
-									from com_vtiger_workflows where module_name=?",array($moduleName));
-			}
-			else{
-				$result = $adb->pquery("select workflow_id, module_name, summary, test, execution_condition 
-									from com_vtiger_workflows where module_name=?",array($moduleName));
-			}
-			return $this->getWorkflowsForResult($result);
-		}
-		
-		private function getWorkflowsForResult($result){
-			$adb=$this->adb;
-			$it = new SqlResultIterator($adb, $result);
-			$workflows=array();
-			foreach($it as $row){
-				$workflow=new Workflow();
-				$workflow->id = $row->workflow_id;
-				$workflow->moduleName = $row->module_name;
-				$workflow->description = $row->summary;
-				$workflow->test = $row->test;
-				$workflow->executionCondition = $row->execution_condition;
-			
-				if($row->defaultworkflow){
-					$workflow->defaultworkflow=$row->defaultworkflow;
-				}
-				$workflows[]=$workflow;
-			}
-			return $workflows;
-		}
-		
-		/**
-		 * Retrieve a workflow from the database
-		 *
-		 * Returns null if the workflow doesn't exist.
-		 *
-		 * @param The id of the workflow
-		 * @return A workflow object.
-		 */
-		function retrieve($id){
-			$adb=$this->adb;
-			$workflow=new Workflow();
-			$result = $adb->pquery("select workflow_id, module_name, summary, test, execution_condition 
-									from com_vtiger_workflows where workflow_id=?", 
-						array($id));
-			if($adb->num_rows($result)){
-				$data = $adb->raw_query_result_rowdata($result, 0);
-				$workflow->id = $data["workflow_id"];
-				$workflow->moduleName = $data["module_name"];
-				$workflow->description = $data["summary"];
-				$workflow->test = $data["test"];
-				$workflow->executionCondition = $data['execution_condition'];
-				return $workflow;
-			}else{
-				return null;
-			}
-		}
-		
-		function delete($id){
-			$adb=$this->adb;
-			$adb->pquery("delete from com_vtiger_workflowtasks where workflow_id=?", array($id));
-			$adb->pquery("delete from com_vtiger_workflows where workflow_id=?", array($id));
-		}
-		
-		function newWorkflow($moduleName){
-			$workflow=new Workflow();
-			$workflow->moduleName = $moduleName;
-			$workflow->executionCondition = self::$ON_EVERY_SAVE;
-			return $workflow;
-			
-		}
-		
-
-		/**
-		 * Export a workflow as a json encoded string
-		 *
-		 * @param $workflow The workflow instance to export.
-		 */
-		public function serializeWorkflow($workflow){
-			$exp = array();
-			$exp['moduleName'] = $workflow->moduleName;
-			$exp['description'] = $workflow->description;
-			$exp['test'] = $workflow->test;
-			$exp['executionCondition'] = $workflow->executionCondition;
-			$exp['tasks'] = array();
-			$tm = new VTTaskManager($this->adb);
-			$tasks = $tm->getTasksForWorkflow($workflow->id);
-			foreach($tasks as $task){
-				unset($task->id);
-				unset($task->workflowId);
-				$exp['tasks'][] = serialize($task);
-			}
-			return  Zend_Json::encode($exp);
-		}
-
-		/**
-		 * Import a json encoded string as a workflow object
-		 * 
-		 * @return The Workflow instance representing the imported workflow.
-		 */
-		public function deserializeWorkflow($str){
-			$data =  Zend_Json::decode($str);
-			$workflow = $this->newWorkflow($data['moduleName']);
-			$workflow->description = $data['description'];
-			$workflow->test = $data['test'];
-			$workflow->executionCondition = $data['executionCondition'];
-			$this->save($workflow);
-			$tm = new VTTaskManager($this->adb);
-			$tasks = $data['tasks'];
-			foreach($tasks as $taskStr){
-				$task = $tm->unserializeTask($taskStr);
-				$task->workflowId = $workflow->id;
-				$tm->saveTask($task);
-			}
-			return $workflow;
-		}
-		
-	}
-	
-	class Workflow{
-		function __construct(){
-			$this->conditionStrategy = new VTJsonCondition();
-		}
-		
-		function evaluate($entityCache, $id){
-			if($this->test==""){
-				return true;
-			}else{
-				$cs = $this->conditionStrategy;
-				return $cs->evaluate($this->test, 
-									 $entityCache, $id);
-			}
-		}
-		
-		function executionConditionAsLabel($label=null){
-			if($label==null){
-				$arr = array('ON_FIRST_SAVE', 'ONCE', 'ON_EVERY_SAVE','ON_MODIFY');
-				return $arr[$this->executionCondition-1];
-			}else{
-				$arr = array('ON_FIRST_SAVE'=>1, 'ONCE'=>2, 'ON_EVERY_SAVE'=>3, 'ON_MODIFY'=>4);
-				$this->executionCondition = $arr[$label];
-			}
-		}
-	}
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowTemplateManager.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowTemplateManager.inc
deleted file mode 100644
index 8f0e1e11..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowTemplateManager.inc
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/*+********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-
-class VTWorkflowTemplateManager{
-	public function __construct($adb){
-		$this->adb = $adb;
-	}
-	
-	/**
-	 * Create anew template instance from a workflow
-	 *
-	 * This template instance will not be saved. The save 
-	 * will have to be done explicitly.
-	 *
-	 * @param $title The title of the template
-	 * @param $workflow A workflow instance.
-	 */
-	public function newTemplate($title, $workflow){
-		$adb = $this->adb;
-		$wms = new VTWorkflowManager($adb);
-		$str = $wms->serializeWorkflow($workflow);
-		$template = new VTWorkflowTemplate();
-		$template->title = $title;
-		$template->moduleName = $workflow->moduleName;
-		$template->template = $str;
-		return $template;
-	}
-	
-	/**
-	 * Retrieve a template given it's id
-	 *
-	 * @param $templateId The id of the template
-	 * @return The template object
-	 */
-	public function retrieveTemplate($templateId){
-		$adb = $this->adb;
-		$result = $adb->pquery('select * from com_vtiger_workflowtemplates where template_id=?', array($templateId));
-		$it = new SqlResultIterator($adb, $result);
-		$data = $it->current();
-		$template = new VTWorkflowTemplate();
-		$template->id = $templateId;
-		$template->title = $data->title;
-		$template->moduleName = $data->module_name;
-		$template->template = $data->template;
-		return $template;
-	}
-
-	/**
-	 * Create a workflow from a template
-	 *
-	 * The new workflow will also be added to the database.
-	 *
-	 * @param $template The template to use
-	 * @return A workflow object.
-	 */
-	public function createWorkflow($template){
-		$adb = $this->adb;
-		$wfm = new VTWorkflowManager($adb);
-		return $wfm->deserializeWorkflow($template->template);
-	}
-
-	/**
-	 * Get template objects for a particular module.
-	 *
-	 * @param $moduleName The name of the module
-	 * @return An array containing template objects
-	 */
-	public function getTemplatesForModule($moduleName){
-		$adb = $this->adb;
-		$result = $adb->pquery("select * from com_vtiger_workflowtemplates where module_name=?", array($moduleName));
-		return $this->getTemplatesForResult($result);
-	}
-
-	/**
-	 * Get all templates
-	 * 
-	 * Get all the templates as an array
-	 *
-	 * @return An array containing template objects.
-	 */
-	public function getTemplates(){
-		$adb = $this->adb;
-		$result = $adb->query("select * from com_vtiger_workflowtemplates");
-		return $this->getTemplatesForResult($result);
-	}
-
-	/**
-	 * Save a template
-	 *
-	 * If the object is a newly created template it
-	 * will be added to the database and a field id containing 
-	 * the new id will be added to the object.
-	 *
-	 * @param $template The template object to save.
-	 */
-	public function saveTemplate($template){
-		$adb = $this->adb;
-		if(is_numeric($template->id)){//How do I check whether a member exists in php?
-				$templateId = $template->id;
-				$adb->pquery("update com_vtiger_workflowtemplates set title=?,"+
-										 " module_name=?, template=? where template_id=?", 
-										 array($template->title, $template->moduleName, 
-													 $template->template, $templateId));	
-				return $templateId;
-			}else{
-				$templateId = $adb->getUniqueID("com_vtiger_workflowtemplates");
-				$template->id = $templateId;
-				$adb->pquery("insert into com_vtiger_workflowtemplates 
-							(template_id, title, module_name, template) 
-							values (?, ?, ?, ?)", 
-					array($templateId, $template->title, 
-								$template->moduleName, $template->template));
-				return $templateId;
-			}
-	}
-
-	/**
-	 * Delete a template
-	 *
-	 * $templateId The id of the template to delete.
-	 */
-	public function deleteTemplate($templateId){
-		$adb = $this->adb;
-		$adb->pquery('delete from com_vtiger_workflowtemplates where template_id=?',
-								 array($templateId));
-	}
-	
-	
-	/**
-	 * Dump all the templates in vtiger into a string
-	 *
-	 * This can be used for exporting templates from one 
-	 * machine to another
-	 *
-	 * @return The string dump of the templates.
-	 */
-	public function dumpAllTemplates(){
-		$adb = $this->adb;
-		$result = $adb->query("select * from com_vtiger_workflowtemplates");
-		$it = new SqlResultIterator($adb, $result);
-		$arr = array();
-		foreach($it as $row){
-			$el = array(
-				'moduleName'=>$row->module_name,
-				'title'=>$row->title,
-				'template'=>$row->template
-			);
-			$arr[] = $el;
-		}
-		return Zend_Json::encode($arr);
-	}
-	
-	/**
-	 * Load templates form a dumped string
-	 *
-	 * @param $str The string dump generated from dumpAllTemplates
-	 */
-	public function loadTemplates($str){
-			$arr = Zend_Json::decode($str);
-			foreach($arr as $el){
-				$template = new VTWorkflowTemplate();
-				$template->moduleName = $el['moduleName'];
-				$template->title = $el['title'];
-				$template->template = $el['template'];
-				$this->save($template);
-				$this->createWorkflow($template);
-			}
-	}
-
-
-	private function getTemplatesForResult($result){
-		$adb = $this->adb;
-		$it = new SqlResultIterator($adb, $result);
-		$templates = array();
-		foreach($it as $row){
-			$template = new VTWorkflowTemplate();
-			$template->id = $row->template_id;
-			$template->title = $row->title;
-			$tempalte->moduleName = $row->module_name;
-			$template->template = $row->template;
-			$templates[] = $template;
-		}
-		return $templates;
-	}
-}
-
-class VTWorkflowTemplate{
-	
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowUtils.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowUtils.php
deleted file mode 100644
index 789a2941..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/VTWorkflowUtils.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-//A collection of util functions for the workflow module
-
-class VTWorkflowUtils{
-
-	function __construct(){
-		global $current_user;
-		$this->userStack = array();
-	}
-	/**
-	 * Check whether the given identifier is valid.
-	 */
-	function validIdentifier($identifier){
-		if(is_string($identifier)){
-			return preg_match("/^[a-zA-Z][a-zA-Z_0-9]+$/", $identifier);
-		}else{
-			return false;
-		}
-	}
-
-
-	/**
-	 * Push the admin user on to the user stack
-	 * and make it the $current_user
-	 *
-	 */
-	function adminUser(){
-		$user = new Users();
-		$user->retrieveCurrentUserInfoFromFile(1);
-		global $current_user;
-		array_push($this->userStack, $current_user);
-		$current_user = $user;
-		return $user;
-	}
-
-	/**
-	 * Revert to the previous use on the user stack
-	 */
-	function revertUser(){
-		global $current_user;
-		if(count($this->userStack)!=0){
-			$current_user = array_pop($this->userStack);
-		}else{
-			$current_user = null;
-		}
-		return $current_user;
-	}
-
-	/**
-	 * Get the current user
-	 */
-	function currentUser(){
-		return $current_user;
-	}
-
-	/**
-	 * The the webservice entity type of an EntityData object
-	 */
-	function toWSModuleName($entityData){
-		$moduleName = $entityData->getModuleName();
-		if($moduleName == 'Activity'){
-			$arr = array('Task' => 'Calendar', 'Emails' => 'Emails');
-			$moduleName = $arr[getActivityType($entityData->getId())];
-			if($moduleName == null){
-				$moduleName = 'Events';
-			}
-		}
-		return $moduleName;
-	}
-
-	/**
-	 * Insert redirection script
-	 */
-	function redirectTo($to, $message){
-				?>
-		<script type="text/javascript" charset="utf-8">
-			window.location="<?=$to?>";
-		</script>
-		<a href="<?=$to?>"><?=$message?></a>
-		<?php
-	}
-
-	/**
-	 * Check if the current user is admin
-	 */
-	function checkAdminAccess(){
-		global $current_user;
-		return strtolower($current_user->is_admin)==='on';
-	}
-	
-/* function to check if the module has workflow
- * @params :: $modulename - name of the module
- */
- function checkModuleWorkflow($modulename){
- 	global $adb;
- 	$tabid = getTabid($modulename);
-	$modules_not_supported = array('Documents','Calendar','Emails','Faq','Events','PBXManager','Users'); 
- 	$query = "SELECT name FROM vtiger_tab WHERE name not in (".generateQuestionMarks($modules_not_supported).") AND isentitytype=1 AND presence = 0 AND tabid = ?";
- 	$result = $adb->pquery($query,array($modules_not_supported,$tabid));
- 	$rows = $adb->num_rows($result);
- 	if($rows > 0){
- 		return true;
- 	}else{
- 		return false;
- 	}
- }
- 
- function vtGetModules($adb){
-	$modules_not_supported = array('Documents','Calendar','Emails','Faq','Events','PBXManager','Users'); 
-	$sql="select distinct vtiger_field.tabid, name
-			from vtiger_field 
-			inner join vtiger_tab 
-				on vtiger_field.tabid=vtiger_tab.tabid 
-			where vtiger_tab.name not in(".generateQuestionMarks($modules_not_supported).") and vtiger_tab.isentitytype=1 and vtiger_tab.presence = 0 ";
-	$it = new SqlResultIterator($adb, $adb->pquery($sql,array($modules_not_supported)));
-	$modules = array();
-	foreach($it as $row){
-		$modules[] = $row->name;
-	}
-	return $modules;
- }
- 
-}
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/com_vtiger_workflowAjax.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/com_vtiger_workflowAjax.php
deleted file mode 100644
index 067b69bf..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/com_vtiger_workflowAjax.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-
-	require_once('include/Ajax/CommonAjax.php');
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/deletetask.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/deletetask.php
deleted file mode 100644
index f8f29ecc..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/deletetask.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once("include/utils/CommonUtils.php");
-require_once("include/events/SqlResultIterator.inc");
-require_once("include/Zend/Json.php");
-require_once("VTWorkflowApplication.inc");
-require_once("VTTaskManager.inc");
-require_once('VTWorkflowUtils.php');
-
-	function vtDeleteWorkflow($adb, $request){
-		$util = new VTWorkflowUtils();
-		$module = new VTWorkflowApplication("deltetask");
-		$mod = return_module_language($current_language, $module->name);
-
-		if(!$util->checkAdminAccess()){
-			$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-			$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-			return;
-		}
-
-		$wm = new VTTaskManager($adb);
-		$wm->deleteTask($request['task_id']);
-		
-		if(isset($request["return_url"])){
-			$returnUrl=$request["return_url"];
-		}else{
-			$returnUrl=$module->editWorkflowUrl($wf->id);
-		}
-		
-		?>
-		<script type="text/javascript" charset="utf-8">
-			window.location="<?=$returnUrl?>";
-		</script>
-		<a href="<?=$returnUrl?>">Return</a>
-		<?php
-	}
-	vtDeleteWorkflow($adb, $_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/deleteworkflow.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/deleteworkflow.php
deleted file mode 100644
index 0e2770ef..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/deleteworkflow.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once("include/utils/CommonUtils.php");
-require_once("include/events/SqlResultIterator.inc");
-require_once("include/Zend/Json.php");
-require_once("VTWorkflowApplication.inc");
-require_once("VTWorkflowManager.inc");
-require_once("VTWorkflowUtils.php");
-	function vtDeleteWorkflow($adb, $request){
-		$util = new VTWorkflowUtils();
-		$module = new VTWorkflowApplication("deleteworkflow");
-		$mod = return_module_language($current_language, $module->name);
-
-		if(!$util->checkAdminAccess()){
-			$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-			$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-			return;
-		}
-
-		$wm = new VTWorkflowManager($adb);
-		$wm->delete($request['workflow_id']);
-		
-		if(isset($request["return_url"])){
-			$returnUrl=$request["return_url"];
-		}else{
-			$returnUrl=$module->listViewUrl($wf->id);
-		}
-		
-		?>
-		<script type="text/javascript" charset="utf-8">
-			window.location="<?=$returnUrl?>";
-		</script>
-		<a href="<?=$returnUrl?>">Return</a>
-		<?php
-	}
-	vtDeleteWorkflow($adb, $_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/edittask.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/edittask.php
deleted file mode 100644
index 8ccfb4ed..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/edittask.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-
-require_once("Smarty_setup.php");
-require_once("include/utils/CommonUtils.php");
-require_once("include/events/SqlResultIterator.inc");
-require_once("include/events/VTWSEntityType.inc");
-
-require_once("VTWorkflowApplication.inc");
-require_once("VTTaskManager.inc");
-require_once("VTWorkflowManager.inc");
-require_once("VTWorkflowUtils.php");
-	function vtTaskEdit($adb, $request, $current_language, $app_strings){
-		global $theme;
-		$util = new VTWorkflowUtils();
-		$image_path = "themes/$theme/images/";
-
-		$module = new VTWorkflowApplication('edittask');
-
-		$mod = return_module_language($current_language, $module->name);		
-
-		if(!$util->checkAdminAccess()){
-			$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-			$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-			return;
-		}
-
-		$smarty = new vtigerCRM_Smarty();
-		$tm = new VTTaskManager($adb);
-		$smarty->assign('edit',isset($request["task_id"]));
-		if(isset($request["task_id"])){
-			$task = $tm->retrieveTask($request["task_id"]);
-			$workflowId=$task->workflowId;
-		}else{
-			$workflowId = $request["workflow_id"];
-			$taskClass = $request["task_type"];
-			$task = $tm->createTask($taskClass, $workflowId);
-		}
-
-		if($task==null){
-			$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NO_TASK']);
-			$util->redirectTo($errorUrl, $mod['LBL_ERROR_NO_TASK']);
-			return;
-		}
-		
-		$wm = new VTWorkflowManager($adb);
-		$workflow = $wm->retrieve($workflowId);
-		if($workflow==null){
-			$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NO_WORKFLOW']);
-			$util->redirectTo($errorUrl, $mod['LBL_ERROR_NO_WORKFLOW']);
-			return;
-		}
-
-		
-		$smarty->assign("workflow", $workflow);
-		$smarty->assign("returnUrl", $request["return_url"]);
-		$smarty->assign("task", $task);
-		$smarty->assign("taskType", $taskClass);
-		$smarty->assign("saveType", $request['save_type']);
-		$taskClass = get_class($task);
-		$smarty->assign("taskTemplate", "{$module->name}/taskforms/$taskClass.tpl");
-		$et = VTWSEntityType::usingGlobalCurrentUser($workflow->moduleName);
-		$smarty->assign("entityType", $et);
-		$smarty->assign('entityName', $workflow->moduleName);
-		$smarty->assign("fieldNames", $et->getFieldNames());
-		
-		$dateFields = array();
-		$fieldTypes = $et->getFieldTypes();
-		$fieldLabels = $et->getFieldLabels();
-		foreach($fieldTypes as $name => $type){
-			if($type->type=='Date' || $type->type=='DateTime'){
-				$dateFields[$name] = $fieldLabels[$name];
-			}
-		}
-		
-		$smarty->assign('dateFields', $dateFields);
-		
-		
-		if($task->trigger!=null){
-			$trigger = $task->trigger;
-			$days = $trigger['days'];
-			if ($days < 0){
-				$days*=-1;
-				$direction = 'before';
-			}else{
-				$direction = 'after';
-			}
-			$smarty->assign('trigger', array('days'=>$days, 'direction'=>$direction, 
-			  'field'=>$trigger['field']));
-		}
-		$curr_date="(general : (__VtigerMeta__) date)";
-		$curr_time='(general : (__VtigerMeta__) time)';
-				
-		$smarty->assign("DATE",$curr_date);
-		$smarty->assign("TIME",$curr_time);
-		$smarty->assign("MOD", array_merge(
-			return_module_language($current_language,'Settings'),
-			return_module_language($current_language, 'Calendar'),
-			return_module_language($current_language, $module->name)));
-		$smarty->assign("APP", $app_strings);
-		$smarty->assign("dateFormat", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
-		$smarty->assign("IMAGE_PATH",$image_path);
-		$smarty->assign("THEME", $theme);
-		$smarty->assign("MODULE_NAME", $module->label);
-		$smarty->assign("PAGE_NAME", $mod['LBL_EDIT_TASK']);
-		$smarty->assign("PAGE_TITLE", $mod['LBL_EDIT_TASK_TITLE']);
-		
-		$smarty->assign("module", $module);
-		$smarty->display("{$module->name}/EditTask.tpl");
-	}
-	vtTaskEdit($adb, $_REQUEST, $current_language, $app_strings);
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/editworkflow.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/editworkflow.php
deleted file mode 100644
index f4bf71de..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/editworkflow.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once("Smarty_setup.php");
-require_once("include/utils/CommonUtils.php");
-require_once("include/Zend/Json.php");
-
-require_once("include/events/SqlResultIterator.inc");
-require_once("include/events/VTWSEntityType.inc");
-
-require_once("VTWorkflowManager.inc");
-require_once("VTTaskManager.inc");
-require_once("VTWorkflowApplication.inc");
-require_once "VTWorkflowTemplateManager.inc";
-require_once "VTWorkflowUtils.php";
-
-function vtWorkflowEdit($adb, $request, $requestUrl, $current_language, $app_strings){
-
-	global $theme;
-	$util = new VTWorkflowUtils();
-
-	$image_path = "themes/$theme/images/";
-
-	$module = new VTWorkflowApplication("editworkflow");
-
-	$mod = return_module_language($current_language, $module->name);
-
-
-	if(!$util->checkAdminAccess()){
-		$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-		$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-		return;
-	}
-
-
-	$smarty = new vtigerCRM_Smarty();
-	if($request['source']=='from_template'){
-		$tm = new VTWorkflowTemplateManager($adb);
-		$template = $tm->retrieveTemplate($request['template_id']);
-		$workflow = $tm->createWorkflow($template);
-	}else{
-		$wfs = new VTWorkflowManager($adb);
-		if(isset($request["workflow_id"])){
-			$workflow = $wfs->retrieve($request["workflow_id"]);
-		}else{
-			$moduleName=$request["module_name"];
-			$workflow = $wfs->newWorkflow($moduleName);
-		}
-	}
-
-	if($workflow==null){
-		$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NO_WORKFLOW']);
-		$util->redirectTo($errorUrl, $mod['LBL_ERROR_NO_WORKFLOW']);
-		return;
-	}
-	$workflow->test = addslashes($workflow->test);
-	$tm = new VTTaskManager($adb);
-	$tasks = $tm->getTasksForWorkflow($workflow->id);
-	$smarty->assign("tasks", $tasks);
-	$smarty->assign("taskTypes", $tm->getTaskTypes());
-	$smarty->assign("newTaskReturnUrl", $requestUrl);
-
-	$smarty->assign("returnUrl", $request["return_url"]);
-	$smarty->assign("APP", $app_strings);
-	$smarty->assign("MOD", array_merge(
-	return_module_language($current_language,'Settings'),
-	return_module_language($current_language, $module->name)));
-	$smarty->assign("THEME", $theme);
-	$smarty->assign("IMAGE_PATH", $image_path);
-	$smarty->assign("MODULE_NAME", $module->label);
-	$smarty->assign("PAGE_NAME", $mod['LBL_EDIT_WORKFLOW']);
-	$smarty->assign("PAGE_TITLE", $mod['LBL_EDIT_WORKFLOW_TITLE']);
-
-	$smarty->assign("workflow", $workflow);
-	$smarty->assign("saveType", isset($workflow->id)?"edit":"new");
-	$smarty->assign("module", $module);
-
-	$smarty->display("{$module->name}/EditWorkflow.tpl");
-}
-vtWorkflowEdit($adb, $_REQUEST, $_SERVER["REQUEST_URI"], $current_language, $app_strings);
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/entitymethodjson.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/entitymethodjson.php
deleted file mode 100644
index 37f71729..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/entitymethodjson.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once("include/Zend/Json.php");
-require_once('modules/com_vtiger_workflow/VTEntityMethodManager.inc');
-
-function vtEntityMethodJson($adb, $request){
-	$moduleName = $request['module_name'];
-	$emm = new VTEntityMethodManager($adb);
-	$methodNames = $emm->methodsForModule($moduleName);
-	echo Zend_Json::encode($methodNames);
-}
-
-vtEntityMethodJson($adb, $_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/errormessage.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/errormessage.php
deleted file mode 100644
index 9459f0b3..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/errormessage.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-?>
-<h1>Error</h1>
-<?=htmlentities($_REQUEST['message'])?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/errorpage.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/errorpage.php
deleted file mode 100644
index 10d1b854..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/errorpage.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-function displayErrorPage($request){
-	?>
-	<h1>Workflow engine error</h1>
-	<?="It appears that you have entered an invalid value."?>
-	<?php
-}
-displayErrorPage($_REQUEST);
-
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/include.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/include.inc
deleted file mode 100644
index 0c8ec5d2..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/include.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once 'include/events/SqlResultIterator.inc';
-require 'VTWorkflowManager.inc';
-require 'VTTaskManager.inc';
-require 'VTWorkflowTemplateManager.inc';
-require 'VTTaskQueue.inc';
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/include_webservices.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/include_webservices.php
deleted file mode 100644
index 78913350..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/include_webservices.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once 'include/Webservices/Utils.php';
-require_once("modules/Users/Users.php");
-require_once("include/Webservices/VtigerCRMObject.php");
-require_once("include/Webservices/VtigerCRMObjectMeta.php");
-require_once("include/Webservices/DataTransform.php");
-require_once("include/Webservices/WebServiceError.php");
-require_once 'include/utils/utils.php';
-require_once 'include/Webservices/ModuleTypes.php';
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/language/en_us.lang.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/language/en_us.lang.php
deleted file mode 100644
index 17afdde6..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/language/en_us.lang.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-$mod_strings = array(
-'VTEmailTask' => 'Send Email',
-'VTEntityMethodTask' => 'Invoke Custom Function',
-'VTCreateTodoTask' => 'Create Todo',
-'VTCreateEventTask' => 'Create Event',
-'VTSMSTask' => 'SMS Task',
-'LBL_EDIT_TASK'=>'Edit Task',
-'LBL_EDIT_TASK_TITLE'=>'Edit an existing task or create a new one',
-'LBL_EDIT_WORKFLOW'=>'Edit Workflow',
-'LBL_EDIT_WORKFLOW_TITLE'=>'Edit an existing workflow or create a one',
-'LBL_FROM_TEMPLATE'=>'From Template',
-'LBL_NEW_WORKFLOW'=>'New Workflow',
-'LBL_NEW_TEMPLATE'=>'Save as Template',
-'LBL_CREATE_WORKFLOW_FOR'=>'Create a workflow for',
-'LBL_FOR_MODULE'=>'For Module',
-'LBL_CHOOSE_A_TEMPLATE'=>'Choose a template',
-'LBL_VALIDATION_MISSING_MANDATORY_FIELDS'=>'There are empty mandatory fields.',
-'LBL_VALIDATION_INVALID_DATE_RANGE'=>'Start date/time is greater than the end date/time',
-'LBL_ERROR_NO_WORKFLOW'=>'The workflow you requested does not exist',
-'LBL_ERROR_NO_TASK'=>'The task you requested does not exist',
-'LBL_ERROR_NOT_ADMIN'=>'You do not have access to this module as you are not an admin user',
-'LBL_CREATE_WORKFLOW'=>'Create workflow',
-'LBL_WORKFLOW_LIST'=>'Workflow List',
-'LBL_AVAILABLE_WORKLIST_LIST'=>'Available Workflows',
-'LBL_LOADING'=>'Loading...',
-'LBL_VALIDATION_ERROR'=>'Validation Error',
-'LBL_SELECT_OPTION_DOTDOTDOT'=>'Select Option...',
-'LBL_WORKFLOW_NOTE_CRON_CONFIG'=>'NOTE: You should have Workflow cron script configured.',
-'LBL_NO_TEMPLATES'=>'No Templates',
-'LBL_SELECT'=>'Select',
-'LBL_MESSAGE'=>'Message',
-);
-
-
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/language/zh_cn.lang.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/language/zh_cn.lang.php
deleted file mode 100644
index 5e91e4eb..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/language/zh_cn.lang.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
-*Copyright(C)2006-2010 YUCHENG HU
-*
-*---------------------------------------------
-*HAWEBSYSTEMS
-*http://www.hawebs.net
-*https://www.hawebs.org/forums/computer/
-*
-*CONTACT
-*huyuchengus@gmail.com/yuchenghu@hawebs.net
-*
-*---------------------------------------------
-*[A]GNUGENERALPUBLICLICENSEGNU/LGPL
-*[B]ApacheLicense,Version2.0
-*
-*---------------------------------------------
-*NOTE
-*1.所有的语言配置文件请采用UTF-8编码
-*
-*---------------------------------------------
-*/
-$mod_strings = array(
-'VTEmailTask' => '发送邮件',
-'VTEntityMethodTask' => '自定义函数',
-'VTCreateTodoTask' => '创建待办事项',
-'VTCreateEventTask' => '创建活动',
-'LBL_EDIT_TASK'=>'编辑任务',
-'LBL_EDIT_TASK_TITLE'=>'编辑现有的任务或者创建新任务',
-'LBL_EDIT_WORKFLOW'=>'编辑工作流程',
-'LBL_EDIT_WORKFLOW_TITLE'=>'编辑现有的工作流程或者创建新流程',
-'LBL_FROM_TEMPLATE'=>'从模板',
-'LBL_NEW_WORKFLOW'=>'新流程',
-'LBL_NEW_TEMPLATE'=>'保存为模板',
-'LBL_CREATE_WORKFLOW_FOR'=>'新的工作流程',
-'LBL_FOR_MODULE'=>'的模块',
-'LBL_FROM_TEMPLATE'=>'从模板',
-'LBL_CHOOSE_A_TEMPLATE'=>'选择模板',
-'LBL_VALIDATION_MISSING_MANDATORY_FIELDS'=>'有空必填。',
-'LBL_VALIDATION_INVALID_DATE_RANGE'=>'开始的日期/时间大于结束日期/时间。',
-'LBL_ERROR_NO_WORKFLOW'=>'你请求的工作流程不存在。 ',
-'LBL_ERROR_NO_TASK'=>'你请求的任务不存在。',
-'LBL_ERROR_NOT_ADMIN'=>'您没有访问此模块的权限。',
-'LBL_CREATE_WORKFLOW'=>'创建工作流',
-'LBL_WORKFLOW_LIST'=>'工作流列表',
-'LBL_AVAILABLE_WORKLIST_LIST'=>'有效的工作流',
-'LBL_LOADING'=>'下载...',
-'LBL_VALIDATION_ERROR'=>'违例错误',
-'LBL_SELECT_OPTION_DOTDOTDOT'=>'选择项...',
-'LBL_WORKFLOW_NOTE_CRON_CONFIG'=>'注意：你必须配置工作流的核心脚本。',
-'LBL_NO_TEMPLATES'=>'没有模板',
-);
-
-
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/loadtemplates.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/loadtemplates.php
deleted file mode 100644
index 3f258573..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/loadtemplates.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('include/utils/utils.php');
-require_once('include/Zend/Json.php');
-require_once('include/events/include.inc');
-require_once('modules/com_vtiger_workflow/include.inc');
-
-/**
- * This is a utility function to load a dumped templates files
- * into vtiger
- * @param $filename The name of the file to load.
- */
-function loadTemplates($filename){
-	global $adb;
-	$str = file_get_contents('fetchtemplates.out');
-	$tm = new VTWorkflowTemplateManager($adb);
-	$tm->loadTemplates($str);
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/modulefieldsjson.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/modulefieldsjson.php
deleted file mode 100644
index 4fdd057d..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/modulefieldsjson.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-	require_once "include/Zend/Json.php";
-	require_once("include/events/VTWSEntityType.inc");
-	
-	function vtModuleTypeInfoJson($adb, $request){
-		$moduleName = $request['module_name'];
-		$et = VTWSEntityType::usingGlobalCurrentUser($moduleName);
-		echo Zend_Json::encode($et->getFieldLabels());
-	}
-	vtModuleTypeInfoJson($adb, $_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/add.png b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/add.png
deleted file mode 100644
index f13429eee3856a60a4c8a643195c6cc17594dc97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#00001b5ch_0Itp)
z=>Px$eNaqPMZ3GZNw^l4$cpy%_U7j1>g(!Xw@OyKC*k7ZuCA_1m`H}wUaanT+u_~h
z<mBS-;6u6xs?VyZsHp4l?2zGE$L*>lnE>JC;<B=`^z`(J*kRGp(YW`6?d|QF+;+pm
z!?w1zT%BSUi2&H%+O5Q~Rhe6%>T1;L&BWWprlzLZ+1bs_%?Nn`#nHx!!+RQk9PjV%
ze657Z$;pz}YB8t)*WcM}%r?!~(X7y_A(sKo`KBtM04$;aDUce2*-Rag0B4?YuhFjF
z<KQ!`01|r-=<Db%rU3c+`3`{qz`(#Tr2sdu04SXR=;-L_>FM$D@$m5Q^Yiom{{Cv9
zbbr-Nnde~|f)d#4({s*1F_s;axt%qeBc$4jj>&n`{;AymvTd+r<LBeh)zG27s6~%U
zt@Cz*&|F}sSW~|ougJ8(>ZQon$vuogf4FzY$Hys{4WhuHN~kw9s0y&=jlkKz)YQ~`
z$YJ^U`TYF+`1tt!{r&p-`ttJf`}_O<|NnrC8ae;~00DGTPE!Ct=GbNc0004EOGiWi
zhy@);00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-gh76}^zdzr!80002$Nkl<Z
z7}H~5APJO8BR~~Ih`A00)PMyQ%FC;3Yx&jH!>cMPYHJlBg4G~FrmU<OkXQvLSWu$8
zva-55mWM~Kwzj&uLI@(r%*<R~uBWCZS6vO%1QW~_v~Y~Ivom&dv?%e13f3f;v1bSX
z0V5+jn*mfXAf3^~+1uOO+0Ct}P!=j^z-1{WW^HZlBW7uD3l-#)6*o0?;<C551<|Zf
zK~^A;<x*0zl?AahA%ecXzJ7i=Iyx?_ety0zP(c<J7GK{K7Z-g$Utbm$h;~nAK0ZDc
t4rOI078X7}e~8~1gp9NiK!~J32LStlIdyjlxgP)k002ovPDHLkV1kVTd4m7|

diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/createeventtaskscript.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/createeventtaskscript.js
deleted file mode 100644
index 4eee1088..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/createeventtaskscript.js
+++ /dev/null
@@ -1,106 +0,0 @@
-function VTCreateTodoTask($){
-
-	var map = fn.map;
-	var dict = fn.dict;
-	var filter = fn.filter;
-	var reduceR = fn.reduceR;
-	var parallelExecuter = fn.parallelExecuter;
-	var contains = fn.contains;
-	var concat = fn.concat;
-
-
-	function parse12HoursTime(timeStr){
-		var hours;
-
-		var match = timeStr.match(/(\d\d):(\d\d)(am|pm)/);
-		if(match[3]=='am'){
-			hours = parseInt(match[1], 10) % 12;
-		}else{
-			hours = parseInt(match[1], 10) % 12 + 12;
-		}
-		return hours*60+parseInt(match[2], 10);
-	}
-
-	function errorDialog(message){
-		alert(message);
-	}
-
-	function index(arr, field){
-		return dict(map(function(e){return [e[field], e];}, arr));
-	}
-
-	function handleError(fn){
-		return function(status, result){
-			if(status){
-				fn(result);
-			}else{
-				errorDialog('Failure:'+result);
-			}
-		};
-	}
-
-	function fillPicklist(picklistId, fieldInfo, defaultValue){
-		var values = fieldInfo['type']['picklistValues'];
-		var select = $('#'+picklistId);
-		$.each(values, function(i, v){
-			select.append('<option value="'+v['value']+'">'+v['label']+'</option>');
-		});
-		select.attr('value', defaultValue);
-	}
-
-	var validateDateRange = {
-		init: function(){
-
-		},
-		validator: function(){
-			var result;
-			var successResult = [true];
-			var failureResult = [false, 'invalid_date_range_message', []];
-			if(this.fieldValue('startDatefield') == this.fieldValue('endDatefield')){
-				var startTime = this.fieldValue('startTime');
-				var endTime = this.fieldValue('endTime');
-				var startDays = parseInt(this.fieldValue('startDays'), 10);
-				var endDays = parseInt(this.fieldValue('endDays'), 10);
-				var startDirection = this.fieldValue('startDirection')=="After"?1:-1;
-				var endDirection = this.fieldValue('endDirection')=="After"?1:-1;
-				var dd = endDays*endDirection - startDays*startDirection;
-				if(dd<0){
-					result = failureResult;
-				}else if(dd==0){
-					if(parse12HoursTime(startTime)>=parse12HoursTime(startTime)){
-						result = failureResult;
-					}else{
-						result = successResult;
-					}
-				}else{
-					result = successResult;
-				}
-			}else{
-				result = successResult;
-			}
-			return result;
-		}
-	};
-
-	var vtinst = new VtigerWebservices("webservice.php");
-	vtinst.extendSession(handleError(function(result){
-		$(document).ready(function(){
-			//Setup the validator
-			validator.addValidator('validateDateRange', validateDateRange);
-			validator.mandatoryFields.push('eventName');
-
-			vtinst.describeObject('Events', handleError(function(result){
-				var fields = result['fields'];
-				var fieldsMap = index(fields, 'name');
-				fillPicklist('event_status', fieldsMap['eventstatus'], eventStatus);
-				$('#event_status_busyicon').hide();
-				$('#event_status').show();
-				
-				fillPicklist('event_type', fieldsMap['activitytype'], eventType);
-				$('#event_type_busyicon').hide();
-				$('#event_type').show();
-			}));
-		});
-	}));
-}
-VTCreateTodoTask(jQuery);
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/createtodotaskscript.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/createtodotaskscript.js
deleted file mode 100644
index 5bd2af01..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/createtodotaskscript.js
+++ /dev/null
@@ -1,63 +0,0 @@
-function VTCreateTodoTask($){
-
-	var map = fn.map;
-	var dict = fn.dict;
-	var filter = fn.filter;
-	var reduceR = fn.reduceR;
-	var parallelExecuter = fn.parallelExecuter;
-	var contains = fn.contains;
-	var concat = fn.concat;
-
-	function errorDialog(message){
-		alert(message);
-	}
-
-	function index(arr, field){
-		return dict(map(function(e){return [e[field], e];}, arr));
-	}
-
-	function handleError(fn){
-		return function(status, result){
-			if(status){
-				fn(result);
-			}else{
-				errorDialog('Failure:'+result);
-			}
-		}
-	}
-
-	var vtinst = new VtigerWebservices("webservice.php");
-	vtinst.extendSession(handleError(function(result){
-		$(document).ready(function(){
-			//Setup the validator
-			validator.mandatoryFields.push('todo');
-
-			vtinst.describeObject('Calendar', handleError(function(result){
-				var fields = result['fields'];
-				var fieldsMap = index(fields, 'name');
-				var eventStatusType = fieldsMap['taskstatus'];
-				var eventStatusValues = eventStatusType['type']['picklistValues'];
-
-				var taskPriorityType = fieldsMap['taskpriority'];
-				var taskPriorityValues = taskPriorityType['type']['picklistValues'];
-
-				var status = $('#task_status');
-				$.each(eventStatusValues, function(i, v){
-					status.append('<option value="'+v['value']+'">'+v['label']+'</option>');
-				});
-				status.attr('value', taskStatus);
-				$('#task_status_busyicon').hide();
-				$('#task_status').show();
-				
-				var priority = $('#task_priority');
-				$.each(taskPriorityValues, function(i, v){
-					priority.append('<option value="'+v['value']+'">'+v['label']+'</option>');
-				});
-				priority.attr('value', taskPriority);
-				$('#task_priority_busyicon').hide();
-				$('#task_priority').show();
-			}));
-		});
-	}));
-}
-VTCreateTodoTask(jQuery);
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/edittaskscript.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/edittaskscript.js
deleted file mode 100644
index 4a2e7016..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/edittaskscript.js
+++ /dev/null
@@ -1,51 +0,0 @@
-function edittaskscript($){
-
-	function NumberBox(element){
-		var elementId = element.attr("id");
-		var boxId = '#'+elementId+'-number-box';
-		var str = "";
-		for(var i = 1; i <= 30; i++){
-			str += '<a href="#'+i+'" class="box_cel">'+(i < 10? ("0"+i) : i)+'</a> ';
-			if(!(i % 5)){
-				str+="<br>";
-			}
-		}
-		element.after('<div id="'+elementId+'-number-box" style="display:none;" class="box">'+str+'</div>');
-		element.focus(function(){
-			var pos = element.position();
-			$(boxId).css('display', 'block');
-			$(boxId).css({
-				position: 'absolute',
-				top: (pos.top+25)+'px'
-			});
-		});
-
-		element.blur(function(){
-			setTimeout(function(){$(boxId).css('display', 'none');},500);
-		});
-
-		$('.box_cel').click(function(){
-			element.attr('value', parseInt($(this).text(), 10));
-		});
-	}
-
-
-
-	$(document).ready(function(){
-		validator = new VTFieldValidator($('#new_task_form'));
-		validator.mandatoryFields = ['summary'];
-		$('.time_field').timepicker();
-		NumberBox($('#select_date_days'));
-        //UI to set the date for executing the task.
-    	$('#check_select_date').click(function(){
-    	    if($(this).attr('checked')){
-    	        $('#select_date').css('display', 'block');
-    	    }else{
-    	        $('#select_date').css('display', 'none');
-    	    }
-    	});
-			$('#edittask_cancel_button').click(function(){
-				window.location=returnUrl;
-			});
-    });
-}
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/editworkflowscript.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/editworkflowscript.js
deleted file mode 100644
index 70b2e778..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/editworkflowscript.js
+++ /dev/null
@@ -1,499 +0,0 @@
-/*+********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-
-function editworkflowscript($, conditions){
-	var vtinst = new VtigerWebservices("webservice.php");
-	var fieldValidator;
-	var desc = null;
-
-	function id(v){
-		return v;
-	}
-
-	function map(fn, list){
-		var out = [];
-		$.each(list, function(i, v){
-			out[out.length]=fn(v);
-		});
-		return out;
-	}
-
-	function field(name){
-		return function(object){
-			if(typeof(object) != 'undefined') {
-				return object[name];
-			}
-		};
-	}
-
-	function zip(){
-		var out = [];
-
-		var lengths = map(field('length'), arguments);
-		var min = reduceR(function(a,b){return a<b?a:b;},lengths,lengths[0]);
-		for(var i=0; i<min; i++){
-			out[i]=map(field(i), arguments);
-		}
-		return out;
-	}
-
-	function dict(list){
-		var out = {};
-		$.each(list, function(i, v){
-			out[v[0]] = v[1];
-		});
-		return out;
-	}
-
-	function filter(pred, list){
-		var out = [];
-		$.each(list, function(i, v){
-			if(pred(v)){
-				out[out.length]=v;
-			}
-		});
-		return out;
-	}
-	
-	function diff(reflist, list) {
-		var out = [];
-		$.each(list, function(i, v) {
-			if(contains(reflist, v)) {
-				out.push(v);
-			}
-		});
-		return out;
-	}
-
-
-	function reduceR(fn, list, start){
-		var acc = start;
-		$.each(list, function(i, v){
-			acc = fn(acc, v);
-		});
-		return acc;
-	}
-
-	function contains(list, value){
-		var ans = false;
-		$.each(list, function(i, v){
-			if(v==value){
-				ans = true;
-				return false;
-			}
-		});
-		return ans;
-	}
-
-	function concat(lista,listb){
-		return lista.concat(listb);
-	}
-
-	function errorDialog(message){
-		alert(message);
-	}
-
-	function handleError(fn){
-		return function(status, result){
-			if(status){
-				fn(result);
-			}else{
-				errorDialog('Failure:'+result);
-			}
-		};
-	}
-
-	function implode(sep, arr){
-		var out = "";
-		$.each(arr, function(i, v){
-			out+=v;
-			if(i<arr.length-1){
-				out+=sep;
-			}
-		});
-		return out;
-	}
-
-	function mergeObjects(obj1, obj2){
-		var res = {};
-		for(var k in obj1){
-			res[k] = obj1[k];
-		}
-		for(var k in obj2){
-			res[k] = obj2[k];
-		}
-		return res;
-	}
-
-	function jsonget(operation, params, callback){
-		var obj = {
-				module:'com_vtiger_workflow',
-				action:'com_vtiger_workflowAjax',
-				file:operation, ajax:'true'};
-		$.each(params,function(key, value){
-			obj[key] = value;
-		});
-		$.get('index.php', obj,
-			function(result){
-				var parsed = JSON.parse(result);
-				callback(parsed);
-		});
-	}
-
-
-
-
-	function center(el){
-		el.css({position: 'absolute'});
-		el.width("400px");
-		el.height("125px");
-		placeAtCenter(el.get(0));
-	}
-
-
-	function PageLoadingPopup(){
-		function show(){
-			$('#workflow_loading').css('display', 'block');
-			//center($('#workflow_loading'));
-		}
-		function close(){
-			$('#workflow_loading').css('display', 'none');
-		}
-		return {
-			show:show, close:close
-		};
-	}
-	var pageLoadingPopup = PageLoadingPopup();
-
-	function NewTemplatePopup(){
-		function close(){
-			$('#new_template_popup').css('display', 'none');
-		}
-
-		function show(module){
-			$('#new_template_popup').css('display', 'block');
-			center($('#new_template_popup'));
-		}
-		
-		
-		
-		$('#new_template_popup_save').click(function(){
-			var messageBoxPopup = MessageBoxPopup();
-		
-			if(trim(this.form.title.value) == '') {
-				messageBoxPopup.show();
-				$('#'+ 'empty_fields_message').show();
-				return false;
-			}
-		});
-
-		$('#new_template_popup_close').click(close);
-		$('#new_template_popup_cancel').click(close);
-		return {
-			close:close,show:show
-		};
-	}
-	var newTemplatePopup = NewTemplatePopup();
-
-	function NewTaskPopup(){
-		function close(){
-			$('#new_task_popup').css('display', 'none');
-		}
-
-		function show(module){
-			$('#new_task_popup').css('display', 'block');
-			center($('#new_task_popup'));
-		}
-
-		$('#new_task_popup_close').click(close);
-		$('#new_task_popup_cancel').click(close);
-		return {
-			close:close,show:show
-		};
-	}
-
-	var operations = function(){
-		var op = {
-			string:["is", "contains", "does not contain", "starts with", "ends with"],
-			number:["equal to", "less than", "greater than", "does not equal",
-							"less than or equal to", "greater than or equal to"],
-			value:['is']
-		};
-		var mapping = [
-			['string', ['string', 'text', 'url', 'email', 'phone']],
-			['number', ['integer', 'double']],
-			['value', ['reference', 'picklist', 'multipicklist', 'datetime',
-								 'time', 'date', 'boolean']]
-		];
-
-
-	  	var out = {};
-		$.each(mapping, function(i, v){
-			var opName = v[0];
-			var types = v[1];
-			$.each(types, function(i, v){
-				out[v] = op[opName];
-			});
-		});
-		return out;
-	}();
-
-	function defaultValue(fieldType){
-
-		function forPicklist(opType, condno){
-			var value = $("#save_condition_"+condno+"_value");
-			var options = implode('',
-				map(function (e){return '<option value="'+e.value+'">'+e.label+'</option>';},
-					opType['picklistValues'])
-			);
-			value.replaceWith('<select id="save_condition_'+condno+'_value" class="value">'+
-												options+'</select>');
-		}
-
-		function forInteger(opType, condno){
-			var value = $(format("#save_condition_%s_value", condno));
-			value.replaceWith(format('<input type="text" id="save_condition_%s_value" '+
-															 'value="0" class="value">', condno));
-		}
-		var functions = {
-			string:function(opType, condno){
-				var value = $(format("#save_condition_%s_value", condno));
-				value.replaceWith(format('<input type="text" id="save_condition_%s_value" '+
-																 'value="" class="value">', condno));
-			},
-			'boolean': function(opType, condno){
-				var value = $("#save_condition_"+condno+"_value");
-				value.replaceWith(
-					'<select id="save_condition_'+condno+'_value" value="true" class="value"> \
-						<option value="true:boolean">True</option>\
-						<option value="false:boolean">False</option>\
-					</select>');
-			},
-			integer: forInteger,
-			picklist:forPicklist,
-			multipicklist:forPicklist
-		};
-		var ret = functions[fieldType];
-		if(ret==null){
-			ret = functions['string'];
-		}
-		return ret;
-	}
-
-	var format = fn.format;
-
-
-	function fillOptions(el,options){
-		el.empty();
-		$.each(options, function(k, v){
-			el.append('<option value="'+k+'">'+v+'</option>');
-		});
-	}
-
-	function resetFields(opType, condno){
-		var ops = $("#save_condition_"+condno+"_operation");
-		var selectedOperations = operations[opType.name];
-		var l = dict(zip(selectedOperations, selectedOperations));
-		fillOptions(ops, l);
-		defaultValue(opType.name)(opType, condno);
-	}
-
-
-	function removeCondition(condno){
-	  $(format("#save_condition_%s", condno)).remove();
-	}
-
-	//Convert user type into reference for consistency in describe objects
-	//This is done inplace
-	function referencify(desc){
-	  var fields = desc['fields'];
-	  for(var i=0; i<fields.length; i++){
-		var field = fields[i];
-		var type = field['type'];
-		if(type['name']=='owner'){
-		  type['name']='reference';
-		  type['refersTo']=['Users'];
-		}
-	  }
-	  return desc;
-	}
-
-	function getDescribeObjects(accessibleModules, moduleName, callback){
-		vtinst.describeObject(moduleName, handleError(function(result){
-			var parent = referencify(result);
-			var fields = parent['fields'];
-			var referenceFields = filter(function(e){return e['type']['name']=='reference';}, fields);
-			var referenceFieldModules =
-				map(function(e){ return e['type']['refersTo'];},
-					referenceFields
-				);
-			function union(a, b){
-				var newfields = filter(function(e){return !contains(a, e);}, b);
-				return a.concat(newfields);
-			}
-			var relatedModules = reduceR(union, referenceFieldModules, [parent['name']]);
-			
-			// Remove modules that is no longer accessible
-			relatedModules = diff(accessibleModules, relatedModules);
-			
-			function executer(parameters){
-				var failures = filter(function(e){return e[0]==false;}, parameters);
-				if(failures.length!=0){
-					var firstFailure = failures[0];
-					callback(false, firstFailure[1]);
-				}else{
-				  var moduleDescriptions = map(function(e){return e[1];}, parameters);
-					var modules = dict(map(function(e){return [e['name'], referencify(e)];}, moduleDescriptions));
-					callback(true, modules);
-				}
-			}
-			var p = parallelExecuter(executer, relatedModules.length);
-			$.each(relatedModules, function(i, v){
-				p(function(callback){vtinst.describeObject(v, callback);});
-			});
-		}));
-	}
-
-	$(document).ready(function(){
-		fieldValidator = new VTFieldValidator($('#edit_workflow_form'));
-		fieldValidator.mandatoryFields = ["description"];
-		pageLoadingPopup.show();
-		vtinst.extendSession(handleError(function(result){
-			vtinst.listTypes(handleError(function(accessibleModules) {
-				getDescribeObjects(accessibleModules, moduleName, handleError(function(modules){
-					var parent = modules[moduleName];
-					function filteredFields(fields){
-						return filter(
-				  			function(e){return !contains(['autogenerated', 'reference', 'owner', 'multipicklist', 'password'], e.type.name);}, fields
-				 		);
-					};
-					var parentFields = map(function(e){return[e['name'],e['label']];}, filteredFields(parent['fields']));
-					var referenceFieldTypes = filter(function(e){return (e['type']['name']=='reference')}, parent['fields']);
-					var moduleFieldTypes = {};
-					$.each(modules, function(k, v){
-						moduleFieldTypes[k] = dict(map(function(e){return [e['name'], e['type']];},
-							filteredFields(v['fields'])));
-					});
-	
-					function getFieldType(fullFieldName){
-						var group = fullFieldName.match(/(\w+) : \((\w+)\) (\w+)/);
-						if(group==null){
-							var fieldModule = moduleName;
-							var fieldName = fullFieldName;
-						}else{
-							var fieldModule = group[2];
-							var fieldName = group[3];
-						}
-						return moduleFieldTypes[fieldModule][fieldName];
-					}
-	
-					function fieldReferenceNames(referenceField){
-						var name = referenceField['name'];
-						var label = referenceField['label'];
-						function forModule(moduleName){
-							// If module is not accessible return no field information
-							if(!contains(accessibleModules, moduleName)) return [];
-				
-							return map(function(field){
-								return [name+' : '+'('+moduleName+') '+field['name'], label+' : '+'('+moduleName+') '+field['label']];},
-								filteredFields(modules[moduleName]['fields'])
-							);
-						}
-						return reduceR(concat, map(forModule,referenceField['type']['refersTo']),[]);
-					}
-	
-	
-					var referenceFields = reduceR(concat, map(fieldReferenceNames, referenceFieldTypes), []);
-					var fieldLabels = dict(parentFields.concat(referenceFields));
-	
-					function addCondition(condno){
-						$("#save_conditions").append(
-							'<div id="save_condition_'+condno+'" style=\'margin-bottom: 5px\'> \
-								<select id="save_condition_'+condno+'_fieldname" class="fieldname"></select> \
-								<select id="save_condition_'+condno+'_operation" class="operation"></select> \
-								<input type="text" id="save_condition_'+condno+'_value" class="value"> \
-								<span id="save_condition_'+condno+'_remove" class="link remove-link"> \
-								<img src="modules/com_vtiger_workflow/resources/remove.png"></span> \
-							</div>'
-						);
-						var fe = $("#save_condition_"+condno+"_fieldname");
-						var i = 1;
-						fillOptions(fe, fieldLabels);
-	
-	
-						var fullFieldName = fe.attr("value");
-	
-						resetFields(getFieldType(fullFieldName), condno);
-	
-						var re = $("#save_condition_"+condno+"_remove");
-						re.bind("click", function(){
-							removeCondition(condno);
-						});
-	
-						fe.bind("change", function(){
-							var select = $(this);
-							var condNo = select.attr("id").match(/save_condition_(\d+)_fieldname/)[1];
-							var fullFieldName = $(this).attr('value');
-							resetFields(getFieldType(fullFieldName), condNo);
-						});
-					}
-	
-					var newTaskPopup = NewTaskPopup();
-					$("#new_task").click(function(){
-						newTaskPopup.show();
-					});
-	
-					var newTemplatePopup = NewTemplatePopup();
-					$("#new_template").click(function(){
-						newTemplatePopup.show();
-					});
-	
-					var condno=0;
-					if(conditions){
-						$.each(conditions, function(i, condition){
-							var fieldname = condition["fieldname"];
-							addCondition(condno);
-							$(format("#save_condition_%s_fieldname", condno)).attr("value", fieldname);
-							resetFields(getFieldType(fieldname), condno);
-							$(format("#save_condition_%s_operation", condno)).attr("value", condition["operation"]);
-							$('#dump').html(condition["value"]);
-							var text = $('#dump').text();
-							$(format("#save_condition_%s_value", condno)).attr("value", text);
-							condno+=1;
-						});
-					}
-	
-					$("#save_conditions_add").bind("click", function(){
-						addCondition(condno++);
-					});
-	
-					$("#save_submit").bind("click", function(){
-						var conditions = [];
-						$("#save_conditions").children().each(function(i){
-							var fieldname = $(this).children(".fieldname").attr("value");
-							var operation = $(this).children(".operation").attr("value");
-							var value = $(this).children(".value").attr("value");
-							var condition = {fieldname:fieldname, operation:operation, value:value};
-							conditions[i]=condition;
-						});
-						if(conditions.length==0){
-						  var out = "";
-						}else{
-						  var out = JSON.stringify(conditions);
-						}
-						$("#save_conditions_json").attr("value", out);
-					});
-					pageLoadingPopup.close();
-					$('#save_conditions_add').show();
-				}));
-			}));
-		}));
-	});
-
-}
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/emailtaskscript.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/emailtaskscript.js
deleted file mode 100644
index 829f363c..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/emailtaskscript.js
+++ /dev/null
@@ -1,280 +0,0 @@
-/*+********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-
-function VTEmailTask($){
-	var vtinst = new VtigerWebservices("webservice.php");
-	var desc = null;
-	var accessibleModulesInfo = null;
-
-	var map = fn.map;
-	var dict = fn.dict;
-	var filter = fn.filter;
-	var reduceR = fn.reduceR;
-	var parallelExecuter = fn.parallelExecuter;
-	var contains = fn.contains;
-	var concat = fn.concat;
-	
-	function diff(reflist, list) {
-		var out = [];
-		$.each(list, function(i, v) {
-			if(contains(reflist, v)) {
-				out.push(v);
-			}
-		});
-		return out;
-	}
-	
-	//Display an error message.
-	function errorDialog(message){
-		alert(message);
-	}
-
-	//This is a wrapper to handle webservice errors.
-	function handleError(fn){
-		return function(status, result){
-			if(status){
-				fn(result);
-			}else{
-				errorDialog('Failure:'+result);
-			}
-		};
-	}
-
-	//Insert text at the cursor
-	function insertAtCursor(element, value){
-		//http://alexking.org/blog/2003/06/02/inserting-at-the-cursor-using-javascript
-		if (document.selection) {
-			element.focus();
-			var sel = document.selection.createRange();
-			sel.text = value;
-			element.focus();
-		}else if (element.selectionStart || element.selectionStart == '0') {
-			var startPos = element.selectionStart;
-			var endPos = element.selectionEnd;
-			var scrollTop = element.scrollTop;
-			element.value = element.value.substring(0, startPos)
-				+ value
-				+ element.value.substring(endPos,
-				element.value.length);
-			element.focus();
-			element.selectionStart = startPos + value.length;
-			element.selectionEnd = startPos + value.length;
-			element.scrollTop = scrollTop;
-		}	else {
-			element.value += value;
-			element.focus();
-		}
-	}
-
-	//Convert user type into reference for consistency in describe objects
-	//This is done inplace
-	function referencify(desc){
-		var fields = desc['fields'];
-		for(var i=0; i<fields.length; i++){
-			var field = fields[i];
-			var type = field['type'];
-			if(type['name']=='owner'){
-				type['name']='reference';
-				type['refersTo']=['Users'];
-			}
-		}
-		return desc;
-	}
-
-	//Get an array containing the the description of a module and all modules
-	//refered to by it. This is passed to callback.
-	function getDescribeObjects(accessibleModules, moduleName, callback){
-		vtinst.describeObject(moduleName, handleError(function(result){
-			var parent = referencify(result);
-			var fields = parent['fields'];
-			var referenceFields = filter(function(e){
-				return e['type']['name']=='reference';},
-			  fields);
-			var referenceFieldModules =
-				map(
-					function(e){
-						return e['type']['refersTo'];
-					},
-					referenceFields
-				);
-			function union(a, b){
-			  var newfields = filter(function(e){return !contains(a, e);}, b);
-			  return a.concat(newfields);
-			}
-			var relatedModules = reduceR(union, referenceFieldModules, [parent['name']]);
-			
-			// Remove modules that is no longer accessible
-			relatedModules = diff(accessibleModules, relatedModules);
-
-			function executer(parameters){
-				var failures = filter(function(e){return e[0]==false;}, parameters);
-				if(failures.length!=0){
-					var firstFailure = failures[0];
-					callback(false, firstFailure[1]);
-				}else{
-					var moduleDescriptions = map(function(e){
-						return referencify(e[1]);},
-					  parameters);
-					var modules = dict(map(function(e){
-						  return [e['name'], e];},
-						moduleDescriptions));
-					callback(true, modules);
-				}
-			}
-			var p = parallelExecuter(executer, relatedModules.length);
-			$.each(relatedModules, function(i, v){
-				p(function(callback){vtinst.describeObject(v, callback);});
-			});
-		}));
-	}
-
-	function fillSelectBox(id, modules, parentModule, filterPred){
-		if(filterPred==null){
-			filterPred = function(){
-				return true;
-			};
-		}
-		var parent = modules[parentModule];
-		var fields = parent['fields'];
-
-		function filteredFields(fields){
-			return filter(
-				function(e){
-					var fieldCheck = !contains(['autogenerated', 'reference', 'owner', 'multipicklist', 'password'], e.type.name);
-					var predCheck = filterPred(e);
-					return fieldCheck && predCheck;
-				},
-				fields
-			);
-		}
-		var parentFields = map(function(e){return[e['name'],e['label']];}, filteredFields(parent['fields']));
-
-		var referenceFieldTypes = filter(function(e){
-				return (e['type']['name']=='reference');
-			},parent['fields']
-		);
-			
-		var moduleFieldTypes = {};
-		$.each(modules, function(k, v){
-				moduleFieldTypes[k] = dict(map(function(e){return [e['name'], e['type']];},filteredFields(v['fields'])));
-			}
-		);
-
-		function getFieldType(fullFieldName){
-			var group = fullFieldName.match(/(\w+) : \((\w+)\) (\w+)/);
-			if(group==null){
-				var fieldModule = moduleName;
-				var fieldName = fullFieldName;
-				}else{
-					var fieldModule = group[2];
-				var fieldName = group[3];
-			}
-			return moduleFieldTypes[fieldModule][fieldName];
-		}
-
-		function fieldReferenceNames(referenceField){
-			var name = referenceField['name'];
-			var label = referenceField['label'];
-			function forModule(moduleName){
-				// If module is not accessible return no field information
-				if(!contains(accessibleModulesInfo, moduleName)) return [];
-				
-				return map(function(field){					
-					return ['('+name+' : '+'('+moduleName+') '+field['name']+')',label+' : '+'('+moduleName+') '+field['label']];
-					},
-					filteredFields(modules[moduleName]['fields']));
-			}
-			return reduceR(concat,map(forModule,referenceField['type']['refersTo']),[]);
-		}
-
-		var referenceFields = reduceR(concat,map(fieldReferenceNames,referenceFieldTypes), []);
-		var fieldLabels = dict(parentFields.concat(referenceFields));
-		var select = $('#'+id);
-		var optionClass = id+'_option';
-		$.each(fieldLabels, function(k, v){
-			select.append('<option class="'+optionClass+'" '+ 'value="'+k+'">' + v + '</option>');
-		});
-
-	}
-
-	$(document).ready(function(){
-		vtinst.extendSession(handleError(function(result){			
-			vtinst.listTypes(handleError(function(accessibleModules) {
-				accessibleModulesInfo = accessibleModules;
-				
-				getDescribeObjects(accessibleModules, moduleName, handleError(function(modules){
-					fillSelectBox('task-fieldnames', modules, moduleName);
-					$('#task-fieldnames-busyicon').hide();
-					$('#task-fieldnames').show();
-					$('#task-fieldnames').change(function(){
-					var textarea = CKEDITOR.instances.save_content;
-					var value = '$'+jQuery(this).attr('value');
-					textarea.insertHtml(value);
-					});
-
-					fillSelectBox('task-emailfields', modules, moduleName,
-										 function(e){return e['type']['name']=='email';});
-					$('#task-emailfields-busyicon').hide();
-					$('#task-emailfields').show();
-					$('#task-emailfields').change(function(){
-						var input = $($('#save_recepient').get());
-						var value = '$'+$(this).attr('value');
-						input.attr("value", input.attr("value")+','+value);
-					});
-					var selptype = document.getElementById('task-emailfields');
-			        var selecc = document.getElementById('task-emailfieldscc');
-			        for (ops=0;ops<selptype.length;ops++) {
-			          selecc.options[ops] = new Option(selptype.options[ops].text, selptype.options[ops].value);
-			        }
-			        $('#task-emailfieldscc-busyicon').hide();
-					$('#task-emailfieldscc').show();
-					$('#task-emailfieldscc').change(function(){
-						var input = $($('#save_emailcc').get());
-						var value = '$'+$(this).attr('value');
-						input.attr("value", input.attr("value")+','+value);
-					});
-			        var selebcc = document.getElementById('task-emailfieldsbcc');
-			        for (ops=0;ops<selptype.length;ops++) {
-			          selebcc.options[ops] = new Option(selptype.options[ops].text, selptype.options[ops].value);
-			        }
-					$('#task-emailfieldsbcc-busyicon').hide();
-					$('#task-emailfieldsbcc').show();
-					$('#task-emailfieldsbcc').change(function(){
-						var input = $($('#save_emailbcc').get());
-						var value = '$'+$(this).attr('value');
-						input.attr("value", input.attr("value")+','+value);
-					});
-					
-					//time_changes
-					$('#task_timefields').change(function(){
-						var textarea = CKEDITOR.instances.save_content;
-						var value = '$'+$(this).attr('value');
-						textarea.insertHtml(value);
-					});
-				
-					//changes
-					fillSelectBox('task-group_usersnames', modules, moduleName);
-					$('#task-fieldnames-busyicon').hide();
-					$('#task-group_usersnames').show();
-					$('#task-group_usersnames').change(function(){
-						var textarea = $('#save_receipent').get(0);
-						var value = '$'+$(this).attr('value');
-						insertAtCursor(textarea, value);
-					});
-				}));
-				
-			}));
-
-		}));
-		//Setup the validator
-		validator.mandatoryFields.push('recepient');
-		validator.mandatoryFields.push('subject');
-	});
-}
-vtEmailTask = VTEmailTask(jQuery);
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/fieldvalidator.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/fieldvalidator.js
deleted file mode 100644
index 17768d10..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/fieldvalidator.js
+++ /dev/null
@@ -1,88 +0,0 @@
-function MessageBoxPopup(){
-	function center(el){
-		el.css({position: 'absolute'});
-		el.width("400px");
-		el.height("110px");
-		placeAtCenter(el.get(0));
-	}
-
-	function close(){
-		jQuery('#error_message_box').css('display', 'none');
-	}
-
-	function show(module){
-		if(typeof('VtigerJS_DialogBox') != 'undefined') VtigerJS_DialogBox.unblock();
-		jQuery('#error_message_box').css('display', 'block');
-		center(jQuery('#error_message_box'));
-	}
-
-	jQuery('#error_message_box_close').click(close);
-	jQuery('#error_message_box_cancel').click(close);
-	return {
-			close:close,show:show
-	};
-}
-
-
-var validateMandatoryFields = {
-	init: function(){
-		this.mandatoryFields = [];
-	},
-	validator: function (){
-		var emptyFields = [];
-		var result;
-		var mandatoryFields = this.mandatoryFields;
-		for(var i = 0; i < mandatoryFields.length; i++){
-			var fieldName = mandatoryFields[i];
-			if(this.fieldValue(fieldName)==""){
-				emptyFields.push(fieldName);
-			}
-		}
-		if(emptyFields.length!=0){
-			result =  [false, 'empty_fields_message', emptyFields];
-		}else{
-			result =  [true];
-		}
-		return result;
-	}
-};
-
-var VTFieldValidatorPrototype = {
-	validate: function(){
-		var isValid = true;
-		var validators = this.validators;
-		for(var i = 0; i < validators.length; i++){
-			var validator = validators[i];
-			var result = validator.call(this);
-			if(result[0]==false){
-				jQuery('#'+result[1]).css('display', 'block');
-				isValid = false;
-			}
-		}
-		if(!isValid){
-			this.messageBoxPopup.show();
-		}
-		return isValid;
-	},
-	addValidator: function(name, validator){
-		validator.init.call(this);
-		this.validators.push(validator.validator);
-	},
-	fieldValue: function(fieldName){
-		return this.form.find('[name='+fieldName+']').val();
-	}
-};
-
-function VTFieldValidator(form){
-	var _this = this;
-	_this.form = form;
-	_this.messageBoxPopup = MessageBoxPopup();
-	form.submit(function(){
-		return _this.validate();
-	});
-	_this.validators = [];
-	_this.addValidator('mandatoryFields', validateMandatoryFields);
-}
-
-VTFieldValidator.prototype = VTFieldValidatorPrototype;
-
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/functional.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/functional.js
deleted file mode 100644
index a5473a2b..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/functional.js
+++ /dev/null
@@ -1,162 +0,0 @@
-function functional($){
-	return {
-    
-	    /**
-	     * Test:
-	     * fn.format("Hello %s", "world") == "Hello world"
-	     */
-	    format: function(){
-	        var i=1;
-	        var fmtStr = arguments[0];
-	        var args = arguments;
-	        return fmtStr.replace(/%s/g,function(){return args[i++];})
-	    },
-
-		addStylesheet: function(url){
-			/*From: http://www.hunlock.com/blogs/Howto_Dynamically_Insert_Javascript_And_CSS*/
-			var headID = document.getElementsByTagName("head")[0];         
-			var cssNode = document.createElement('link');
-			cssNode.type = 'text/css';
-			cssNode.rel = 'stylesheet';
-			cssNode.href = url;
-			cssNode.media = 'screen';
-			headID.appendChild(cssNode);
-		},
-
-		id: function(v){
-			return v;
-		},
-	
-		map: function(fn, list){
-			var out = [];
-			$.each(list, function(i, v){
-				out[out.length]=fn(v);
-			});
-			return out;
-		},
-	
-		field: function(name){
-			return function(object){
-				return object[name];
-			}
-		},
-	
-		zip: function(){
-			var out = [];
-		
-			var lengths = map(field('length'), arguments);
-			var min = reduceR(function(a,b){return a<b?a:b},lengths,lengths[0]);
-			for(var i=0; i<min; i++){
-				out[i]=map(field(i), arguments);
-			}
-			return out;
-		},
-	
-		dict: function(list){
-			var out = {};
-			$.each(list, function(i, v){
-				out[v[0]] = v[1];
-			});
-			return out;
-		},
-	
-		filter: function(pred, list){
-			var out = [];
-			$.each(list, function(i, v){
-				if(pred(v)){
-					out[out.length]=v;
-				}
-			});
-			return out;
-		},
-
-		reduceR: function(fn, list, start){
-			var acc = start;
-			$.each(list, function(i, v){
-				acc = fn(acc, v);
-			});
-			return acc;
-		},
-	
-		contains: function(list, value){
-			var ans = false;
-			$.each(list, function(i, v){
-				if(v==value){
-					ans = true;
-					return false;
-				}
-			});
-			return ans;
-		},
-	
-		concat: function(lista,listb){
-			return lista.concat(listb);
-		},
-	
-	
-		mergeObjects: function(obj1, obj2){
-			var res = {};
-			for(var k in obj1){
-				res[k] = obj1[k];
-			}
-			for(var k in obj2){
-				res[k] = obj2[k];
-			}
-			return res;
-		},
-	
-		parallelExecuter: function(executer, operationCount){
-			var parameters = [];
-			var n = 0;
-			var ctr = 0;
-			function makeParallel(operation){
-				var id = n;
-				n++;
-				function cookie(){
-					parameters[id] = arguments;
-					ctr++;
-					if(ctr == operationCount){
-						executer(parameters);
-					}
-				}
-				operation(cookie);
-			}
-			return makeParallel;
-		},
-	    /*
-	     *Convert the last parameter into a list argument
-	     */
-	    larg: function (fn){
-	    	var arity = fn.arity;
-	    	var nparams = arity-1;
-	        return function(){
-	    		if(nparams>arguments.length){
-	    			nparams = arguments.length;
-	    		}
-
-	    		var args = [];	
-	    		for(var i=0;i<nparams;i++){
-	    			args[i] = arguments[i];
-	    		}
-
-	    		var largs = [];
-	    		alert(arguments.length-nparams);
-	    		for(var i=0, n=arguments.length-nparams;i<n;i++){
-	    			largs[i]=arguments[nparams+i];
-	    		}
-	    		args[args.length]=largs;
-	    		return fn.apply(this, args);
-	    	}
-	    },
-	
-		htmlentities: function(s){
-			var out = "";
-			for(var i = 0; i<s.length;i++){
-				out+="&#"+s.charCodeAt(i)+";"
-			}
-			return out;
-		}
-	}
-}
-
-fn = functional(jQuery);
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/ico-workflow.png b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/ico-workflow.png
deleted file mode 100644
index b989c554020663dfece89fa8a637eeb099b9d103..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1266
zcmV<O1P%L%P)<h;3K|Lk000e1NJLTq001ih001fo1^@s6DgmNp00004b3#c}2nYxW
zd<bNS00009a7bBm000L~000L~0o<GxRR9108FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11aC=1K~z|U?U+kX8&?>H-x-hZHrP1EhS<bl2!?S&q=+VD(X@;H
zf~MW}r!>mCzoNS;+b*K+x~N3bfYYX>!51#VH{$q$FZee0bdlPbVa_=-R6?N@uVl${
zzWL@n^XWa8Ib8SY(?e4%=ENme|Jk!|1yd~MG{xh-j}4<I>BS3~|JV@c(G~1P=?eCu
zWC(UJ9HP=_qt)qOG!LrH4o<t|egx&k=FSmP*)nR)4r;9~YRwK#nr$@OJ;(qaJrwcP
zLy_58tJA}i?|+6Y%c^#s=kWNO&tbC&l+5?~?uTEH&Xr-e2=Glh;G1~=Ym{wYs4@?a
zYxr?9Nqx|Mp~~zC0Dj%g<Df{s@Acj>)??SHxzb=b&TaQ3WJ`5qOLYLiw7|zyHV`8L
zCWsN(&7C7^Y&%t8<{lKQkOo6yEMgw+s9=}FKA25(8&?`_oV2>s_-VI~*L%m*cp_bZ
zOpOA`Y=s)T=aAH}X2FD|@HNKc*wuZxo2OO=0IH2P4k;D^fOM`*Z1+vrv2K?Nnli>C
z(=1l(Gdg2gV5F@i-3qBJ8Fnoi1VEU&L_JtaW!pUozh{cfT!8M|lU5gRYb|1o3cD1V
zg4Il)UTCme$vpZD3yhS>S5QCI`krP1p5t(9fdXsddBo=EzI|J3q1EYW+MgS+0079c
zj8|!Gb!iq@4Ef-+naQvK5T8Gv6*@f$iL|~2M%pI$HbtrI$N~TbR?oM4g_^qaQ~`Zy
zplX|NSmCr;i21)|iWm$(Ok%PuBa<UfTX*ze=V!cdSj|+}vz2}Rm(~LJRzkRYbB36I
z+U;Za=-v1_TdJeolQj3a?G{95y=+*X<FFd>(_t0USGPYvf-u4#h+(Y9Leyt$C-dX~
zGz;8X2!i7{HY~ulLb2Q!S0a%rpxaklz~i!E<%S<?(I6~>i43cF!4zfXT3ZaNuBouB
z#X$zfD-p>8_g6yTI1W~`3Adv`O&kDn@9N`u)yUvt!iEDLxE)q1@Lr*Yo-`n?NE>2!
z{GYYU+D;Y5yQ{OB3wYpl*^I$*07RB=3st;I7t!sj2ga1!j^()zd3SHlf>-!XsYEJ|
zOs=BY`vU4&Ko=HZZyEQCRpLT$e>DUpn%izc><0Oz|2!z+kA3nk?atykVOfhqu2jdC
zVnmO$A<k*qKA~8lFAeb1%e1E5W)ZMV*!?kKXMJvX-F9MZD9f6;(Kq41Qb>Eav%XCC
zE$O>Xj7&oy?5lM@81+^&r8dMcNbbBg>A?Jqmk=TA>?|;nF09@@L8*<^Ff~TA0!bvl
z0!CmBR@U!vV)6PEHO{hvQUR|E0k4Y~(}neWobY?}PefT&1%UAMB!W|92&HIM1q>c?
z7^&_9kqrwNt1fAN9myE1j&B2Am!Scq=Uc(VLuB;DJ|6i;x1&KkVw}V*7#!(KAs@c}
zERG>z#R34Y%f|eqG6Xx}u<9Ng84<^E`0~@$f1UsTJ4L)Kx`MqZ{ik4s!J9YaGn-2$
cxl-Z&2F>rAKNwAn{{R3007*qoM6N<$f^BYEG5`Po

diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/jquery-1.2.6.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/jquery-1.2.6.js
deleted file mode 100644
index 88e661ee..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/jquery-1.2.6.js
+++ /dev/null
@@ -1,3549 +0,0 @@
-(function(){
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
- */
-
-// Map over jQuery in case of overwrite
-var _jQuery = window.jQuery,
-// Map over the $ in case of overwrite
-	_$ = window.$;
-
-var jQuery = window.jQuery = window.$ = function( selector, context ) {
-	// The jQuery object is actually just the init constructor 'enhanced'
-	return new jQuery.fn.init( selector, context );
-};
-
-// A simple way to check for HTML strings or ID strings
-// (both of which we optimize for)
-var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,
-
-// Is it a simple selector
-	isSimple = /^.[^:#\[\.]*$/,
-
-// Will speed up references to undefined, and allows munging its name.
-	undefined;
-
-jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
-		// Make sure that a selection was provided
-		selector = selector || document;
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-		// Handle HTML strings
-		if ( typeof selector == "string" ) {
-			// Are we dealing with HTML string or an ID?
-			var match = quickExpr.exec( selector );
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] )
-					selector = jQuery.clean( [ match[1] ], context );
-
-				// HANDLE: $("#id")
-				else {
-					var elem = document.getElementById( match[3] );
-
-					// Make sure an element was located
-					if ( elem ){
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id != match[3] )
-							return jQuery().find( selector );
-
-						// Otherwise, we inject the element directly into the jQuery object
-						return jQuery( elem );
-					}
-					selector = [];
-				}
-
-			// HANDLE: $(expr, [context])
-			// (which is just equivalent to: $(content).find(expr)
-			} else
-				return jQuery( context ).find( selector );
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) )
-			return jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
-
-		return this.setArray(jQuery.makeArray(selector));
-	},
-
-	// The current version of jQuery being used
-	jquery: "1.2.6",
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	// The number of elements contained in the matched element set
-	length: 0,
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == undefined ?
-
-			// Return a 'clean' array
-			jQuery.makeArray( this ) :
-
-			// Return just the object
-			this[ num ];
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-		// Build a new jQuery matched element set
-		var ret = jQuery( elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Force the current matched set of elements to become
-	// the specified array of elements (destroying the stack in the process)
-	// You should use pushStack() in order to do this, but maintain the stack
-	setArray: function( elems ) {
-		// Resetting the length to 0, then using the native Array push
-		// is a super-fast way to populate an object with array-like properties
-		this.length = 0;
-		Array.prototype.push.apply( this, elems );
-
-		return this;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		var ret = -1;
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem && elem.jquery ? elem[0] : elem
-		, this );
-	},
-
-	attr: function( name, value, type ) {
-		var options = name;
-
-		// Look for the case where we're accessing a style value
-		if ( name.constructor == String )
-			if ( value === undefined )
-				return this[0] && jQuery[ type || "attr" ]( this[0], name );
-
-			else {
-				options = {};
-				options[ name ] = value;
-			}
-
-		// Check to see if we're setting style values
-		return this.each(function(i){
-			// Set all the styles
-			for ( name in options )
-				jQuery.attr(
-					type ?
-						this.style :
-						this,
-					name, jQuery.prop( this, options[ name ], type, i, name )
-				);
-		});
-	},
-
-	css: function( key, value ) {
-		// ignore negative width and height values
-		if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
-			value = undefined;
-		return this.attr( key, value, "curCSS" );
-	},
-
-	text: function( text ) {
-		if ( typeof text != "object" && text != null )
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-
-		var ret = "";
-
-		jQuery.each( text || this, function(){
-			jQuery.each( this.childNodes, function(){
-				if ( this.nodeType != 8 )
-					ret += this.nodeType != 1 ?
-						this.nodeValue :
-						jQuery.fn.text( [ this ] );
-			});
-		});
-
-		return ret;
-	},
-
-	wrapAll: function( html ) {
-		if ( this[0] )
-			// The elements to wrap the target around
-			jQuery( html, this[0].ownerDocument )
-				.clone()
-				.insertBefore( this[0] )
-				.map(function(){
-					var elem = this;
-
-					while ( elem.firstChild )
-						elem = elem.firstChild;
-
-					return elem;
-				})
-				.append(this);
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		return this.each(function(){
-			jQuery( this ).contents().wrapAll( html );
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function(){
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, false, function(elem){
-			if (this.nodeType == 1)
-				this.appendChild( elem );
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, true, function(elem){
-			if (this.nodeType == 1)
-				this.insertBefore( elem, this.firstChild );
-		});
-	},
-
-	before: function() {
-		return this.domManip(arguments, false, false, function(elem){
-			this.parentNode.insertBefore( elem, this );
-		});
-	},
-
-	after: function() {
-		return this.domManip(arguments, false, true, function(elem){
-			this.parentNode.insertBefore( elem, this.nextSibling );
-		});
-	},
-
-	end: function() {
-		return this.prevObject || jQuery( [] );
-	},
-
-	find: function( selector ) {
-		var elems = jQuery.map(this, function(elem){
-			return jQuery.find( selector, elem );
-		});
-
-		return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ?
-			jQuery.unique( elems ) :
-			elems );
-	},
-
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function(){
-			if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var clone = this.cloneNode(true),
-					container = document.createElement("div");
-				container.appendChild(clone);
-				return jQuery.clean([container.innerHTML])[0];
-			} else
-				return this.cloneNode(true);
-		});
-
-		// Need to set the expando to null on the cloned set if it exists
-		// removeData doesn't work here, IE removes it from the original as well
-		// this is primarily for IE but the data expando shouldn't be copied over in any browser
-		var clone = ret.find("*").andSelf().each(function(){
-			if ( this[ expando ] != undefined )
-				this[ expando ] = null;
-		});
-
-		// Copy the events from the original to the clone
-		if ( events === true )
-			this.find("*").andSelf().each(function(i){
-				if (this.nodeType == 3)
-					return;
-				var events = jQuery.data( this, "events" );
-
-				for ( var type in events )
-					for ( var handler in events[ type ] )
-						jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data );
-			});
-
-		// Return the cloned set
-		return ret;
-	},
-
-	filter: function( selector ) {
-		return this.pushStack(
-			jQuery.isFunction( selector ) &&
-			jQuery.grep(this, function(elem, i){
-				return selector.call( elem, i );
-			}) ||
-
-			jQuery.multiFilter( selector, this ) );
-	},
-
-	not: function( selector ) {
-		if ( selector.constructor == String )
-			// test special case where just one selector is passed in
-			if ( isSimple.test( selector ) )
-				return this.pushStack( jQuery.multiFilter( selector, this, true ) );
-			else
-				selector = jQuery.multiFilter( selector, this );
-
-		var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
-		return this.filter(function() {
-			return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector;
-		});
-	},
-
-	add: function( selector ) {
-		return this.pushStack( jQuery.unique( jQuery.merge(
-			this.get(),
-			typeof selector == 'string' ?
-				jQuery( selector ) :
-				jQuery.makeArray( selector )
-		)));
-	},
-
-	is: function( selector ) {
-		return !!selector && jQuery.multiFilter( selector, this ).length > 0;
-	},
-
-	hasClass: function( selector ) {
-		return this.is( "." + selector );
-	},
-
-	val: function( value ) {
-		if ( value == undefined ) {
-
-			if ( this.length ) {
-				var elem = this[0];
-
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type == "select-one";
-
-					// Nothing was selected
-					if ( index < 0 )
-						return null;
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
-
-						if ( option.selected ) {
-							// Get the specifc value for the option
-							value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
-
-							// We don't need an array for one selects
-							if ( one )
-								return value;
-
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-
-					return values;
-
-				// Everything else, we just grab the value
-				} else
-					return (this[0].value || "").replace(/\r/g, "");
-
-			}
-
-			return undefined;
-		}
-
-		if( value.constructor == Number )
-			value += '';
-
-		return this.each(function(){
-			if ( this.nodeType != 1 )
-				return;
-
-			if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
-				this.checked = (jQuery.inArray(this.value, value) >= 0 ||
-					jQuery.inArray(this.name, value) >= 0);
-
-			else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(value);
-
-				jQuery( "option", this ).each(function(){
-					this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
-						jQuery.inArray( this.text, values ) >= 0);
-				});
-
-				if ( !values.length )
-					this.selectedIndex = -1;
-
-			} else
-				this.value = value;
-		});
-	},
-
-	html: function( value ) {
-		return value == undefined ?
-			(this[0] ?
-				this[0].innerHTML :
-				null) :
-			this.empty().append( value );
-	},
-
-	replaceWith: function( value ) {
-		return this.after( value ).remove();
-	},
-
-	eq: function( i ) {
-		return this.slice( i, i + 1 );
-	},
-
-	slice: function() {
-		return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function(elem, i){
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	},
-
-	data: function( key, value ){
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
-
-		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
-			if ( data === undefined && this.length )
-				data = jQuery.data( this[0], key );
-
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-		} else
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
-				jQuery.data( this, key, value );
-			});
-	},
-
-	removeData: function( key ){
-		return this.each(function(){
-			jQuery.removeData( this, key );
-		});
-	},
-
-	domManip: function( args, table, reverse, callback ) {
-		var clone = this.length > 1, elems;
-
-		return this.each(function(){
-			if ( !elems ) {
-				elems = jQuery.clean( args, this.ownerDocument );
-
-				if ( reverse )
-					elems.reverse();
-			}
-
-			var obj = this;
-
-			if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) )
-				obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") );
-
-			var scripts = jQuery( [] );
-
-			jQuery.each(elems, function(){
-				var elem = clone ?
-					jQuery( this ).clone( true )[0] :
-					this;
-
-				// execute all scripts after the elements have been injected
-				if ( jQuery.nodeName( elem, "script" ) )
-					scripts = scripts.add( elem );
-				else {
-					// Remove any inner scripts for later evaluation
-					if ( elem.nodeType == 1 )
-						scripts = scripts.add( jQuery( "script", elem ).remove() );
-
-					// Inject the elements into the document
-					callback.call( obj, elem );
-				}
-			});
-
-			scripts.each( evalScript );
-		});
-	}
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-function evalScript( i, elem ) {
-	if ( elem.src )
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-
-	else
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-
-	if ( elem.parentNode )
-		elem.parentNode.removeChild( elem );
-}
-
-function now(){
-	return +new Date;
-}
-
-jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
-
-	// Handle a deep copy situation
-	if ( target.constructor == Boolean ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target != "object" && typeof target != "function" )
-		target = {};
-
-	// extend jQuery itself if only one argument is passed
-	if ( length == i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ )
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null )
-			// Extend the base object
-			for ( var name in options ) {
-				var src = target[ name ], copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy )
-					continue;
-
-				// Recurse if we're merging object values
-				if ( deep && copy && typeof copy == "object" && !copy.nodeType )
-					target[ name ] = jQuery.extend( deep, 
-						// Never move original objects, clone them
-						src || ( copy.length != null ? [ ] : { } )
-					, copy );
-
-				// Don't bring in undefined values
-				else if ( copy !== undefined )
-					target[ name ] = copy;
-
-			}
-
-	// Return the modified object
-	return target;
-};
-
-var expando = "jQuery" + now(), uuid = 0, windowData = {},
-	// exclude the following css properties to add px
-	exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-	// cache defaultView
-	defaultView = document.defaultView || {};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		window.$ = _$;
-
-		if ( deep )
-			window.jQuery = _jQuery;
-
-		return jQuery;
-	},
-
-	// See test/unit/core.js for details concerning this function.
-	isFunction: function( fn ) {
-		return !!fn && typeof fn != "string" && !fn.nodeName &&
-			fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
-	},
-
-	// check if an element is in a (or is an) XML document
-	isXMLDoc: function( elem ) {
-		return elem.documentElement && !elem.body ||
-			elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
-	},
-
-	// Evalulates a script in a global context
-	globalEval: function( data ) {
-		data = jQuery.trim( data );
-
-		if ( data ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-			if ( jQuery.browser.msie )
-				script.text = data;
-			else
-				script.appendChild( document.createTextNode( data ) );
-
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
-	},
-
-	cache: {},
-
-	data: function( elem, name, data ) {
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ];
-
-		// Compute a unique ID for the element
-		if ( !id )
-			id = elem[ expando ] = ++uuid;
-
-		// Only generate the data cache if we're
-		// trying to access or manipulate it
-		if ( name && !jQuery.cache[ id ] )
-			jQuery.cache[ id ] = {};
-
-		// Prevent overriding the named cache with undefined values
-		if ( data !== undefined )
-			jQuery.cache[ id ][ name ] = data;
-
-		// Return the named cache data, or the ID for the element
-		return name ?
-			jQuery.cache[ id ][ name ] :
-			id;
-	},
-
-	removeData: function( elem, name ) {
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ];
-
-		// If we want to remove a specific section of the element's data
-		if ( name ) {
-			if ( jQuery.cache[ id ] ) {
-				// Remove the section of cache data
-				delete jQuery.cache[ id ][ name ];
-
-				// If we've removed all the data, remove the element's cache
-				name = "";
-
-				for ( name in jQuery.cache[ id ] )
-					break;
-
-				if ( !name )
-					jQuery.removeData( elem );
-			}
-
-		// Otherwise, we want to remove all of the element's data
-		} else {
-			// Clean up the element expando
-			try {
-				delete elem[ expando ];
-			} catch(e){
-				// IE has trouble directly removing the expando
-				// but it's ok with using removeAttribute
-				if ( elem.removeAttribute )
-					elem.removeAttribute( expando );
-			}
-
-			// Completely remove the data cache
-			delete jQuery.cache[ id ];
-		}
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0, length = object.length;
-
-		if ( args ) {
-			if ( length == undefined ) {
-				for ( name in object )
-					if ( callback.apply( object[ name ], args ) === false )
-						break;
-			} else
-				for ( ; i < length; )
-					if ( callback.apply( object[ i++ ], args ) === false )
-						break;
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( length == undefined ) {
-				for ( name in object )
-					if ( callback.call( object[ name ], name, object[ name ] ) === false )
-						break;
-			} else
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
-		}
-
-		return object;
-	},
-
-	prop: function( elem, value, type, i, name ) {
-		// Handle executable functions
-		if ( jQuery.isFunction( value ) )
-			value = value.call( elem, i );
-
-		// Handle passing in a number to a CSS property
-		return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
-			value + "px" :
-			value;
-	},
-
-	className: {
-		// internal only, use addClass("class")
-		add: function( elem, classNames ) {
-			jQuery.each((classNames || "").split(/\s+/), function(i, className){
-				if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
-					elem.className += (elem.className ? " " : "") + className;
-			});
-		},
-
-		// internal only, use removeClass("class")
-		remove: function( elem, classNames ) {
-			if (elem.nodeType == 1)
-				elem.className = classNames != undefined ?
-					jQuery.grep(elem.className.split(/\s+/), function(className){
-						return !jQuery.className.has( classNames, className );
-					}).join(" ") :
-					"";
-		},
-
-		// internal only, use hasClass("class")
-		has: function( elem, className ) {
-			return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
-		}
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( var name in options )
-			elem.style[ name ] = old[ name ];
-	},
-
-	css: function( elem, name, force ) {
-		if ( name == "width" || name == "height" ) {
-			var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
-
-			function getWH() {
-				val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
-				var padding = 0, border = 0;
-				jQuery.each( which, function() {
-					padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-				});
-				val -= Math.round(padding + border);
-			}
-
-			if ( jQuery(elem).is(":visible") )
-				getWH();
-			else
-				jQuery.swap( elem, props, getWH );
-
-			return Math.max(0, val);
-		}
-
-		return jQuery.curCSS( elem, name, force );
-	},
-
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style;
-
-		// A helper method for determining if an element's values are broken
-		function color( elem ) {
-			if ( !jQuery.browser.safari )
-				return false;
-
-			// defaultView is cached
-			var ret = defaultView.getComputedStyle( elem, null );
-			return !ret || ret.getPropertyValue("color") == "";
-		}
-
-		// We need to handle opacity special in IE
-		if ( name == "opacity" && jQuery.browser.msie ) {
-			ret = jQuery.attr( style, "opacity" );
-
-			return ret == "" ?
-				"1" :
-				ret;
-		}
-		// Opera sometimes will give the wrong display answer, this fixes it, see #2037
-		if ( jQuery.browser.opera && name == "display" ) {
-			var save = style.outline;
-			style.outline = "0 solid black";
-			style.outline = save;
-		}
-
-		// Make sure we're using the right name for getting the float value
-		if ( name.match( /float/i ) )
-			name = styleFloat;
-
-		if ( !force && style && style[ name ] )
-			ret = style[ name ];
-
-		else if ( defaultView.getComputedStyle ) {
-
-			// Only "float" is needed here
-			if ( name.match( /float/i ) )
-				name = "float";
-
-			name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
-
-			var computedStyle = defaultView.getComputedStyle( elem, null );
-
-			if ( computedStyle && !color( elem ) )
-				ret = computedStyle.getPropertyValue( name );
-
-			// If the element isn't reporting its values properly in Safari
-			// then some display: none elements are involved
-			else {
-				var swap = [], stack = [], a = elem, i = 0;
-
-				// Locate all of the parent display: none elements
-				for ( ; a && color(a); a = a.parentNode )
-					stack.unshift(a);
-
-				// Go through and make them visible, but in reverse
-				// (It would be better if we knew the exact display type that they had)
-				for ( ; i < stack.length; i++ )
-					if ( color( stack[ i ] ) ) {
-						swap[ i ] = stack[ i ].style.display;
-						stack[ i ].style.display = "block";
-					}
-
-				// Since we flip the display style, we have to handle that
-				// one special, otherwise get the value
-				ret = name == "display" && swap[ stack.length - 1 ] != null ?
-					"none" :
-					( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
-
-				// Finally, revert the display styles back
-				for ( i = 0; i < swap.length; i++ )
-					if ( swap[ i ] != null )
-						stack[ i ].style.display = swap[ i ];
-			}
-
-			// We should always get a number back from opacity
-			if ( name == "opacity" && ret == "" )
-				ret = "1";
-
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(/\-(\w)/g, function(all, letter){
-				return letter.toUpperCase();
-			});
-
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
-
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-			// If we're not dealing with a regular pixel number
-			// but a number that has a weird ending, we need to convert it to pixels
-			if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
-				// Remember the original values
-				var left = style.left, rsLeft = elem.runtimeStyle.left;
-
-				// Put in the new values to get a computed value out
-				elem.runtimeStyle.left = elem.currentStyle.left;
-				style.left = ret || 0;
-				ret = style.pixelLeft + "px";
-
-				// Revert the changed values
-				style.left = left;
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret;
-	},
-
-	clean: function( elems, context ) {
-		var ret = [];
-		context = context || document;
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if (typeof context.createElement == 'undefined')
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-
-		jQuery.each(elems, function(i, elem){
-			if ( !elem )
-				return;
-
-			if ( elem.constructor == Number )
-				elem += '';
-
-			// Convert html string into DOM nodes
-			if ( typeof elem == "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
-					return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
-						all :
-						front + "></" + tag + ">";
-				});
-
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div");
-
-				var wrap =
-					// option or optgroup
-					!tags.indexOf("<opt") &&
-					[ 1, "<select multiple='multiple'>", "</select>" ] ||
-
-					!tags.indexOf("<leg") &&
-					[ 1, "<fieldset>", "</fieldset>" ] ||
-
-					tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
-					[ 1, "<table>", "</table>" ] ||
-
-					!tags.indexOf("<tr") &&
-					[ 2, "<table><tbody>", "</tbody></table>" ] ||
-
-				 	// <thead> matched above
-					(!tags.indexOf("<td") || !tags.indexOf("<th")) &&
-					[ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] ||
-
-					!tags.indexOf("<col") &&
-					[ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] ||
-
-					// IE can't serialize <link> and <script> tags normally
-					jQuery.browser.msie &&
-					[ 1, "div<div>", "</div>" ] ||
-
-					[ 0, "", "" ];
-
-				// Go to html and back, then peel off extra wrappers
-				div.innerHTML = wrap[1] + elem + wrap[2];
-
-				// Move to the right depth
-				while ( wrap[0]-- )
-					div = div.lastChild;
-
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( jQuery.browser.msie ) {
-
-					// String was a <table>, *may* have spurious <tbody>
-					var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ?
-						div.firstChild && div.firstChild.childNodes :
-
-						// String was a bare <thead> or <tfoot>
-						wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ?
-							div.childNodes :
-							[];
-
-					for ( var j = tbody.length - 1; j >= 0 ; --j )
-						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
-							tbody[ j ].parentNode.removeChild( tbody[ j ] );
-
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( /^\s/.test( elem ) )
-						div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
-
-				}
-
-				elem = jQuery.makeArray( div.childNodes );
-			}
-
-			if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) )
-				return;
-
-			if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options )
-				ret.push( elem );
-
-			else
-				ret = jQuery.merge( ret, elem );
-
-		});
-
-		return ret;
-	},
-
-	attr: function( elem, name, value ) {
-		// don't set attributes on text and comment nodes
-		if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
-			return undefined;
-
-		var notxml = !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined,
-			msie = jQuery.browser.msie;
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
-
-		// Only do all the following if this is a node (faster for style)
-		// IE elem.getAttribute passes even for style
-		if ( elem.tagName ) {
-
-			// These attributes require special treatment
-			var special = /href|src|style/.test( name );
-
-			// Safari mis-reports the default selected property of a hidden option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name == "selected" && jQuery.browser.safari )
-				elem.parentNode.selectedIndex;
-
-			// If applicable, access the attribute via the DOM 0 way
-			if ( name in elem && notxml && !special ) {
-				if ( set ){
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
-						throw "type property can't be changed";
-
-					elem[ name ] = value;
-				}
-
-				// browsers index elements by id/name on forms, give priority to attributes.
-				if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
-					return elem.getAttributeNode( name ).nodeValue;
-
-				return elem[ name ];
-			}
-
-			if ( msie && notxml &&  name == "style" )
-				return jQuery.attr( elem.style, "cssText", value );
-
-			if ( set )
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
-
-			var attr = msie && notxml && special
-					// Some attributes require a special call on IE
-					? elem.getAttribute( name, 2 )
-					: elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
-		}
-
-		// elem is actually elem.style ... set the style
-
-		// IE uses filters for opacity
-		if ( msie && name == "opacity" ) {
-			if ( set ) {
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				elem.zoom = 1;
-
-				// Set the alpha filter to set the opacity
-				elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) +
-					(parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
-			}
-
-			return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
-				(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
-				"";
-		}
-
-		name = name.replace(/-([a-z])/ig, function(all, letter){
-			return letter.toUpperCase();
-		});
-
-		if ( set )
-			elem[ name ] = value;
-
-		return elem[ name ];
-	},
-
-	trim: function( text ) {
-		return (text || "").replace( /^\s+|\s+$/g, "" );
-	},
-
-	makeArray: function( array ) {
-		var ret = [];
-
-		if( array != null ){
-			var i = array.length;
-			//the window, strings and functions also have 'length'
-			if( i == null || array.split || array.setInterval || array.call )
-				ret[0] = array;
-			else
-				while( i )
-					ret[--i] = array[i];
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array ) {
-		for ( var i = 0, length = array.length; i < length; i++ )
-		// Use === because on IE, window == document
-			if ( array[ i ] === elem )
-				return i;
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		// We have to loop this way because IE & Opera overwrite the length
-		// expando of getElementsByTagName
-		var i = 0, elem, pos = first.length;
-		// Also, we need to make sure that the correct elements are being returned
-		// (IE returns comment nodes in a '*' query)
-		if ( jQuery.browser.msie ) {
-			while ( elem = second[ i++ ] )
-				if ( elem.nodeType != 8 )
-					first[ pos++ ] = elem;
-
-		} else
-			while ( elem = second[ i++ ] )
-				first[ pos++ ] = elem;
-
-		return first;
-	},
-
-	unique: function( array ) {
-		var ret = [], done = {};
-
-		try {
-
-			for ( var i = 0, length = array.length; i < length; i++ ) {
-				var id = jQuery.data( array[ i ] );
-
-				if ( !done[ id ] ) {
-					done[ id ] = true;
-					ret.push( array[ i ] );
-				}
-			}
-
-		} catch( e ) {
-			ret = array;
-		}
-
-		return ret;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [];
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ )
-			if ( !inv != !callback( elems[ i ], i ) )
-				ret.push( elems[ i ] );
-
-		return ret;
-	},
-
-	map: function( elems, callback ) {
-		var ret = [];
-
-		// Go through the array, translating each of the items to their
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			var value = callback( elems[ i ], i );
-
-			if ( value != null )
-				ret[ ret.length ] = value;
-		}
-
-		return ret.concat.apply( [], ret );
-	}
-});
-
-var userAgent = navigator.userAgent.toLowerCase();
-
-// Figure out what browser is being used
-jQuery.browser = {
-	version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1],
-	safari: /webkit/.test( userAgent ),
-	opera: /opera/.test( userAgent ),
-	msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
-	mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
-};
-
-var styleFloat = jQuery.browser.msie ?
-	"styleFloat" :
-	"cssFloat";
-
-jQuery.extend({
-	// Check to see if the W3C box model is being used
-	boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
-
-	props: {
-		"for": "htmlFor",
-		"class": "className",
-		"float": styleFloat,
-		cssFloat: styleFloat,
-		styleFloat: styleFloat,
-		readonly: "readOnly",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing"
-	}
-});
-
-jQuery.each({
-	parent: function(elem){return elem.parentNode;},
-	parents: function(elem){return jQuery.dir(elem,"parentNode");},
-	next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
-	prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
-	nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
-	prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
-	siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
-	children: function(elem){return jQuery.sibling(elem.firstChild);},
-	contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
-}, function(name, fn){
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = jQuery.map( this, fn );
-
-		if ( selector && typeof selector == "string" )
-			ret = jQuery.multiFilter( selector, ret );
-
-		return this.pushStack( jQuery.unique( ret ) );
-	};
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function(name, original){
-	jQuery.fn[ name ] = function() {
-		var args = arguments;
-
-		return this.each(function(){
-			for ( var i = 0, length = args.length; i < length; i++ )
-				jQuery( args[ i ] )[ original ]( this );
-		});
-	};
-});
-
-jQuery.each({
-	removeAttr: function( name ) {
-		jQuery.attr( this, name, "" );
-		if (this.nodeType == 1)
-			this.removeAttribute( name );
-	},
-
-	addClass: function( classNames ) {
-		jQuery.className.add( this, classNames );
-	},
-
-	removeClass: function( classNames ) {
-		jQuery.className.remove( this, classNames );
-	},
-
-	toggleClass: function( classNames ) {
-		jQuery.className[ jQuery.className.has( this, classNames ) ? "remove" : "add" ]( this, classNames );
-	},
-
-	remove: function( selector ) {
-		if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) {
-			// Prevent memory leaks
-			jQuery( "*", this ).add(this).each(function(){
-				jQuery.event.remove(this);
-				jQuery.removeData(this);
-			});
-			if (this.parentNode)
-				this.parentNode.removeChild( this );
-		}
-	},
-
-	empty: function() {
-		// Remove element nodes and prevent memory leaks
-		jQuery( ">*", this ).remove();
-
-		// Remove any remaining nodes
-		while ( this.firstChild )
-			this.removeChild( this.firstChild );
-	}
-}, function(name, fn){
-	jQuery.fn[ name ] = function(){
-		return this.each( fn, arguments );
-	};
-});
-
-jQuery.each([ "Height", "Width" ], function(i, name){
-	var type = name.toLowerCase();
-
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		return this[0] == window ?
-			// Opera reports document.body.client[Width/Height] properly in both quirks and standards
-			jQuery.browser.opera && document.body[ "client" + name ] ||
-
-			// Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
-			jQuery.browser.safari && window[ "inner" + name ] ||
-
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :
-
-			// Get document width or height
-			this[0] == document ?
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]),
-					Math.max(document.body["offset" + name], document.documentElement["offset" + name])
-				) :
-
-				// Get or set width or height on the element
-				size == undefined ?
-					// Get width or height on the element
-					(this.length ? jQuery.css( this[0], type ) : null) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, size.constructor == String ? size : size + "px" );
-	};
-});
-
-// Helper function used by the dimensions and offset modules
-function num(elem, prop) {
-	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
-}var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
-		"(?:[\\w*_-]|\\\\.)" :
-		"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
-	quickChild = new RegExp("^>\\s*(" + chars + "+)"),
-	quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
-	quickClass = new RegExp("^([#.]?)(" + chars + "*)");
-
-jQuery.extend({
-	expr: {
-		"": function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},
-		"#": function(a,i,m){return a.getAttribute("id")==m[2];},
-		":": {
-			// Position Checks
-			lt: function(a,i,m){return i<m[3]-0;},
-			gt: function(a,i,m){return i>m[3]-0;},
-			nth: function(a,i,m){return m[3]-0==i;},
-			eq: function(a,i,m){return m[3]-0==i;},
-			first: function(a,i){return i==0;},
-			last: function(a,i,m,r){return i==r.length-1;},
-			even: function(a,i){return i%2==0;},
-			odd: function(a,i){return i%2;},
-
-			// Child Checks
-			"first-child": function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},
-			"last-child": function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},
-			"only-child": function(a){return !jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},
-
-			// Parent Checks
-			parent: function(a){return a.firstChild;},
-			empty: function(a){return !a.firstChild;},
-
-			// Text Check
-			contains: function(a,i,m){return (a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},
-
-			// Visibility
-			visible: function(a){return "hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},
-			hidden: function(a){return "hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},
-
-			// Form attributes
-			enabled: function(a){return !a.disabled;},
-			disabled: function(a){return a.disabled;},
-			checked: function(a){return a.checked;},
-			selected: function(a){return a.selected||jQuery.attr(a,"selected");},
-
-			// Form elements
-			text: function(a){return "text"==a.type;},
-			radio: function(a){return "radio"==a.type;},
-			checkbox: function(a){return "checkbox"==a.type;},
-			file: function(a){return "file"==a.type;},
-			password: function(a){return "password"==a.type;},
-			submit: function(a){return "submit"==a.type;},
-			image: function(a){return "image"==a.type;},
-			reset: function(a){return "reset"==a.type;},
-			button: function(a){return "button"==a.type||jQuery.nodeName(a,"button");},
-			input: function(a){return /input|select|textarea|button/i.test(a.nodeName);},
-
-			// :has()
-			has: function(a,i,m){return jQuery.find(m[3],a).length;},
-
-			// :header
-			header: function(a){return /h\d/i.test(a.nodeName);},
-
-			// :animated
-			animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}
-		}
-	},
-
-	// The regular expressions that power the parsing engine
-	parse: [
-		// Match: [@value='test'], [@foo]
-		/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
-
-		// Match: :contains('foo')
-		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
-
-		// Match: :even, :last-child, #id, .class
-		new RegExp("^([:.#]*)(" + chars + "+)")
-	],
-
-	multiFilter: function( expr, elems, not ) {
-		var old, cur = [];
-
-		while ( expr && expr != old ) {
-			old = expr;
-			var f = jQuery.filter( expr, elems, not );
-			expr = f.t.replace(/^\s*,\s*/, "" );
-			cur = not ? elems = f.r : jQuery.merge( cur, f.r );
-		}
-
-		return cur;
-	},
-
-	find: function( t, context ) {
-		// Quickly handle non-string expressions
-		if ( typeof t != "string" )
-			return [ t ];
-
-		// check to make sure context is a DOM element or a document
-		if ( context && context.nodeType != 1 && context.nodeType != 9)
-			return [ ];
-
-		// Set the correct context (if none is provided)
-		context = context || document;
-
-		// Initialize the search
-		var ret = [context], done = [], last, nodeName;
-
-		// Continue while a selector expression exists, and while
-		// we're no longer looping upon ourselves
-		while ( t && last != t ) {
-			var r = [];
-			last = t;
-
-			t = jQuery.trim(t);
-
-			var foundToken = false,
-
-			// An attempt at speeding up child selectors that
-			// point to a specific element tag
-				re = quickChild,
-
-				m = re.exec(t);
-
-			if ( m ) {
-				nodeName = m[1].toUpperCase();
-
-				// Perform our own iteration and filter
-				for ( var i = 0; ret[i]; i++ )
-					for ( var c = ret[i].firstChild; c; c = c.nextSibling )
-						if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName) )
-							r.push( c );
-
-				ret = r;
-				t = t.replace( re, "" );
-				if ( t.indexOf(" ") == 0 ) continue;
-				foundToken = true;
-			} else {
-				re = /^([>+~])\s*(\w*)/i;
-
-				if ( (m = re.exec(t)) != null ) {
-					r = [];
-
-					var merge = {};
-					nodeName = m[2].toUpperCase();
-					m = m[1];
-
-					for ( var j = 0, rl = ret.length; j < rl; j++ ) {
-						var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
-						for ( ; n; n = n.nextSibling )
-							if ( n.nodeType == 1 ) {
-								var id = jQuery.data(n);
-
-								if ( m == "~" && merge[id] ) break;
-
-								if (!nodeName || n.nodeName.toUpperCase() == nodeName ) {
-									if ( m == "~" ) merge[id] = true;
-									r.push( n );
-								}
-
-								if ( m == "+" ) break;
-							}
-					}
-
-					ret = r;
-
-					// And remove the token
-					t = jQuery.trim( t.replace( re, "" ) );
-					foundToken = true;
-				}
-			}
-
-			// See if there's still an expression, and that we haven't already
-			// matched a token
-			if ( t && !foundToken ) {
-				// Handle multiple expressions
-				if ( !t.indexOf(",") ) {
-					// Clean the result set
-					if ( context == ret[0] ) ret.shift();
-
-					// Merge the result sets
-					done = jQuery.merge( done, ret );
-
-					// Reset the context
-					r = ret = [context];
-
-					// Touch up the selector string
-					t = " " + t.substr(1,t.length);
-
-				} else {
-					// Optimize for the case nodeName#idName
-					var re2 = quickID;
-					var m = re2.exec(t);
-
-					// Re-organize the results, so that they're consistent
-					if ( m ) {
-						m = [ 0, m[2], m[3], m[1] ];
-
-					} else {
-						// Otherwise, do a traditional filter check for
-						// ID, class, and element selectors
-						re2 = quickClass;
-						m = re2.exec(t);
-					}
-
-					m[2] = m[2].replace(/\\/g, "");
-
-					var elem = ret[ret.length-1];
-
-					// Try to do a global search by ID, where we can
-					if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) {
-						// Optimization for HTML document case
-						var oid = elem.getElementById(m[2]);
-
-						// Do a quick check for the existence of the actual ID attribute
-						// to avoid selecting by the name attribute in IE
-						// also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
-						if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] )
-							oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
-
-						// Do a quick check for node name (where applicable) so
-						// that div#foo searches will be really fast
-						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-					} else {
-						// We need to find all descendant elements
-						for ( var i = 0; ret[i]; i++ ) {
-							// Grab the tag name being searched for
-							var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2];
-
-							// Handle IE7 being really dumb about <object>s
-							if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
-								tag = "param";
-
-							r = jQuery.merge( r, ret[i].getElementsByTagName( tag ));
-						}
-
-						// It's faster to filter by class and be done with it
-						if ( m[1] == "." )
-							r = jQuery.classFilter( r, m[2] );
-
-						// Same with ID filtering
-						if ( m[1] == "#" ) {
-							var tmp = [];
-
-							// Try to find the element with the ID
-							for ( var i = 0; r[i]; i++ )
-								if ( r[i].getAttribute("id") == m[2] ) {
-									tmp = [ r[i] ];
-									break;
-								}
-
-							r = tmp;
-						}
-
-						ret = r;
-					}
-
-					t = t.replace( re2, "" );
-				}
-
-			}
-
-			// If a selector string still exists
-			if ( t ) {
-				// Attempt to filter it
-				var val = jQuery.filter(t,r);
-				ret = r = val.r;
-				t = jQuery.trim(val.t);
-			}
-		}
-
-		// An error occurred with the selector;
-		// just return an empty set instead
-		if ( t )
-			ret = [];
-
-		// Remove the root context
-		if ( ret && context == ret[0] )
-			ret.shift();
-
-		// And combine the results
-		done = jQuery.merge( done, ret );
-
-		return done;
-	},
-
-	classFilter: function(r,m,not){
-		m = " " + m + " ";
-		var tmp = [];
-		for ( var i = 0; r[i]; i++ ) {
-			var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
-			if ( !not && pass || not && !pass )
-				tmp.push( r[i] );
-		}
-		return tmp;
-	},
-
-	filter: function(t,r,not) {
-		var last;
-
-		// Look for common filter expressions
-		while ( t && t != last ) {
-			last = t;
-
-			var p = jQuery.parse, m;
-
-			for ( var i = 0; p[i]; i++ ) {
-				m = p[i].exec( t );
-
-				if ( m ) {
-					// Remove what we just matched
-					t = t.substring( m[0].length );
-
-					m[2] = m[2].replace(/\\/g, "");
-					break;
-				}
-			}
-
-			if ( !m )
-				break;
-
-			// :not() is a special case that can be optimized by
-			// keeping it out of the expression list
-			if ( m[1] == ":" && m[2] == "not" )
-				// optimize if only one selector found (most common case)
-				r = isSimple.test( m[3] ) ?
-					jQuery.filter(m[3], r, true).r :
-					jQuery( r ).not( m[3] );
-
-			// We can get a big speed boost by filtering by class here
-			else if ( m[1] == "." )
-				r = jQuery.classFilter(r, m[2], not);
-
-			else if ( m[1] == "[" ) {
-				var tmp = [], type = m[3];
-
-				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
-
-					if ( z == null || /href|src|selected/.test(m[2]) )
-						z = jQuery.attr(a,m[2]) || '';
-
-					if ( (type == "" && !!z ||
-						 type == "=" && z == m[5] ||
-						 type == "!=" && z != m[5] ||
-						 type == "^=" && z && !z.indexOf(m[5]) ||
-						 type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
-						 (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
-							tmp.push( a );
-				}
-
-				r = tmp;
-
-			// We can get a speed boost by handling nth-child here
-			} else if ( m[1] == ":" && m[2] == "nth-child" ) {
-				var merge = {}, tmp = [],
-					// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-					test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
-						m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
-						!/\D/.test(m[3]) && "0n+" + m[3] || m[3]),
-					// calculate the numbers (first)n+(last) including if they are negative
-					first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0;
-
-				// loop through all the elements left in the jQuery object
-				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
-
-					if ( !merge[id] ) {
-						var c = 1;
-
-						for ( var n = parentNode.firstChild; n; n = n.nextSibling )
-							if ( n.nodeType == 1 )
-								n.nodeIndex = c++;
-
-						merge[id] = true;
-					}
-
-					var add = false;
-
-					if ( first == 0 ) {
-						if ( node.nodeIndex == last )
-							add = true;
-					} else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 )
-						add = true;
-
-					if ( add ^ not )
-						tmp.push( node );
-				}
-
-				r = tmp;
-
-			// Otherwise, find the expression to execute
-			} else {
-				var fn = jQuery.expr[ m[1] ];
-				if ( typeof fn == "object" )
-					fn = fn[ m[2] ];
-
-				if ( typeof fn == "string" )
-					fn = eval("false||function(a,i){return " + fn + ";}");
-
-				// Execute it against the current filter
-				r = jQuery.grep( r, function(elem, i){
-					return fn(elem, i, m, r);
-				}, not );
-			}
-		}
-
-		// Return an array of filtered elements (r)
-		// and the modified expression string (t)
-		return { r: r, t: t };
-	},
-
-	dir: function( elem, dir ){
-		var matched = [],
-			cur = elem[dir];
-		while ( cur && cur != document ) {
-			if ( cur.nodeType == 1 )
-				matched.push( cur );
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	nth: function(cur,result,dir,elem){
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] )
-			if ( cur.nodeType == 1 && ++num == result )
-				break;
-
-		return cur;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType == 1 && n != elem )
-				r.push( n );
-		}
-
-		return r;
-	}
-});
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code orignated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function(elem, types, handler, data) {
-		if ( elem.nodeType == 3 || elem.nodeType == 8 )
-			return;
-
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( jQuery.browser.msie && elem.setInterval )
-			elem = window;
-
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid )
-			handler.guid = this.guid++;
-
-		// if data is passed, bind to handler
-		if( data != undefined ) {
-			// Create temporary function pointer to original handler
-			var fn = handler;
-
-			// Create unique handler function, wrapped around original handler
-			handler = this.proxy( fn, function() {
-				// Pass arguments and context to original handler
-				return fn.apply(this, arguments);
-			});
-
-			// Store data in unique handler
-			handler.data = data;
-		}
-
-		// Init the element's event structure
-		var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
-			handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				if ( typeof jQuery != "undefined" && !jQuery.event.triggered )
-					return jQuery.event.handle.apply(arguments.callee.elem, arguments);
-			});
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native
-		// event in IE.
-		handle.elem = elem;
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		jQuery.each(types.split(/\s+/), function(index, type) {
-			// Namespaced event handlers
-			var parts = type.split(".");
-			type = parts[0];
-			handler.type = parts[1];
-
-			// Get the current list of functions bound to this event
-			var handlers = events[type];
-
-			// Init the event handler queue
-			if (!handlers) {
-				handlers = events[type] = {};
-
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
-				if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) {
-					// Bind the global event handler to the element
-					if (elem.addEventListener)
-						elem.addEventListener(type, handle, false);
-					else if (elem.attachEvent)
-						elem.attachEvent("on" + type, handle);
-				}
-			}
-
-			// Add the function to the element's handler list
-			handlers[handler.guid] = handler;
-
-			// Keep track of which events have been used, for global triggering
-			jQuery.event.global[type] = true;
-		});
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	guid: 1,
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function(elem, types, handler) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType == 3 || elem.nodeType == 8 )
-			return;
-
-		var events = jQuery.data(elem, "events"), ret, index;
-
-		if ( events ) {
-			// Unbind all events for the element
-			if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") )
-				for ( var type in events )
-					this.remove( elem, type + (types || "") );
-			else {
-				// types is actually an event object here
-				if ( types.type ) {
-					handler = types.handler;
-					types = types.type;
-				}
-
-				// Handle multiple events seperated by a space
-				// jQuery(...).unbind("mouseover mouseout", fn);
-				jQuery.each(types.split(/\s+/), function(index, type){
-					// Namespaced event handlers
-					var parts = type.split(".");
-					type = parts[0];
-
-					if ( events[type] ) {
-						// remove the given handler for the given type
-						if ( handler )
-							delete events[type][handler.guid];
-
-						// remove all handlers for the given type
-						else
-							for ( handler in events[type] )
-								// Handle the removal of namespaced events
-								if ( !parts[1] || events[type][handler].type == parts[1] )
-									delete events[type][handler];
-
-						// remove generic event handler if no more handlers exist
-						for ( ret in events[type] ) break;
-						if ( !ret ) {
-							if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) {
-								if (elem.removeEventListener)
-									elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
-								else if (elem.detachEvent)
-									elem.detachEvent("on" + type, jQuery.data(elem, "handle"));
-							}
-							ret = null;
-							delete events[type];
-						}
-					}
-				});
-			}
-
-			// Remove the expando if it's no longer used
-			for ( ret in events ) break;
-			if ( !ret ) {
-				var handle = jQuery.data( elem, "handle" );
-				if ( handle ) handle.elem = null;
-				jQuery.removeData( elem, "events" );
-				jQuery.removeData( elem, "handle" );
-			}
-		}
-	},
-
-	trigger: function(type, data, elem, donative, extra) {
-		// Clone the incoming data, if any
-		data = jQuery.makeArray(data);
-
-		if ( type.indexOf("!") >= 0 ) {
-			type = type.slice(0, -1);
-			var exclusive = true;
-		}
-
-		// Handle a global trigger
-		if ( !elem ) {
-			// Only trigger if we've ever bound an event for it
-			if ( this.global[type] )
-				jQuery("*").add([window, document]).trigger(type, data);
-
-		// Handle triggering a single element
-		} else {
-			// don't do events on text and comment nodes
-			if ( elem.nodeType == 3 || elem.nodeType == 8 )
-				return undefined;
-
-			var val, ret, fn = jQuery.isFunction( elem[ type ] || null ),
-				// Check to see if we need to provide a fake event, or not
-				event = !data[0] || !data[0].preventDefault;
-
-			// Pass along a fake event
-			if ( event ) {
-				data.unshift({
-					type: type,
-					target: elem,
-					preventDefault: function(){},
-					stopPropagation: function(){},
-					timeStamp: now()
-				});
-				data[0][expando] = true; // no need to fix fake event
-			}
-
-			// Enforce the right trigger type
-			data[0].type = type;
-			if ( exclusive )
-				data[0].exclusive = true;
-
-			// Trigger the event, it is assumed that "handle" is a function
-			var handle = jQuery.data(elem, "handle");
-			if ( handle )
-				val = handle.apply( elem, data );
-
-			// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
-			if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
-				val = false;
-
-			// Extra functions don't get the custom event object
-			if ( event )
-				data.shift();
-
-			// Handle triggering of extra function
-			if ( extra && jQuery.isFunction( extra ) ) {
-				// call the extra function and tack the current return value on the end for possible inspection
-				ret = extra.apply( elem, val == null ? data : data.concat( val ) );
-				// if anything is returned, give it precedence and have it overwrite the previous value
-				if (ret !== undefined)
-					val = ret;
-			}
-
-			// Trigger the native events (except for clicks on links)
-			if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
-				this.triggered = true;
-				try {
-					elem[ type ]();
-				// prevent IE from throwing an error for some hidden elements
-				} catch (e) {}
-			}
-
-			this.triggered = false;
-		}
-
-		return val;
-	},
-
-	handle: function(event) {
-		// returned undefined or false
-		var val, ret, namespace, all, handlers;
-
-		event = arguments[0] = jQuery.event.fix( event || window.event );
-
-		// Namespaced event handlers
-		namespace = event.type.split(".");
-		event.type = namespace[0];
-		namespace = namespace[1];
-		// Cache this now, all = true means, any handler
-		all = !namespace && !event.exclusive;
-
-		handlers = ( jQuery.data(this, "events") || {} )[event.type];
-
-		for ( var j in handlers ) {
-			var handler = handlers[j];
-
-			// Filter the functions by class
-			if ( all || handler.type == namespace ) {
-				// Pass in a reference to the handler function itself
-				// So that we can later remove it
-				event.handler = handler;
-				event.data = handler.data;
-
-				ret = handler.apply( this, arguments );
-
-				if ( val !== false )
-					val = ret;
-
-				if ( ret === false ) {
-					event.preventDefault();
-					event.stopPropagation();
-				}
-			}
-		}
-
-		return val;
-	},
-
-	fix: function(event) {
-		if ( event[expando] == true )
-			return event;
-
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = event;
-		event = { originalEvent: originalEvent };
-		var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
-		for ( var i=props.length; i; i-- )
-			event[ props[i] ] = originalEvent[ props[i] ];
-
-		// Mark it as fixed
-		event[expando] = true;
-
-		// add preventDefault and stopPropagation since
-		// they will not work on the clone
-		event.preventDefault = function() {
-			// if preventDefault exists run it on the original event
-			if (originalEvent.preventDefault)
-				originalEvent.preventDefault();
-			// otherwise set the returnValue property of the original event to false (IE)
-			originalEvent.returnValue = false;
-		};
-		event.stopPropagation = function() {
-			// if stopPropagation exists run it on the original event
-			if (originalEvent.stopPropagation)
-				originalEvent.stopPropagation();
-			// otherwise set the cancelBubble property of the original event to true (IE)
-			originalEvent.cancelBubble = true;
-		};
-
-		// Fix timeStamp
-		event.timeStamp = event.timeStamp || now();
-
-		// Fix target property, if necessary
-		if ( !event.target )
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
-
-		// check if target is a textnode (safari)
-		if ( event.target.nodeType == 3 )
-			event.target = event.target.parentNode;
-
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement )
-			event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
-
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement, body = document.body;
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0);
-		}
-
-		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )
-			event.which = event.charCode || event.keyCode;
-
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey )
-			event.metaKey = event.ctrlKey;
-
-		// Add which for click: 1 == left; 2 == middle; 3 == right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button )
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-
-		return event;
-	},
-
-	proxy: function( fn, proxy ){
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
-		// So proxy can be declared as an argument
-		return proxy;
-	},
-
-	special: {
-		ready: {
-			setup: function() {
-				// Make sure the ready event is setup
-				bindReady();
-				return;
-			},
-
-			teardown: function() { return; }
-		},
-
-		mouseenter: {
-			setup: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler);
-				return true;
-			},
-
-			teardown: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler);
-				return true;
-			},
-
-			handler: function(event) {
-				// If we actually just moused on to a sub-element, ignore it
-				if ( withinElement(event, this) ) return true;
-				// Execute the right handlers by setting the event type to mouseenter
-				event.type = "mouseenter";
-				return jQuery.event.handle.apply(this, arguments);
-			}
-		},
-
-		mouseleave: {
-			setup: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler);
-				return true;
-			},
-
-			teardown: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler);
-				return true;
-			},
-
-			handler: function(event) {
-				// If we actually just moused on to a sub-element, ignore it
-				if ( withinElement(event, this) ) return true;
-				// Execute the right handlers by setting the event type to mouseleave
-				event.type = "mouseleave";
-				return jQuery.event.handle.apply(this, arguments);
-			}
-		}
-	}
-};
-
-jQuery.fn.extend({
-	bind: function( type, data, fn ) {
-		return type == "unload" ? this.one(type, data, fn) : this.each(function(){
-			jQuery.event.add( this, type, fn || data, fn && data );
-		});
-	},
-
-	one: function( type, data, fn ) {
-		var one = jQuery.event.proxy( fn || data, function(event) {
-			jQuery(this).unbind(event, one);
-			return (fn || data).apply( this, arguments );
-		});
-		return this.each(function(){
-			jQuery.event.add( this, type, one, fn && data);
-		});
-	},
-
-	unbind: function( type, fn ) {
-		return this.each(function(){
-			jQuery.event.remove( this, type, fn );
-		});
-	},
-
-	trigger: function( type, data, fn ) {
-		return this.each(function(){
-			jQuery.event.trigger( type, data, this, true, fn );
-		});
-	},
-
-	triggerHandler: function( type, data, fn ) {
-		return this[0] && jQuery.event.trigger( type, data, this[0], false, fn );
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments, i = 1;
-
-		// link all the functions, so any of them can unbind this click handler
-		while( i < args.length )
-			jQuery.event.proxy( fn, args[i++] );
-
-		return this.click( jQuery.event.proxy( fn, function(event) {
-			// Figure out which function to execute
-			this.lastToggle = ( this.lastToggle || 0 ) % i;
-
-			// Make sure that clicks stop
-			event.preventDefault();
-
-			// and execute the function
-			return args[ this.lastToggle++ ].apply( this, arguments ) || false;
-		}));
-	},
-
-	hover: function(fnOver, fnOut) {
-		return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut);
-	},
-
-	ready: function(fn) {
-		// Attach the listeners
-		bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady )
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		else
-			// Add the function to the wait list
-			jQuery.readyList.push( function() { return fn.call(this, jQuery); } );
-
-		return this;
-	}
-});
-
-jQuery.extend({
-	isReady: false,
-	readyList: [],
-	// Handle when the DOM is ready
-	ready: function() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If there are functions bound, to execute
-			if ( jQuery.readyList ) {
-				// Execute all of them
-				jQuery.each( jQuery.readyList, function(){
-					this.call( document );
-				});
-
-				// Reset the list of functions
-				jQuery.readyList = null;
-			}
-
-			// Trigger any bound ready events
-			jQuery(document).triggerHandler("ready");
-		}
-	}
-});
-
-var readyBound = false;
-
-function bindReady(){
-	if ( readyBound ) return;
-	readyBound = true;
-
-	// Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
-	if ( document.addEventListener && !jQuery.browser.opera)
-		// Use the handy event callback
-		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
-
-	// If IE is used and is not in a frame
-	// Continually check to see if the document is ready
-	if ( jQuery.browser.msie && window == top ) (function(){
-		if (jQuery.isReady) return;
-		try {
-			// If IE is used, use the trick by Diego Perini
-			// http://javascript.nwbox.com/IEContentLoaded/
-			document.documentElement.doScroll("left");
-		} catch( error ) {
-			setTimeout( arguments.callee, 0 );
-			return;
-		}
-		// and execute any waiting functions
-		jQuery.ready();
-	})();
-
-	if ( jQuery.browser.opera )
-		document.addEventListener( "DOMContentLoaded", function () {
-			if (jQuery.isReady) return;
-			for (var i = 0; i < document.styleSheets.length; i++)
-				if (document.styleSheets[i].disabled) {
-					setTimeout( arguments.callee, 0 );
-					return;
-				}
-			// and execute any waiting functions
-			jQuery.ready();
-		}, false);
-
-	if ( jQuery.browser.safari ) {
-		var numStyles;
-		(function(){
-			if (jQuery.isReady) return;
-			if ( document.readyState != "loaded" && document.readyState != "complete" ) {
-				setTimeout( arguments.callee, 0 );
-				return;
-			}
-			if ( numStyles === undefined )
-				numStyles = jQuery("style, link[rel=stylesheet]").length;
-			if ( document.styleSheets.length != numStyles ) {
-				setTimeout( arguments.callee, 0 );
-				return;
-			}
-			// and execute any waiting functions
-			jQuery.ready();
-		})();
-	}
-
-	// A fallback to window.onload, that will always work
-	jQuery.event.add( window, "load", jQuery.ready );
-}
-
-jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-	"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," +
-	"submit,keydown,keypress,keyup,error").split(","), function(i, name){
-
-	// Handle event binding
-	jQuery.fn[name] = function(fn){
-		return fn ? this.bind(name, fn) : this.trigger(name);
-	};
-});
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function(event, elem) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-	// Traverse up the tree
-	while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; }
-	// Return true if we actually just moused on to a sub-element
-	return parent == elem;
-};
-
-// Prevent memory leaks in IE
-// And prevent errors on refresh with events like mouseover in other browsers
-// Window isn't included so as not to unbind existing unload events
-jQuery(window).bind("unload", function() {
-	jQuery("*").add(document).unbind();
-});
-jQuery.fn.extend({
-	// Keep a copy of the old load
-	_load: jQuery.fn.load,
-
-	load: function( url, params, callback ) {
-		if ( typeof url != 'string' )
-			return this._load( url );
-
-		var off = url.indexOf(" ");
-		if ( off >= 0 ) {
-			var selector = url.slice(off, url.length);
-			url = url.slice(0, off);
-		}
-
-		callback = callback || function(){};
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params )
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = null;
-
-			// Otherwise, build a param string
-			} else {
-				params = jQuery.param( params );
-				type = "POST";
-			}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			complete: function(res, status){
-				// If successful, inject the HTML into all the matched elements
-				if ( status == "success" || status == "notmodified" )
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div/>")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						res.responseText );
-
-				self.each( callback, [res.responseText, status, res] );
-			}
-		});
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param(this.serializeArray());
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			return jQuery.nodeName(this, "form") ?
-				jQuery.makeArray(this.elements) : this;
-		})
-		.filter(function(){
-			return this.name && !this.disabled &&
-				(this.checked || /select|textarea/i.test(this.nodeName) ||
-					/text|hidden|password/i.test(this.type));
-		})
-		.map(function(i, elem){
-			var val = jQuery(this).val();
-			return val == null ? null :
-				val.constructor == Array ?
-					jQuery.map( val, function(val, i){
-						return {name: elem.name, value: val};
-					}) :
-					{name: elem.name, value: val};
-		}).get();
-	}
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
-	jQuery.fn[o] = function(f){
-		return this.bind(o, f);
-	};
-});
-
-var jsc = now();
-
-jQuery.extend({
-	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was ommited
-		if ( jQuery.isFunction( data ) ) {
-			callback = data;
-			data = null;
-		}
-
-		return jQuery.ajax({
-			type: "GET",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get(url, null, callback, "script");
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get(url, data, callback, "json");
-	},
-
-	post: function( url, data, callback, type ) {
-		if ( jQuery.isFunction( data ) ) {
-			callback = data;
-			data = {};
-		}
-
-		return jQuery.ajax({
-			type: "POST",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
-	},
-
-	ajaxSettings: {
-		url: location.href,
-		global: true,
-		type: "GET",
-		timeout: 0,
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		data: null,
-		username: null,
-		password: null,
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			script: "text/javascript, application/javascript",
-			json: "application/json, text/javascript",
-			text: "text/plain",
-			_default: "*/*"
-		}
-	},
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-
-	ajax: function( s ) {
-		// Extend the settings, but re-extend 's' so that it can be
-		// checked again later (in the test suite, specifically)
-		s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
-
-		var jsonp, jsre = /=\?(&|$)/g, status, data,
-			type = s.type.toUpperCase();
-
-		// convert data if not already a string
-		if ( s.data && s.processData && typeof s.data != "string" )
-			s.data = jQuery.param(s.data);
-
-		// Handle JSONP Parameter Callbacks
-		if ( s.dataType == "jsonp" ) {
-			if ( type == "GET" ) {
-				if ( !s.url.match(jsre) )
-					s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-			} else if ( !s.data || !s.data.match(jsre) )
-				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-			s.dataType = "json";
-		}
-
-		// Build temporary JSONP function
-		if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
-			jsonp = "jsonp" + jsc++;
-
-			// Replace the =? sequence both in the query string and the data
-			if ( s.data )
-				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
-			// We need to make sure
-			// that a JSONP style response is executed properly
-			s.dataType = "script";
-
-			// Handle JSONP-style loading
-			window[ jsonp ] = function(tmp){
-				data = tmp;
-				success();
-				complete();
-				// Garbage collect
-				window[ jsonp ] = undefined;
-				try{ delete window[ jsonp ]; } catch(e){}
-				if ( head )
-					head.removeChild( script );
-			};
-		}
-
-		if ( s.dataType == "script" && s.cache == null )
-			s.cache = false;
-
-		if ( s.cache === false && type == "GET" ) {
-			var ts = now();
-			// try replacing _= if it is there
-			var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
-			// if nothing was replaced, add timestamp to the end
-			s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
-		}
-
-		// If data is available, append data to url for get requests
-		if ( s.data && type == "GET" ) {
-			s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
-
-			// IE likes to send both get and post data, prevent this
-			s.data = null;
-		}
-
-		// Watch for a new set of requests
-		if ( s.global && ! jQuery.active++ )
-			jQuery.event.trigger( "ajaxStart" );
-
-		// Matches an absolute URL, and saves the domain
-		var remote = /^(?:\w+:)?\/\/([^\/?#]+)/;
-
-		// If we're requesting a remote document
-		// and trying to load JSON or Script with a GET
-		if ( s.dataType == "script" && type == "GET"
-				&& remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
-			var head = document.getElementsByTagName("head")[0];
-			var script = document.createElement("script");
-			script.src = s.url;
-			if (s.scriptCharset)
-				script.charset = s.scriptCharset;
-
-			// Handle Script loading
-			if ( !jsonp ) {
-				var done = false;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function(){
-					if ( !done && (!this.readyState ||
-							this.readyState == "loaded" || this.readyState == "complete") ) {
-						done = true;
-						success();
-						complete();
-						head.removeChild( script );
-					}
-				};
-			}
-
-			head.appendChild(script);
-
-			// We handle everything using the script element injection
-			return undefined;
-		}
-
-		var requestDone = false;
-
-		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
-		var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
-
-		// Open the socket
-		// Passing null username, generates a login popup on Opera (#2865)
-		if( s.username )
-			xhr.open(type, s.url, s.async, s.username, s.password);
-		else
-			xhr.open(type, s.url, s.async);
-
-		// Need an extra try/catch for cross domain requests in Firefox 3
-		try {
-			// Set the correct header, if data is being sent
-			if ( s.data )
-				xhr.setRequestHeader("Content-Type", s.contentType);
-
-			// Set the If-Modified-Since header, if ifModified mode.
-			if ( s.ifModified )
-				xhr.setRequestHeader("If-Modified-Since",
-					jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
-
-			// Set header so the called script knows that it's an XMLHttpRequest
-			xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-
-			// Set the Accepts header for the server, depending on the dataType
-			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-				s.accepts[ s.dataType ] + ", */*" :
-				s.accepts._default );
-		} catch(e){}
-
-		// Allow custom headers/mimetypes
-		if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
-			// cleanup active request counter
-			s.global && jQuery.active--;
-			// close opended socket
-			xhr.abort();
-			return false;
-		}
-
-		if ( s.global )
-			jQuery.event.trigger("ajaxSend", [xhr, s]);
-
-		// Wait for a response to come back
-		var onreadystatechange = function(isTimeout){
-			// The transfer is complete and the data is available, or the request timed out
-			if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
-				requestDone = true;
-
-				// clear poll interval
-				if (ival) {
-					clearInterval(ival);
-					ival = null;
-				}
-
-				status = isTimeout == "timeout" && "timeout" ||
-					!jQuery.httpSuccess( xhr ) && "error" ||
-					s.ifModified && jQuery.httpNotModified( xhr, s.url ) && "notmodified" ||
-					"success";
-
-				if ( status == "success" ) {
-					// Watch for, and catch, XML document parse errors
-					try {
-						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xhr, s.dataType, s.dataFilter );
-					} catch(e) {
-						status = "parsererror";
-					}
-				}
-
-				// Make sure that the request was successful or notmodified
-				if ( status == "success" ) {
-					// Cache Last-Modified header, if ifModified mode.
-					var modRes;
-					try {
-						modRes = xhr.getResponseHeader("Last-Modified");
-					} catch(e) {} // swallow exception thrown by FF if header is not available
-
-					if ( s.ifModified && modRes )
-						jQuery.lastModified[s.url] = modRes;
-
-					// JSONP handles its own success callback
-					if ( !jsonp )
-						success();
-				} else
-					jQuery.handleError(s, xhr, status);
-
-				// Fire the complete handlers
-				complete();
-
-				// Stop memory leaks
-				if ( s.async )
-					xhr = null;
-			}
-		};
-
-		if ( s.async ) {
-			// don't attach the handler to the request, just poll it instead
-			var ival = setInterval(onreadystatechange, 13);
-
-			// Timeout checker
-			if ( s.timeout > 0 )
-				setTimeout(function(){
-					// Check to see if the request is still happening
-					if ( xhr ) {
-						// Cancel the request
-						xhr.abort();
-
-						if( !requestDone )
-							onreadystatechange( "timeout" );
-					}
-				}, s.timeout);
-		}
-
-		// Send the data
-		try {
-			xhr.send(s.data);
-		} catch(e) {
-			jQuery.handleError(s, xhr, null, e);
-		}
-
-		// firefox 1.5 doesn't fire statechange for sync requests
-		if ( !s.async )
-			onreadystatechange();
-
-		function success(){
-			// If a local callback was specified, fire it and pass it the data
-			if ( s.success )
-				s.success( data, status );
-
-			// Fire the global callback
-			if ( s.global )
-				jQuery.event.trigger( "ajaxSuccess", [xhr, s] );
-		}
-
-		function complete(){
-			// Process result
-			if ( s.complete )
-				s.complete(xhr, status);
-
-			// The request was completed
-			if ( s.global )
-				jQuery.event.trigger( "ajaxComplete", [xhr, s] );
-
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active )
-				jQuery.event.trigger( "ajaxStop" );
-		}
-
-		// return XMLHttpRequest to allow aborting the request etc.
-		return xhr;
-	},
-
-	handleError: function( s, xhr, status, e ) {
-		// If a local callback was specified, fire it
-		if ( s.error ) s.error( xhr, status, e );
-
-		// Fire the global callback
-		if ( s.global )
-			jQuery.event.trigger( "ajaxError", [xhr, s, e] );
-	},
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( xhr ) {
-		try {
-			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !xhr.status && location.protocol == "file:" ||
-				( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 ||
-				jQuery.browser.safari && xhr.status == undefined;
-		} catch(e){}
-		return false;
-	},
-
-	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xhr, url ) {
-		try {
-			var xhrRes = xhr.getResponseHeader("Last-Modified");
-
-			// Firefox always returns 200. check Last-Modified date
-			return xhr.status == 304 || xhrRes == jQuery.lastModified[url] ||
-				jQuery.browser.safari && xhr.status == undefined;
-		} catch(e){}
-		return false;
-	},
-
-	httpData: function( xhr, type, filter ) {
-		var ct = xhr.getResponseHeader("content-type"),
-			xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
-			data = xml ? xhr.responseXML : xhr.responseText;
-
-		if ( xml && data.documentElement.tagName == "parsererror" )
-			throw "parsererror";
-			
-		// Allow a pre-filtering function to sanitize the response
-		if( filter )
-			data = filter( data, type );
-
-		// If the type is "script", eval it in global context
-		if ( type == "script" )
-			jQuery.globalEval( data );
-
-		// Get the JavaScript object, if JSON is used.
-		if ( type == "json" )
-			data = eval("(" + data + ")");
-
-		return data;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a ) {
-		var s = [];
-
-		// If an array was passed in, assume that it is an array
-		// of form elements
-		if ( a.constructor == Array || a.jquery )
-			// Serialize the form elements
-			jQuery.each( a, function(){
-				s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) );
-			});
-
-		// Otherwise, assume that it's an object of key/value pairs
-		else
-			// Serialize the key/values
-			for ( var j in a )
-				// If the value is an array then the key names need to be repeated
-				if ( a[j] && a[j].constructor == Array )
-					jQuery.each( a[j], function(){
-						s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
-					});
-				else
-					s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) );
-
-		// Return the resulting serialization
-		return s.join("&").replace(/%20/g, "+");
-	}
-
-});
-jQuery.fn.extend({
-	show: function(speed,callback){
-		return speed ?
-			this.animate({
-				height: "show", width: "show", opacity: "show"
-			}, speed, callback) :
-
-			this.filter(":hidden").each(function(){
-				this.style.display = this.oldblock || "";
-				if ( jQuery.css(this,"display") == "none" ) {
-					var elem = jQuery("<" + this.tagName + " />").appendTo("body");
-					this.style.display = elem.css("display");
-					// handle an edge condition where css is - div { display:none; } or similar
-					if (this.style.display == "none")
-						this.style.display = "block";
-					elem.remove();
-				}
-			}).end();
-	},
-
-	hide: function(speed,callback){
-		return speed ?
-			this.animate({
-				height: "hide", width: "hide", opacity: "hide"
-			}, speed, callback) :
-
-			this.filter(":visible").each(function(){
-				this.oldblock = this.oldblock || jQuery.css(this,"display");
-				this.style.display = "none";
-			}).end();
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2 ){
-		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
-			this._toggle.apply( this, arguments ) :
-			fn ?
-				this.animate({
-					height: "toggle", width: "toggle", opacity: "toggle"
-				}, fn, fn2) :
-				this.each(function(){
-					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
-				});
-	},
-
-	slideDown: function(speed,callback){
-		return this.animate({height: "show"}, speed, callback);
-	},
-
-	slideUp: function(speed,callback){
-		return this.animate({height: "hide"}, speed, callback);
-	},
-
-	slideToggle: function(speed, callback){
-		return this.animate({height: "toggle"}, speed, callback);
-	},
-
-	fadeIn: function(speed, callback){
-		return this.animate({opacity: "show"}, speed, callback);
-	},
-
-	fadeOut: function(speed, callback){
-		return this.animate({opacity: "hide"}, speed, callback);
-	},
-
-	fadeTo: function(speed,to,callback){
-		return this.animate({opacity: to}, speed, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		return this[ optall.queue === false ? "each" : "queue" ](function(){
-			if ( this.nodeType != 1)
-				return false;
-
-			var opt = jQuery.extend({}, optall), p,
-				hidden = jQuery(this).is(":hidden"), self = this;
-
-			for ( p in prop ) {
-				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
-					return opt.complete.call(this);
-
-				if ( p == "height" || p == "width" ) {
-					// Store display property
-					opt.display = jQuery.css(this, "display");
-
-					// Make sure that nothing sneaks out
-					opt.overflow = this.style.overflow;
-				}
-			}
-
-			if ( opt.overflow != null )
-				this.style.overflow = "hidden";
-
-			opt.curAnim = jQuery.extend({}, prop);
-
-			jQuery.each( prop, function(name, val){
-				var e = new jQuery.fx( self, opt, name );
-
-				if ( /toggle|show|hide/.test(val) )
-					e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
-				else {
-					var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
-						start = e.cur(true) || 0;
-
-					if ( parts ) {
-						var end = parseFloat(parts[2]),
-							unit = parts[3] || "px";
-
-						// We need to compute starting value
-						if ( unit != "px" ) {
-							self.style[ name ] = (end || 1) + unit;
-							start = ((end || 1) / e.cur(true)) * start;
-							self.style[ name ] = start + unit;
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] )
-							end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
-
-						e.custom( start, end, unit );
-					} else
-						e.custom( start, val, "" );
-				}
-			});
-
-			// For JS strict compliance
-			return true;
-		});
-	},
-
-	queue: function(type, fn){
-		if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
-			fn = type;
-			type = "fx";
-		}
-
-		if ( !type || (typeof type == "string" && !fn) )
-			return queue( this[0], type );
-
-		return this.each(function(){
-			if ( fn.constructor == Array )
-				queue(this, type, fn);
-			else {
-				queue(this, type).push( fn );
-
-				if ( queue(this, type).length == 1 )
-					fn.call(this);
-			}
-		});
-	},
-
-	stop: function(clearQueue, gotoEnd){
-		var timers = jQuery.timers;
-
-		if (clearQueue)
-			this.queue([]);
-
-		this.each(function(){
-			// go in reverse order so anything added to the queue during the loop is ignored
-			for ( var i = timers.length - 1; i >= 0; i-- )
-				if ( timers[i].elem == this ) {
-					if (gotoEnd)
-						// force the next step to be the last
-						timers[i](true);
-					timers.splice(i, 1);
-				}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if (!gotoEnd)
-			this.dequeue();
-
-		return this;
-	}
-
-});
-
-var queue = function( elem, type, array ) {
-	if ( elem ){
-
-		type = type || "fx";
-
-		var q = jQuery.data( elem, type + "queue" );
-
-		if ( !q || array )
-			q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) );
-
-	}
-	return q;
-};
-
-jQuery.fn.dequeue = function(type){
-	type = type || "fx";
-
-	return this.each(function(){
-		var q = queue(this, type);
-
-		q.shift();
-
-		if ( q.length )
-			q[0].call( this );
-	});
-};
-
-jQuery.extend({
-
-	speed: function(speed, easing, fn) {
-		var opt = speed && speed.constructor == Object ? speed : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && easing.constructor != Function && easing
-		};
-
-		opt.duration = (opt.duration && opt.duration.constructor == Number ?
-			opt.duration :
-			jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds.def;
-
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function(){
-			if ( opt.queue !== false )
-				jQuery(this).dequeue();
-			if ( jQuery.isFunction( opt.old ) )
-				opt.old.call( this );
-		};
-
-		return opt;
-	},
-
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
-		},
-		swing: function( p, n, firstNum, diff ) {
-			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
-		}
-	},
-
-	timers: [],
-	timerId: null,
-
-	fx: function( elem, options, prop ){
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
-
-		if ( !options.orig )
-			options.orig = {};
-	}
-
-});
-
-jQuery.fx.prototype = {
-
-	// Simple function for setting a style value
-	update: function(){
-		if ( this.options.step )
-			this.options.step.call( this.elem, this.now, this );
-
-		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-
-		// Set display property to block for height/width animations
-		if ( this.prop == "height" || this.prop == "width" )
-			this.elem.style.display = "block";
-	},
-
-	// Get the current size
-	cur: function(force){
-		if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
-			return this.elem[ this.prop ];
-
-		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
-		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
-	},
-
-	// Start an animation from one number to another
-	custom: function(from, to, unit){
-		this.startTime = now();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || "px";
-		this.now = this.start;
-		this.pos = this.state = 0;
-		this.update();
-
-		var self = this;
-		function t(gotoEnd){
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		jQuery.timers.push(t);
-
-		if ( jQuery.timerId == null ) {
-			jQuery.timerId = setInterval(function(){
-				var timers = jQuery.timers;
-
-				for ( var i = 0; i < timers.length; i++ )
-					if ( !timers[i]() )
-						timers.splice(i--, 1);
-
-				if ( !timers.length ) {
-					clearInterval( jQuery.timerId );
-					jQuery.timerId = null;
-				}
-			}, 13);
-		}
-	},
-
-	// Simple 'show' function
-	show: function(){
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		this.custom(0, this.cur());
-
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		if ( this.prop == "width" || this.prop == "height" )
-			this.elem.style[this.prop] = "1px";
-
-		// Start by showing the element
-		jQuery(this.elem).show();
-	},
-
-	// Simple 'hide' function
-	hide: function(){
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function(gotoEnd){
-		var t = now();
-
-		if ( gotoEnd || t > this.options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			this.options.curAnim[ this.prop ] = true;
-
-			var done = true;
-			for ( var i in this.options.curAnim )
-				if ( this.options.curAnim[i] !== true )
-					done = false;
-
-			if ( done ) {
-				if ( this.options.display != null ) {
-					// Reset the overflow
-					this.elem.style.overflow = this.options.overflow;
-
-					// Reset the display
-					this.elem.style.display = this.options.display;
-					if ( jQuery.css(this.elem, "display") == "none" )
-						this.elem.style.display = "block";
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( this.options.hide )
-					this.elem.style.display = "none";
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( this.options.hide || this.options.show )
-					for ( var p in this.options.curAnim )
-						jQuery.attr(this.elem.style, p, this.options.orig[p]);
-			}
-
-			if ( done )
-				// Execute the complete function
-				this.options.complete.call( this.elem );
-
-			return false;
-		} else {
-			var n = t - this.startTime;
-			this.state = n / this.options.duration;
-
-			// Perform the easing function, defaults to swing
-			this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
-			this.now = this.start + ((this.end - this.start) * this.pos);
-
-			// Perform the next step of the animation
-			this.update();
-		}
-
-		return true;
-	}
-
-};
-
-jQuery.extend( jQuery.fx, {
-	speeds:{
-		slow: 600,
- 		fast: 200,
- 		// Default speed
- 		def: 400
-	},
-	step: {
-		scrollLeft: function(fx){
-			fx.elem.scrollLeft = fx.now;
-		},
-
-		scrollTop: function(fx){
-			fx.elem.scrollTop = fx.now;
-		},
-
-		opacity: function(fx){
-			jQuery.attr(fx.elem.style, "opacity", fx.now);
-		},
-
-		_default: function(fx){
-			fx.elem.style[ fx.prop ] = fx.now + fx.unit;
-		}
-	}
-});
-// The Offset Method
-// Originally By Brandon Aaron, part of the Dimension Plugin
-// http://jquery.com/plugins/project/dimensions
-jQuery.fn.offset = function() {
-	var left = 0, top = 0, elem = this[0], results;
-
-	if ( elem ) with ( jQuery.browser ) {
-		var parent       = elem.parentNode,
-		    offsetChild  = elem,
-		    offsetParent = elem.offsetParent,
-		    doc          = elem.ownerDocument,
-		    safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
-		    css          = jQuery.curCSS,
-		    fixed        = css(elem, "position") == "fixed";
-
-		// Use getBoundingClientRect if available
-		if ( elem.getBoundingClientRect ) {
-			var box = elem.getBoundingClientRect();
-
-			// Add the document scroll offsets
-			add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-				box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
-
-			// IE adds the HTML element's border, by default it is medium which is 2px
-			// IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; }
-			// IE 7 standards mode, the border is always 2px
-			// This border/offset is typically represented by the clientLeft and clientTop properties
-			// However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS
-			// Therefore this method will be off by 2px in IE while in quirksmode
-			add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop );
-
-		// Otherwise loop through the offsetParents and parentNodes
-		} else {
-
-			// Initial element offsets
-			add( elem.offsetLeft, elem.offsetTop );
-
-			// Get parent offsets
-			while ( offsetParent ) {
-				// Add offsetParent offsets
-				add( offsetParent.offsetLeft, offsetParent.offsetTop );
-
-				// Mozilla and Safari > 2 does not include the border on offset parents
-				// However Mozilla adds the border for table or table cells
-				if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 )
-					border( offsetParent );
-
-				// Add the document scroll offsets if position is fixed on any offsetParent
-				if ( !fixed && css(offsetParent, "position") == "fixed" )
-					fixed = true;
-
-				// Set offsetChild to previous offsetParent unless it is the body element
-				offsetChild  = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent;
-				// Get next offsetParent
-				offsetParent = offsetParent.offsetParent;
-			}
-
-			// Get parent scroll offsets
-			while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
-				// Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
-				if ( !/^inline|table.*$/i.test(css(parent, "display")) )
-					// Subtract parent scroll offsets
-					add( -parent.scrollLeft, -parent.scrollTop );
-
-				// Mozilla does not add the border for a parent that has overflow != visible
-				if ( mozilla && css(parent, "overflow") != "visible" )
-					border( parent );
-
-				// Get next parent
-				parent = parent.parentNode;
-			}
-
-			// Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
-			// Mozilla doubles body offsets with a non-absolutely positioned offsetChild
-			if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) ||
-				(mozilla && css(offsetChild, "position") != "absolute") )
-					add( -doc.body.offsetLeft, -doc.body.offsetTop );
-
-			// Add the document scroll offsets if position is fixed
-			if ( fixed )
-				add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-					Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
-		}
-
-		// Return an object with top and left properties
-		results = { top: top, left: left };
-	}
-
-	function border(elem) {
-		add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
-	}
-
-	function add(l, t) {
-		left += parseInt(l, 10) || 0;
-		top += parseInt(t, 10) || 0;
-	}
-
-	return results;
-};
-
-
-jQuery.fn.extend({
-	position: function() {
-		var left = 0, top = 0, results;
-
-		if ( this[0] ) {
-			// Get *real* offsetParent
-			var offsetParent = this.offsetParent(),
-
-			// Get correct offsets
-			offset       = this.offset(),
-			parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-			// Subtract element margins
-			// note: when an element has margin: auto the offsetLeft and marginLeft 
-			// are the same in Safari causing offset.left to incorrectly be 0
-			offset.top  -= num( this, 'marginTop' );
-			offset.left -= num( this, 'marginLeft' );
-
-			// Add offsetParent borders
-			parentOffset.top  += num( offsetParent, 'borderTopWidth' );
-			parentOffset.left += num( offsetParent, 'borderLeftWidth' );
-
-			// Subtract the two offsets
-			results = {
-				top:  offset.top  - parentOffset.top,
-				left: offset.left - parentOffset.left
-			};
-		}
-
-		return results;
-	},
-
-	offsetParent: function() {
-		var offsetParent = this[0].offsetParent;
-		while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
-			offsetParent = offsetParent.offsetParent;
-		return jQuery(offsetParent);
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( ['Left', 'Top'], function(i, name) {
-	var method = 'scroll' + name;
-	
-	jQuery.fn[ method ] = function(val) {
-		if (!this[0]) return;
-
-		return val != undefined ?
-
-			// Set the scroll offset
-			this.each(function() {
-				this == window || this == document ?
-					window.scrollTo(
-						!i ? val : jQuery(window).scrollLeft(),
-						 i ? val : jQuery(window).scrollTop()
-					) :
-					this[ method ] = val;
-			}) :
-
-			// Return the scroll offset
-			this[0] == window || this[0] == document ?
-				self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
-					jQuery.boxModel && document.documentElement[ method ] ||
-					document.body[ method ] :
-				this[0][ method ];
-	};
-});
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function(i, name){
-
-	var tl = i ? "Left"  : "Top",  // top or left
-		br = i ? "Right" : "Bottom"; // bottom or right
-
-	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function(){
-		return this[ name.toLowerCase() ]() +
-			num(this, "padding" + tl) +
-			num(this, "padding" + br);
-	};
-
-	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function(margin) {
-		return this["inner" + name]() +
-			num(this, "border" + tl + "Width") +
-			num(this, "border" + br + "Width") +
-			(margin ?
-				num(this, "margin" + tl) + num(this, "margin" + br) : 0);
-	};
-
-});})();
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/jquery.timepicker.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/jquery.timepicker.js
deleted file mode 100644
index 0a92aff0..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/jquery.timepicker.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/* jQuery timepicker
- * replaces a single text input with a set of pulldowns to select hour, minute, and am/pm
- *
- * Copyright (c) 2007 Jason Huck/Core Five Creative (http://www.corefive.com/)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- * Version 1.0
- */
-
-(function($){
-	jQuery.fn.timepicker = function(){
-		this.each(function(){
-			// get the ID and value of the current element
-			var i = this.id;
-			var v = $(this).val();
-
-			// the options we need to generate
-			var hrs = new Array('01','02','03','04','05','06','07','08','09','10','11','12');
-			var mins = new Array('00','15','30','45');
-			var ap = new Array('am','pm');
-
-			// default to the current time
-			var d = new Date;
-			var h = d.getHours();
-			var m = d.getMinutes();
-			var p = (h >= 12 ? 'pm' : 'am');
-
-			// adjust hour to 12-hour format
-			if(h > 12) h = h - 12;
-
-			// round minutes to nearest quarter hour
-			$.each(mins, function(mn){
-				if(m <= parseInt(mins[mn], 10)){
-					m = parseInt(mins[mn], 10);
-					return false;
-				}
-			});
-
-			// increment hour if we push minutes to next 00
-			if(m > 45){
-				m = 0;
-
-				switch(h){
-					case(11):
-						h += 1;
-						p = (p == 'am' ? 'pm' : 'am');
-						break;
-
-					case(12):
-						h = 1;
-						break;
-
-					default:
-						h += 1;
-						break;
-				}
-			}
-
-			// override with current values if applicable
-			if(v.length == 7){
-				h = parseInt(v.substr(0,2), 10);
-				m = parseInt(v.substr(3,2), 10);
-				p = v.substr(5);
-			}
-
-			// build the new DOM objects
-			var output = '';
-
-			output += '<select id="h_' + i + '" class="h timepicker">';
-			$.each(hrs, function(hr){
-				output += '<option value="' + hrs[hr] + '"';
-							 if(parseInt(hrs[hr], 10) == h) output += ' selected';
-				output += '>' + hrs[hr] + '</option>';
-			});
-			output += '</select>';
-
-			output += '<select id="m_' + i + '" class="m timepicker">';
-			$.each(mins, function(mn){
-				output += '<option value="' + mins[mn] + '"';
-				if(parseInt(mins[mn], 10) == m) output += ' selected';
-				output += '>' + mins[mn] + '</option>';
-			});
-			output += '</select>';
-
-			output += '<select id="p_' + i + '" class="p timepicker">';
-			$.each(ap, function(pp){
-				output += '<option value="' + ap[pp] + '"';
-				if(ap[pp] == p) output += ' selected';
-				output += '>' + ap[pp] + '</option>';
-			});
-			output += '</select>';
-
-			// hide original input and append new replacement inputs
-			//$(this).attr('type','hidden').after(output);
-			$(this).after(output);
-			
-			// Initialize the default value
-			if(v == '') {
-				$(this).val( h + ':' + m + p );
-			}
-		});
-
-		$('select.timepicker').change(function(){
-			var i = this.id.substr(2);
-			var h = $('#h_' + i).val();
-			var m = $('#m_' + i).val();
-			var p = $('#p_' + i).val();
-			var v = h + ':' + m + p;
-			$('#' + i).val(v);
-		});
-
-		return this;
-	};
-})(jQuery);
-
-
-
-/* SVN: $Id: jquery.timepicker.js 456 2007-07-16 19:09:57Z Jason Huck $ */
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/json2.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/json2.js
deleted file mode 100644
index 33b6783f..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/json2.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-    json2.js
-    2007-11-06
-
-    Public Domain
-
-    See http://www.JSON.org/js.html
-
-    This file creates a global JSON object containing two methods:
-
-        JSON.stringify(value, whitelist)
-            value       any JavaScript value, usually an object or array.
-
-            whitelist   an optional that determines how object values are
-                        stringified.
-
-            This method produces a JSON text from a JavaScript value.
-            There are three possible ways to stringify an object, depending
-            on the optional whitelist parameter.
-
-            If an object has a toJSON method, then the toJSON() method will be
-            called. The value returned from the toJSON method will be
-            stringified.
-
-            Otherwise, if the optional whitelist parameter is an array, then
-            the elements of the array will be used to select members of the
-            object for stringification.
-
-            Otherwise, if there is no whitelist parameter, then all of the
-            members of the object will be stringified.
-
-            Values that do not have JSON representaions, such as undefined or
-            functions, will not be serialized. Such values in objects will be
-            dropped, in arrays will be replaced with null. JSON.stringify()
-            returns undefined. Dates will be stringified as quoted ISO dates.
-
-            Example:
-
-            var text = JSON.stringify(['e', {pluribus: 'unum'}]);
-            // text is '["e",{"pluribus":"unum"}]'
-
-        JSON.parse(text, filter)
-            This method parses a JSON text to produce an object or
-            array. It can throw a SyntaxError exception.
-
-            The optional filter parameter is a function that can filter and
-            transform the results. It receives each of the keys and values, and
-            its return value is used instead of the original value. If it
-            returns what it received, then structure is not modified. If it
-            returns undefined then the member is deleted.
-
-            Example:
-
-            // Parse the text. If a key contains the string 'date' then
-            // convert the value to a date.
-
-            myData = JSON.parse(text, function (key, value) {
-                return key.indexOf('date') >= 0 ? new Date(value) : value;
-            });
-
-    This is a reference implementation. You are free to copy, modify, or
-    redistribute.
-
-    Use your own copy. It is extremely unwise to load third party
-    code into your pages.
-*/
-
-/*jslint evil: true */
-/*extern JSON */
-
-if (!this.JSON) {
-
-    JSON = function () {
-
-        function f(n) {    // Format integers to have at least two digits.
-            return n < 10 ? '0' + n : n;
-        }
-
-        Date.prototype.toJSON = function () {
-
-// Eventually, this method will be based on the date.toISOString method.
-
-            return this.getUTCFullYear()   + '-' +
-                 f(this.getUTCMonth() + 1) + '-' +
-                 f(this.getUTCDate())      + 'T' +
-                 f(this.getUTCHours())     + ':' +
-                 f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z';
-        };
-
-
-        var m = {    // table of character substitutions
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        };
-
-        function stringify(value, whitelist) {
-            var a,          // The array holding the partial texts.
-                i,          // The loop counter.
-                k,          // The member key.
-                l,          // Length.
-                r = /["\\\x00-\x1f\x7f-\x9f]/g,
-                v;          // The member value.
-
-            switch (typeof value) {
-            case 'string':
-
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can safely slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe sequences.
-
-                return r.test(value) ?
-                    '"' + value.replace(r, function (a) {
-                        var c = m[a];
-                        if (c) {
-                            return c;
-                        }
-                        c = a.charCodeAt();
-                        return '\\u00' + Math.floor(c / 16).toString(16) +
-                                                   (c % 16).toString(16);
-                    }) + '"' :
-                    '"' + value + '"';
-
-            case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
-                return isFinite(value) ? String(value) : 'null';
-
-            case 'boolean':
-            case 'null':
-                return String(value);
-
-            case 'object':
-
-// Due to a specification blunder in ECMAScript,
-// typeof null is 'object', so watch out for that case.
-
-                if (!value) {
-                    return 'null';
-                }
-
-// If the object has a toJSON method, call it, and stringify the result.
-
-                if (typeof value.toJSON === 'function') {
-                    return stringify(value.toJSON());
-                }
-                a = [];
-                if (typeof value.length === 'number' &&
-                        !(value.propertyIsEnumerable('length'))) {
-
-// The object is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
-                    l = value.length;
-                    for (i = 0; i < l; i += 1) {
-                        a.push(stringify(value[i], whitelist) || 'null');
-                    }
-
-// Join all of the elements together and wrap them in brackets.
-
-                    return '[' + a.join(',') + ']';
-                }
-                if (whitelist) {
-
-// If a whitelist (array of keys) is provided, use it to select the components
-// of the object.
-
-                    l = whitelist.length;
-                    for (i = 0; i < l; i += 1) {
-                        k = whitelist[i];
-                        if (typeof k === 'string') {
-                            v = stringify(value[k], whitelist);
-                            if (v) {
-                                a.push(stringify(k) + ':' + v);
-                            }
-                        }
-                    }
-                } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
-                    for (k in value) {
-                        if (typeof k === 'string') {
-                            v = stringify(value[k], whitelist);
-                            if (v) {
-                                a.push(stringify(k) + ':' + v);
-                            }
-                        }
-                    }
-                }
-
-// Join all of the member texts together and wrap them in braces.
-
-                return '{' + a.join(',') + '}';
-            }
-						return undefined;
-        }
-
-        return {
-            stringify: stringify,
-            parse: function (text, filter) {
-                var j;
-
-                function walk(k, v) {
-                    var i, n;
-                    if (v && typeof v === 'object') {
-                        for (i in v) {
-                            if (Object.prototype.hasOwnProperty.apply(v, [i])) {
-                                n = walk(i, v[i]);
-                                if (n !== undefined) {
-                                    v[i] = n;
-                                }
-                            }
-                        }
-                    }
-                    return filter(k, v);
-                }
-
-
-// Parsing happens in three stages. In the first stage, we run the text against
-// regular expressions that look for non-JSON patterns. We are especially
-// concerned with '()' and 'new' because they can cause invocation, and '='
-// because it can cause mutation. But just to be safe, we want to reject all
-// unexpected forms.
-
-// We split the first stage into 4 regexp operations in order to work around
-// crippling inefficiencies in IE's and Safari's regexp engines. First we
-// replace all backslash pairs with '@' (a non-JSON character). Second, we
-// replace all simple value tokens with ']' characters. Third, we delete all
-// open brackets that follow a colon or comma or that begin the text. Finally,
-// we look to see that the remaining characters are only whitespace or ']' or
-// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-
-                if (/^[\],:{}\s]*$/.test(text.replace(/\\./g, '@').
-replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(:?[eE][+\-]?\d+)?/g, ']').
-replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-// In the second stage we use the eval function to compile the text into a
-// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-// in JavaScript: it can begin a block or an object literal. We wrap the text
-// in parens to eliminate the ambiguity.
-
-                    j = eval('(' + text + ')');
-
-// In the optional third stage, we recursively walk the new structure, passing
-// each name/value pair to a filter function for possible transformation.
-
-                    return typeof filter === 'function' ? walk('', j) : j;
-                }
-
-// If the text is not JSON parseable, then a SyntaxError is thrown.
-
-                throw new SyntaxError('parseJSON');
-            }
-        };
-    }();
-}
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/parallelexecuter.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/parallelexecuter.js
deleted file mode 100644
index 9ff3d08a..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/parallelexecuter.js
+++ /dev/null
@@ -1,18 +0,0 @@
-function parallelExecuter(executer, operationCount){
-	var parameters = [];
-	var n = 0;
-	var ctr = 0;
-	function makeParallel(operation){
-		var id = n;
-		n++;
-		function cookie(){
-			parameters[id] = arguments;
-			ctr++;
-			if(ctr == operationCount){
-				executer(parameters);
-			}
-		}
-		operation(cookie);
-	}
-	return makeParallel;
-}
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/remove.png b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/remove.png
deleted file mode 100644
index 4136934aaa6c9207e2102abf7c41dd125e29db3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q#0(@S$S&Ulq!^2X+?^QKos)S9<ZuS~gt#&=
zh}PHF|NsA=Wg<&8NJUAIUoeBivm0q3PLj8~3quF1tOrPWfk$L90|U1(2s1Lwnj--e
zWH0gbb!ETFD#j@-p6D#P3@D`O>Eal|aXmS~fw_m#LCNGwW20jBROTtFmXjHqCq!|o
hw1_crUK8l>V-PIo5Ns9peG1gX;OXk;vd$@?2>|g!F6aON

diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/style.css b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/style.css
deleted file mode 100644
index 358c9eca..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/style.css
+++ /dev/null
@@ -1,80 +0,0 @@
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-
-.popup_content{
-	padding: 0.5em;
-	margin:0.5em;
-	background-color: white;
-}
-
-/* From http://www.quirksmode.org/css/forms.html*/
-.form_label .form_input{
-	display: block;
-	/*width: 150px;*/
-	float: left;
-	margin-bottom: 10px;
-}
-
-.form_input{
-    width: 500px;
-}
-
-.form_label {
-	text-align: right;
-	width: 75px;
-	padding-right: 20px;
-}
-
-.form_br {
-	clear: left;
-}
-
-.value{
-	display: inline-block;
-	width: 120px;
-}
-
-.operation{
-	width: 150px;
-}
-
-.link{
-	text-decoration: underline
-}
-.link:hover{
-	cursor:pointer;
-}
-
-#select_date_days{
-	width:50px;
-}
-
-.box{
-	background-color: white;
-	border: 1px solid black;
-}
-
-.box_cel{
-	display: inline-block;
-	width: 2em;
-	height:2em;
-	margin: 5px;
-}
-
-.row_selected{
-		color:white;
-		background-color:black;
-}
-
-/* similar to .small class defined themes/softed/style.css */ 
-.fieldname, .operation, .value, .form_input, .time_field, .timepicker {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-}
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/vtigerwebservices.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/vtigerwebservices.js
deleted file mode 100644
index 5f7632fd..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/vtigerwebservices.js
+++ /dev/null
@@ -1,156 +0,0 @@
-function vtigerwebservicesproto(){
-	var $ = jQuery;
-	function md5(str){
-		return hex_md5(str);
-	}
-
-	function mergeObjects(obj1, obj2){
-		var res = {};
-		for(var k in obj1){
-			res[k] = obj1[k];
-		}
-		for(var k in obj2){
-			res[k] = obj2[k];
-		}
-		return res;
-	}
-
-	function doGet(params, callback){
-		$.get(this.serviceUrl, params, function(result){
-			var parsed = JSON.parse(result);
-			callback(parsed);
-		});
-	}
-
-	function doPost(params, callback){
-		$.post(this.serviceUrl, params, function(result){
-			var parsed = JSON.parse(result);
-			callback(parsed);
-		});
-	}
-
-
-	function get(operation, parameters, callback){
-		response = this.doGet(mergeObjects(parameters,
-			{'operation':operation, 'sessionName':this.sessionId}), function(response){
-			if(response['success']==true){
-				callback(true,response['result']);
-			}else{
-				callback(false,response['error']);
-			}
-		});
-	}
-
-	function post(operation, parameters, callback){
-		response = this.doPost(mergeObjects(parameters,
-			{'operation':operation, 'sessionName':this.sessionId}), function(response){
-			if(response['success']==true){
-				callback(true,response['result']);
-			}else{
-				callback(false,response['error']);
-			}
-		});
-	}
-
-
-	function login(callback){
-		var self = this;
-		response = this.doGet({operation:'getchallenge', username:this.username}, function(response){
-			if(response['success']==true){
-				var token = response['result']['token'];
-				var encodedKey = md5(token+self.accessKey);
-				self.doPost({operation:'login', username: self.username, accessKey: encodedKey}, function (response){
-					if(response['success']==true){
-						self.sessionId = response['result']['sessionName'];
-						self.userId = response['result']['userId'];
-						callback(true);
-					}else{
-						callback(false,response['error']);
-					}
-				});
-			}else{
-				callback(false,response['error']);
-			}
-		});
-	}
-
-
-	function logout(callback){
-		this.post('logout', {}, callback);
-	}
-
-	function listTypes(callback){
-		this.get('listtypes', {}, function (status, result){
-			if(status){
-				callback(true, result['types']);
-			}else{
-				callback(false, result);
-			}
-		});
-	}
-
-	function describeObject(name, callback){
-		this.get('describe', {'elementType':name}, callback);
-	}
-
-	function create(object, objectType, callback){
-		if(object['assigned_user_id']==null){
-			object['assigned_user_id'] = this.userId;
-		}
-		objectJson = JSON.encode(object);
-		this.post('create', {'elementType':objectType,
-			'element':objectJson}, callback);
-	}
-
-	function retrieve(id, callback){
-		this.get('retrieve', {'id':id}, callback);
-	}
-
-	function update(object, callback){
-		objectJson = JSON.encode(object);
-		this.post('update', {'element':objectJson}, callback);
-	}
-
-
-	function deleteObject(id, callback){
-		this.post('delete', {'id':id}, callback);
-	}
-
-	function query(query, callback){
-		this.get('query', {'query':query}, callback);
-	}
-
-	function extendSession(callback){
-		var self = this;
-		this.doPost({operation: 'extendsession'}, function(response){
-			var status = response['success'];
-			var result = response['result'];
-			if(status==true){
-				self.sessionId = result['sessionName'];
-				self.userId = result['userId'];
-				callback(true, result);
-			}else{
-				callback(false, result);
-			}
-
-		});
-	}
-
-	return {
-		doPost:doPost, doGet:doGet,
-		get:get, post:post,
-		login:login, logout:logout,
-		listTypes:listTypes, describeObject:describeObject,
-		create:create, retrieve:retrieve, update:update, deleteObject:deleteObject,
-		query:query, extendSession: extendSession
-	}
-}
-
-function VtigerWebservices(serviceUrl, username, accessKey){
-	this.serviceUrl = serviceUrl;
-	this.username = username;
-	this.accessKey = accessKey;
-}
-VtigerWebservices.prototype = vtigerwebservicesproto();
-
-vtInst = new VtigerWebservices("http://localhost/504/webservice.php", "admin", "u1p8CDnxtCFwBRMZ");
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/workflowlistscript.js b/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/workflowlistscript.js
deleted file mode 100644
index da56bc62..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/resources/workflowlistscript.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/*+********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-
-jQuery.noConflict();
-function workflowlistscript($){
-
-
-	function jsonget(operation, params, callback){
-		var obj = {
-				module:'com_vtiger_workflow',
-				action:'com_vtiger_workflowAjax',
-				file:operation, ajax:'true'};
-		$.each(params,function(key, value){
-			obj[key] = value;
-		});
-		$.get('index.php', obj,
-			function(result){
-				var parsed = JSON.parse(result);
-				callback(parsed);
-		});
-	}
-
-	function center(el){
-		el.css({position: 'absolute'});
-		el.width("400px");
-		el.height("175px");
-		placeAtCenter(el.get(0));
-	}
-
-	function NewWorkflowPopup(){
-		function close(){
-			$('#new_workflow_popup').css('display', 'none');
-		}
-
-		function show(module){
-			$('#new_workflow_popup').css('display', 'block');
-			center($('#new_workflow_popup'));
-		}
-
-		$('#new_workflow_popup_close').click(close);
-		$('#new_workflow_popup_cancel').click(close);
-		return {
-			close:close,show:show
-		};
-	}
-
-
-	var workflowCreationMode='from_module';
-	var templatesForModule = {};
-	function updateTemplateList(){
-		var moduleSelect = $('#module_list');
-		var currentModule = moduleSelect.attr('value');
-		
-		$('#template_list').hide();
-		$('#template_list_foundnone').hide();
-		$('#template_list_busyicon').show();
-		
-		function fillTemplateList(templates){
-			var templateSelect = $('#template_list');
-			templateSelect.empty();
-			
-			$.each(templates, function(i, v){
-				templateSelect.append('<option value="'+v['id']+'">'+
-											v['title']+'</option>');
-			});
-			if(templateSelect.children().length > 0) { templateSelect.show(); } 
-			else { $('#template_list_foundnone').show(); }
-			$('#template_list_busyicon').hide();
-			
-		}
-		if(templatesForModule[currentModule]==null){
-
-			jsonget('templatesformodulejson',{module_name:currentModule},
-			function(templates){
-				templatesForModule[currentModule] = templates;
-				fillTemplateList(templatesForModule[currentModule]);
-			});
-		}else{
-			fillTemplateList(templatesForModule[currentModule]);
-		}
-	}
-
-	$(document).ready(function(){
-		var newWorkflowPopup = NewWorkflowPopup();
-		$("#new_workflow").click(newWorkflowPopup.show);
-		$("#pick_module").change(function(){
-			VtigerJS_DialogBox.block();
-			$("#filter_modules").submit();
-		});
-
-
-		$('.workflow_creation_mode').click(function(){
-			var el = $(this);
-			workflowCreationMode = el.attr('value');
-			if(workflowCreationMode=='from_template'){
-				updateTemplateList();
-				$('#template_select_field').show();
-			}else{
-				$('#template_select_field').hide();
-			}
-
-		});
-		$('#module_list').change(function(){
-			if(workflowCreationMode=='from_template'){
-				updateTemplateList();
-			}
-		});
-
-		var filterModule = $('#pick_module').attr('value');
-		if(filterModule!='All'){
-			$('#module_list').attr('value', filterModule);
-			$('#module_list').change();
-		}
-		
-		$('#new_workflow_popup_save').click(function() {
-			if(workflowCreationMode == 'from_template') {
-				// No templates selected?
-				if($('#template_list').attr('value') == '') {
-					return false;
-				}
-			}
-		});
-	});
-}
-workflowlistscript(jQuery);
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/runtaskjob.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/runtaskjob.php
deleted file mode 100644
index f6e4dca4..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/runtaskjob.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-ini_set('include_path',ini_get('include_path').':../..');
-
-	require_once("config.inc.php");
-	require_once("include/HTTP_Session/Session.php");
-	require_once 'include/Webservices/Utils.php';
-	require_once("modules/Users/Users.php");
-	require_once("include/Webservices/State.php");
-	require_once("include/Webservices/OperationManager.php");
-	require_once("include/Webservices/SessionManager.php");
-	require_once("include/Zend/Json.php");
-	require_once 'include/Webservices/WebserviceField.php';
-	require_once 'include/Webservices/EntityMeta.php';
-	require_once 'include/Webservices/VtigerWebserviceObject.php';
-	require_once("include/Webservices/VtigerCRMObject.php");
-	require_once("include/Webservices/VtigerCRMObjectMeta.php");
-	require_once("include/Webservices/DataTransform.php");
-	require_once("include/Webservices/WebServiceError.php");
-	require_once 'include/utils/CommonUtils.php';
-	require_once 'include/utils/utils.php';
-	require_once 'include/utils/UserInfoUtil.php';
-	require_once 'include/Webservices/ModuleTypes.php';
-	require_once 'include/utils/VtlibUtils.php';
-	require_once('include/logging.php');
-	require_once 'include/Webservices/WebserviceEntityOperation.php';
-	require_once "include/language/$default_language.lang.php";
-require_once 'include/Webservices/Retrieve.php';
-require_once('modules/Emails/mail.php');
-require_once 'modules/Users/Users.php';
-require_once('VTSimpleTemplate.inc');
-require_once 'VTEntityCache.inc';
-require_once('VTWorkflowUtils.php');
-
-	require 'include.inc';
-	
-	function vtRunTaskJob($adb){
-		$util = new VTWorkflowUtils();
-		$adminUser = $util->adminUser();
-		$tq = new VTTaskQueue($adb);
-		$readyTasks = $tq->getReadyTasks();
-		$tm = new VTTaskManager($adb);
-		foreach($readyTasks as $pair){
-			list($taskId, $entityId) = $pair;
-			$task = $tm->retrieveTask($taskId);
-			$entity = new VTWorkflowEntity($adminUser, $entityId);
-			$task->doTask($entity);
-		}
-	}
-	vtRunTaskJob($adb);
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/savetask.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/savetask.php
deleted file mode 100644
index 232aa32c..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/savetask.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once("Smarty_setup.php");
-require_once("include/utils/CommonUtils.php");
-require_once("include/events/SqlResultIterator.inc");
-require_once("VTTaskManager.inc");
-require_once("VTWorkflowUtils.php");
-require_once("VTWorkflowApplication.inc");
-
-	function vtSaveTask($adb, $request){
-	$util = new VTWorkflowUtils();
-		$module = new VTWorkflowApplication("savetask");
-		$mod = return_module_language($current_language, $module->name);
-
-		if(!$util->checkAdminAccess()){
-			$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-			$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-			return;
-		}
-
-		$tm = new VTTaskManager($adb);
-		if(isset($request["task_id"])){
-			$task = $tm->retrieveTask($request["task_id"]);
-		}else{
-			$taskType = $request["task_type"];
-			$workflowId = $request["workflow_id"];
-			$task = $tm->createTask($taskType, $workflowId);
-		}
-		$task->summary = $request["summary"];
-		
-		if($request["active"]=="true"){
-			$task->active=true;
-		}else if($request["active"]=="false"){
-			$task->active=false;
-		}
-		if(isset($request['check_select_date'])){
-			$trigger = array(
-				'days'=>($request['select_date_direction']=='after'?1:-1)*(int)$request['select_date_days'],
-				'field'=>$request['select_date_field']
-				); 
-			$task->trigger=$trigger;
-		}
-		
-		$fieldNames = $task->getFieldNames();
-		foreach($fieldNames as $fieldName){
-			$task->$fieldName = $request[$fieldName];
-			if ($fieldName == 'calendar_repeat_limit_date') {
-				$task->$fieldName = getDBInsertDateValue($request[$fieldName]);
-			}
-		}
-		$tm->saveTask($task);
-		
-		if(isset($request["return_url"])){
-			$returnUrl=$request["return_url"];
-		}else{
-			$returnUrl=$module->editTaskUrl($task->id);
-		}
-		
-		?>
-		<script type="text/javascript" charset="utf-8">
-			window.location="<?=$returnUrl?>";
-		</script>
-		<a href="<?=$returnUrl?>">Return</a>
-		<?php
-	}
-vtSaveTask($adb, $_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/savetemplate.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/savetemplate.php
deleted file mode 100644
index 4b5c489c..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/savetemplate.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once "include/utils/CommonUtils.php";
-require_once "include/events/SqlResultIterator.inc";
-require_once "include/Zend/Json.php";
-require_once "VTWorkflowApplication.inc";
-require_once "VTWorkflowManager.inc";
-require_once "VTWorkflowTemplateManager.inc";
-require_once "VTTaskManager.inc";
-require_once "VTWorkflowUtils.php";
-
-function vtSaveWorkflowTemplate($adb, $request){
-	$util = new VTWorkflowUtils();
-	$module = new VTWorkflowApplication("savetemplate");
-	$mod = return_module_language($current_language, $module->name);
-	
-	if(!$util->checkAdminAccess()){
-		$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-		$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-		return;
-	}
-
-	$title = $request['title'];
-	$workflowId = $request['workflow_id'];
-	$wfs = new VTworkflowManager($adb);
-	$workflow = $wfs->retrieve($workflowId);
-	$tm = new VTWorkflowTemplateManager($adb);
-	$tpl = $tm->newTemplate($title, $workflow);
-	$tm->saveTemplate($tpl);
-	$returnUrl = $request['return_url'];
-	?>
-		<script type="text/javascript" charset="utf-8">
-			 window.location="<?=$returnUrl?>";
-		</script>
-		<a href="<?=$returnUrl?>">Return</a>	
-	<?php
-}
-vtSaveWorkflowTemplate($adb, $_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/saveworkflow.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/saveworkflow.php
deleted file mode 100644
index a4d49b4c..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/saveworkflow.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once("Smarty_setup.php");
-require_once("include/utils/CommonUtils.php");
-require_once("include/events/SqlResultIterator.inc");
-require_once("include/Zend/Json.php");
-require_once("VTWorkflowApplication.inc");
-require_once("VTWorkflowManager.inc");
-require_once("VTWorkflowUtils.php");
-
-	function vtWorkflowSave($adb, $request){
-		$util = new VTWorkflowUtils();
-		$module = new VTWorkflowApplication("saveworkflow");
-		$mod = return_module_language($current_language, $module->name);
-
-		if(!$util->checkAdminAccess()){
-			$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-			$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-			return;
-		}
-
-		$description = $request["description"];
-		$moduleName = $request["module_name"];
-		$conditions = $request["conditions"];
-		$taskId = $request["task_id"];
-		$saveType=$request["save_type"];
-		$executionCondition = $request['execution_condition'];
-		$wm = new VTWorkflowManager($adb);
-		if($saveType=='new'){
-			$wf = $wm->newWorkflow($moduleName);
-			$wf->description = $description;
-			$wf->test = $conditions;
-			$wf->taskId = $taskId;
-			$wf->executionConditionAsLabel($executionCondition);
-			$wm->save($wf);
-		}else if($saveType=='edit'){
-			$wf = $wm->retrieve($request["workflow_id"]);
-			$wf->description = $description;
-			$wf->test = $conditions;
-			$wf->taskId = $taskId;
-			$wf->executionConditionAsLabel($executionCondition);
-			$wm->save($wf);
-		}else{
-			throw new Exception();
-		}
-		if(isset($request["return_url"])){
-			$returnUrl=$request["return_url"];
-		}else{
-			$returnUrl=$module->editWorkflowUrl($wf->id);
-		}
-		?>
-		<script type="text/javascript" charset="utf-8">
-			window.location="<?=$returnUrl?>";
-		</script>
-		<a href="<?=$returnUrl?>">Return</a>
-		<?php
-		
-	}
-	
-	vtWorkflowSave($adb, $_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/sortfieldsjson.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/sortfieldsjson.php
deleted file mode 100644
index 55e83270..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/sortfieldsjson.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-	function vtSortFieldsJson($request){
-		$moduleName = $request['module_name'];
-		require_once("modules/$moduleName/$moduleName.php");
-		$focus = new $moduleName();
-		echo Zend_Json::encode($focus->sortby_fields);
-	}
-	vtSortFieldsJson($_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasklist.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/tasklist.php
deleted file mode 100644
index de7ea0f2..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasklist.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-	require_once("Smarty_setup.php");
-	require_once("include/utils/CommonUtils.php");
-	require_once("include/events/SqlResultIterator.inc");
-	
-	require_once("VTTaskManager.inc");
-	require_once("VTWorkflowApplication.inc");
-require_once("VTWorkflowUtils.php");
-
-	
-	function vtDisplayTaskList($adb, $requestUrl, $current_language){
-		global $theme, $app_strings;
-		$image_path = "themes/$theme/images/";
-		
-		$util = new VTWorkflowUtils();
-		$module = new VTWorkflowApplication("tasklist");
-		$mod = return_module_language($current_language, $module->name);
-	
-		if(!$util->checkAdminAccess()){
-			$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-			$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-			return;
-		}
-
-		$smarty = new vtigerCRM_Smarty();
-		$tm = new VTTaskManager($adb);
-		$smarty->assign("tasks", $tm->getTasks());
-		$smarty->assign("moduleNames", array("Contacts", "Applications"));
-		$smarty->assign("taskTypes", array("VTEmailTask", "VTDummyTask"));
-		$smarty->assign("returnUrl", $requestUrl);
-		
-		$smarty->assign("MOD", return_module_language($current_language,'Settings'));
-		$smarty->assign("APP", $app_strings);
-		$smarty->assign("THEME", $theme);
-		$smarty->assign("IMAGE_PATH",$image_path);
-		$smarty->assign("MODULE_NAME", $module->label);
-		$smarty->assign("PAGE_NAME", 'Task List');
-		$smarty->assign("PAGE_TITLE", 'List available tasks');
-		$smarty->assign("moduleName", $moduleName);
-		$smarty->display("{$module->name}/ListTasks.tpl");
-	}
-	vtDisplayTaskList($adb, $_SERVER["REQUEST_URI"], $current_language);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
deleted file mode 100644
index d12c03cc..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-class VTCreateEntityTask extends VTTask{
-
-	public function getFieldNames(){
-		return array("fieldExpressions");
-	}
-	public function doTask($module, $data){
-	}
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateEventTask.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateEventTask.inc
deleted file mode 100644
index bc050993..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateEventTask.inc
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('include/Webservices/Utils.php');
-require_once("include/Webservices/VtigerCRMObject.php");
-require_once("include/Webservices/VtigerCRMObjectMeta.php");
-require_once("include/Webservices/DataTransform.php");
-require_once("include/Webservices/WebServiceError.php");
-require_once 'include/Webservices/ModuleTypes.php';
-require_once('include/Webservices/Create.php');
-require_once 'include/Webservices/DescribeObject.php';
-require_once 'include/Webservices/WebserviceField.php';
-require_once 'include/Webservices/EntityMeta.php';
-require_once 'include/Webservices/VtigerWebserviceObject.php';
-
-require_once("modules/Users/Users.php");
-
-class VTCreateEventTask extends VTTask{
-	public $executeImmediately = true;
-	
-	public function getFieldNames(){
-		return array('eventType', 'eventName', 'description', 'sendNotification', 
-								 'startTime', 'startDays', 'startDirection', 'startDatefield', 
-								 'endTime','endDays', 'endDirection', 'endDatefield',
-								 'status', 'priority','recurringcheck','repeat_frequency',
-								 'recurringtype','calendar_repeat_limit_date',
-								 'mon_flag','tue_flag','wed_flag','thu_flag','fri_flag','sat_flag','sun_flag',
-								 'repeatMonth','repeatMonth_date','repeatMonth_daytype','repeatMonth_day');
-	}
-	
-	function getAdmin(){
-		$user = new Users();
-		$user->retrieveCurrentUserInfoFromFile(1);
-		global $current_user;
-		$this->originalUser = $current_user;
-		$current_user = $user;
-		return $user;
-	}
-	
-	public function doTask($entityData){
-		global $adb, $current_user;
-		$userId = $entityData->get('assigned_user_id');
-		if($userId===null){
-			$userId = vtws_getWebserviceEntityId('Users', 1);;
-		}
-
-		$startDate = $this->calculateDate($entityData, $this->startDays, 
-															$this->startDirection, $this->startDatefield);
-		$endDate = $this->calculateDate($entityData, $this->endDays, 
-															$this->endDirection, $this->endDatefield);
-		
-		$fields = array(
-			'activitytype'=>$this->eventType,
-			'description'=>$this->description,
-			'subject'=>$this->eventName,
-			'taskpriority'=>$this->priority,
-			'eventstatus'=>$this->status,
-			'assigned_user_id'=>$userId,
-			'time_start'=>self::conv12to24hour($this->startTime),
-			'date_start'=>$startDate,
-			'time_end'=>self::conv12to24hour($this->endTime),
-			'due_date'=>$endDate,
-			'visibility'=>'all',
-			'taskstatus'=>'',
-			'duration_hours'=>'0'
-		);
-
-		$_REQUEST['date_start'] = getDisplayDate($startDate);
-		$_REQUEST['due_date'] = getDisplayDate($endDate);
-		$_REQUEST['recurringcheck']=$this->recurringcheck;
-		$_REQUEST['repeat_frequency']=$this->repeat_frequency;
-		$_REQUEST['recurringtype']=$this->recurringtype;
-		$_REQUEST['calendar_repeat_limit_date']=getDisplayDate($this->calendar_repeat_limit_date);
-		$_REQUEST['mon_flag']=$this->mon_flag;
-		$_REQUEST['tue_flag']=$this->tue_flag;
-		$_REQUEST['wed_flag']=$this->wed_flag;
-		$_REQUEST['thu_flag']=$this->thu_flag;
-		$_REQUEST['fri_flag']=$this->fri_flag;
-		$_REQUEST['sat_flag']=$this->sat_flag;
-		$_REQUEST['sun_flag']=$this->sun_flag;
-		$_REQUEST['repeatMonth']=$this->repeatMonth;
-		$_REQUEST['repeatMonth_date']=$this->repeatMonth_date;
-		$_REQUEST['repeatMonth_daytype']=$this->repeatMonth_daytype;
-		$_REQUEST['repeatMonth_day']=$this->repeatMonth_day;
-
-		$moduleName = $entityData->getModuleName();
-		$adminUser = $this->getAdmin();
-		$id = $entityData->getId();
-		if($moduleName=='Contacts'){
-			$fields['contact_id'] = $id;
-		}else{ 
-			$data = vtws_describe('Calendar', $adminUser);
-			$fieldInfo = $data['fields'];
-			foreach($fieldInfo as $field){
-				if($field['name']=='parent_id'){
-					$parentIdField = $field;
-				}
-			}
-			$refersTo = $parentIdField['type']['refersTo'];
-			
-			if(in_array($moduleName, $refersTo)){
-				$fields['parent_id'] = $id;
-			}
-		}
-		
-		$event = vtws_create('Events', $fields, $adminUser);
-		list($typeId, $id) = vtws_getIdComponents($event['id']);
-		$event = CRMEntity::getInstance('Events');
-		$event->id = $id;
-		$startDate = $entityData->get($this->startDatefield);
-		if($this->recurringcheck && !empty($startDate) &&
-				($this->calendar_repeat_limit_date)) {
-			include_once 'modules/Calendar/RepeatEvents.php';
-			Calendar_RepeatEvents::repeat($event);
-		}
-		global $current_user;
-		$current_user = $this->originalUser;
-	}
-
-	private function calculateDate($entityData, $days, $direction, $datefield){
-		$baseDate = $entityData->get($datefield);
-		preg_match('/\d\d\d\d-\d\d-\d\d/', $baseDate, $match);
-		$baseDate = strtotime($match[0]);
-		$date = strftime('%Y-%m-%d', $baseDate+$days*24*60*60*
-										 ($direction=='Before'?-1:1));
-		return $date;
-	}
-
-	static function conv12to24hour($timeStr){
-		$arr = array();
-		preg_match('/(\d{1,2}):(\d{1,2})(am|pm)/', $timeStr, $arr);
-		if($arr[3]=='am'){
-			$hours = ((int)$arr[1]) % 12;
-		}else{
-			$hours = ((int)$arr[1]) % 12 + 12;
-		}
-		return str_pad($hours, 2, '0', STR_PAD_LEFT).':'.str_pad($arr[2], 2, '0', STR_PAD_LEFT);
-	}
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateTodoTask.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateTodoTask.inc
deleted file mode 100644
index 82c04e28..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTCreateTodoTask.inc
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('include/Webservices/Utils.php');
-require_once("include/Webservices/VtigerCRMObject.php");
-require_once("include/Webservices/VtigerCRMObjectMeta.php");
-require_once("include/Webservices/DataTransform.php");
-require_once("include/Webservices/WebServiceError.php");
-require_once 'include/Webservices/ModuleTypes.php';
-require_once('include/Webservices/Create.php');
-require_once 'include/Webservices/DescribeObject.php';
-require_once 'include/Webservices/WebserviceField.php';
-require_once 'include/Webservices/EntityMeta.php';
-require_once 'include/Webservices/VtigerWebserviceObject.php';
-
-require_once("modules/Users/Users.php");
-
-class VTCreateTodoTask extends VTTask{
-	public $executeImmediately = true;
-	
-	public function getFieldNames(){return array('todo', 'description', 'sendNotification', 'time', 'date', 'status', 'priority', 'days', 'direction', 'datefield', 'sendNotification');}
-	
-	function getAdmin(){
-		$user = new Users();
-		$user->retrieveCurrentUserInfoFromFile(1);
-		global $current_user;
-		$this->originalUser = $current_user;
-		$current_user = $user;
-		return $user;
-	}
-	
-	public function doTask($entityData){
-		global $adb, $current_user;
-		$userId = $entityData->get('assigned_user_id');
-		if($userId===null){
-			$userId = vtws_getWebserviceEntityId('Users', 1);;
-		}
-
-		$baseDate = $entityData->get($this->datefield);
-		$time = explode(' ',$baseDate);
-		if(count($time) < 2) {
-			$time[] = date('H:i');
-		}
-		preg_match('/\d\d\d\d-\d\d-\d\d/', $baseDate, $match);
-		$baseDate = strtotime($match[0]);
-		$date = strftime('%Y-%m-%d', $baseDate+$this->days*24*60*60*($this->directions=='Before'?-1:1));
-		$fields = array(
-			'activitytype'=>'Task',
-			'description'=>$this->description,
-			'subject'=>$this->todo,
-			'taskpriority'=>$this->priority,
-			'taskstatus'=>$this->status,
-			'assigned_user_id'=>$userId,
-			'time_start'=>$time[1],
-			'sendnotification'=>$this->sendNotification!=''?1:0,
-			'date_start'=>$date,
-			'due_date'=>$date,
-			'visibility'=>'all',
-			'eventstatus'=>''
-		);
-		$moduleName = $entityData->getModuleName();
-		$adminUser = $this->getAdmin();
-		$id = $entityData->getId();
-		if($moduleName=='Contacts'){
-			$fields['contact_id'] = $id;
-		}else{ 
-			$data = vtws_describe('Calendar', $adminUser);
-			$fieldInfo = $data['fields'];
-			foreach($fieldInfo as $field){
-				if($field['name']=='parent_id'){
-					$parentIdField = $field;
-				}
-			}
-			$refersTo = $parentIdField['type']['refersTo'];
-			
-			if(in_array($moduleName, $refersTo)){
-				$fields['parent_id'] = $id;
-			}
-		}
-		
-		vtws_create('Calendar', $fields, $adminUser);
-		global $current_user;
-		$current_user = $this->originalUser;
-	}
-
-	static function conv12to24hour($timeStr){
-		$arr = array();
-		preg_match('/(\d{1,2}):(\d{1,2})(am|pm)/', $timeStr, $arr);
-		if($arr[3]=='am'){
-			$hours = ((int)$arr[1]) % 12;
-		}else{
-			$hours = ((int)$arr[1]) % 12 + 12;
-		}
-		return str_pad($hours, 2, '0', STR_PAD_LEFT).':'.str_pad($arr[2], 2, '0', STR_PAD_LEFT);
-	}
-}
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTDummyTask.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTDummyTask.inc
deleted file mode 100644
index b936cd74..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTDummyTask.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-class VTDummyTask extends VTTask{
-	public $executeImmediately = true; 
-	
-	public function getFieldNames(){return array();}
-	public function doTask($entity){
-		$statement=$this->statement;
-		echo "This is a dummy workflow task with $statement";
-	}
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTEmailTask.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTEmailTask.inc
deleted file mode 100644
index b675e48f..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTEmailTask.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('modules/com_vtiger_workflow/VTEntityCache.inc');
-require_once('modules/com_vtiger_workflow/VTWorkflowUtils.php');
-require_once('modules/com_vtiger_workflow/VTEmailRecipientsTemplate.inc');
-require_once('modules/Emails/mail.php');
-class VTEmailTask extends VTTask{
-	// Sending email takes more time, this should be handled via queue all the time.
-	public $executeImmediately = false; 
-
-	public function getFieldNames(){
-		return array("subject", "content", "recepient", 'emailcc', 'emailbcc');
-	}
-	public function doTask($entity){
-		global $adb, $current_user;
-		$util = new VTWorkflowUtils();
-
-		$result = $adb->query("select user_name, email1, email2 from vtiger_users where id=1");
-		$from_email = $adb->query_result($result,0,'email1');
-		$from_name  = $adb->query_result($result,0,'user_name');
-
-		$admin = $util->adminUser();
-		$module = $entity->getModuleName();
-
-		$entityCache = new VTEntityCache($admin);
-
-		$et = new VTEmailRecipientsTemplate($this->recepient);
-		$to_email = $et->render($entityCache, $entity->getId());
-		$ecct = new VTEmailRecipientsTemplate($this->emailcc);
-		$cc = $ecct->render($entityCache, $entity->getId());
-		$ebcct = new VTEmailRecipientsTemplate($this->emailbcc);
-		$bcc = $ebcct->render($entityCache, $entity->getId());
-		if(strlen(trim($to_email, " \t\n,")) == 0 && strlen(trim($cc, " \t\n,")) == 0 &&
-				strlen(trim($bcc, " \t\n,")) == 0) {
-			return ;
-		}
-
-		$st = new VTSimpleTemplate($this->subject);
-		$subject = $st->render($entityCache, $entity->getId());
-		$ct = new VTSimpleTemplate($this->content);
-		$content = $ct->render($entityCache, $entity->getId());
-		send_mail($module,$to_email,$from_name,$from_email,$subject,$content, $cc, $bcc);
-
-		$util->revertUser();
-	}
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTEntityMethodTask.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTEntityMethodTask.inc
deleted file mode 100644
index ad4d4fbd..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTEntityMethodTask.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('modules/com_vtiger_workflow/VTEntityMethodManager.inc');
-class VTEntityMethodTask extends VTTask{
-	
-	public $executeImmediately = true;
-	
-	public function getFieldNames(){return array('methodName');}
-	public function doTask($entityData){
-		global $adb;
-		$emm = new VTEntityMethodManager($adb);
-		$emm->executeMethod($entityData, $this->methodName);
-	}
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTSMSTask.inc b/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTSMSTask.inc
deleted file mode 100644
index d3bc0721..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/tasks/VTSMSTask.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('modules/SMSNotifier/workflow/VTSMSTask.php');
-
-?>
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/templatesformodulejson.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/templatesformodulejson.php
deleted file mode 100644
index 4bcbbf7d..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/templatesformodulejson.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once 'include/Zend/Json.php';
-require_once 'VTWorkflowTemplateManager.inc';
-function vtTemplatesForModuleJson($adb, $request){
-	$moduleName = $request['module_name'];
-	$tm = new VTWorkflowTemplateManager($adb); 
-	$templates = $tm->getTemplatesForModule($moduleName);
-	$arr = array();
-	foreach($templates as $template){
-		$arr[] = array("title"=>$template->title, 'id'=>$template->id);
-	}
-	echo Zend_Json::encode($arr);
-}
-vtTemplatesForModuleJson($adb, $_REQUEST);
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/com_vtiger_workflow/workflowlist.php b/oss/vtiger/trunk/modules/com_vtiger_workflow/workflowlist.php
deleted file mode 100644
index 275b0cee..00000000
--- a/oss/vtiger/trunk/modules/com_vtiger_workflow/workflowlist.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once("Smarty_setup.php");
-require_once("include/utils/CommonUtils.php");
-
-require_once("include/events/SqlResultIterator.inc");
-
-require_once("VTWorkflowManager.inc");
-require_once("VTWorkflowApplication.inc");
-require_once("VTWorkflowUtils.php");
-
-function vtGetModules($adb){
-	$modules_not_supported = array('Documents','Calendar','Emails','Faq','Events','PBXManager','Users'); 
-	$sql="select distinct vtiger_field.tabid, name
-			from vtiger_field 
-			inner join vtiger_tab 
-				on vtiger_field.tabid=vtiger_tab.tabid 
-			where vtiger_tab.name not in(".generateQuestionMarks($modules_not_supported).") and vtiger_tab.isentitytype=1 and vtiger_tab.presence = 0 ";
-	$it = new SqlResultIterator($adb, $adb->pquery($sql,array($modules_not_supported)));
-	$modules = array();
-	foreach($it as $row){
-		$modules[] = $row->name;
-	}
-	return $modules;
-}
-
-function vtDisplayWorkflowList($adb, $request, $requestUrl, $app_strings, $current_language){
-	global $theme;
-	$image_path = "themes/$theme/images/";
-
-	$module = new VTWorkflowApplication("workflowlist");
-	$util = new VTWorkflowUtils();
-	$mod = return_module_language($current_language, $module->name);
-
-	if(!$util->checkAdminAccess()){
-		$errorUrl = $module->errorPageUrl($mod['LBL_ERROR_NOT_ADMIN']);
-		$util->redirectTo($errorUrl, $mod['LBL_ERROR_NOT_ADMIN']);
-		return;
-	}
-
-	$smarty = new vtigerCRM_Smarty();
-	$wfs = new VTWorkflowManager($adb);
-	$smarty->assign("moduleNames", $util->vtGetModules($adb));
-	$smarty->assign("returnUrl", $requestUrl);
-
-	$listModule =$request['list_module'];
-	$smarty->assign("listModule", $listModule);
-	if($listModule==null || strtolower($listModule)=="all"){
-		$smarty->assign("workflows", $wfs->getWorkflows());
-	}else{
-		$smarty->assign("workflows", $wfs->getWorkflowsForModule($listModule));
-	}
-
-	$smarty->assign("MOD",array_merge(
-	return_module_language($current_language,'Settings'),
-	return_module_language($current_language, $module->name)));
-	$smarty->assign("APP", $app_strings);
-	$smarty->assign("THEME", $theme);
-	$smarty->assign("IMAGE_PATH",$image_path);
-	$smarty->assign("MODULE_NAME", $module->label);
-	$smarty->assign("PAGE_NAME", $mod['LBL_WORKFLOW_LIST']);
-	$smarty->assign("PAGE_TITLE", $mod['LBL_AVAILABLE_WORKLIST_LIST']);
-	$smarty->assign("module", $module);
-	$smarty->display("{$module->name}/ListWorkflows.tpl");
-}
-vtDisplayWorkflowList($adb, $_REQUEST, $_SERVER["REQUEST_URI"], $app_strings, $current_language);
-?>