From 1b7488e4b1a95b026c0b31c9bd357e420f2eff57 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 28 Apr 2006 17:12:58 +0000
Subject: [PATCH] [ 1475220 ] some 6.99 templates have double slashes

---
 lib/WebGUI/Form/Float.pm            | 2 +-
 lib/WebGUI/Form/HTMLArea.pm         | 2 +-
 lib/WebGUI/Form/Image.pm            | 4 ++--
 lib/WebGUI/HTMLForm.pm              | 2 +-
 lib/WebGUI/Operation/Commerce.pm    | 2 +-
 lib/WebGUI/Operation/FormHelpers.pm | 4 ++--
 lib/WebGUI/Operation/Settings.pm    | 2 --
 lib/WebGUI/Operation/User.pm        | 2 --
 lib/WebGUI/Operation/WebGUI.pm      | 2 +-
 lib/WebGUI/Session/Style.pm         | 2 +-
 lib/WebGUI/Storage.pm               | 4 ++--
 lib/WebGUI/TabForm.pm               | 6 +++---
 12 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/lib/WebGUI/Form/Float.pm b/lib/WebGUI/Form/Float.pm
index 882fa48ad..700574ebf 100644
--- a/lib/WebGUI/Form/Float.pm
+++ b/lib/WebGUI/Form/Float.pm
@@ -116,7 +116,7 @@ Renders a floating point field.
 
 sub toHtml {
         my $self = shift;
-	$self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' });
+	$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
 	$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789-.\')"');
 	return $self->SUPER::toHtml;
 }
diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm
index b860cebe4..045c545cf 100644
--- a/lib/WebGUI/Form/HTMLArea.pm
+++ b/lib/WebGUI/Form/HTMLArea.pm
@@ -123,7 +123,7 @@ Renders an HTML area field.
 
 sub toHtml {
 	my $self = shift;
-        $self->session->style->setScript($self->session->config->get("extrasURL").'/textFix.js',{ type=>'text/javascript' });
+        $self->session->style->setScript($self->session->url->extras('textFix.js'),{ type=>'text/javascript' });
 	$self->set("extras", $self->get('extras') . ' onblur="fixChars(this.form.'.$self->get("name").')" mce_editable="true" ');
 	$self->set("resizeable", 0);
 	return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->session,$self->get("richEditId"))->getRichEditor($self->get('id'));
diff --git a/lib/WebGUI/Form/Image.pm b/lib/WebGUI/Form/Image.pm
index c96f98888..61ba97460 100644
--- a/lib/WebGUI/Form/Image.pm
+++ b/lib/WebGUI/Form/Image.pm
@@ -163,7 +163,7 @@ sub toHtml {
 	my @files = $storage->getFiles if (defined $storage);
 	my $maxFiles = $self->get('maxAttachments') - scalar(@files);
 	if ($maxFiles > 0) {
-        	$self->session->style->setScript($self->session->config->get("extrasURL").'/FileUploadControl.js',{type=>"text/javascript"});
+        	$self->session->style->setScript($self->session->url->extras('/FileUploadControl.js'),{type=>"text/javascript"});
         	$uploadControl = '<script type="text/javascript">
                 	var fileIcons = new Array();
                 	';
@@ -174,7 +174,7 @@ sub toHtml {
                 	unless ($file eq "." || $file eq "..") {
                         	my $ext = $file;
 	                        $ext =~ s/(.*?)\.gif/$1/;
-        	                $uploadControl .= 'fileIcons["'.$ext.'"] = "'.$self->session->config->get("extrasURL").'/fileIcons/'.$file.'";'."\n";
+        	                $uploadControl .= 'fileIcons["'.$ext.'"] = "'.$self->session->url->extras('fileIcons/'.$file).'";'."\n";
                 	}
         	}
         	$uploadControl .= sprintf q!var uploader = new FileUploadControl("%s", fileIcons, "%s","%d");
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index eb4ff9838..f5678d405 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -206,7 +206,7 @@ Returns the HTML for this form object.
 
 sub print {
 	my $self = shift;
-        return $self->{_header}.$self->{_data}.$self->{_footer}.'<script type="text/javascript" src="'.$self->session->config->get("extrasURL").'/wz_tooltip.js"></script>';
+        return $self->{_header}.$self->{_data}.$self->{_footer}.'<script type="text/javascript" src="'.$self->session->url->extras('wz_tooltip.js').'"></script>';
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 782feaaed..bc8de916a 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -698,7 +698,7 @@ sub www_editCommerceSettings {
 
 	$tabform->submit;
 
-	$session->style->setScript($session->config->get("extrasURL").'/swapLayers.js',{type=>"text/javascript"});
+	$session->style->setScript($session->url->extras('swapLayers.js'),{type=>"text/javascript"});
 	
 	return _submenu($session,$tabform->print, 'edit commerce settings title', 'commerce manage');
 }
diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm
index c45da6ccb..e5cff7e55 100644
--- a/lib/WebGUI/Operation/FormHelpers.pm
+++ b/lib/WebGUI/Operation/FormHelpers.pm
@@ -93,7 +93,7 @@ sub www_richEditPageTree {
 		-value=>$i18n->get('done'),
 		-extras=>'onclick="createLink()"'
 		);
-	$session->style->setScript($session->config->get("extrasURL")."/tinymce2/jscripts/tiny_mce/tiny_mce_popup.js",{type=>"text/javascript"});
+	$session->style->setScript($session->url->extras('tinymce2/jscripts/tiny_mce/tiny_mce_popup.js'),{type=>"text/javascript"});
 	my $output = '<fieldset><legend>'.$i18n->get('insert a link').'</legend>
 		<fieldset><legend>'.$i18n->get('insert a link').'</legend>'.$f->print.'</fieldset>
 	<script type="text/javascript">
@@ -213,7 +213,7 @@ sub www_richEditViewThumbnail {
     		    </script>\n";
 		return $output;
 	}
-	return '<div align="center"><img src="'.$session->config->get("extrasURL").'/tinymce2/images/icon.gif" style="border-style:none;" alt="'.$i18n->get('image manager').'" /></div>';
+	return '<div align="center"><img src="'.$session->url->extras('tinymce2/images/icon.gif').'" style="border-style:none;" alt="'.$i18n->get('image manager').'" /></div>';
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 368429e8b..f4c25dab0 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -262,8 +262,6 @@ sub www_editSettings {
                 -extras=>'onchange="alert(\''.$i18n->get("Illegal Warning").'\')" '
         );
 # auth settings 
-	$session->style->setScript($session->config->get("extrasURL")."/swapLayers.js",{type=>"text/javascript"});
-	$session->style->setRawHeadTags('<script type="text/javascript" >var active="'.$session->setting->get("authMethod").'";</script>');
    	my $options;
    	foreach (@{$session->config->get("authMethods")}) {
       		$options->{$_} = $_;
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 063da60b0..b9a267910 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -313,8 +313,6 @@ sub www_editUser {
 	my $u = WebGUI::User->new($session,($uid eq 'new') ? '' : $uid); #Setting uid to '' when uid is 'new' so visitor defaults prefill field for new user
 	my $username = $u->userId eq '1' ? '' : $u->username;
 	$session->stow->set("editUser_UID", $uid);
-	$session->style->setScript($session->config->get("extrasURL")."/swapLayers.js", {type=>"text/javascript"});
-	$session->style->setRawHeadTags('<script type="text/javascript">var active="'.$u->authMethod.'";</script>');
     	$tabform->hidden({name=>"op",value=>"editUserSave"});
     	$tabform->hidden({name=>"uid",value=>$uid});
     	$tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>');
diff --git a/lib/WebGUI/Operation/WebGUI.pm b/lib/WebGUI/Operation/WebGUI.pm
index 6fd70a0d5..102f59eb6 100644
--- a/lib/WebGUI/Operation/WebGUI.pm
+++ b/lib/WebGUI/Operation/WebGUI.pm
@@ -145,7 +145,7 @@ sub www_setup {
 		$output .= $f->print; 
 	}
 	$output .= '</fieldset></div>
-		<img src="'.$session->config->get("extrasURL").'/background.jpg" style="border-style:none;position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 5;" />
+		<img src="'.$session->url->extras('background.jpg').'" style="border-style:none;position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 5;" />
 	</body>
 </html>';
 	return $output;
diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm
index 52f1f18f5..50ad62f73 100644
--- a/lib/WebGUI/Session/Style.pm
+++ b/lib/WebGUI/Session/Style.pm
@@ -173,7 +173,7 @@ $var{'head.tags'} = '
 <script type="text/javascript">
 function getWebguiProperty (propName) {
 var props = new Array();
-props["extrasURL"] = "'.$self->session->config->get("extrasURL").'";
+props["extrasURL"] = "'.$self->session->url->extras().'";
 props["pageURL"] = "'.$self->session->url->page(undef, undef, 1).'";
 return props[propName];
 }
diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm
index 9ebc03aa9..ddf6d7355 100644
--- a/lib/WebGUI/Storage.pm
+++ b/lib/WebGUI/Storage.pm
@@ -505,9 +505,9 @@ sub getFileIconUrl {
 	my $extension = $self->getFileExtension($filename);	
 	my $path = $self->session->config->get("extrasPath").'/fileIcons/'.$extension.".gif";
 	if (-e $path) {
-		return $self->session->config->get("extrasURL")."/fileIcons/".$extension.".gif";
+		return $self->session->url->extras("fileIcons/".$extension.".gif");
 	}
-	return $self->session->config->get("extrasURL")."/fileIcons/unknown.gif";
+	return $self->session->url->extras("fileIcons/unknown.gif");
 }
 
 
diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm
index 51ade1e8e..cc879574e 100644
--- a/lib/WebGUI/TabForm.pm
+++ b/lib/WebGUI/TabForm.pm
@@ -194,7 +194,7 @@ sub new {
 	my $class = shift;
 	my $session = shift;
 	my $startingTabs = shift;
-	my $css = shift || $session->config->get("extrasURL").'/tabs/tabs.css';
+	my $css = shift || $session->url->extras('tabs/tabs.css');
 	my $cancelUrl = shift || $session->url->page();
 	my $uiLevelOverride = shift;
 	my %tabs;
@@ -223,7 +223,7 @@ Returns an HTML string with all the necessary components to draw the tab form.
 
 sub print {
 	my $self = shift;
-	$self->session->style->setScript($self->session->config->get("extrasURL").'/tabs/tabs.js',{type=>"text/javascript"});
+	$self->session->style->setScript($self->session->url->extras('tabs/tabs.js'),{type=>"text/javascript"});
 	$self->session->style->setLink($self->{_css},{rel=>"stylesheet", rev=>"stylesheet",type=>"text/css"});
 	my $output = $self->{_form};
 	$output .= $self->{_hidden};
@@ -245,7 +245,7 @@ sub print {
 	$output .= $form;
 	$output .= WebGUI::Form::formFooter($self->session,);
 	$output .= '<script type="text/javascript">var numberOfTabs = '.($i-1).'; initTabs();</script>';
-	$output .= '<script type="text/javascript" src="'.$self->session->config->get("extrasURL").'/wz_tooltip.js"></script>';
+	$output .= '<script type="text/javascript" src="'.$self->session->url->extras('wz_tooltip.js').'"></script>';
 	return $output;
 }