Use UNIX line endings consistently

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / AdRotator.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
index e9db968306afc65902d1a1e9319a22c3eafc19ad..ea504d18d0d657d29b2d3a3da587f156b39ca7dd 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
@@ -30,6 +30,7 @@ using System.Xml;
 using System.Collections;
 using System.ComponentModel;
 using System.Security.Permissions;
+using System.Web.Util;
 
 namespace System.Web.UI.WebControls {
 
@@ -69,7 +70,13 @@ namespace System.Web.UI.WebControls {
                        Hashtable ht = null;
                        
                        if (ad_file != "" && ad_file != null) {
-                               ReadAdsFromFile (Page.MapPath (ad_file));
+                               ReadAdsFromFile (
+#if NET_2_0
+                                       GetPhysicalFilePath (ad_file)
+#else
+                                       Page.MapPath (ad_file)
+#endif
+                               );
                                ht = ChooseAd ();
                        }
 
@@ -105,23 +112,39 @@ namespace System.Web.UI.WebControls {
                        AdCreatedEventArgs e = createdargs;
 
                        base.AddAttributesToRender (w);
-                       
-                       if (e.NavigateUrl != null)
-                               w.AddAttribute (HtmlTextWriterAttribute.Href, ResolveClientUrl (e.NavigateUrl));
-                       w.AddAttribute (HtmlTextWriterAttribute.Target, Target);
+
+                       if (e.NavigateUrl != null && e.NavigateUrl.Length > 0)
+                               w.AddAttribute (HtmlTextWriterAttribute.Href, ResolveAdUrl (e.NavigateUrl));
+                       if (Target != null && Target.Length > 0)
+                               w.AddAttribute (HtmlTextWriterAttribute.Target, Target);
                        
                        w.RenderBeginTag (HtmlTextWriterTag.A);
 
-                       if (e.NavigateUrl != null)
-                               w.AddAttribute (HtmlTextWriterAttribute.Src, ResolveClientUrl (e.ImageUrl));
-                       
+                       if (e.ImageUrl != null && e.ImageUrl.Length > 0)
+                               w.AddAttribute (HtmlTextWriterAttribute.Src, ResolveAdUrl (e.ImageUrl));
+
                        w.AddAttribute (HtmlTextWriterAttribute.Alt, e.AlternateText == null ? "" : e.AlternateText);
-                       w.AddAttribute (HtmlTextWriterAttribute.Border, "0");
+                       w.AddAttribute (HtmlTextWriterAttribute.Border, "0", false);
                        w.RenderBeginTag (HtmlTextWriterTag.Img);
                        w.RenderEndTag (); // img
                        w.RenderEndTag (); // a
                }
 
+               string ResolveAdUrl (string url)
+               {
+                       string path = url;
+
+                       if (AdvertisementFile != null && AdvertisementFile.Length > 0 && path [0] != '/' && path [0] != '~')
+                               try {
+                                       new Uri (path);
+                               }
+                               catch {
+                                       return UrlUtils.Combine (UrlUtils.GetDirectory (ResolveUrl (AdvertisementFile)), path);
+                               }
+                       
+                       return ResolveUrl (path);
+               }
+
                //
                // We take all the ads in the ad file and add up their
                // impression weight. We then take a random number [0,