Skip to content

Commit

Permalink
Dev Fixed typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Jan 21, 2024
1 parent 159fb2f commit d574265
Show file tree
Hide file tree
Showing 44 changed files with 100 additions and 100 deletions.
2 changes: 1 addition & 1 deletion application/controllers/AssessmentController.php
View file
Expand Up @@ -48,7 +48,7 @@ protected function beforeRender($view)
* Renders th view for: show the list of assessments(if assessment is activated)
* or the button to activate assessment mode
*
* @param int $surveyid the survey id
* @param int $surveyid the survey ID
*
*/
public function actionIndex($surveyid)
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/OptinController.php
View file
Expand Up @@ -39,7 +39,7 @@ public function actiontokens()
$languageCode = Yii::app()->request->getQuery('langcode');
$accessToken = Token::sanitizeToken(Yii::app()->request->getQuery('token'));

//IF there is no survey id, redirect back to the default public page
//IF there is no survey ID, redirect back to the default public page
if (!$surveyId) {
$this->redirect(['/']);
}
Expand Down Expand Up @@ -91,7 +91,7 @@ public function actionparticipants()
$languageCode = Yii::app()->request->getQuery('langcode');
$accessToken = Token::sanitizeToken(Yii::app()->request->getQuery('token'));

//IF there is no survey id, redirect back to the default public page
//IF there is no survey ID, redirect back to the default public page
if (!$surveyId) {
$this->redirect(['/']);
}
Expand Down
6 changes: 3 additions & 3 deletions application/controllers/OptoutController.php
View file
Expand Up @@ -37,7 +37,7 @@ public function actiontokens()
Yii::app()->loadHelper('database');
Yii::app()->loadHelper('sanitize');

//IF there is no survey id, redirect back to the default public page
//IF there is no survey ID, redirect back to the default public page
if (!$iSurveyID) {
$this->redirect(array('/'));
}
Expand Down Expand Up @@ -85,7 +85,7 @@ public function actionparticipants()
Yii::app()->loadHelper('database');
Yii::app()->loadHelper('sanitize');

//IF there is no survey id, redirect back to the default public page
//IF there is no survey ID, redirect back to the default public page
if (!$surveyId) {
$this->redirect(array('/'));
}
Expand Down Expand Up @@ -149,7 +149,7 @@ public function actionremovetokens()
Yii::app()->loadHelper('database');
Yii::app()->loadHelper('sanitize');

// If there is no survey id, redirect back to the default public page
// If there is no survey ID, redirect back to the default public page
if (!$surveyId) {
$this->redirect(['/']);
}
Expand Down
18 changes: 9 additions & 9 deletions application/controllers/QuestionAdministrationController.php
View file
Expand Up @@ -316,7 +316,7 @@ public function actionListQuestions($surveyid, $landOnSideMenuTab = 'settings')
if (!in_array($landOnSideMenuTab, ['settings', 'structure', ''])) {
$landOnSideMenuTab = 'settings';
}
// Reinit LEMlang and LEMsid: ensure LEMlang are set to default lang, surveyid are set to this survey id
// Reinit LEMlang and LEMsid: ensure LEMlang are set to default lang, surveyid are set to this survey ID
// Ensure Last GetLastPrettyPrintExpression get info from this sid and default lang
LimeExpressionManager::SetEMLanguage(Survey::model()->findByPk($iSurveyID)->language);
LimeExpressionManager::SetSurveyId($iSurveyID);
Expand Down Expand Up @@ -358,7 +358,7 @@ public function actionListQuestions($surveyid, $landOnSideMenuTab = 'settings')
App()->user->setState('pageSize', (int) $_GET['pageSize']);
}
$aData['pageSize'] = App()->user->getState('pageSize', App()->params['defaultPageSize']);
// We filter the current survey id
// We filter the current survey ID
$questionModel->sid = $oSurvey->sid;
$aData['questionModel'] = $questionModel;

Expand Down Expand Up @@ -712,7 +712,7 @@ public function actionGetSubquestionRowForAllLanguages($surveyid, $gid, $codes,
{
$oSurvey = Survey::model()->findByPk($surveyid);
if (empty($oSurvey)) {
throw new CHttpException(404, gT("Invalid survey id"));
throw new CHttpException(404, gT("Invalid survey ID"));
}
if (!Permission::model()->hasSurveyPermission($oSurvey->sid, 'surveycontent', 'update')) {
throw new CHttpException(403, gT("No permission"));
Expand Down Expand Up @@ -784,7 +784,7 @@ public function actionGetAnswerOptionRowForAllLanguages($surveyid, $gid, $codes,
{
$oSurvey = Survey::model()->findByPk($surveyid);
if (empty($oSurvey)) {
throw new CHttpException(404, gT("Invalid survey id"));
throw new CHttpException(404, gT("Invalid survey ID"));
}
if (!Permission::model()->hasSurveyPermission($oSurvey->sid, 'surveycontent', 'update')) {
throw new CHttpException(403, gT("No permission"));
Expand Down Expand Up @@ -1374,8 +1374,8 @@ public function actionDelete($qid = null, $massAction = false, $redirectTo = nul
$qid = Yii::app()->getRequest()->getPost('qid');
}

// @todo: request should specify the survey id of the question to be deleted
// - survey id is verified before deletion
// @todo: request should specify the survey ID of the question to be deleted
// - survey ID is verified before deletion
$oQuestion = Question::model()->findByPk($qid);
$surveyid = $oQuestion->sid;

Expand Down Expand Up @@ -2015,7 +2015,7 @@ protected function isValidCSSClass($class)
*
* @param array $aQids All question id's affected
* @param string $sOther the "other" value 'Y' or 'N'
* @param int $iSid survey id
* @param int $iSid survey ID
*/
public static function setMultipleQuestionOtherState($aQids, $sOther, $iSid)
{
Expand All @@ -2035,7 +2035,7 @@ public static function setMultipleQuestionOtherState($aQids, $sOther, $iSid)
*
* @param array $aQids All question id's affected
* @param string $sMandatory The mandatory va
* @param int $iSid survey id
* @param int $iSid survey ID
*/
public static function setMultipleQuestionMandatoryState($aQids, $sMandatory, $iSid)
{
Expand Down Expand Up @@ -2602,7 +2602,7 @@ public function actionCheckQuestionValidateTitle($sid, int $qid, string $code)

$survey = Survey::model()->findByPk($sid);
if (empty($survey)) {
throw new CHttpException(404, gT("Invalid survey id"));
throw new CHttpException(404, gT("Invalid survey ID"));
}
if ($qid) {
$oQuestion = Question::model()->findByAttributes(['qid' => $qid, 'sid' => $sid]);
Expand Down
6 changes: 3 additions & 3 deletions application/controllers/QuestionGroupsAdministrationController.php
View file
Expand Up @@ -80,7 +80,7 @@ protected function beforeRender($view)
/**
* Renders the html for the question group view.
*
* @param int $surveyid survey id is important here for new questiongroups without groupid
* @param int $surveyid survey ID is important here for new questiongroups without groupid
* @param int $gid
* @param string $landOnSideMenuTab
* @param string $mode either 'overview' or 'auto'. The 'overview' mode ignores the 'noViewMode' user setting
Expand Down Expand Up @@ -150,7 +150,7 @@ public function actionView(int $surveyid, int $gid, $landOnSideMenuTab = 'struct
/**
* Renders the html for the question group edit.
*
* @param int $surveyid survey id is important here if group does not exist
* @param int $surveyid survey ID is important here if group does not exist
* @param int $gid
* @param string $landOnSideMenuTab
*
Expand Down Expand Up @@ -720,7 +720,7 @@ private function getQuestionGroupServiceClass()
}

/**
* Sets survey id and object into passed array
* Sets survey ID and object into passed array
* @param array $aData
* @return array
*/
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/RegisterController.php
View file
Expand Up @@ -187,7 +187,7 @@ public function getRegisterErrors($iSurveyId)
/**
* Creates the array for the registration success page
*
* @param Integer $iSurveyId The survey id
* @param Integer $iSurveyId The survey ID
* @param Integer $iTokenId The token id
*
* @return array The rendereable array
Expand Down
8 changes: 4 additions & 4 deletions application/controllers/ResponsesController.php
View file
Expand Up @@ -630,7 +630,7 @@ public function actionDelete(int $surveyId): void
/**
* Deletes a single response and redirects to the gridview.
*
* @param int $surveyId -- the survey id
* @param int $surveyId -- the survey ID
* @param int $responseId -- the response id to be deleted
* @throws CDbException
* @throws CHttpException
Expand Down Expand Up @@ -662,7 +662,7 @@ public function actionDeleteSingle(int $surveyId, int $responseId): void
* Download individual file by response and filename
*
* @access public
* @param int $surveyId : survey id
* @param int $surveyId : survey ID
* @param int $responseId
* @param int $qid
* @param int $index
Expand Down Expand Up @@ -731,7 +731,7 @@ public function actionDownloadfile(int $surveyId, int $responseId, int $qid, int
* Construct a zip files from a list of response
*
* @access public
* @param int $surveyId : survey id
* @param int $surveyId : survey ID
* @param string $responseIds : list of responses as string
* @return void application/zip
* @throws CException
Expand Down Expand Up @@ -1036,7 +1036,7 @@ private function getData(int $surveyId = null, int $responseId = null, string $l

$thissurvey = getSurveyInfo($surveyId);

// Reinit LEMlang and LEMsid: ensure LEMlang are set to default lang, surveyid are set to this survey id
// Reinit LEMlang and LEMsid: ensure LEMlang are set to default lang, surveyid are set to this survey ID
// Ensure Last GetLastPrettyPrintExpression get info from this sid and default lang
LimeExpressionManager::SetEMLanguage($thissurvey['oSurvey']->language);
LimeExpressionManager::SetSurveyId($surveyId);
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/SurveyAdministrationController.php
View file
Expand Up @@ -137,7 +137,7 @@ public function actionView()

$aData = array('aAdditionalLanguages' => $survey->additionalLanguages);

// Reinit LEMlang and LEMsid: ensure LEMlang are set to default lang, surveyid are set to this survey id
// Reinit LEMlang and LEMsid: ensure LEMlang are set to default lang, surveyid are set to this survey ID
// Ensure Last GetLastPrettyPrintExpression get info from this sid and default lang
LimeExpressionManager::SetEMLanguage($baselang);
LimeExpressionManager::SetSurveyId($iSurveyID);
Expand Down Expand Up @@ -2581,7 +2581,7 @@ public function actionExpireMultipleSurveys()

/**
* Try to get the get-parameter from request.
* At the moment there are three namings for a survey id:
* At the moment there are three namings for a survey ID:
* 'sid'
* 'surveyid'
* 'iSurveyID'
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/ThemeOptionsController.php
View file
Expand Up @@ -782,7 +782,7 @@ private function updateCommon(TemplateConfiguration $model, int $sid = null, int
$basePageTitle = sprintf('Survey options for theme %s', $templateName);

if (!is_null($sid)) {
$addictionalSubtitle = gT(" for survey id: $sid");
$addictionalSubtitle = gT(" for survey ID: $sid");
} elseif (!is_null($gsid)) {
$addictionalSubtitle = gT(" for survey group id: $gsid");
} else {
Expand Down Expand Up @@ -812,7 +812,7 @@ private function updateCommon(TemplateConfiguration $model, int $sid = null, int

/**
* Try to get the get-parameter from request.
* At the moment there are three namings for a survey id:
* At the moment there are three namings for a survey ID:
* 'sid'
* 'surveyid'
* 'iSurveyID'
Expand Down
10 changes: 5 additions & 5 deletions application/controllers/admin/CheckIntegrity.php
View file
Expand Up @@ -1025,8 +1025,8 @@ protected function checkintegrity()
/**********************************************************************/
/* Check old survey tables */
/**********************************************************************/
//1: Get list of 'old_survey' tables and extract the survey id
//2: Check if that survey id still exists
//1: Get list of 'old_survey' tables and extract the survey ID
//2: Check if that survey ID still exists
//3: If it doesn't offer it for deletion
$sQuery = dbSelectTablesLike('{{old_survey}}%');
$aTables = Yii::app()->db->createCommand($sQuery)->queryColumn();
Expand Down Expand Up @@ -1093,8 +1093,8 @@ protected function checkintegrity()
/**********************************************************************/
/* CHECK OLD TOKEN TABLES */
/**********************************************************************/
//1: Get list of 'old_token' tables and extract the survey id
//2: Check if that survey id still exists
//1: Get list of 'old_token' tables and extract the survey ID
//2: Check if that survey ID still exists
//3: If it doesn't offer it for deletion
$sQuery = dbSelectTablesLike('{{old_token}}%');
$aTables = Yii::app()->db->createCommand($sQuery)->queryColumn();
Expand Down Expand Up @@ -1185,7 +1185,7 @@ protected function checkintegrity()
/**********************************************************************/
/* CHECK CPDB SURVEY_LINKS TABLE FOR REDUNDENT Survey participants tableS */
/**********************************************************************/
//1: Get distinct list of survey_link survey ids, check if tokens
//1: Get distinct list of survey_link survey IDs, check if tokens
// table still exists for each one, and remove if not


Expand Down
6 changes: 3 additions & 3 deletions application/controllers/admin/ExpressionValidate.php
View file
Expand Up @@ -16,7 +16,7 @@ class ExpressionValidate extends SurveyCommonAction
public $layout = 'popup';

/**
* @var integer : The survey id to start to fill know vars
* @var integer : The survey ID to start to fill know vars
*/
private $iSurveyId;
/**
Expand All @@ -31,7 +31,7 @@ public function index()

/**
* Check the Expression in quota
* @param integer $iSurveyId : the survey id : can be sid/surveyid url GET parameters
* @param integer $iSurveyId : the survey ID : can be sid/surveyid url GET parameters
* @param integer $quota : the quota id
* @param string $lang : the survey language, optional : if not set get all language of survey
*
Expand Down Expand Up @@ -86,7 +86,7 @@ public function quota($iSurveyId, $quota, $lang = null)
}
/**
* Check the Expression in email
* @param integer $iSurveyId : the survey id : can be sid/surveyid url GET parameters
* @param integer $iSurveyId : the survey ID : can be sid/surveyid url GET parameters
* @param string $lang : the mail language
*
* @author Denis Chenu
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/ParticipantsAction.php
View file
Expand Up @@ -2098,7 +2098,7 @@ public function editShareInfo()
* Receives an ajax call containing the participant id in the fourth segment of the url
* Supplies list of survey links - surveys of which this participant is on the tokens table
* URL: [localurl]/limesurvey/admin/participants/getSurveyInfoJson/pid/[participant_id]
* Echoes json data containing linked survey information (Survey name, survey id, token_id and date_added)
* Echoes json data containing linked survey information (Survey name, survey ID, token_id and date_added)
* @return void
* @todo Where is this called from?
*/
Expand Down
2 changes: 1 addition & 1 deletion application/core/LS_Twig_Extension.php
View file
Expand Up @@ -700,7 +700,7 @@ public static function getLanguageRTL($sLanguageCode)
* Returns the "tracking url" for Google Analytics when style is "Survey-SID/GROUP"
* @param int $surveyId
* @param string $trackUrlPageName Specific page name to include in the tracking url. If it's empty, we will try to infer it from the context.
* @return string The tracking URL as "<survey name>-[<survey id>]/[<page name|group seq>]-<group name>"
* @return string The tracking URL as "<survey name>-[<survey ID>]/[<page name|group seq>]-<group name>"
*/
public static function getGoogleAnalyticsTrackingUrl($surveyId, $trackUrlPageName = '')
{
Expand Down
2 changes: 1 addition & 1 deletion application/core/LimeMailer.php
View file
Expand Up @@ -38,7 +38,7 @@ class LimeMailer extends PHPMailer
/* Plugin */
const MethodPlugin = 'plugin';

/* @var null|integer $surveyId Current survey id */
/* @var null|integer $surveyId Current survey ID */
public $surveyId;
/* @var null|string $mailLanguage Current language for the mail (=language is used for language of mailer (error etc …) */
public $mailLanguage;
Expand Down
4 changes: 2 additions & 2 deletions application/core/SurveyCommonAction.php
View file
Expand Up @@ -177,7 +177,7 @@ private function addPseudoParams($params)
if ((string) (int) $params['iSurveyId'] !== (string) $params['iSurveyId']) {
// pgsql need filtering before find
// 403 mean The request was valid, but the server is refusing action.
throw new CHttpException(403, gT("Invalid survey id"));
throw new CHttpException(403, gT("Invalid survey ID"));
}
$oSurvey = Survey::model()->findByPk($params['iSurveyId']);
if (!$oSurvey) {
Expand Down Expand Up @@ -1002,7 +1002,7 @@ protected function listquestions($aData)

$aData['pageSize'] = App()->user->getState('pageSize', App()->params['defaultPageSize']);

// We filter the current survey id
// We filter the current survey ID
$model->sid = $iSurveyID;

$aData['model'] = $model;
Expand Down
6 changes: 3 additions & 3 deletions application/helpers/SurveyRuntimeHelper.php
View file
Expand Up @@ -92,7 +92,7 @@ class SurveyRuntimeHelper
private $aSurveyInfo = null;

/**
* The survey id
* The survey ID
* @var int|null
*/
private $iSurveyid = null;
Expand Down Expand Up @@ -793,7 +793,7 @@ private function initFirstStep()
}

/**
* If a step is requested, but the survey id in the session is different from the requested one
* If a step is requested, but the survey ID in the session is different from the requested one
* It reload the needed infos for the requested survey and jump to the requested step.
*/
private function initDirtyStep()
Expand Down Expand Up @@ -1434,7 +1434,7 @@ private function setVarFromArgs($args)
* setJavascriptVar
*
* @return void
* @param mixed $iSurveyId : the survey id for the script
* @param mixed $iSurveyId : the survey ID for the script
*/
public function setJavascriptVar($iSurveyId = '')
{
Expand Down

0 comments on commit d574265

Please sign in to comment.