Merge branch 'Settings_Page_Warning' into 'master'

Fixes Settings page warnings

See merge request !618

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;
     }
     

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();

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();

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;
 	}
 

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;
 	}