diff --git a/modules/Settings/Profiles/views/EditAjax.php b/modules/Settings/Profiles/views/EditAjax.php index 45f0a0f33e81286f6460acd34e40de2dafa530cb..6dbd41aba73c9a9a320bf2a0bdd8210530fe1c47 100644 --- a/modules/Settings/Profiles/views/EditAjax.php +++ b/modules/Settings/Profiles/views/EditAjax.php @@ -10,7 +10,7 @@ Class Settings_Profiles_EditAjax_View extends Settings_Profiles_Edit_View { - public function preProcess(Vtiger_Request $request) { + public function preProcess(Vtiger_Request $request, $display=true) { return true; } diff --git a/modules/Settings/SharingAccess/models/Module.php b/modules/Settings/SharingAccess/models/Module.php index bce41635cea08dd6513bd5b34c7980b82d7c3513..0c2c54b3e635ef7b2f80803f9238660b8c5a8014 100644 --- a/modules/Settings/SharingAccess/models/Module.php +++ b/modules/Settings/SharingAccess/models/Module.php @@ -109,7 +109,7 @@ class Settings_SharingAccess_Module_Model extends Vtiger_Module_Model { * Static Function to get the instance of Vtiger Module Model for all the modules * @return <Array> - List of Vtiger Module Model or sub class instances */ - public static function getAll($editable=false) { + public static function getAll($presence = array(), $restrictedModulesList = array(), $editable=false) { $db = PearDatabase::getInstance(); $moduleModels = array(); diff --git a/modules/Settings/Vtiger/models/Systems.php b/modules/Settings/Vtiger/models/Systems.php index ebb4fba7becf3a251af40f8324524da80c163193..d36d27fcc939ce8c88c57ef8ab6ce657fe913ec2 100644 --- a/modules/Settings/Vtiger/models/Systems.php +++ b/modules/Settings/Vtiger/models/Systems.php @@ -21,7 +21,7 @@ class Settings_Vtiger_Systems_Model extends Vtiger_Base_Model{ return ($smtp_auth_value == 'on' || $smtp_auth_value == 1 || $smtp_auth_value == 'true') ? true : false; } - public function save() { + public function save($request) { $db = PearDatabase::getInstance(); $id = $this->getId(); diff --git a/modules/Settings/Vtiger/views/IndexAjax.php b/modules/Settings/Vtiger/views/IndexAjax.php index 77169d555afda1efdf54a9fd66bfb7322e30f6a5..ccb34249f77a90d5c45f03cad8c38d3a2c3ae6c0 100644 --- a/modules/Settings/Vtiger/views/IndexAjax.php +++ b/modules/Settings/Vtiger/views/IndexAjax.php @@ -14,7 +14,7 @@ class Settings_Vtiger_IndexAjax_View extends Settings_Vtiger_Index_View { $this->exposeMethod('getSettingsShortCutBlock'); } - public function preProcess (Vtiger_Request $request) { + public function preProcess (Vtiger_Request $request, $display=true) { return; } diff --git a/pkg/vtiger/modules/Webforms/settings/models/Field.php b/pkg/vtiger/modules/Webforms/settings/models/Field.php index eb1383223bf927ea6bdd7fe19072ef4ed5b995de..1190f67709e6ac56d2dbef0fea212e429b3ede0d 100644 --- a/pkg/vtiger/modules/Webforms/settings/models/Field.php +++ b/pkg/vtiger/modules/Webforms/settings/models/Field.php @@ -82,7 +82,7 @@ class Settings_Webforms_Field_Model extends Vtiger_Field_Model { return $this->getPicklistValues(); } - public function getDisplayValue($value) { + public function getDisplayValue($value, $record=false, $recordInstance = false) { if ($this->getName() === 'enabled') { $moduleName = 'Settings:Webforms'; if ($value) { @@ -93,7 +93,7 @@ class Settings_Webforms_Field_Model extends Vtiger_Field_Model { return parent::getDisplayValue($value); } - public function getPermissions() { + public function getPermissions($accessmode = false) { return true; }