Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Dev Renamed TokenDynamic model
  • Loading branch information
c-schmitz committed Mar 29, 2013
1 parent 93141ea commit 971f98c
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 75 deletions.
4 changes: 2 additions & 2 deletions application/controllers/OptinController.php
Expand Up @@ -64,7 +64,7 @@ function actiontokens($surveyid, $token, $langcode = '')
}
else
{
$row = Tokens_dynamic::model($iSurveyID)->getEmailStatus($sToken);
$row = TokenDynamic::model($iSurveyID)->getEmailStatus($sToken);

if ($row == false)
{
Expand All @@ -75,7 +75,7 @@ function actiontokens($surveyid, $token, $langcode = '')
$usresult = $row['emailstatus'];
if ($usresult=='OptOut')
{
$usresult = Tokens_dynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OK');
$usresult = TokenDynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OK');
$html = $clang->gT('You have been successfully added back to this survey.');
}
else if ($usresult=='OK')
Expand Down
10 changes: 5 additions & 5 deletions application/controllers/OptoutController.php
Expand Up @@ -70,7 +70,7 @@ function actiontokens()
}
else
{
$row = Tokens_dynamic::model($iSurveyID)->getEmailStatus($sToken);
$row = TokenDynamic::model($iSurveyID)->getEmailStatus($sToken);

if ($row == false)
{
Expand All @@ -81,7 +81,7 @@ function actiontokens()
$usresult = $row['emailstatus'];
if ($usresult == 'OK')
{
$usresult = Tokens_dynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OptOut');
$usresult = TokenDynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OptOut');
$html = $clang->gT('You have been successfully removed from this survey.');
}
else
Expand Down Expand Up @@ -153,8 +153,8 @@ function actionparticipants()
}
else
{
$row = Tokens_dynamic::model($iSurveyID)->getEmailStatus($sToken);
$datas = Tokens_dynamic::model($iSurveyID)->find('token = :token', array(":token"=>$sToken));
$row = TokenDynamic::model($iSurveyID)->getEmailStatus($sToken);
$datas = TokenDynamic::model($iSurveyID)->find('token = :token', array(":token"=>$sToken));

if ($row == false)
{
Expand All @@ -165,7 +165,7 @@ function actionparticipants()
$usresult = $row['emailstatus'];
if ($usresult == 'OK')
{
$usresult = Tokens_dynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OptOut');
$usresult = TokenDynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OptOut');
$html = $clang->gT('You have been successfully removed from this survey.');
}
else
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/RegisterController.php
Expand Up @@ -159,8 +159,8 @@ function actionIndex($surveyid = null)
$postattribute2=sanitize_xss_string(strip_tags(returnGlobal('register_attribute2'))); */

// Insert new entry into tokens db
Tokens_dynamic::sid($thissurvey['sid']);
$token = new Tokens_dynamic;
TokenDynamic::sid($thissurvey['sid']);
$token = new TokenDynamic;
$token->firstname = $postfirstname;
$token->lastname = $postlastname;
$token->email = Yii::app()->request->getPost('register_email');
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/dataentry.php
Expand Up @@ -1839,7 +1839,7 @@ public function insert()
(".implode(',',$columns).")
VALUES
(".implode(',',$values).")";
//$this->tokens_dynamic_model->insertToken($surveyid,$tokendata);
//$this->TokenDynamic_model->insertToken($surveyid,$tokendata);
dbExecuteAssoc($SQL);
//Yii::app()->db->AutoExecute(db_table_name("tokens_".$surveyid), $tokendata,'INSERT');
$aDataentrymsgs[] = CHtml::tag('font', array('class'=>'successtitle'), $clang->gT("A token entry for the saved survey has been created too."));
Expand Down
28 changes: 14 additions & 14 deletions application/controllers/admin/remotecontrol.php
Expand Up @@ -720,7 +720,7 @@ public function get_summary($sSessionKey,$iSurveyID, $sStatName)
if(in_array($sStatName, $aPermittedTokenStats))
{
if (tableExists('{{tokens_' . $iSurveyID . '}}'))
$summary = Tokens_dynamic::model($iSurveyID)->summary();
$summary = TokenDynamic::model($iSurveyID)->summary();
else
return array('status' => 'No available data');
}
Expand Down Expand Up @@ -1845,13 +1845,13 @@ public function add_participants($sSessionKey, $iSurveyID, $aParticipantData, $b
foreach ($aParticipantData as &$aParticipant)
{
$aParticipant=array_intersect_key($aParticipant,$aDestinationFields);
Tokens_dynamic::sid($iSurveyID);
$token = new Tokens_dynamic;
TokenDynamic::sid($iSurveyID);
$token = new TokenDynamic;

if ($new_token_id=$token->insertParticipant($aParticipant))
{
if ($bCreateToken)
$token_string = Tokens_dynamic::model()->createToken($new_token_id);
$token_string = TokenDynamic::model()->createToken($new_token_id);
else
$token_string = '';

Expand Down Expand Up @@ -1899,13 +1899,13 @@ public function delete_participants($sSessionKey, $iSurveyID, $aTokenIDs)
$aResult=array();
foreach($aTokenIDs as $iTokenID)
{
$tokenidExists = Tokens_dynamic::model($iSurveyID)->findByPk($iTokenID);
$tokenidExists = TokenDynamic::model($iSurveyID)->findByPk($iTokenID);
if (!isset($tokenidExists))
$aResult[$iTokenID]='Invalid token ID';
else
{
Survey_links::deleteTokenLink(array($iTokenID), $iSurveyID);
if(Tokens_dynamic::model($iSurveyID)->deleteRecords(array($iTokenID)))
if(TokenDynamic::model($iSurveyID)->deleteRecords(array($iTokenID)))
$aResult[$iTokenID]='Deleted';
else
$aResult[$iTokenID]='Deletion went wrong';
Expand Down Expand Up @@ -1944,12 +1944,12 @@ public function get_participant_properties($sSessionKey, $iSurveyID, $iTokenID,
if(!tableExists("{{tokens_$iSurveyID}}"))
return array('status' => 'Error: No token table');

$oToken = Tokens_dynamic::model($iSurveyID)->findByPk($iTokenID);
$oToken = TokenDynamic::model($iSurveyID)->findByPk($iTokenID);
if (!isset($oToken))
return array('status' => 'Error: Invalid tokenid');

$aResult=array();
$aBasicDestinationFields=Tokens_dynamic::model()->tableSchema->columnNames;
$aBasicDestinationFields=TokenDynamic::model()->tableSchema->columnNames;
$aTokenProperties=array_intersect($aTokenProperties,$aBasicDestinationFields);

if (empty($aTokenProperties))
Expand Down Expand Up @@ -1992,15 +1992,15 @@ public function set_participant_properties($sSessionKey, $iSurveyID, $iTokenID,
if(!tableExists("{{tokens_$iSurveyID}}"))
return array('status' => 'Error: No token table');

$oToken = Tokens_dynamic::model($iSurveyID)->findByPk($iTokenID);
$oToken = TokenDynamic::model($iSurveyID)->findByPk($iTokenID);
if (!isset($oToken))
return array('status' => 'Error: Invalid tokenid');

$aResult = array();
// Remove fields that may not be modified
unset($aTokenData['tid']);

$aBasicDestinationFields=array_flip(Tokens_dynamic::model()->tableSchema->columnNames);
$aBasicDestinationFields=array_flip(TokenDynamic::model()->tableSchema->columnNames);
$aTokenData=array_intersect_key($aTokenData,$aBasicDestinationFields);
$aTokenAttributes = $oToken->getAttributes();

Expand Down Expand Up @@ -2061,9 +2061,9 @@ public function list_participants($sSessionKey, $iSurveyID, $iStart=0, $iLimit=1
return array('status' => 'Error: No token table');

if($bUnused)
$oTokens = Tokens_dynamic::model($iSurveyID)->findAll(array('condition'=>"completed = 'N'", 'limit' => $iLimit, 'offset' => $iStart));
$oTokens = TokenDynamic::model($iSurveyID)->findAll(array('condition'=>"completed = 'N'", 'limit' => $iLimit, 'offset' => $iStart));
else
$oTokens = Tokens_dynamic::model($iSurveyID)->findAll(array('limit' => $iLimit, 'offset' => $iStart));
$oTokens = TokenDynamic::model($iSurveyID)->findAll(array('limit' => $iLimit, 'offset' => $iStart));

if(count($oTokens)==0)
return array('status' => 'No Tokens found');
Expand Down Expand Up @@ -2158,7 +2158,7 @@ public function invite_participants($sSessionKey, $iSurveyID )
$iMaxEmails = (int)Yii::app()->getConfig("maxemails");
$SQLemailstatuscondition = "emailstatus = 'OK'";

$oTokens = Tokens_dynamic::model($iSurveyID);
$oTokens = TokenDynamic::model($iSurveyID);
$aResultTokens = $oTokens->findUninvited(false, $iMaxEmails, true, $SQLemailstatuscondition);
$aAllTokens = $oTokens->findUninvited(false, 0, true, $SQLemailstatuscondition);
if (empty($aResultTokens))
Expand Down Expand Up @@ -2222,7 +2222,7 @@ public function remind_participants($sSessionKey, $iSurveyID, $iMinDaysBetween=n
if(!is_null($iMaxReminders))
$SQLremindercountcondition = "remindercount < " . $iMaxReminders;

$oTokens = Tokens_dynamic::model($iSurveyID);
$oTokens = TokenDynamic::model($iSurveyID);
$aResultTokens = $oTokens->findUninvited(false, $iMaxEmails, false, $SQLemailstatuscondition, $SQLremindercountcondition, $SQLreminderdelaycondition);
$aAllTokens = $oTokens->findUninvited(false, 0, false, $SQLemailstatuscondition, $SQLremindercountcondition, $SQLreminderdelaycondition);

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/responses.php
Expand Up @@ -305,7 +305,7 @@ public function index($iSurveyID)
if (tableExists('{{tokens_' . $iSurveyID . '}}') && Permission::model()->hasSurveyPermission($iSurveyID,'tokens','read'))
{
$aData['with_token']= Yii::app()->db->schema->getTable('{{tokens_' . $iSurveyID . '}}');
$aData['tokeninfo'] = Tokens_dynamic::model($iSurveyID)->summary();
$aData['tokeninfo'] = TokenDynamic::model($iSurveyID)->summary();
}

$aViewUrls[] = 'browseindex_view';
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/surveyadmin.php
Expand Up @@ -685,7 +685,7 @@ public function getSurveys_json()
$aSurveyEntry['viewurl'] = $this->getController()->createUrl("/admin/survey/sa/view/surveyid/" . $rows['sid']);
if (tableExists('tokens_' . $rows['sid'] ))
{
$cntResult = Tokens_dynamic::countAllAndCompleted($rows['sid']);
$cntResult = TokenDynamic::countAllAndCompleted($rows['sid']);
$tokens = $cntResult['cntall'];
$tokenscompleted = $cntResult['cntcompleted'];

Expand Down

0 comments on commit 971f98c

Please sign in to comment.