Skip to content

Commit

Permalink
Fixed issue #5354: EDIT quota shows no form of quota name
Browse files Browse the repository at this point in the history 
Dev Moved self-registration option to 'Tokens' tab

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@10562 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Jul 22, 2011
1 parent 41dcc15 commit 98b9d94
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 96 deletions.
30 changes: 16 additions & 14 deletions admin/editsurveysettings.php
View file
Expand Up @@ -589,20 +589,6 @@
. "</select>\n"
. "</li>\n";

// Self registration
$editsurvey .= "<li><label for='allowregister'>".$clang->gT("Allow public registration?")."</label>\n"
. "<select id='allowregister' name='allowregister'>\n"
. "<option value='Y'";
if ($esrow['allowregister'] == "Y") {
$editsurvey .= " selected='selected'";
}
$editsurvey .= ">".$clang->gT("Yes")."</option>\n"
. "<option value='N'";
if ($esrow['allowregister'] != "Y") {
$editsurvey .= " selected='selected'";
}
$editsurvey .= ">".$clang->gT("No")."</option>\n"
. "</select></li>\n";

// Start date
$dateformatdetails=getDateFormatData($_SESSION['dateformat']);
Expand Down Expand Up @@ -928,6 +914,22 @@
$editsurvey .= ">".$clang->gT("No")."</option>\n"
. "</select></li>\n";

// Self registration
$editsurvey .= "<li><label for='allowregister'>".$clang->gT("Allow public registration?")."</label>\n"
. "<select id='allowregister' name='allowregister'>\n"
. "<option value='Y'";
if ($esrow['allowregister'] == "Y") {
$editsurvey .= " selected='selected'";
}
$editsurvey .= ">".$clang->gT("Yes")."</option>\n"
. "<option value='N'";
if ($esrow['allowregister'] != "Y") {
$editsurvey .= " selected='selected'";
}
$editsurvey .= ">".$clang->gT("No")."</option>\n"
. "</select></li>\n";


// Email format
$editsurvey .= "<li><label for=''>".$clang->gT("Use HTML format for token emails?")."</label>\n"
. "<select name='htmlemail' onchange=\"alert('".$clang->gT("If you switch email mode, you'll have to review your email templates to fit the new format","js")."');\">\n"
Expand Down
127 changes: 45 additions & 82 deletions admin/quota.php
View file
Expand Up @@ -223,9 +223,9 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)
if(!isset($_POST['quota_limit']) || $_POST['quota_limit'] < 0 || empty($_POST['quota_limit']) || !is_numeric($_POST['quota_limit']))
{
$_POST['quota_limit'] = 0;

}

array_walk( $_POST, 'db_quote', true);

$query = "INSERT INTO ".db_table_name('quota')." (sid,name,qlimit,action,autoload_url)
Expand Down Expand Up @@ -386,53 +386,30 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)
$result = db_execute_assoc($query) or safe_die($connect->ErrorMsg());
$quotainfo = $result->FetchRow();

$quotasoutput .='<form action="'.$scriptname.'" method="post">
<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#F8F8FF">
<tr>
<td valign="top">
<table width="100%" border="0">
<tbody>
<tr>
<td colspan="2" class="header ui-widget-header">'.$clang->gT("Edit quota").'</td>
</tr>
<tr class="evenrow">
<td align="right"><blockquote>
<p><strong>'.$clang->gT("Quota name").':</strong></p>
</blockquote></td>
<td align="left"> <input name="quota_name" type="text" size="30" maxlength="255" value="'.$quotainfo['name'].'" /></td>
</tr>
<tr class="evenrow">
<td align="right"><blockquote>
<p><strong>'.$clang->gT("Quota limit").':</strong></p>
</blockquote></td>
<td align="left"><input name="quota_limit" type="text" size="12" maxlength="8" value="'.$quotainfo['qlimit'].'" /></td>
</tr>
<tr class="evenrow">
<td align="right"><blockquote>
<p><strong>'.$clang->gT("Quota action").':</strong></p>
</blockquote></td>
<td align="left"> <select name="quota_action">
<option value ="1" ';
if($quotainfo['action'] == 1) $quotasoutput .= "selected";
$quotasoutput .='>'.$clang->gT("Terminate survey") .'</option>
<option value ="2" ';
if($quotainfo['action'] == 2) $quotasoutput .= "selected";
$quotasoutput .= '>'.$clang->gT("Terminate survey with warning") .'</option>
</select></td>
</tr>
<tr class="evenrow">
<td align="right"><blockquote>
<p><strong>'.$clang->gT("Autoload URL").':</strong></p>
</blockquote></td>
<td align="left"><input name="autoload_url" type="checkbox" value="1"';
if($quotainfo['autoload_url'] == "1") {$quotasoutput .= " checked";}
$quotasoutput .= ' /></td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>';
$quotasoutput .="<form action='{$scriptname}' method='post' class='form30'>
<div class='header ui-widget-header'>".$clang->gT("Edit quota")."</div>
<ul>
<li>
<label for ='quota_name'>".$clang->gT("Quota name").":</label> <input name='quota_name' id='quota_name' type='text' size='60' maxlength='255' value='{$quotainfo['name']}' />
</li>
<li>
<label for ='quota_limit'>".$clang->gT("Quota limit").":</label> <input name='quota_limit' id='quota_limit' type='text' size='12' maxlength='9' value='{$quotainfo['qlimit']}' />
</li>
<li>
<label for ='quota_action'>".$clang->gT("Quota action").":</label> <select name='quota_action' id='quota_action'>
<option value ='1' ";
if($quotainfo['action'] == 1) $quotasoutput .= 'selected';
$quotasoutput .='>'.$clang->gT('Terminate survey') .'</option>
<option value ="2" ';
if($quotainfo['action'] == 2) $quotasoutput .= 'selected';
$quotasoutput .= '>'.$clang->gT('Terminate survey with warning') ."</option>
</select>
</li>
<li>
<label for ='autoload_url'> ".$clang->gT("Autoload URL").":</label><input name='autoload_url' id='autoload_url' type='checkbox' value='1'";
if($quotainfo['autoload_url'] == "1") {$quotasoutput .= " checked";}
$quotasoutput .= ' /></li>
</ul>';
$langs = GetAdditionalLanguagesFromSurveyID($surveyid);
$baselang = GetBaseLanguageFromSurveyID($surveyid);
array_push($langs,$baselang);
Expand All @@ -455,35 +432,21 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)
$quotasoutput .= "</h2>";

$quotasoutput.='
<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#F8F8FF">
<tr>
<td valign="top">
<table width="100%" border="0">
<tbody>
<tr class="evenrow">
<td align="right" valign="top"><blockquote>
<p><strong>'.$clang->gT("Quota message").':</strong></p>
</blockquote></td>
<td align="left"> <textarea name="quotals_message_'.$lang.'" cols="60" rows="6">'.$langquotainfo['quotals_message'].'</textarea></td>
</tr>
<tr class="evenrow">
<td align="right"><blockquote>
<p><strong>'.$clang->gT("URL").':</strong></p>
</blockquote></td>
<td align="left"> <input name="quotals_url_'.$lang.'" type="text" size="30" maxlength="255" value="'.$langquotainfo['quotals_url'].'" /></td>
</tr>
<tr class="evenrow">
<td align="right"><blockquote>
<p><strong>'.$clang->gT("URL description").':</strong></p>
</blockquote></td>
<td align="left"> <input name="quotals_urldescrip_'.$lang.'" type="text" size="30" maxlength="255" value="'.$langquotainfo['quotals_urldescrip'].'" /></td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</div>';
<ul>
<li>
<label for="quotals_message_'.$lang.'">'.$clang->gT("Quota message").':</label>
<textarea id="quotals_message_'.$lang.'" name="quotals_message_'.$lang.'" cols="60" rows="6">'.$langquotainfo['quotals_message'].'</textarea>
</li>
<li>
<label for="quotals_url_'.$lang.'">'.$clang->gT("URL").':</label>
<input id="quotals_url_'.$lang.'" name="quotals_url_'.$lang.'" type="text" size="50" maxlength="255" value="'.$langquotainfo['quotals_url'].'" />
</li>
<li>
<label for="quotals_urldescrip_'.$lang.'">'.$clang->gT("URL description").':</label>
<input id="quotals_urldescrip_'.$lang.'" name="quotals_urldescrip_'.$lang.'" type="text" size="50" maxlength="255" value="'.$langquotainfo['quotals_urldescrip'].'" />
</li>
</ul>
</div>';
};
$quotasoutput .= '
<p><input name="submit" type="submit" value="'.$clang->gT("Save quota").'" />
Expand Down Expand Up @@ -681,7 +644,7 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)
<input type="hidden" name="action" value="quotas" />
<input type="hidden" name="subaction" value="new_quota" />
</form>';

}
$quotasoutput .='</td>
</tr>
Expand Down Expand Up @@ -709,11 +672,11 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)

$query = "SELECT name FROM ".db_table_name('quota')." WHERE id='".$_POST['quota_id']."'";
$result = db_execute_assoc($query) or safe_die($connect->ErrorMsg());
while ($quotadetails = $result->FetchRow())
while ($quotadetails = $result->FetchRow())
{
$quota_name=$quotadetails['name'];
}

$query = "SELECT qid, title, question FROM ".db_table_name('questions')." WHERE $allowed_types AND sid='$surveyid' AND language='{$baselang}'";
$result = db_execute_assoc($query) or safe_die($connect->ErrorMsg());
if ($result->RecordCount() == 0)
Expand Down Expand Up @@ -779,7 +742,7 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)

$query = "SELECT name FROM ".db_table_name('quota')." WHERE id='".$_POST['quota_id']."'";
$result = db_execute_assoc($query) or safe_die($connect->ErrorMsg());
while ($quotadetails = $result->FetchRow())
while ($quotadetails = $result->FetchRow())
{
$quota_name=$quotadetails['name'];
}
Expand Down

0 comments on commit 98b9d94

Please sign in to comment.