diff --git a/modules/Inventory/views/ProductsPopupAjax.php b/modules/Inventory/views/ProductsPopupAjax.php
index 21d5569ac6f2657e28a18f345928c6b7a67cbbf7..51655199ba19c6278511d5d0587484153e37ecb4 100644
--- a/modules/Inventory/views/ProductsPopupAjax.php
+++ b/modules/Inventory/views/ProductsPopupAjax.php
@@ -25,7 +25,7 @@ class Inventory_ProductsPopupAjax_View extends Inventory_ProductsPopup_View {
return 'Products';
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display = true) {
return true;
}
diff --git a/modules/Inventory/views/SendEmail.php b/modules/Inventory/views/SendEmail.php
index 1bff6874a9359a7f5711b4f94af13b92ccf48209..d5eaae3f339daad5707043bbba8ed99fd41a1000 100644
--- a/modules/Inventory/views/SendEmail.php
+++ b/modules/Inventory/views/SendEmail.php
@@ -15,7 +15,7 @@ class Inventory_SendEmail_View extends Vtiger_ComposeEmail_View {
* This will handle the case of attaching the invoice pdf as attachment
* @param Vtiger_Request $request
*/
- public function composeMailData(Vtiger_Request $request) {
+ public function composeMailData($request) {
parent::composeMailData($request);
$viewer = $this->getViewer($request);
$inventoryRecordId = $request->get('record');
diff --git a/modules/Inventory/views/ServicesPopupAjax.php b/modules/Inventory/views/ServicesPopupAjax.php
index 9d393f94b6f39b9a323c76994a633eeb64de2e6a..95c1e88f465a88fe60e3e15e8e6be6533b270851 100644
--- a/modules/Inventory/views/ServicesPopupAjax.php
+++ b/modules/Inventory/views/ServicesPopupAjax.php
@@ -17,7 +17,7 @@ class Inventory_ServicesPopupAjax_View extends Inventory_ServicesPopup_View {
$this->exposeMethod('getPageCount');
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/Inventory/views/SubProductsPopupAjax.php b/modules/Inventory/views/SubProductsPopupAjax.php
index e55a57c2b96ba046230f10f5236178843e9a9c70..dd419300b91b558b84aa70cc664cddbdaac5c2a6 100644
--- a/modules/Inventory/views/SubProductsPopupAjax.php
+++ b/modules/Inventory/views/SubProductsPopupAjax.php
@@ -25,7 +25,7 @@ class Inventory_SubProductsPopupAjax_View extends Inventory_SubProductsPopup_Vie
return 'Products';
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/PriceBooks/views/PopupAjax.php b/modules/PriceBooks/views/PopupAjax.php
index ac9cee20551b47a4f07a0f6e505637659f0d7de4..cf0136d57b9f3fa590f01dd0938855f51fba5437 100755
--- a/modules/PriceBooks/views/PopupAjax.php
+++ b/modules/PriceBooks/views/PopupAjax.php
@@ -17,7 +17,7 @@ class PriceBooks_PopupAjax_View extends PriceBooks_Popup_View {
$this->exposeMethod('getPageCount');
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/PurchaseOrder/views/ProductsPopupAjax.php b/modules/PurchaseOrder/views/ProductsPopupAjax.php
index d67314230f45c4dedaeb7f4ed267a484ad4106ad..7064091916f570299f3f647318961de69c243ca1 100644
--- a/modules/PurchaseOrder/views/ProductsPopupAjax.php
+++ b/modules/PurchaseOrder/views/ProductsPopupAjax.php
@@ -17,7 +17,7 @@ class PurchaseOrder_ProductsPopupAjax_View extends PurchaseOrder_ProductsPopup_V
$this->exposeMethod('getPageCount');
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display = true) {
return true;
}
diff --git a/modules/Rss/actions/Save.php b/modules/Rss/actions/Save.php
index b8ac615ae1a493f26ec0e98b6ece061a5b823aa5..a5c4defe690612a6f09228a7a217a7c3b00baf8d 100644
--- a/modules/Rss/actions/Save.php
+++ b/modules/Rss/actions/Save.php
@@ -24,7 +24,8 @@ class Rss_Save_Action extends Vtiger_Save_Action {
$result = $recordModel->validateRssUrl($url);
if($result) {
- $recordModel->save($url);
+ $recordModel->set('url', $url);
+ $recordModel->save();
$response->setResult(array('success' => true, 'message' => vtranslate('JS_RSS_SUCCESSFULLY_SAVED', $moduleName), 'id' => $recordModel->getId(), 'title' => $recordModel->get('rsstitle')));
} else {
$response->setResult(array('success' => false, 'message' => vtranslate('JS_INVALID_RSS_URL', $moduleName)));
diff --git a/modules/Rss/models/Record.php b/modules/Rss/models/Record.php
index 8a9973a85f6badf0d3236359de80cf75f414a30d..92a116387075cdfb30fba9a610881c775b9907e0 100644
--- a/modules/Rss/models/Record.php
+++ b/modules/Rss/models/Record.php
@@ -69,9 +69,10 @@ class Rss_Record_Model extends Vtiger_Record_Model {
/**
* Function to save the record
- * @param <string> $url
*/
- public function save($url) {
+ public function save() {
+ $url = $this->get('url');
+
$db = PearDatabase::getInstance();
$title = $this->getName();
$id = $db->getUniqueID("vtiger_rss");
@@ -123,7 +124,7 @@ class Rss_Record_Model extends Vtiger_Record_Model {
* @param <String> $qualifiedModuleName
* @return <Rss_Record_Model> RecordModel
*/
- static public function getInstanceById($recordId, $qualifiedModuleName) {
+ static public function getInstanceById($recordId, $qualifiedModuleName = null) {
$db = PearDatabase::getInstance();
$result = $db->pquery('SELECT * FROM vtiger_rss WHERE rssid = ?', array($recordId));
diff --git a/modules/Settings/PickListDependency/views/IndexAjax.php b/modules/Settings/PickListDependency/views/IndexAjax.php
index 0f551c32fcc9310d189227ff0729599640e4db26..b4351fb4627f9186c69b3b66cd3dda4efba2dec0 100644
--- a/modules/Settings/PickListDependency/views/IndexAjax.php
+++ b/modules/Settings/PickListDependency/views/IndexAjax.php
@@ -15,7 +15,7 @@ class Settings_PickListDependency_IndexAjax_View extends Settings_PickListDepend
$this->exposeMethod('getDependencyGraph');
}
- public function preProcess(Vtiger_Request $request) {
+ public function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/Settings/Roles/actions/MoveAjax.php b/modules/Settings/Roles/actions/MoveAjax.php
index f8f8a05de8c2e64fc4046df67a5e44b653be7138..eb7e3dcd5436585fd7a661a5aea728582d7fa698 100644
--- a/modules/Settings/Roles/actions/MoveAjax.php
+++ b/modules/Settings/Roles/actions/MoveAjax.php
@@ -10,7 +10,7 @@
class Settings_Roles_MoveAjax_Action extends Settings_Vtiger_Basic_Action {
- public function preProcess(Vtiger_Request $request) {
+ public function preProcess(Vtiger_Request $request, $display=true) {
return;
}
diff --git a/modules/Settings/Roles/views/IndexAjax.php b/modules/Settings/Roles/views/IndexAjax.php
index 3f5baacb62f0e24d70ea95ab22597ab14f099aad..3ffa310552b3c3c5c0967a4a2084f9113cf3e23e 100644
--- a/modules/Settings/Roles/views/IndexAjax.php
+++ b/modules/Settings/Roles/views/IndexAjax.php
@@ -10,7 +10,7 @@
class Settings_Roles_IndexAjax_View extends Settings_Roles_Index_View {
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display=true) {
return;
}
diff --git a/modules/Users/views/ListAjax.php b/modules/Users/views/ListAjax.php
index c34611818dcf33f8135e9a8b03ab40597b04ccb9..0e9c08363a2a3c41d554273f7999e2802a0677bd 100755
--- a/modules/Users/views/ListAjax.php
+++ b/modules/Users/views/ListAjax.php
@@ -16,7 +16,7 @@ class Users_ListAjax_View extends Users_List_View{
$this->exposeMethod('getPageCount');
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/Vtiger/dashboards/MiniList.php b/modules/Vtiger/dashboards/MiniList.php
index 0f4baea21986e74050842435902fe2096b10ae49..69f0f433a46494fa957c66bffd38f159f0bceb52 100644
--- a/modules/Vtiger/dashboards/MiniList.php
+++ b/modules/Vtiger/dashboards/MiniList.php
@@ -42,7 +42,7 @@ class Vtiger_MiniList_Dashboard extends Vtiger_IndexAjax_View {
$viewer->assign('BASE_MODULE', $minilistWidgetModel->getTargetModule());
$viewer->assign('CURRENT_PAGE', $currentPage);
$viewer->assign('MORE_EXISTS', $minilistWidgetModel->moreRecordExists());
- $viewer->assign('SCRIPTS', $this->getHeaderScripts());
+ $viewer->assign('SCRIPTS', $this->getHeaderScripts($request));
$viewer->assign('USER_MODEL', Users_Record_Model::getCurrentUserModel());
$content = $request->get('content');
@@ -56,7 +56,7 @@ class Vtiger_MiniList_Dashboard extends Vtiger_IndexAjax_View {
}
- function getHeaderScripts() {
+ function getHeaderScripts(Vtiger_Request $request) {
return $this->checkAndConvertJsScripts(array('modules.Emails.resources.MassEdit'));
}
}
diff --git a/modules/Vtiger/views/EmailsRelatedModulePopupAjax.php b/modules/Vtiger/views/EmailsRelatedModulePopupAjax.php
index 21ccf782b9727b4b44217f1148ed2652af976dc1..474b0191d3d187753031263ef72ced87981f0240 100644
--- a/modules/Vtiger/views/EmailsRelatedModulePopupAjax.php
+++ b/modules/Vtiger/views/EmailsRelatedModulePopupAjax.php
@@ -17,7 +17,7 @@ class Vtiger_EmailsRelatedModulePopupAjax_View extends Vtiger_EmailsRelatedModul
$this->exposeMethod('getPageCount');
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/Vtiger/views/PopupAjax.php b/modules/Vtiger/views/PopupAjax.php
index 09ec65ed888765aa7f1e9e2cb625722420dc199d..99c456fee2aba09ed72ea1427d9a851cea781d5c 100644
--- a/modules/Vtiger/views/PopupAjax.php
+++ b/modules/Vtiger/views/PopupAjax.php
@@ -17,7 +17,7 @@ class Vtiger_PopupAjax_View extends Vtiger_Popup_View {
$this->exposeMethod('getPageCount');
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/Vtiger/views/TooltipAjax.php b/modules/Vtiger/views/TooltipAjax.php
index dba0715f76119f9218a6d6c6b6f58c271ce81135..a9792a420485561843f1ec9bf044dd352dbbaaa5 100644
--- a/modules/Vtiger/views/TooltipAjax.php
+++ b/modules/Vtiger/views/TooltipAjax.php
@@ -10,7 +10,7 @@
class Vtiger_TooltipAjax_View extends Vtiger_PopupAjax_View {
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index 19680e5c83de7ca151c87d5f06719043d23be712..569ed9bd23a55aa735fee3cf37c8c803ef45121c 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index 479a7a1f0703e9ea205416565ee66f2b641490ea..4e9844a41e9e8e38e19600ae7e80496886671ae7 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/mandatory/Mobile.zip b/packages/vtiger/mandatory/Mobile.zip
index d0b949ccce03f1230591eae8c3738682958bc996..68bc84fef104cfaf68aecc4558a13d392fd35529 100644
Binary files a/packages/vtiger/mandatory/Mobile.zip and b/packages/vtiger/mandatory/Mobile.zip differ
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index e18a7db595290de3c432e95ec4d4a2ad273b8227..e1bee3f72f8cde122f669b93bf5edf512cda2bf6 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/mandatory/ServiceContracts.zip b/packages/vtiger/mandatory/ServiceContracts.zip
index c099cbb811cdcda5d1b0b2c1819a560d4fe37b93..c5d30005e429b0e886bfb9343be0a5ebdd589ea4 100644
Binary files a/packages/vtiger/mandatory/ServiceContracts.zip and b/packages/vtiger/mandatory/ServiceContracts.zip differ
diff --git a/packages/vtiger/mandatory/Services.zip b/packages/vtiger/mandatory/Services.zip
index c2f625f9f358fcda2f143a80528f010c5db28db4..7b9d6c3db6fddc511cad45006cd13d2da7df22b7 100644
Binary files a/packages/vtiger/mandatory/Services.zip and b/packages/vtiger/mandatory/Services.zip differ
diff --git a/packages/vtiger/mandatory/WSAPP.zip b/packages/vtiger/mandatory/WSAPP.zip
index 2de97a4309ad6d9707340a38cb40a37fff3b2751..66c4e2c5d436b995ad3aeca4e0e2245d87bd334c 100644
Binary files a/packages/vtiger/mandatory/WSAPP.zip and b/packages/vtiger/mandatory/WSAPP.zip differ
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index bada393301fb799df01d09c52b74426047550847..819915e1a02e8e39a1e007b07527cf2c9cf2830c 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index 6972ed14bad7333c6270dd492357221da3bdbe0d..529f47a241835a6f29c73f57b45d5bec63a46c45 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index e182b55a44ca91dde07f758f08d1d4291e8ef98a..cd009909ba6a507debd42d8c1640b45955329f3e 100644
Binary files a/packages/vtiger/optional/EmailTemplates.zip and b/packages/vtiger/optional/EmailTemplates.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index aaa5a12998abc8c1a7f4169877b9241ad4a78b00..bd1cbbcb235271845f45afd26acf838f8f94a05a 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index 8693cb077964e5fe765af7cf5aa52a1b9edb7552..ec3c70577534a68f0243df9eb5b06bf9ef2afd28 100644
Binary files a/packages/vtiger/optional/ModComments.zip and b/packages/vtiger/optional/ModComments.zip differ
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index b490d3f606c93820b04f00a5ddc24e8c1f1df1ba..29d4b0a57f4278846dd6086a80bf707b494bcb3d 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip
index ee807b1b19c1f8e860531838794f21ffca350fa1..dd9e22dfd0917dbabecd0c4a9a8e1697a904cccb 100644
Binary files a/packages/vtiger/optional/RecycleBin.zip and b/packages/vtiger/optional/RecycleBin.zip differ
diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip
index 46b6b3414454d597651e7000d0fe0e9318405d1f..f09431fe48b3aed3755e02e8e6af9edf9591390f 100644
Binary files a/packages/vtiger/optional/SMSNotifier.zip and b/packages/vtiger/optional/SMSNotifier.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index b238de3c72dee32548639ef903e6dffa23cc83af..a5c32bc0b782de23d00fa18608a73c2e7d362d86 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/views/PopupAjax.php b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/views/PopupAjax.php
index 0ece8bb25e244cb7f8312e747a10623aa38a9aad..c51aa6c198b488ebbb1dfde182a324fc1ee22120 100644
--- a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/views/PopupAjax.php
+++ b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/views/PopupAjax.php
@@ -17,7 +17,7 @@ class EmailTemplates_PopupAjax_View extends EmailTemplates_Popup_View {
$this->exposeMethod('getPageCount');
}
- function preProcess(Vtiger_Request $request) {
+ function preProcess(Vtiger_Request $request,$display=true) {
return true;
}
diff --git a/pkg/vtiger/modules/Google/modules/Google/connectors/Calendar.php b/pkg/vtiger/modules/Google/modules/Google/connectors/Calendar.php
index 37baa17670eb866c1f5aaa2a5ca55219af4e6a1e..dbedfef350d428bda6410c9a8197ce13f9e8e5d5 100644
--- a/pkg/vtiger/modules/Google/modules/Google/connectors/Calendar.php
+++ b/pkg/vtiger/modules/Google/modules/Google/connectors/Calendar.php
@@ -307,7 +307,7 @@ Class Google_Calendar_Connector extends WSAPP_TargetConnector {
* @param <array> $vtEvents
* @return <array> tranformed vtiger Records
*/
- public function transformToTargetRecord($vtEvents, $user) {
+ public function transformToTargetRecord($vtEvents, $user = false) {
$records = array();
foreach ($vtEvents as $vtEvent) {
$newEvent = new Google_Service_Calendar_Event();
diff --git a/pkg/vtiger/modules/Google/modules/Google/connectors/Contacts.php b/pkg/vtiger/modules/Google/modules/Google/connectors/Contacts.php
index 0dcd6e11f4e1c3796cf784ab7dd2e0970ca353ad..91ea5dfaf3b7091242aa6ebb16e7b007ae6abbc0 100644
--- a/pkg/vtiger/modules/Google/modules/Google/connectors/Contacts.php
+++ b/pkg/vtiger/modules/Google/modules/Google/connectors/Contacts.php
@@ -825,7 +825,7 @@ Class Google_Contacts_Connector extends WSAPP_TargetConnector {
* @param <array> $vtContacts
* @return <array> tranformed vtiger Records
*/
- public function transformToTargetRecord($vtContacts) {
+ public function transformToTargetRecord($vtContacts, $user = false) {
$records = array();
foreach ($vtContacts as $vtContact) {
$recordModel = Google_Contacts_Model::getInstanceFromValues(array('entity' => $vtContact));
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/AlertDetailsWithMessage.php b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/AlertDetailsWithMessage.php
index 2a65732cf5d6f532bdaef2dd38b0059b530197bc..6ad2f17b0b1c4ee44ba6612d69cac9e2111dfe6c 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/AlertDetailsWithMessage.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/AlertDetailsWithMessage.php
@@ -32,7 +32,7 @@ class Mobile_WS_AlertDetailsWithMessage extends Mobile_WS_FetchAllAlerts {
return $response;
}
- function getAlertDetails($alertid) {
+ function getAlertDetails($alertid=false) {
$alertModel = Mobile_WS_AlertModel::modelWithId($alertid);
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchAllAlerts.php b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchAllAlerts.php
index 7348b845567fee671019d453ec22334d540a3fd3..8a937c6cea189219ef092a6fd3a4c535f956b0b1 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchAllAlerts.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchAllAlerts.php
@@ -23,7 +23,7 @@ class Mobile_WS_FetchAllAlerts extends Mobile_WS_Controller {
return $response;
}
- function getAlertDetails() {
+ function getAlertDetails($alertid=false) {
$alertModels = Mobile_WS_AlertModel::models();
$alerts = array();
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/html/Viewer.php b/pkg/vtiger/modules/Mobile/modules/Mobile/html/Viewer.php
index cec82da40bcb5ade399a1fe7f0a2b8e29a82a986..c0105147b88a658d37dec21f74dc00a3fa1e9123 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/html/Viewer.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/html/Viewer.php
@@ -16,7 +16,7 @@ class Mobile_HTML_Viewer extends Vtiger_Viewer{
private $parameters = array();
private $_smarty = null;
- function assign($key, $value, $nocache = false) {
+ function assign($key, $value = null, $nocache = false) {
$this->parameters[$key] = $value;
}
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/ui/Viewer.php b/pkg/vtiger/modules/Mobile/modules/Mobile/ui/Viewer.php
index 55fa684da048db62881485e8e9a292192d13ad09..f8c98bb2b8592f626d3fb2bcd625728809f5feee 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/ui/Viewer.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/ui/Viewer.php
@@ -13,7 +13,7 @@ include_once 'includes/runtime/Viewer.php';
class Mobile_UI_Viewer extends Vtiger_Viewer{
private $parameters = array();
- function assign($key, $value, $nocache = false) {
+ function assign($key, $value = null, $nocache = false) {
$this->parameters[$key] = $value;
}
diff --git a/pkg/vtiger/modules/WSAPP/modules/WSAPP/synclib/connectors/TargetConnector.php b/pkg/vtiger/modules/WSAPP/modules/WSAPP/synclib/connectors/TargetConnector.php
index ed5d00f0af9eecb8e6c076c208e42df0aa894f08..8b9652d014f07a01c3aeacae815418618863f0f4 100644
--- a/pkg/vtiger/modules/WSAPP/modules/WSAPP/synclib/connectors/TargetConnector.php
+++ b/pkg/vtiger/modules/WSAPP/modules/WSAPP/synclib/connectors/TargetConnector.php
@@ -11,7 +11,7 @@ require_once 'modules/WSAPP/synclib/connectors/BaseConnector.php';
abstract class WSAPP_TargetConnector extends WSAPP_BaseConnector{
- public function transformToTargetRecord($sourceRecords){
+ public function transformToTargetRecord($sourceRecords, $user = false){
$destinationRecordList = array();
foreach($sourceRecords as $record){
$destinationRecord = clone $record;
@@ -25,7 +25,7 @@ abstract class WSAPP_TargetConnector extends WSAPP_BaseConnector{
}
return $destinationRecordList;
}
- public function transformToSourceRecord($targetRecords){
+ public function transformToSourceRecord($targetRecords, $user = false){
$sourceRcordList = array();
foreach($targetRecords as $record){
$sourceRecord = clone $record;
diff --git a/vtlib/Vtiger/LanguageExport.php b/vtlib/Vtiger/LanguageExport.php
index 83fa170a9951ab0591e4dbba133263170d99e60d..33ed480632de68c4c30cb6ca8f39095413b2fe20 100644
--- a/vtlib/Vtiger/LanguageExport.php
+++ b/vtlib/Vtiger/LanguageExport.php
@@ -52,7 +52,7 @@ class Vtiger_LanguageExport extends Vtiger_Package {
* @param String Zipfilename to use
* @param Boolean True for sending the output as download
*/
- function export($languageCode, $todir='', $zipfilename='', $directDownload=false) {
+ function export($languageCode, $todir='', $zipfilename='', $directDownload=false, $extra=false) {
$this->__initExport($languageCode);
diff --git a/vtlib/Vtiger/LayoutExport.php b/vtlib/Vtiger/LayoutExport.php
index 2dfee458133463b69f84e7a02dabe3f3a2023e00..b40849852e01373542504933a35c16d87d4edce1 100644
--- a/vtlib/Vtiger/LayoutExport.php
+++ b/vtlib/Vtiger/LayoutExport.php
@@ -51,7 +51,7 @@ class Vtiger_LayoutExport extends Vtiger_Package {
* @param String Zipfilename to use
* @param Boolean True for sending the output as download
*/
- function export($layoutName, $todir='', $zipfilename='', $directDownload=false) {
+ function export($layoutName, $todir='', $zipfilename='', $directDownload=false, $extra=false) {
$this->__initExport($layoutName);
// Call layout export function
diff --git a/vtlib/Vtiger/PackageExport.php b/vtlib/Vtiger/PackageExport.php
index ac5346e7d017cdee3a465853b4c6e18e507e46e3..8d7663d09ac21e1783df6a7ba6b182bf8e562a43 100644
--- a/vtlib/Vtiger/PackageExport.php
+++ b/vtlib/Vtiger/PackageExport.php
@@ -108,7 +108,7 @@ class Vtiger_PackageExport {
* @param String Zipfilename to use
* @param Boolean True for sending the output as download
*/
- function export($moduleInstance, $todir='', $zipfilename='', $directDownload=false) {
+ function export($moduleInstance, $todir='', $zipfilename='', $directDownload=false, $extra=false) {
$module = $moduleInstance->name;
diff --git a/vtlib/Vtiger/ThemeExport.php b/vtlib/Vtiger/ThemeExport.php
index 635bfc1d842f9c07b644a7d3575df4edc7e0ab29..6b5b5f9b946769b13ee700dc9fba087f4417f3d0 100644
--- a/vtlib/Vtiger/ThemeExport.php
+++ b/vtlib/Vtiger/ThemeExport.php
@@ -51,7 +51,7 @@ class Vtiger_ThemeExport extends Vtiger_Package {
* @param String Zipfilename to use
* @param Boolean True for sending the output as download
*/
- function export($layoutName, $themeName, $todir='', $zipfilename='', $directDownload=false) {
+ function export($layoutName, $themeName='', $todir='', $zipfilename='', $directDownload=false) {
$this->__initExport($layoutName, $themeName);
// Call layout export function
@@ -132,7 +132,7 @@ class Vtiger_ThemeExport extends Vtiger_Package {
* Export vtiger dependencies
* @access private
*/
- function export_Dependencies() {
+ function export_Dependencies($theme = false) {
global $vtiger_current_version, $adb;
$vtigerMinVersion = $vtiger_current_version;
diff --git a/vtlib/Vtiger/ThemeImport.php b/vtlib/Vtiger/ThemeImport.php
index 7b109b4d1369c240c2d102a99206c09fe432e696..58b9802f3eea9235b317e193ea887bbaf776c42a 100644
--- a/vtlib/Vtiger/ThemeImport.php
+++ b/vtlib/Vtiger/ThemeImport.php
@@ -27,7 +27,7 @@ class Vtiger_ThemeImport extends Vtiger_ThemeExport {
* Initialize Import
* @access private
*/
- function initImport($zipfile, $overwrite) {
+ function initImport($zipfile, $overwrite=true) {
$this->__initSchema();
$name = $this->getModuleNameFromZip($zipfile);
return $name;