From 88c42da7a0c8a6f2acf0d431c33dae849fa9081a Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 7 Mar 2005 19:38:17 +0000
Subject: [PATCH] bug fixes

---
 docs/changelog/6.x.x.txt              |   4 ++++
 docs/upgrades/upgrade_6.4.0-6.5.0.sql |   2 +-
 lib/WebGUI/AdminConsole.pm            |   2 +-
 lib/WebGUI/Asset/Post.pm              |  23 +++++++++++---------
 lib/WebGUI/Asset/Wobject/Survey.pm    |   8 +++----
 lib/WebGUI/HTMLForm.pm                |   2 +-
 lib/WebGUI/Operation/Auth.pm          |   2 +-
 lib/WebGUI/Operation/Help.pm          |   4 ++--
 lib/WebGUI/Operation/Profile.pm       |   2 +-
 lib/WebGUI/i18n/English/Asset.pm      |   2 +-
 sbin/uploadsAccessHandler.perl        |   2 +-
 www/extras/assets/small/thread.gif    | Bin 680 -> 1023 bytes
 www/extras/assets/thread.gif          | Bin 2501 -> 2211 bytes
 www/extras/tabs/tabs.js               |  29 ++++++++++++++++++++++++++
 14 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index b352881fe..3a6b81de3 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -4,6 +4,10 @@
    the start date.
  - fix [ 1157202 ] users can add themselves to Admins group
  - fix [ 1157218 ] user cannot view it's own profile
+ - fix [ 1157195 ] Problem with request when saving profile
+ - fix [ 1158117 ] Help Index Unavailable from RWG
+ - fix [ 1157453 ] Error on Edit Template / Save and Cancel
+ - fix [ 1157434 ] [CVS 6.5]edit question controls have incorrect URL in Survey
 
 
 6.4.0
diff --git a/docs/upgrades/upgrade_6.4.0-6.5.0.sql b/docs/upgrades/upgrade_6.4.0-6.5.0.sql
index 040536e45..fd3098849 100644
--- a/docs/upgrades/upgrade_6.4.0-6.5.0.sql
+++ b/docs/upgrades/upgrade_6.4.0-6.5.0.sql
@@ -1,4 +1,4 @@
 insert into webguiVersion values ('6.5.0','upgrade',unix_timestamp());
 alter table asset add column isPrototype int not null default 0;
 alter table asset add index isPrototype_className_assetId (isPrototype,className,assetId);
-
+update Folder set templateId='PBtmpl0000000000000078' where templateId='';
diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index 7a424aabe..ab2fdc413 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -225,7 +225,7 @@ sub getAdminFunction {
 			},
 			icon=>"help.gif",
 			op=>"viewHelpIndex",
-			group=>"12"
+			group=>"7"
 		},
 		"statistics"=>{
 			title=>{
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index cd8b2193a..f71c39cd6 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -455,20 +455,22 @@ sub getThumbnailUrl {
 #-------------------------------------------------------------------
 sub getUploadControl {
 	my $self = shift;
+	my $maxAttachments = $self->getThread->getParent->getValue("attachmentsPerPost");
 	my $uploadControl;
+	return undef unless ($maxAttachments);
 	if ($self->get("storageId")) {
 		my $i;
 		foreach my $filename (@{$self->getStorageLocation->getFiles}) {
 			$uploadControl .= '<a href="'.$self->getStorageLocation->getUrl($filename).'">'.$filename.'</a><br />';	
 			$i++;
 		}
-		return $uploadControl unless ($i < $self->getThread->getParent->get("attachmentsPerPost"));
+		return $uploadControl unless ($i < $maxAttachments);
 	}
 	WebGUI::Style::setScript($session{config}{extrasURL}.'/FileUploadControl.js',{type=>"text/javascript"});
 	$uploadControl .= '<div id="fileUploadControl"> </div>
 		<script>
 		var images = new Array();
-		var fileLimit = '.$self->getThread->getParent->get("attachmentsPerPost").';
+		var fileLimit = '.$maxAttachments.';
 		';
 	opendir(DIR,$session{config}{extrasPath}.'/fileIcons');
 	my @files = readdir(DIR);
@@ -817,15 +819,16 @@ sub www_edit {
 			.WebGUI::Form::hidden({
                 		name=>"func",
 				value=>"add"
+				})
+			.WebGUI::Form::hidden({
+				name=>"assetId",
+				value=>"new"
+				})
+			.WebGUI::Form::hidden({
+				name=>"class",
+				value=>$session{form}{class}
 				});
         	$var{'isNewPost'} = 1;
-		$var{'form.header'} .= WebGUI::Form::hidden({
-			name=>"assetId",
-			value=>"new"
-			}).WebGUI::Form::hidden({
-			name=>"class",
-			value=>$session{form}{class}
-			});
 		if ($session{form}{class} eq "WebGUI::Asset::Post") { # new reply
 			$self->{_thread} = $self->getParent->getThread;
 			return WebGUI::Privilege::insufficient() unless ($self->getThread->canReply);
@@ -859,7 +862,7 @@ sub www_edit {
 				name=>"subscribe",
 				value=>$session{form}{subscribe} || 1
 				});
-                }
+		}
                 $content .= "\n\n".$session{user}{signature} if ($session{user}{signature});
 	} else { # edit
 		return WebGUI::Privilege::insufficient() unless ($self->canEdit);
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 107633c78..9ff2a2da1 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -559,10 +559,10 @@ sub view {
 	while (my %data = $sth->hash) {
 		push(@edit,{
 			'question.edit.controls'=>
-				deleteIcon('func=deleteQuestionConfirm&qid='.$data{Survey_questionId}, $self->getUrl, WebGUI::International::get(44,'Survey')).
-				editIcon('func=editQuestion&qid='.$data{Survey_questionId}, $self->getUrl).
-				moveUpIcon('func=moveQuestionUp&qid='.$data{Survey_questionId}, $self->getUrl).
-				moveDownIcon('func=moveQuestionDown&qid='.$data{Survey_questionId}, $self->getUrl),
+				deleteIcon('func=deleteQuestionConfirm&qid='.$data{Survey_questionId}, $self->get("url"), WebGUI::International::get(44,'Survey')).
+				editIcon('func=editQuestion&qid='.$data{Survey_questionId}, $self->get("url")).
+				moveUpIcon('func=moveQuestionUp&qid='.$data{Survey_questionId}, $self->get("url")).
+				moveDownIcon('func=moveQuestionDown&qid='.$data{Survey_questionId}, $self->get("url")),
 			'question.edit.question'=>$data{question},
 			'question.edit.id'=>$data{Survey_questionId}
 			});
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index 297fd87e6..bedd2da0b 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -213,7 +213,7 @@ sub _tableFormRow {
 	unless ($_[0]->{_noTable}) {
 		my $class = $_[0]->{_class};
 		$class = qq| class="$class" | if($class);
-        	return '<tr'.$class.'><td class="formDescription" valign="top">'.$_[1].'</td><td class="tableData">'.$_[2]."</td></tr>\n";
+        	return '<tr'.$class.'><td class="formDescription" valign="top">'.$_[1].'</td><td class="tableData" style="width: 95%;">'.$_[2]."</td></tr>\n";
 	} else {
 		return $_[2];
 	}
diff --git a/lib/WebGUI/Operation/Auth.pm b/lib/WebGUI/Operation/Auth.pm
index 61f3b448a..03ec1e6b4 100644
--- a/lib/WebGUI/Operation/Auth.pm
+++ b/lib/WebGUI/Operation/Auth.pm
@@ -53,7 +53,7 @@ sub www_auth {
    my $auth;
    ($auth) = WebGUI::SQL->quickArray("select authMethod from users where username=".quote($session{form}{username})) if($session{form}{username});
    my $authMethod = getInstance($auth);
-   my $methodCall = $session{form}{method} || $_[0];
+   my $methodCall = $session{form}{method} || $_[0] || "init";
    if(!$authMethod->isCallable($methodCall)){
       WebGUI::ErrorHandler::security("access uncallable auth method on page '".$session{page}{title}."' [".$session{page}{pageId}."].");
 	  return WebGUI::International::get(1077);
diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm
index 007db1e87..a491ead8d 100644
--- a/lib/WebGUI/Operation/Help.pm
+++ b/lib/WebGUI/Operation/Help.pm
@@ -46,7 +46,7 @@ sub _seeAlso {
 
 #-------------------------------------------------------------------
 sub www_viewHelp {
-	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
 	my $ac = WebGUI::AdminConsole->new("help");
 	my $namespace = $session{form}{namespace} || "WebGUI";
 	my $help = _get($session{form}{hid},$namespace);
@@ -63,7 +63,7 @@ sub www_viewHelp {
 
 #-------------------------------------------------------------------
 sub www_viewHelpIndex {
-	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
 	my %helpIndex;
 	tie %helpIndex, "Tie::IxHash";
 	my $i;
diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm
index 5a6e48923..6e8a7eb65 100644
--- a/lib/WebGUI/Operation/Profile.pm
+++ b/lib/WebGUI/Operation/Profile.pm
@@ -215,7 +215,7 @@ sub www_editProfileSave {
     foreach $fieldName (keys %{$profile}) {
        $u->profileField($fieldName,WebGUI::HTML::filter(${$profile}{$fieldName},"javascript"));
 	}
-	return WebGUI::Operation::Auth::www_displayAccount();
+	return WebGUI::Operation::Auth::www_auth();
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm
index cde63cae7..69e07fff4 100644
--- a/lib/WebGUI/i18n/English/Asset.pm
+++ b/lib/WebGUI/i18n/English/Asset.pm
@@ -501,7 +501,7 @@ each wobject under the tab &quot;Metadata&quot; in the wobject properties.</p>
         '493' => {
                    lastUpdated => 1031514049,
                    message => q|Back to site.|
-                 }
+                 },
 	'encrypt page' => {
                 message => q|Encrypt content?|,
                 lastUpdated =>1092748557,
diff --git a/sbin/uploadsAccessHandler.perl b/sbin/uploadsAccessHandler.perl
index ab2911f74..e1a62717c 100644
--- a/sbin/uploadsAccessHandler.perl
+++ b/sbin/uploadsAccessHandler.perl
@@ -1,7 +1,7 @@
 package WebGUI::UploadsAccessHandler;
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2004 Plain Black Corporation.
+# WebGUI is Copyright 2001-2005 Plain Black Corporation.
 #-------------------------------------------------------------------
 # Please read the legal notices (docs/legal.txt) and the license
 # (docs/license.txt) that came with this distribution before using
diff --git a/www/extras/assets/small/thread.gif b/www/extras/assets/small/thread.gif
index 6e1de61f61649b1a3688692c382d5ded9d4f5281..c7cc0e167c26e60ca6cf519b322456dfbb4bd568 100644
GIT binary patch
delta 766
zcmV<a0s;M~1^)+sM@dFFIbje05CHe10Mpac#l^+?ZV;H5n3a{4`H?Wt&CH^rqWW(T
z`E(Zfb{F}GDEWLH#JIHQR1w9ww8pox`HCs?UJl2;ou#Fv|Ij-B(mVQX5Z7=v)6mZO
zZV>rv54)d|_-POMc^SZoZqar@!H8<0pP2cFC-i?M#d1=A!mp{zYeMn7F8|FkzF{)l
zSRA;xxbllN`Gh3uwlKtgVD^?b!l#|ofHL~UHOs@m`N1&%z7fg3qxo<W>QxTqx<ckx
z5%9e-+FBv`j4aSxEBKZ*kB^V&u^sPY6Q!i2!o9M+gm34vBFVUd$-%zQzKH+OGWmle
z$B9bO(b2kpsdn#Q5&426z<_7>Xb_>Hq4|6q_<0-lgDTXI9`Rfb)VFE>&pEu6g!+*%
z`)Ur;($e#581{Q2_j?}YQV;fxG4O&ekdTn`yDIl=5R;RWz?_lwX%f%R&&7II%gf8v
zc_G_iCeLa+(qJ$1ZyNHp7{GvLxv!4KgI(ZL4bjkl&*!Zk-Ks6&b1(L05c6UYy`Pob
zb0_s-4fet|`F$P##4Gn}5cH5Wy1Tpi!Y%2xC-;Xd!H03o$hM@Ur1^IkwU}(hxU}_S
z5A|LQ$9GWZW*^p49@>B}$hx+?mx}jk5Xf&vy_19gy$!*unE8Mq;aVB^%Q?xvyw%m!
z0001y^qG<Ycz+@J1OWg5qW~-b0000G01yBG2;2Zi2{Zx24W$nd1S(wkU_}@)Sj_b4
zvT$LEKVwD|h|wZMMS&USuwmfhN038!J_<bH$HS)uUdn(lppwy~1XiR(ScIX5%1EFt
zJR;PDL?uq6003ABM$VTU3a-%EG^)sfDvnqPY`|lK26HM=9Ap}WXaIpT0|eR;B%nha
z4xVr<5kWwW5DKFJ>Cl9L2qZpx>U6pjAi$d^Yb<FoBp^^B8$DhiNwQGX5i*j}TuM=a
w3k^j(+EkR`LjoK$p)3p<a$~|rOhEEvLBS*ulty|~Dw(2UhLbHuDh31qJF1C(wg3PC

literal 680
zcmZ?wbhEHb6krfw_~yaj9g`fCm>!l{5LZ&2QIJ$qo*h-)n%X@*Z|dB_=C1Uqiz;U>
z%w4&&XwkajwR>y!UD(=ZHowPn(zK$*6a2Q$58t;ec<;K}i*vQkuCTkkO!LZWi@Td_
zzweTHxKj7oX3gi@t<J6Xytym=#{SaBI~^bHjs9^!`{yy!-xsX9XUv*8bNZxt3nwm_
z-MfBQ=cawr7A{_~a>a)A>-Oy3+r01mlwF4x?mEzU^7gEg*SgO=n11=mvZH60p1-yJ
z%H92k4z0NPeB1q3yC1zhxqH!p{rk=yoPX@dp5w=lUA%Dq>eZ`H9zOz-3_}4Z{$ycf
zVDMnj0XY^FCk*WW8ayz8n~RI9jg1>j!o|(a#=ynh#RVeZ;;zTe&&9`O;|dmVans;2
zH)XQ3<#urdX)(0nF*Rpr(zUncb~6F;U9|X3xy<ZMbnSG23fw#lHP{*0OquN&S%gFs
z<QtSc^tDWl*v%|71tlfr<YZJl4D^j{&DhxlWz^J^<rS1&4Gr|HY|R)I)IdN%)!9Q|
zU(eE(O+igvU0qE|M$yAnUtddKLqJ?kT}@3wMjqq_eN9bPSxGfDRV8Ovu&aR<J18ou
S$UA{~aDuJD4d{tR25SJw=*6i3

diff --git a/www/extras/assets/thread.gif b/www/extras/assets/thread.gif
index 0c801e024768021da1caa57b3a0dccbe05427906..38559b3bdbefac6b213886e9859a6e7e38a2600d 100644
GIT binary patch
delta 2210
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

literal 2501
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
P1P6oo#3+tPKmY(c%XWwI

diff --git a/www/extras/tabs/tabs.js b/www/extras/tabs/tabs.js
index f80d5c428..cfba2659c 100644
--- a/www/extras/tabs/tabs.js
+++ b/www/extras/tabs/tabs.js
@@ -18,6 +18,7 @@ function toggleTab(i){
                 document.getElementById('tab'+i).className = 'tab tabActive';
 	 	document.getElementById('tab'+i).onmouseover = '';
 	 	document.getElementById('tab'+i).onmouseout = '';
+		fixFckEditor();
         }
 }
 
@@ -25,4 +26,32 @@ function initTabs () {
         toggleTab(1);
 }
 
+function fixFckEditor() {
+	if ( !document.all && FCKeditorAPI) {
+		for ( var o in FCKeditorAPI.__Instances ) {
+			var oEditor = FCKeditorAPI.__Instances[ o ] ;
+			if ( oEditor.EditMode == FCK_EDITMODE_WYSIWYG ) {
+				oEditor.SwitchEditMode() ;
+				//oEditor.SwitchEditMode() ;
+			}
+		}
+	}
+}
+
+function fixFckEditor1 () {
+	for (i=0;i<document.forms.length; i++) {
+		for (j=0; j< document.forms[i].elements.length; j++) {
+			if (document.forms[i].elements[j].type == "textarea") {
+				if ( !document.all ) {
+					var oEditor = FCKeditorAPI.GetInstance( document.forms[i].elements[j].name ) ;
+					if ( oEditor.EditMode == FCK_EDITMODE_WYSIWYG ) {
+						oEditor.SwitchEditMode() ;
+					//	oEditor.SwitchEditMode() ;
+					} 
+				}
+				//alert("found a text area - value = " + document.forms[i].elements[j].value);
+			}
+		}
+	}
+}