Jeremy Newman : remove xinha, add wysiwyg class to load editor
Jeremy Newman
jnewman at winehq.org
Fri Feb 3 11:06:49 CST 2017
Module: appdb
Branch: master
Commit: 8f6be98e4e0fc51b60d6ff514404d404608f0d7e
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8f6be98e4e0fc51b60d6ff514404d404608f0d7e
Author: Jeremy Newman <jnewman at codeweavers.com>
Date: Fri Feb 3 11:06:11 2017 -0600
remove xinha, add wysiwyg class to load editor
---
include/application.php | 4 +---
include/filter.php | 5 +----
include/note.php | 4 +---
include/testData.php | 8 +++-----
include/version.php | 3 +--
5 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/include/application.php b/include/application.php
index 376b459..75d13ee 100644
--- a/include/application.php
+++ b/include/application.php
@@ -565,8 +565,6 @@ class Application {
/* output a html table and this applications values to the fields for editing */
public function outputEditor($sVendorName = "")
{
- HtmlAreaLoaderScript(array("app_editor"));
-
echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'">';
/* Used to distinguish between the first step of entering an application
@@ -638,7 +636,7 @@ class Application {
echo '<td><input size="75%" type="text" name="sAppKeywords" value="'.$this->sKeywords.'"></td></tr>',"\n";
echo '<tr valign=top><td class="color0"><b>Application description (In your own words)</b></td>',"\n";
- echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription">';
+ echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription" class="wysiwyg">';
echo $this->sDescription.'</textarea></p></td></tr>',"\n";
diff --git a/include/filter.php b/include/filter.php
index aa3fa6d..ec4c0b7 100644
--- a/include/filter.php
+++ b/include/filter.php
@@ -31,14 +31,11 @@ function filter_gpc()
// Special cases for variables that don't fit our filtering scheme
// don't filter the AppDB session cookie and MAX_FILE_SIZE
- // and the DialogX values that xinha uses
// NOTE: we must use === when comparing the return value of strpos
// against a value, otherwise if strpos() returns false indicating that
// the value wasn't found strpos(something) == 0 will still be true
- if((strpos($aKeys[$i], "Dialog") === 0) ||
- (strpos($aKeys[$i], "XinhaColorPicker") === 0) || // Xinha variables
- ($aKeys[$i] == "cx") || // google custom search variable
+ if(($aKeys[$i] == "cx") || // google custom search variable
($aKeys[$i] == "cof") || // google custom search variable
($aKeys[$i] == "q") || // google custom search variable
($aKeys[$i] == "g-recaptcha-response")) // google reCaptcha variable
diff --git a/include/note.php b/include/note.php
index 0e43cce..8a9dabd 100644
--- a/include/note.php
+++ b/include/note.php
@@ -382,8 +382,6 @@ class Note {
$this->iAppId = $oVersion->iAppId;
}
- HtmlAreaLoaderScript(array("editor"));
-
echo html_frame_start("Edit Application Note", "90%","",0);
echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'");
@@ -401,7 +399,7 @@ class Note {
echo '</td></tr>';
echo '<tr><td class=color1>Description</td><td class=color0>', "\n";
echo '<p style="width:700px">', "\n";
- echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc">'.$this->shDescription.'</textarea>',"\n";
+ echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc" class="wysiwyg">'.$this->shDescription.'</textarea>',"\n";
echo '</p>';
echo '</td></tr>'."\n";
diff --git a/include/testData.php b/include/testData.php
index 18a04b4..8ba45c1 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -834,8 +834,6 @@ class testData{
if(!$this->sTestedDate)
$this->sTestedDate = date('Y-m-d H:i:s');
- HtmlAreaLoaderScript(array("Test1", "Test2", "Test3"));
-
$sName = version::fullName($this->iVersionId);
echo html_frame_start("Test Form - $sName", "90%", "", 0);
@@ -843,15 +841,15 @@ class testData{
// What works
echo '<tr valign=top><td class="color0"><b>What works</b></td>',"\n";
- echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks">';
+ echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks" class="wysiwyg">';
echo $this->shWhatWorks.'</textarea></p></td></tr>',"\n";
// What Does not work
echo '<tr valign=top><td class=color1><b>What does not work</b></td>',"\n";
- echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt">';
+ echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt" class="wysiwyg">';
echo $this->shWhatDoesnt.'</textarea></p></td></tr>',"\n";
// What was not tested
echo '<tr valign=top><td class=color0><b>What was not tested</b></td>',"\n";
- echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested">';
+ echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested" class="wysiwyg">';
echo $this->shWhatNotTested.'</textarea></p></td></tr>',"\n";
// Date Tested
echo '<tr valign=top><td class="color1"><b>Date tested </b></td>',"\n";
diff --git a/include/version.php b/include/version.php
index 2e34d1a..b79954d 100644
--- a/include/version.php
+++ b/include/version.php
@@ -595,7 +595,6 @@ class version {
/* otherwise, if $editParentAppliation is false, we leave them out */
public function outputEditor()
{
- HtmlAreaLoaderScript(array("version_editor"));
echo html_frame_start("Version Form", "90%", "", 0);
echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">';
@@ -669,7 +668,7 @@ class version {
$oTableCell->SetClass("color0");
$oTableRow->AddCell($oTableCell);
- $oTableRow->AddTextCell('<p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription">'.
+ $oTableRow->AddTextCell('<p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription" class="wysiwyg">'.
$this->sDescription.'</textarea></p>');
$oTable->AddRow($oTableRow);
More information about the wine-cvs
mailing list