diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php index e7119189f..dc414a4e2 100644 --- a/application/loginwebpage.class.inc.php +++ b/application/loginwebpage.class.inc.php @@ -239,8 +239,8 @@ EOF { case 'form': // iTop standard mode: form based authentication - $sAuthUser = utils::ReadParam('auth_user', '', 'post'); - $sAuthPwd = utils::ReadParam('auth_pwd', '', 'post'); + $sAuthUser = utils::ReadPostedParam('auth_user', ''); + $sAuthPwd = utils::ReadPostedParam('auth_pwd', ''); if ($sAuthUser != '') { $sLoginMode = 'form'; @@ -280,10 +280,10 @@ EOF case 'url': // Credentials passed directly in the url - $sAuthUser = utils::ReadParam('auth_user', '', 'get'); + $sAuthUser = utils::ReadParam('auth_user', ''); if ($sAuthUser != '') { - $sAuthPwd = utils::ReadParam('auth_pwd', '', 'post'); + $sAuthPwd = utils::ReadParam('auth_pwd', ''); $sLoginMode = 'url'; } break; diff --git a/pages/UI.php b/pages/UI.php index a365c0306..d54727164 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -1289,17 +1289,17 @@ EOF break; case 'do_modify_links': - $aLinks = utils::ReadParam('linkId', array(), 'post'); - $sLinksToRemove = trim(utils::ReadParam('linksToRemove', '', 'post')); + $aLinks = utils::ReadPostedParam('linkId', array()); + $sLinksToRemove = trim(utils::ReadPostedParam('linksToRemove', '')); $aLinksToRemove = array(); if (!empty($sLinksToRemove)) { $aLinksToRemove = explode(' ', trim($sLinksToRemove)); } - $sClass = utils::ReadParam('class', '', 'post'); - $sLinkageAtt = utils::ReadParam('linkage', '', 'post'); - $iObjectId = utils::ReadParam('object_id', '', 'post'); - $sLinkingAttCode = utils::ReadParam('linking_attcode', '', 'post'); + $sClass = utils::ReadPostedParam('class', ''); + $sLinkageAtt = utils::ReadPostedParam('linkage', ''); + $iObjectId = utils::ReadPostedParam('object_id', ''); + $sLinkingAttCode = utils::ReadPostedParam('linking_attcode', ''); $oMyChange = MetaModel::NewObject("CMDBChange"); $oMyChange->Set("date", time()); if (UserRights::IsImpersonated()) diff --git a/pages/ajax.render.php b/pages/ajax.render.php index eb1b4aaef..f8b197108 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -49,9 +49,9 @@ switch($operation) case 'addObjects': require_once('../application/uilinkswizard.class.inc.php'); $sClass = utils::ReadParam('class', '', 'get'); - $sLinkedClass = utils::ReadParam('linkedClass', '', 'get'); - $sLinkageAttr = utils::ReadParam('linkageAttr', '', 'get'); - $iObjectId = utils::ReadParam('objectId', '', 'get'); + $sLinkedClass = utils::ReadParam('linkedClass', ''); + $sLinkageAttr = utils::ReadParam('linkageAttr', ''); + $iObjectId = utils::ReadParam('objectId', ''); $oLinksWizard = new UILinksWizard($sClass, $sLinkageAttr, $iObjectId, $sLinkedClass); $oLinksWizard->DisplayAddForm($oPage); break; @@ -72,13 +72,13 @@ switch($operation) $sAttCode = utils::ReadParam('sAttCode', ''); $iInputId = utils::ReadParam('iInputId', ''); $sSuffix = utils::ReadParam('sSuffix', ''); - $aLinkedObjectIds = utils::ReadParam('selectObject', array(), 'get'); + $aLinkedObjectIds = utils::ReadParam('selectObject', array()); $oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix); $oWidget->DoAddObjects($oPage, $aLinkedObjectIds); break; case 'wizard_helper_preview': - $sJson = utils::ReadParam('json_obj', '', 'post'); + $sJson = utils::ReadParam('json_obj', ''); $oWizardHelper = WizardHelper::FromJSON($sJson); $oObj = $oWizardHelper->GetTargetObject(); $oObj->DisplayBareProperties($oPage); @@ -323,8 +323,8 @@ switch($operation) break; case 'set_pref': - $sCode = utils::ReadParam('code', '', 'post'); - $sValue = utils::ReadParam('value', '', 'post'); + $sCode = utils::ReadPostedParam('code', ''); + $sValue = utils::ReadPostedParam('value', ''); appUserPreferences::SetPref($sCode, $sValue); break; diff --git a/pages/csvimport.php b/pages/csvimport.php index a4a93aa07..420f2c6e1 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -815,7 +815,7 @@ EOF */ function SelectOptions(WebPage $oPage) { - $sOperation = utils::ReadParam('operation', 'csv_data', 'post'); + $sOperation = utils::ReadParam('operation', 'csv_data'); $sCSVData = ''; switch($sOperation) { @@ -828,7 +828,7 @@ EOF break; default: - $sCSVData = utils::ReadParam('csvdata', '', 'post'); + $sCSVData = utils::ReadPostedParam('csvdata', ''); } $sEncoding = utils::ReadParam('encoding', 'UTF-8'); diff --git a/portal/index.php b/portal/index.php index 1070534b5..bc43b5f11 100644 --- a/portal/index.php +++ b/portal/index.php @@ -111,7 +111,7 @@ function SelectService($oP, $oUserOrg) $oSet = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey())); $oP->add("