diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs index e37b63c6..109893a8 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs @@ -293,7 +293,8 @@ namespace Npgsql.Web.Blog cnx.Open (); using (NpgsqlDataReader rdr = cmd.ExecuteReader()) { totalRecords = 0; - int firstrec = pageIndex * pageSize; + // pageIndex became one based + int firstrec = (pageIndex-1) * pageSize; int lastrec = firstrec + pageSize - 1; while (rdr.Read()) { if (totalRecords >= firstrec && totalRecords <= lastrec) { diff --git a/WebControls/ResultPages.cs b/WebControls/ResultPages.cs index 39c6bf8d..ee94dcd7 100644 --- a/WebControls/ResultPages.cs +++ b/WebControls/ResultPages.cs @@ -102,9 +102,8 @@ namespace Yavsc.WebControls writer.AddAttribute (HtmlTextWriterAttribute.Href, string.Format (Action, pi)); writer.RenderBeginTag ("a"); - } - writer.Write (pi); + writer.Write (pi+1); writer.RenderEndTag (); writer.Write (" "); } diff --git a/web/Controllers/AccountController.cs b/web/Controllers/AccountController.cs index 7a8ab175..bd471159 100644 --- a/web/Controllers/AccountController.cs +++ b/web/Controllers/AccountController.cs @@ -144,7 +144,7 @@ namespace Yavsc.Controllers body = body.Replace ("<%SiteName%>", YavscHelpers.SiteName); body = body.Replace ("<%UserName%>", user.UserName); body = body.Replace ("<%UserActivatonUrl%>", - string.Format ("<{0}://{1}/Account/Validate/{2}?key={3}", + string.Format ("<{0}://{1}/Account/Validate/{2}?key={3}>", Request.Url.Scheme, Request.Url.Authority, user.UserName, diff --git a/web/Controllers/AdminController.cs b/web/Controllers/AdminController.cs index 3710770d..0a327f78 100644 --- a/web/Controllers/AdminController.cs +++ b/web/Controllers/AdminController.cs @@ -260,13 +260,23 @@ namespace Yavsc.Controllers [Authorize()] public ActionResult Admin (NewAdminModel model) { + + // ASSERT (Roles.RoleExists (adminRoleName)) + string [] admins = Roles.GetUsersInRole (adminRoleName); string currentUser = Membership.GetUser ().UserName; + List users = new List (); + foreach (MembershipUser u in Membership.GetAllUsers ()) { + var i = new SelectListItem (); + i.Text = string.Format ("{0} <{1}>", u.UserName, u.Email); + i.Value = u.UserName; + users.Add (i); + } + ViewData ["admins"] = admins; + ViewData ["useritems"] = users; if (ModelState.IsValid) { Roles.AddUserToRole (model.UserName, adminRoleName); ViewData ["Message"] = model.UserName + " "+LocalizedText.was_added_to_the_role+" '" + adminRoleName + "'"; } else { - // ASSERT (Roles.RoleExists (adminRoleName)) - string [] admins = Roles.GetUsersInRole (adminRoleName); if (admins.Length > 0) { if (! admins.Contains (Membership.GetUser ().UserName)) { ModelState.Remove("UserName"); @@ -274,22 +284,13 @@ namespace Yavsc.Controllers return View ("Index"); } } else { + // No admin, gives the Admin Role to the current user Roles.AddUserToRole (currentUser, adminRoleName); admins = new string[] { currentUser }; ViewData ["Message"] += string.Format ( LocalizedText.was_added_to_the_empty_role, currentUser, adminRoleName); } - - List users = new List (); - foreach (MembershipUser u in Membership.GetAllUsers ()) { - var i = new SelectListItem (); - i.Text = string.Format ("{0} <{1}>", u.UserName, u.Email); - i.Value = u.UserName; - users.Add (i); - } - ViewData ["useritems"] = users; - ViewData ["admins"] = admins; } return View (model); } diff --git a/web/Controllers/BasketController.cs b/web/Controllers/BasketController.cs index be5050ad..c732d167 100644 --- a/web/Controllers/BasketController.cs +++ b/web/Controllers/BasketController.cs @@ -5,6 +5,7 @@ using System.Web; using System.Web.Security; using System.Web.Http; using Yavsc.Model.WorkFlow; +using System.Collections.Specialized; namespace Yavsc.ApiControllers { @@ -26,32 +27,11 @@ namespace Yavsc.ApiControllers base.Initialize (controllerContext); wfmgr = new WorkFlowManager (); } - - /// - /// Validates the order. - /// - /// - /// true, if order was validated, false otherwise. - /// Orderid. - bool ValidateOrder(long orderid) { - throw new NotImplementedException (); - } - - long CreateOrder(string title,string mesg) + [AcceptVerbs("GET")] + public long Create(string productId , NameValueCollection cmdParams) { throw new NotImplementedException (); } - /// - /// Adds to basket, a product from the catalog, in the user's session. - /// - /// The to basket. - [HttpGet] - public long AddToOrder (long orderid, string prodref,int count, object prodparams=null) - { - //TODO find the basket for Membership.GetUser().UserName - //return WFManager.Write(estid << from the basket, desc, ucost, count, productid); - throw new NotImplementedException (); - } } } \ No newline at end of file diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index db7c3e17..28e211aa 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -98,6 +98,7 @@ namespace Yavsc.Controllers + // page index becomes one-based /// /// Users the posts. /// @@ -106,7 +107,7 @@ namespace Yavsc.Controllers /// Page index. /// Page size. [HttpGet] - public ActionResult UserPosts (string user, int pageIndex = 0, int pageSize = 10) + public ActionResult UserPosts (string user, int pageIndex = 1, int pageSize = 10) { int tr; MembershipUser u = Membership.GetUser (); diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index 81cb5b8b..5755b7bb 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -204,9 +204,9 @@ namespace Yavsc.Controllers { try { // get files from the request - string fnre = "[A-Za-z0-9~\\-.]+"; + string fnre = "[A-Za-z0-9~\\-.]+"; HttpFileCollectionBase hfc = Request.Files; - + // TODO mime-magic on content, and file name filter foreach (String h in hfc.AllKeys) { if (!Regex.Match (hfc [h].FileName, fnre).Success) { ViewData ["Message"] = "File name refused"; @@ -232,9 +232,5 @@ namespace Yavsc.Controllers } } - ActionResult YourCommands () - { - return View (GetBasket()); - } } } diff --git a/web/Controllers/GoogleController.cs b/web/Controllers/GoogleController.cs index d3fe1ac8..2f1d4cfc 100644 --- a/web/Controllers/GoogleController.cs +++ b/web/Controllers/GoogleController.cs @@ -25,7 +25,6 @@ namespace Yavsc.Controllers /// public class GoogleController : Controller { - private string SetSessionSate () { Random rand = new Random (); diff --git a/web/Global.asax.cs b/web/Global.asax.cs index 3c44f431..452cb5bc 100644 --- a/web/Global.asax.cs +++ b/web/Global.asax.cs @@ -37,11 +37,11 @@ namespace Yavsc "Blog", "Blog/{user}/{title}", new { controller = "Blogs", action = "Index", user=UrlParameter.Optional, title = UrlParameter.Optional } - ); + ); routes.MapRoute ( "Default", - "{controller}/{action}/{user}/{title}", - new { controller = "Blogs", action = "Index", user=UrlParameter.Optional, title = UrlParameter.Optional } + "{controller}/{action}/{id}", + new { controller = "Home", action = "Index", id=UrlParameter.Optional} ); } /// diff --git a/web/Helpers/BBCodeHelper.cs b/web/Helpers/BBCodeHelper.cs index 29d3da39..5f0f4758 100644 --- a/web/Helpers/BBCodeHelper.cs +++ b/web/Helpers/BBCodeHelper.cs @@ -325,7 +325,7 @@ namespace Yavsc.Helpers new BBTag ("h", "

", "

"), bblist, new BBTag ("*", "
  • ", "
  • ", true, false), - new BBTag ("url", "", "", true, true, new BBAttribute ("href", ""), new BBAttribute ("href", "href")), + new BBTag ("url", "", " <${href}>", true, false, new BBAttribute ("href", ""), new BBAttribute ("href", "href")), new BBTag ("br", "
    ", "", true, false), new BBTag ("video", "