Skip to content

Commit

Permalink
New feature: Updated FCKeditor to CKEditor
Browse files Browse the repository at this point in the history 
Dev Plus more pending fixes from stable

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@10141 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed May 28, 2011
1 parent 99626ff commit 5539939
Show file tree
Hide file tree
Showing 1,338 changed files with 138,072 additions and 84,624 deletions.
2 changes: 1 addition & 1 deletion admin/browse.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@
$query .= ", $question ";
$count++;
}
$query .= " FROM $surveytable WHERE id=".mysql_real_escape_string($_POST['downloadfile']);
$query .= " FROM $surveytable WHERE id=".$_POST['downloadfile'];
$filearray = db_execute_assoc($query) or safe_die("Could not download response<br />$query<br />".$connect->ErrorMsg());
while ($metadata = $filearray->FetchRow())
{
Expand Down
4 changes: 0 additions & 4 deletions admin/dataentry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1390,10 +1390,6 @@ function saveshow(value)

elseif ($subaction == "update" && bHasSurveyPermission($surveyid,'responses','update'))
{
if ($_SESSION['USER_RIGHT_SUPERADMIN'] != 1 && $surveyinfo['owner_id'] != $_SESSION['loginID'])
{
safe_die('You are not allowed to update an existing response.');
}

$baselang = GetBaseLanguageFromSurveyID($surveyid);
$dataentryoutput .= $surveyoptions."<div class='header ui-widget-header'>".$clang->gT("Data entry")."</div>\n";
Expand Down
3 changes: 2 additions & 1 deletion admin/dumpdb.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
Header("Content-Disposition: attachment; filename=$file_name");
Header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
echo $export;
exit; // needs to be inside the condition so the updater still can include this file
}
exit;


/**
* Creates a full dump of the current LimeSurvey database
Expand Down
2 changes: 1 addition & 1 deletion admin/editansweroptions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
}

// Print Key Control JavaScript
$vasummary = PrepareEditorScript("editanswer");
$vasummary = PrepareEditorScript();

$query = "SELECT sortorder FROM ".db_table_name('answers')." WHERE qid='{$qid}' AND language='".GetBaseLanguageFromSurveyID($surveyid)."' ORDER BY sortorder desc";
$result = db_execute_assoc($query) or safe_die($connect->ErrorMsg()); //Checked
Expand Down
2 changes: 1 addition & 1 deletion admin/editsubquestions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
}

// Print Key Control JavaScript
$vasummary .= PrepareEditorScript("editanswer");
$vasummary .= PrepareEditorScript();

$query = "SELECT question_order FROM ".db_table_name('questions')." WHERE parent_qid='{$qid}' AND language='".GetBaseLanguageFromSurveyID($surveyid)."' ORDER BY question_order desc";
$result = db_execute_assoc($query) or safe_die($connect->ErrorMsg()); //Checked
Expand Down
2 changes: 1 addition & 1 deletion admin/editsurveysettings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@
. "<input type='hidden' name='action' value='importsurveyresources' />\n"
. "<ul>\n"
. "<li><label>&nbsp;</label>\n"
. "<input type='button' onclick='window.open(\"$sFCKEditorURL/editor/filemanager/browser/default/browser.html?Connector=../../connectors/php/connector.php\", \"_blank\")' value=\"".$clang->gT("Browse Uploaded Resources")."\" $disabledIfNoResources /></li>\n"
. "<input type='button' onclick='window.open(\"$sCKEditorURL/editor/filemanager/browser/default/browser.html?Connector=../../connectors/php/connector.php\", \"_blank\")' value=\"".$clang->gT("Browse Uploaded Resources")."\" $disabledIfNoResources /></li>\n"
. "<li><label>&nbsp;</label>\n"
. "<input type='button' onclick='window.open(\"$scriptname?action=exportsurvresources&amp;sid={$surveyid}\", \"_blank\")' value=\"".$clang->gT("Export Resources As ZIP Archive")."\" $disabledIfNoResources /></li>\n"
. "<li><label for='the_file'>".$clang->gT("Select ZIP File:")."</label>\n"
Expand Down
20 changes: 2 additions & 18 deletions admin/fck_LimeReplacementFields.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,9 @@
$replFields=Array();
$isInstertansEnabled=false;

$limereplacementoutput="<html>\n"
. "\t<head>\n"
. "\t\t<title>LimeReplacementFields</title>\n"
. "\t\t<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n"
. "\t\t<meta content=\"noindex, nofollow\" name=\"robots\">\n"
. "\t\t<script src=\"$sFCKEditorURL/editor/dialog/common/fck_dialog_common.js\" type=\"text/javascript\"></script>\n"
. "\t\t<script src=\"$rooturl/scripts/jquery/jquery.js\" type=\"text/javascript\"></script>\n"
. "\t\t<script language=\"javascript\">\n"
. "\t\t\tvar mydialog = window.parent ;\n"
. "\t\t\tvar oEditor = mydialog.InnerDialogLoaded() ;\n"
. "\t\t\tvar dialog = oEditor.FCK ;\n"
. "\t\t\tvar FCKLang = oEditor.FCKLang ;\n"
. "\t\t\tvar FCKLimeReplacementFieldss = oEditor.FCKLimeReplacementFieldss ;\n"
$limereplacementoutput="\t\t<script language=\"javascript\">\n"
. "\t\t\$(document).ready(function ()\n"
. "\t\t\t{\n"
. "\t\t\t\toEditor.FCKLanguageManager.TranslatePage( document ) ;\n"
. "\t\t\t\tLoadSelected() ;\n"
. "\t\t\t\tmydialog.SetOkButton( true ) ;\n"
. "\n"
Expand Down Expand Up @@ -338,7 +325,6 @@
// Now I´ll add a hack to add the questions before as option
// if they are date type

//$limereplacementoutput .="\t<div style='overflow-x:scroll; width:100%; overflow: -moz-scrollbars-horizontal; overflow-y:scroll; height: 100px;'>\n"
}

if (count($replFields) > 0 || isset($cquestions) )
Expand Down Expand Up @@ -421,10 +407,8 @@
}
}

$limereplacementoutput .= "</table>\n"
. "\t</body>\n"
. "</html>";

$limereplacementoutput .= "</table>\n";
echo $limereplacementoutput;
exit;
?>
2 changes: 1 addition & 1 deletion admin/html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
{
if ($sumcount6 > 0) {
$surveysummary .= "<li><a href=\"#\" onclick=\"".get2post("{$scriptname}?action=resetsurveylogic&amp;sid=$surveyid")."\">"
. "<img src='{$imageurl}/resetsurveylogic_30.png' name='ResetSurveyLogic'> ".$clang->gT("Reset conditions")."</a></li>\n";
. "<img src='{$imageurl}/resetsurveylogic_30.png' name='ResetSurveyLogic' /> ".$clang->gT("Reset conditions")."</a></li>\n";
}
else
{
Expand Down
Loading

0 comments on commit 5539939

Please sign in to comment.