Skip to content

Commit

Permalink
Working on the question copy
Browse files Browse the repository at this point in the history 
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2653 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Mar 31, 2007
1 parent 8ada0e2 commit fcf9564
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 58 deletions.
18 changes: 9 additions & 9 deletions admin/html.php
View file
Expand Up @@ -2390,7 +2390,7 @@
. "\t\t<td><input type='text' size='50' name='faxto' /></td></tr>\n";
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Format:")."</font></td>\n"
. "\t\t<td><select name='format'>\n"
. "\t\t\t<option value='S' selected>".$clang->gT("Question by Question")."</option>\n"
. "\t\t\t<option value='S' selected='selected'>".$clang->gT("Question by Question")."</option>\n"
. "\t\t\t<option value='G'>".$clang->gT("Group by Group")."</option>\n"
. "\t\t\t<option value='A'>".$clang->gT("All in one")."</option>\n"
. "\t\t</select></td>\n"
Expand Down Expand Up @@ -2447,7 +2447,7 @@
. "\t</tr>\n";
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Anonymous?")."</font></td>\n"
. "\t\t<td><select name='private'>\n"
. "\t\t\t<option value='Y' selected>".$clang->gT("Yes")."</option>\n"
. "\t\t\t<option value='Y' selected='selected'>".$clang->gT("Yes")."</option>\n"
. "\t\t\t<option value='N'>".$clang->gT("No")."</option>\n"
. "\t\t</select></td>\n\t</tr>\n";
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Invitation Email Subject:")."</font></td>\n"
Expand All @@ -2471,7 +2471,7 @@
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Allow public registration?")."</font></td>\n"
. "\t\t<td><select name='allowregister'>\n"
. "\t\t\t<option value='Y'>".$clang->gT("Yes")."</option>\n"
. "\t\t\t<option value='N' selected>".$clang->gT("No")."</option>\n"
. "\t\t\t<option value='N' selected='selected'>".$clang->gT("No")."</option>\n"
. "\t\t</select></td>\n\t</tr>\n";
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Public registration Email Subject:")."</font></td>\n"
. "\t\t<td><input type='text' size='54' name='email_register_subj' value='".$clang->gT("Survey Registration Confirmation")."' />\n"
Expand All @@ -2485,17 +2485,17 @@
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Date Stamp?")."</font></td>\n"
. "\t\t<td><select name='datestamp'>\n"
. "\t\t\t<option value='Y'>".$clang->gT("Yes")."</option>\n"
. "\t\t\t<option value='N' selected>".$clang->gT("No")."</option>\n"
. "\t\t\t<option value='N' selected='selected'>".$clang->gT("No")."</option>\n"
. "\t\t</select></td>\n\t</tr>\n";
// IP Address
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Save IP Address?")."</font></td>\n"
. "\t\t<td><select name='ipaddr'>\n" . "\t\t\t<option value='Y'>".$clang->gT("Yes")."</option>\n"
. "\t\t\t<option value='N' selected>".$clang->gT("No")."</option>\n"
. "\t\t\t<option value='N' selected='selected'>".$clang->gT("No")."</option>\n"
. "\t\t</select></td>\n\t</tr>\n";
// Referring URL
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Save Referring URL?")."</font></td>\n"
. "\t\t<td><select name='refurl'>\n" . "\t\t\t<option value='Y'>".$clang->gT("Yes")."</option>\n"
. "\t\t\t<option value='N' selected>".$clang->gT("No")."</option>\n"
. "\t\t\t<option value='N' selected='selected'>".$clang->gT("No")."</option>\n"
. "\t\t</select></td>\n\t</tr>\n";
//Survey Language
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Base Language:")."</font></td>\n"
Expand All @@ -2513,7 +2513,7 @@
. "\t</tr>\n";
$newsurvey .= "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Expires?")."</font></td>\n"
. "\t\t\t<td><select name='useexpiry'><option value='Y'>".$clang->gT("Yes")."</option>\n"
. "\t\t\t<option value='N' selected>".$clang->gT("No")."</option></select></td></tr>\n"
. "\t\t\t<option value='N' selected='selected'>".$clang->gT("No")."</option></select></td></tr>\n"
. "<tr><td align='right'><font class='settingcaption'>".$clang->gT("Expiry Date:")."</font></td>\n"
. "\t\t<td><input type='text' id='f_date_b' size='12' name='expires' value='"
. date("Y-m-d")."' /><button type='reset' id='f_trigger_b'>...</button>"
Expand All @@ -2529,7 +2529,7 @@
. "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Automatically load URL when survey complete?")."</font></td>\n"
. "\t\t<td><select name='autoredirect'>\n"
. "\t\t\t<option value='Y'>".$clang->gT("Yes")."</option>\n"
. "\t\t\t<option value='N' selected>".$clang->gT("No")."</option>\n"
. "\t\t\t<option value='N' selected='selected'>".$clang->gT("No")."</option>\n"
. "</select></td></tr>"
. "\t<tr><td colspan='2' align='center'><input type='submit' value='".$clang->gT("Create Survey")."' />\n"
. "\t<input type='hidden' name='action' value='insertnewsurvey' /></td>\n"
Expand All @@ -2543,7 +2543,7 @@
. "\t\t<td align='right'><font class='settingcaption'>".$clang->gT("Select CSV/SQL File:")."</font></td>\n"
. "\t\t<td><input name=\"the_file\" type=\"file\" size=\"35\" /></td></tr>\n"
. "\t<tr><td colspan='2' align='center'><input type='submit' value='".$clang->gT("Import Survey")."' />\n"
. "\t<input type='hidden' name='action' value='importsurvey' /></TD>\n"
. "\t<input type='hidden' name='action' value='importsurvey' /></td>\n"
. "\t</tr>\n</table></form>\n";
// Here we do setup the date javascript
$newsurvey .= "<script type=\"text/javascript\">\n"
Expand Down
6 changes: 3 additions & 3 deletions admin/integritycheck.php
View file
Expand Up @@ -50,7 +50,7 @@
. "\t<tr>\n"
. "\t\t<td colspan='2' align='center' bgcolor='#BBBBBB'>\n"
. "\t\t\t<strong>".$clang->gT("Data Consistency Check")."<br /><font size='1'>".$clang->gT("If errors are showing up you might have to execute this script repeatedly.")."</font></strong>\n"
. "\t\t</font></td>\n"
. "\t\t</td>\n"
. "\t</tr>\n"
. "\t<tr><td align='center'>"
. "<br />\n";
Expand Down Expand Up @@ -313,7 +313,7 @@
."</form>\n";
}
$integritycheck .= "<br /><br />\n"
."</font></td></tr></table>\n"
."</td></tr></table>\n"
."<table><tr><td height='1'></td></tr></table>\n";
}
elseif ($ok == "Y")
Expand All @@ -324,7 +324,7 @@
. "\t<tr>\n"
. "\t\t<td colspan='2' align='center' bgcolor='#BBBBBB'>\n"
. "\t\t\t<strong>".$clang->gT("Data Consistency Check")."<br /><font size='1'>".$clang->gT("If errors are showing up you might have to execute this script repeatedly.")."</strong>\n"
. "\t\t</font></td>\n"
. "\t\t</td>\n"
. "\t</tr>\n"
. "\t<tr><td align='center'>";
$cdelete=returnglobal('cdelete');
Expand Down
70 changes: 37 additions & 33 deletions admin/labels.php
View file
Expand Up @@ -43,6 +43,9 @@
if($_SESSION['USER_RIGHT_MANAGE_LABEL'] == 1)
{


if (isset($_POST['sortorder'])) {$_POST['sortorder']=sanitize_int($_POST['sortorder']);}

if (!isset($action)) {$action=returnglobal('action');}
if (!isset($lid)) {$lid=returnglobal('lid');}
$labelsoutput= include2var('./scripts/addremove.js');
Expand Down Expand Up @@ -96,12 +99,12 @@
foreach ($labelsets as $lb)
{
$labelsoutput.="<option value='admin.php?action=labels&amp;lid={$lb[0]}'";
if ($lb[0] == $lid) {$labelsoutput.= " selected";}
if ($lb[0] == $lid) {$labelsoutput.= " selected='selected'";}
$labelsoutput.= ">{$lb[1]}</option>\n";
}
}
$labelsoutput.= "<option value=''";
if (!isset($lid) || $lid<1) {$labelsoutput.= " selected";}
if (!isset($lid) || $lid<1) {$labelsoutput.= " selected='selected'";}
$labelsoutput.= ">".$clang->gT("Please Choose...")."</option>\n";

$labelsoutput.= "\t</select>\n"
Expand Down Expand Up @@ -145,7 +148,7 @@
."\t</tr>\n"
// Additional languages listbox
. "\t<tr><td align='right'><font class='settingcaption'>".$clang->gT("Languages").":</font></td>\n"
. "<td><select multiple style='min-width:250px;' size='5' id='additional_languages' name='additional_languages'>";
. "<td><select multiple='multiple' style='min-width:250px;' size='5' id='additional_languages' name='additional_languages'>";
foreach ($langidsarray as $langid)
{
$labelsoutput.= "\t<option id='".$langid."' value='".$langid."'";
Expand All @@ -154,10 +157,10 @@

// Add/Remove Buttons
$labelsoutput.= "</select></td>"
. "<td align=left><INPUT type=\"button\" value=\"<< ".$clang->gT("Add")."\" onclick=\"DoAdd()\" ID=\"AddBtn\" /><br /> <INPUT type=\"button\" value=\"".$clang->gT("Remove")." >>\" onclick=\"DoRemove(1,'".$clang->gT("You cannot remove this items since you need at least one language in a labelset.", "js")."')\" ID=\"RemoveBtn\" /></td>\n"
. "<td align='left'><input type=\"button\" value=\"<< ".$clang->gT("Add")."\" onclick=\"DoAdd()\" id=\"AddBtn\" /><br /> <input type=\"button\" value=\"".$clang->gT("Remove")." >>\" onclick=\"DoRemove(1,'".$clang->gT("You cannot remove this items since you need at least one language in a labelset.", "js")."')\" id=\"RemoveBtn\" /></td>\n"

// Available languages listbox
. "<td align=left width='45%'><select size='5' id='available_languages' name='available_languages'>";
. "<td align='left' width='45%'><select size='5' id='available_languages' name='available_languages'>";
foreach (getLanguageData() as $langkey=>$langname)
{
if (in_array($langkey,$langidsarray)==false) // base languag must not be shown here
Expand Down Expand Up @@ -205,7 +208,7 @@
."<td><input name=\"the_file\" type=\"file\" size=\"35\" />"
."</td></tr>\n"
."\t<tr><td></td><td><input type='submit' value='".$clang->gT("Import Label Set")."' />\n"
."\t<input type='hidden' name='action' value='importlabels' /></TD>\n"
."\t<input type='hidden' name='action' value='importlabels' /></td>\n"
."\t</tr></table></form>\n";
}
}
Expand Down Expand Up @@ -288,7 +291,7 @@
."\t<table width='100%' style='border: solid; border-width: 0px; border-color: #555555' cellspacing='0'>\n"
."<thead align='center'>"
."<tr bgcolor='#BBBBBB'>\n"
."\t<td width='25%' align=right><strong><font size='1' face='verdana' >\n"
."\t<td width='25%' align='right'><strong><font size='1' face='verdana' >\n"
.$clang->gT("Code")
."\t</font></strong></td>\n"
."\t<td width='35%'><strong><font size='1' face='verdana'>\n"
Expand All @@ -297,7 +300,7 @@
."\t<td width='25%'><strong><font size='1' face='verdana'>\n"
.$clang->gT("Action")
."\t</font></strong></td>\n"
."\t<td width='15%' align=center><strong><font size='1' face='verdana'>\n"
."\t<td width='15%' align='center'><strong><font size='1' face='verdana'>\n"
.$clang->gT("Order")
."\t</font></strong></td>\n"
."</tr></thead>"
Expand All @@ -306,7 +309,7 @@
{
$sortorderids=$sortorderids.' '.$row['language'].'_'.$row['sortorder'];
if ($first) {$codeids=$codeids.' '.$row['sortorder'];}
$labelsoutput.= "<tr><td width='25%' align=right>\n";
$labelsoutput.= "<tr><td width='25%' align='right'>\n";

if ($activeuse > 0)
{
Expand Down Expand Up @@ -347,13 +350,13 @@
}
if ($labelcount>0)
{
$labelsoutput.= "\t<tr><td colspan=4><center><input type='submit' name='method' value='".$clang->gT("Save All")."' />"
$labelsoutput.= "\t<tr><td colspan='4'><center><input type='submit' name='method' value='".$clang->gT("Save All")."' />"
."</center></td></tr>\n";
}

$position=sprintf("%05d", $position);
if ($activeuse == 0 && $first)
{ $labelsoutput.= "<tr><td><br /></td></tr><tr><td width='25%' align=right>"
{ $labelsoutput.= "<tr><td><br /></td></tr><tr><td width='25%' align='right'>"
."<strong>".$clang->gT("New label").":</strong> <input type='text' maxlength='10' name='insertcode' size='10' id='addnewlabelcode' />\n"
."\t</td>\n"
."\t<td width='35%'>\n"
Expand All @@ -377,7 +380,7 @@
$labelsoutput.= "<tr>\n"
."\t<td colspan='4' align='center'>\n"
."<font color='green' size='1'><i><strong>"
.$clang->gT("Warning")."</strong>: ".$clang->gT("Inserting New labels must be done on the first language folder.")."</i></strong></font>\n"
.$clang->gT("Warning")."</strong>: ".$clang->gT("Inserting New labels must be done on the first language folder.")."</i></font>\n"
."\t</td>\n"
."</tr>\n";
}
Expand Down Expand Up @@ -415,7 +418,7 @@
."</tr></tbody></table>"
."\t<input type='hidden' name='lid' value='$lid' />\n"
."\t<input type='hidden' name='action' value='modlabelsetanswers' />\n"
."</form>\n";
."</form></td></tr>\n";
if ($totaluse > 0 && $activeuse == 0) //If there are surveys using this labelset, but none are active warn about modifying
{
$labelsoutput.= "<tr>\n"
Expand All @@ -429,6 +432,7 @@
}
$labelsoutput.= "\t</table>\n";
}
$labelsoutput.="</td></tr></table>";
}
else
{
Expand All @@ -440,12 +444,12 @@
//************************FUNCTIONS********************************
function updateset($lid)
{
global $dbprefix, $connect;
$_POST['label_name'] = db_quote($_POST['label_name']);
$_POST['languageids'] = db_quote($_POST['languageids']);

global $dbprefix, $connect, $labelsoutput;
// Get added and deleted languagesid arrays
$newlanidarray=explode(" ",trim($_POST['languageids']));

$_POST['languageids'] = db_quoteall($_POST['languageids']);
$_POST['label_name'] = db_quoteall($_POST['label_name']);
$oldlangidsarray=array();
$query = "SELECT languages FROM ".db_table_name('labelsets')." WHERE lid=".$lid;
$result=db_execute_assoc($query);
Expand Down Expand Up @@ -496,7 +500,7 @@ function updateset($lid)
}

// Update the labelset itself
$query = "UPDATE ".db_table_name('labelsets')." SET label_name='{$_POST['label_name']}', languages='{$_POST['languageids']}' WHERE lid=$lid";
$query = "UPDATE ".db_table_name('labelsets')." SET label_name={$_POST['label_name']}, languages={$_POST['languageids']} WHERE lid=$lid";
if (!$result = $connect->Execute($query))
{
$labelsoutput.= "<script type=\"text/javascript\">\n<!--\n alert(\"".$clang->gT("Update of Label Set failed","js")." - ".$query." - ".$connect->ErrorMsg()."\")\n //-->\n</script>\n";
Expand Down Expand Up @@ -532,11 +536,11 @@ function deletelabelset($lid)

function insertlabelset()
{
global $dbprefix, $connect;
global $dbprefix, $connect, $clang, $labelsoutput;
// $labelsoutput.= $_POST['languageids']; For debug purposes
$_POST['label_name'] = db_quote($_POST['label_name']);
$_POST['languageids'] = db_quote($_POST['languageids']);
$query = "INSERT INTO ".db_table_name('labelsets')." (label_name,languages) VALUES ('{$_POST['label_name']}','{$_POST['languageids']}')";
$_POST['label_name'] = db_quoteall($_POST['label_name']);
$_POST['languageids'] = db_quoteall($_POST['languageids']);
$query = "INSERT INTO ".db_table_name('labelsets')." (label_name,languages) VALUES ({$_POST['label_name']},{$_POST['languageids']})";
if (!$result = $connect->Execute($query))
{
$labelsoutput.= "<script type=\"text/javascript\">\n<!--\n alert(\"".$clang->gT("Update of Label Set failed","js")." - ".$query." - ".$connect->ErrorMsg()."\")\n //-->\n</script>\n";
Expand All @@ -551,7 +555,7 @@ function insertlabelset()

function modlabelsetanswers($lid)
{
global $dbprefix, $connect, $clang;
global $dbprefix, $connect, $clang, $labelsoutput;

$qulabelset = "SELECT * FROM ".db_table_name('labelsets')." WHERE lid='$lid'";
$rslabelset = db_execute_assoc($qulabelset) or die($connect->ErrorMsg());
Expand All @@ -571,11 +575,11 @@ function modlabelsetanswers($lid)
$newsortorder=sprintf("%05d", $result->fields['maxorder']+1);


$_POST['insertcode'] = db_quote($_POST['insertcode']);
$_POST['insertcode'] = db_quoteall($_POST['insertcode']);
$_POST['inserttitle'] = db_quoteall($_POST['inserttitle']);
foreach ($lslanguages as $lslanguage)
{
$_POST['inserttitle'] = db_quote($_POST['inserttitle']);
$query = "INSERT INTO ".db_table_name('labels')." (lid, code, title, sortorder,language) VALUES ($lid, '{$_POST['insertcode']}', '{$_POST['inserttitle']}', '$newsortorder','$lslanguage')";
$query = "INSERT INTO ".db_table_name('labels')." (lid, code, title, sortorder,language) VALUES ($lid, {$_POST['insertcode']}, {$_POST['inserttitle']}, '$newsortorder','$lslanguage')";
if (!$result = $connect->Execute($query))
{
$labelsoutput.= "<script type=\"text/javascript\">\n<!--\n alert(\"".$clang->gT("Failed to insert label", "js")." - ".$query." - ".$connect->ErrorMsg()."\")\n //-->\n</script>\n";
Expand All @@ -594,18 +598,18 @@ function modlabelsetanswers($lid)
// Quote each code_codeid first
foreach ($codeids as $codeid)
{
$_POST['code_'.$codeid] = db_quote($_POST['code_'.$codeid]);
$_POST['code_'.$codeid] = db_quoteall($_POST['code_'.$codeid]);
}
foreach ($sortorderids as $sortorderid)
{
$langid=substr($sortorderid,0,strrpos($sortorderid,'_'));
$orderid=substr($sortorderid,strrpos($sortorderid,'_')+1,20);
$_POST['title_'.$sortorderid] = db_quote($_POST['title_'.$sortorderid]);
$query = "UPDATE ".db_table_name('labels')." SET code='".$_POST['code_'.$codeids[$count]]."', title='{$_POST['title_'.$sortorderid]}' WHERE lid=$lid AND sortorder=$orderid AND language='$langid'";
$_POST['title_'.$sortorderid] = db_quoteall($_POST['title_'.$sortorderid]);
$query = "UPDATE ".db_table_name('labels')." SET code=".$_POST['code_'.$codeids[$count]].", title={$_POST['title_'.$sortorderid]} WHERE lid=$lid AND sortorder=$orderid AND language='$langid'";
if (!$result = $connect->Execute($query))
// if update didn't work we assume the label does not exist and insert it
{
$query = "insert into ".db_table_name('labels')." SET code='".$_POST['code_'.$codeids[$count]]."', title='{$_POST['title_'.$sortorderid]}', lid=$lid , sortorder=$orderid , language='$langid'";
$query = "insert into ".db_table_name('labels')." SET code=".$_POST['code_'.$codeids[$count]].", title={$_POST['title_'.$sortorderid]}, lid=$lid , sortorder=$orderid , language='$langid'";
if (!$result = $connect->Execute($query))
{
$labelsoutput.= "<script type=\"text/javascript\">\n<!--\n alert(\"".$clang->gT("Failed to update label","js")." - ".$query." - ".$connect->ErrorMsg()."\")\n //-->\n</script>\n";
Expand All @@ -619,9 +623,9 @@ function modlabelsetanswers($lid)

// Pressing the Up button
case $clang->gT("Up", "unescaped"):
$newsortorder=$_POST['sortorder']-1;
$newsortorder=$_POST['sortorder']-1;
$oldsortorder=$_POST['sortorder'];
$cdquery = "UPDATE ".db_table_name('labels')." SET sortorder=-1 WHERE lid=$lid AND sortorder='$newsortorder'";
$cdquery = "UPDATE ".db_table_name('labels')." SET sortorder=-1 WHERE lid=$lid AND sortorder=$newsortorder";
$cdresult=$connect->Execute($cdquery) or die($connect->ErrorMsg());
$cdquery = "UPDATE ".db_table_name('labels')." SET sortorder=$newsortorder WHERE lid=$lid AND sortorder=$oldsortorder";
$cdresult=$connect->Execute($cdquery) or die($connect->ErrorMsg());
Expand Down Expand Up @@ -660,7 +664,7 @@ function modlabelsetanswers($lid)

function fixorder($lid) //Function rewrites the sortorder for a group of answers
{
global $dbprefix, $connect;
global $dbprefix, $connect, $labelsoutput;
$qulabelset = "SELECT * FROM ".db_table_name('labelsets')." WHERE lid=$lid";
$rslabelset = db_execute_assoc($qulabelset) or die($connect->ErrorMsg());
$rwlabelset=$rslabelset->FetchRow();
Expand Down
2 changes: 1 addition & 1 deletion admin/login_check.php
View file
Expand Up @@ -106,7 +106,7 @@
foreach (getlanguagedata() as $langkey=>$languagekind)
{
$loginsummary .= "\t\t\t\t<option value='$langkey'";
if (isset($_SESSION['adminlang']) && $langkey == $_SESSION['adminlang']) {$loginsummary .= " selected";}
if (isset($_SESSION['adminlang']) && $langkey == $_SESSION['adminlang']) {$loginsummary .= " selected='selected'";}
$loginsummary .= ">".$languagekind['description']." - ".$languagekind['nativedescription']."</option>\n";
}
$loginsummary .= "\t\t\t</select>\n"
Expand Down

0 comments on commit fcf9564

Please sign in to comment.