* ResultPages.cs:
* NpgsqlBlogProvider.cs: PageIndex is now one based * AccountController.cs: Fixes a typo in the registration mail * AdminController.cs: Should fix a 500 at Registration validation * BasketController.cs: WIP * BlogsController.cs: page indexes are now one based * FrontOfficeController.cs: cleanning * GoogleController.cs: code formatting * Global.asax.cs: Default route data to "controller" "action" "id" * BBCodeHelper.cs: Allows not closed "url" BBcodes * InitDb.aspx: StatisPage.master was renamed * packages.config: Google references require System.Web 4.0.0.0 ... removed
This commit is contained in:
parent
630ddee841
commit
f54336852b
12 changed files with 29 additions and 54 deletions
|
|
@ -293,7 +293,8 @@ namespace Npgsql.Web.Blog
|
||||||
cnx.Open ();
|
cnx.Open ();
|
||||||
using (NpgsqlDataReader rdr = cmd.ExecuteReader()) {
|
using (NpgsqlDataReader rdr = cmd.ExecuteReader()) {
|
||||||
totalRecords = 0;
|
totalRecords = 0;
|
||||||
int firstrec = pageIndex * pageSize;
|
// pageIndex became one based
|
||||||
|
int firstrec = (pageIndex-1) * pageSize;
|
||||||
int lastrec = firstrec + pageSize - 1;
|
int lastrec = firstrec + pageSize - 1;
|
||||||
while (rdr.Read()) {
|
while (rdr.Read()) {
|
||||||
if (totalRecords >= firstrec && totalRecords <= lastrec) {
|
if (totalRecords >= firstrec && totalRecords <= lastrec) {
|
||||||
|
|
|
||||||
|
|
@ -102,9 +102,8 @@ namespace Yavsc.WebControls
|
||||||
writer.AddAttribute (HtmlTextWriterAttribute.Href,
|
writer.AddAttribute (HtmlTextWriterAttribute.Href,
|
||||||
string.Format (Action, pi));
|
string.Format (Action, pi));
|
||||||
writer.RenderBeginTag ("a");
|
writer.RenderBeginTag ("a");
|
||||||
|
|
||||||
}
|
}
|
||||||
writer.Write (pi);
|
writer.Write (pi+1);
|
||||||
writer.RenderEndTag ();
|
writer.RenderEndTag ();
|
||||||
writer.Write (" ");
|
writer.Write (" ");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ namespace Yavsc.Controllers
|
||||||
body = body.Replace ("<%SiteName%>", YavscHelpers.SiteName);
|
body = body.Replace ("<%SiteName%>", YavscHelpers.SiteName);
|
||||||
body = body.Replace ("<%UserName%>", user.UserName);
|
body = body.Replace ("<%UserName%>", user.UserName);
|
||||||
body = body.Replace ("<%UserActivatonUrl%>",
|
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.Scheme,
|
||||||
Request.Url.Authority,
|
Request.Url.Authority,
|
||||||
user.UserName,
|
user.UserName,
|
||||||
|
|
|
||||||
|
|
@ -260,13 +260,23 @@ namespace Yavsc.Controllers
|
||||||
[Authorize()]
|
[Authorize()]
|
||||||
public ActionResult Admin (NewAdminModel model)
|
public ActionResult Admin (NewAdminModel model)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
// ASSERT (Roles.RoleExists (adminRoleName))
|
||||||
|
string [] admins = Roles.GetUsersInRole (adminRoleName);
|
||||||
string currentUser = Membership.GetUser ().UserName;
|
string currentUser = Membership.GetUser ().UserName;
|
||||||
|
List<SelectListItem> users = new List<SelectListItem> ();
|
||||||
|
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) {
|
if (ModelState.IsValid) {
|
||||||
Roles.AddUserToRole (model.UserName, adminRoleName);
|
Roles.AddUserToRole (model.UserName, adminRoleName);
|
||||||
ViewData ["Message"] = model.UserName + " "+LocalizedText.was_added_to_the_role+" '" + adminRoleName + "'";
|
ViewData ["Message"] = model.UserName + " "+LocalizedText.was_added_to_the_role+" '" + adminRoleName + "'";
|
||||||
} else {
|
} else {
|
||||||
// ASSERT (Roles.RoleExists (adminRoleName))
|
|
||||||
string [] admins = Roles.GetUsersInRole (adminRoleName);
|
|
||||||
if (admins.Length > 0) {
|
if (admins.Length > 0) {
|
||||||
if (! admins.Contains (Membership.GetUser ().UserName)) {
|
if (! admins.Contains (Membership.GetUser ().UserName)) {
|
||||||
ModelState.Remove("UserName");
|
ModelState.Remove("UserName");
|
||||||
|
|
@ -274,22 +284,13 @@ namespace Yavsc.Controllers
|
||||||
return View ("Index");
|
return View ("Index");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
// No admin, gives the Admin Role to the current user
|
||||||
Roles.AddUserToRole (currentUser, adminRoleName);
|
Roles.AddUserToRole (currentUser, adminRoleName);
|
||||||
admins = new string[] { currentUser };
|
admins = new string[] { currentUser };
|
||||||
ViewData ["Message"] += string.Format (
|
ViewData ["Message"] += string.Format (
|
||||||
LocalizedText.was_added_to_the_empty_role,
|
LocalizedText.was_added_to_the_empty_role,
|
||||||
currentUser, adminRoleName);
|
currentUser, adminRoleName);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<SelectListItem> users = new List<SelectListItem> ();
|
|
||||||
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);
|
return View (model);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ using System.Web;
|
||||||
using System.Web.Security;
|
using System.Web.Security;
|
||||||
using System.Web.Http;
|
using System.Web.Http;
|
||||||
using Yavsc.Model.WorkFlow;
|
using Yavsc.Model.WorkFlow;
|
||||||
|
using System.Collections.Specialized;
|
||||||
|
|
||||||
namespace Yavsc.ApiControllers
|
namespace Yavsc.ApiControllers
|
||||||
{
|
{
|
||||||
|
|
@ -26,32 +27,11 @@ namespace Yavsc.ApiControllers
|
||||||
base.Initialize (controllerContext);
|
base.Initialize (controllerContext);
|
||||||
wfmgr = new WorkFlowManager ();
|
wfmgr = new WorkFlowManager ();
|
||||||
}
|
}
|
||||||
|
[AcceptVerbs("GET")]
|
||||||
/// <summary>
|
public long Create(string productId , NameValueCollection cmdParams)
|
||||||
/// Validates the order.
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
/// <returns><c>true</c>, if order was validated, <c>false</c> otherwise.</returns>
|
|
||||||
/// <param name="orderid">Orderid.</param>
|
|
||||||
bool ValidateOrder(long orderid) {
|
|
||||||
throw new NotImplementedException ();
|
|
||||||
}
|
|
||||||
|
|
||||||
long CreateOrder(string title,string mesg)
|
|
||||||
{
|
{
|
||||||
throw new NotImplementedException ();
|
throw new NotImplementedException ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Adds to basket, a product from the catalog, in the user's session.
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>The to basket.</returns>
|
|
||||||
[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 ();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -98,6 +98,7 @@ namespace Yavsc.Controllers
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// page index becomes one-based
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Users the posts.
|
/// Users the posts.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -106,7 +107,7 @@ namespace Yavsc.Controllers
|
||||||
/// <param name="pageIndex">Page index.</param>
|
/// <param name="pageIndex">Page index.</param>
|
||||||
/// <param name="pageSize">Page size.</param>
|
/// <param name="pageSize">Page size.</param>
|
||||||
[HttpGet]
|
[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;
|
int tr;
|
||||||
MembershipUser u = Membership.GetUser ();
|
MembershipUser u = Membership.GetUser ();
|
||||||
|
|
|
||||||
|
|
@ -204,9 +204,9 @@ namespace Yavsc.Controllers
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
// get files from the request
|
// get files from the request
|
||||||
string fnre = "[A-Za-z0-9~\\-.]+";
|
string fnre = "[A-Za-z0-9~\\-.]+";
|
||||||
HttpFileCollectionBase hfc = Request.Files;
|
HttpFileCollectionBase hfc = Request.Files;
|
||||||
|
// TODO mime-magic on content, and file name filter
|
||||||
foreach (String h in hfc.AllKeys) {
|
foreach (String h in hfc.AllKeys) {
|
||||||
if (!Regex.Match (hfc [h].FileName, fnre).Success) {
|
if (!Regex.Match (hfc [h].FileName, fnre).Success) {
|
||||||
ViewData ["Message"] = "File name refused";
|
ViewData ["Message"] = "File name refused";
|
||||||
|
|
@ -232,9 +232,5 @@ namespace Yavsc.Controllers
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ActionResult YourCommands ()
|
|
||||||
{
|
|
||||||
return View (GetBasket());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ namespace Yavsc.Controllers
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class GoogleController : Controller
|
public class GoogleController : Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
private string SetSessionSate ()
|
private string SetSessionSate ()
|
||||||
{
|
{
|
||||||
Random rand = new Random ();
|
Random rand = new Random ();
|
||||||
|
|
|
||||||
|
|
@ -37,11 +37,11 @@ namespace Yavsc
|
||||||
"Blog",
|
"Blog",
|
||||||
"Blog/{user}/{title}",
|
"Blog/{user}/{title}",
|
||||||
new { controller = "Blogs", action = "Index", user=UrlParameter.Optional, title = UrlParameter.Optional }
|
new { controller = "Blogs", action = "Index", user=UrlParameter.Optional, title = UrlParameter.Optional }
|
||||||
);
|
);
|
||||||
routes.MapRoute (
|
routes.MapRoute (
|
||||||
"Default",
|
"Default",
|
||||||
"{controller}/{action}/{user}/{title}",
|
"{controller}/{action}/{id}",
|
||||||
new { controller = "Blogs", action = "Index", user=UrlParameter.Optional, title = UrlParameter.Optional }
|
new { controller = "Home", action = "Index", id=UrlParameter.Optional}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -325,7 +325,7 @@ namespace Yavsc.Helpers
|
||||||
new BBTag ("h", "<h2>", "</h2>"),
|
new BBTag ("h", "<h2>", "</h2>"),
|
||||||
bblist,
|
bblist,
|
||||||
new BBTag ("*", "<li>", "</li>", true, false),
|
new BBTag ("*", "<li>", "</li>", true, false),
|
||||||
new BBTag ("url", "<a href=\"${href}\">", "</a>", true, true, new BBAttribute ("href", ""), new BBAttribute ("href", "href")),
|
new BBTag ("url", "<a href=\"${href}\">", " <<i>${href}</i>></a>", true, false, new BBAttribute ("href", ""), new BBAttribute ("href", "href")),
|
||||||
new BBTag ("br", "<br/>", "", true, false),
|
new BBTag ("br", "<br/>", "", true, false),
|
||||||
new BBTag ("video", "<video style=\"${style}\" controls>" +
|
new BBTag ("video", "<video style=\"${style}\" controls>" +
|
||||||
"<source src=\"${mp4}\" type=\"video/mp4\"/>" +
|
"<source src=\"${mp4}\" type=\"video/mp4\"/>" +
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<%@ Page Title="Init db" Language="C#" MasterPageFile="~/Models/StaticPage.master" Inherits="System.Web.Mvc.ViewPage<DataAccess>" %>
|
<%@ Page Title="Init db" Language="C#" MasterPageFile="~/Models/NoLogin.master" Inherits="System.Web.Mvc.ViewPage<DataAccess>" %>
|
||||||
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||||
<%= Html.ValidationSummary("Init a new data base") %>
|
<%= Html.ValidationSummary("Init a new data base") %>
|
||||||
<% using (Html.BeginForm("InitDb","Admin")) { %>
|
<% using (Html.BeginForm("InitDb","Admin")) { %>
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="GoogleMapsHelpers" version="0.1.4.1" targetFramework="net451" />
|
|
||||||
<package id="jQuery" version="2.1.3" targetFramework="net45" />
|
<package id="jQuery" version="2.1.3" targetFramework="net45" />
|
||||||
<package id="JQuery.GoogleMaps" version="2.2.4" targetFramework="net451" />
|
<package id="JQuery.GoogleMaps" version="2.2.4" targetFramework="net451" />
|
||||||
<package id="jquery-globalize" version="0.1.3" targetFramework="net45" />
|
<package id="jquery-globalize" version="0.1.3" targetFramework="net45" />
|
||||||
<package id="log4net" version="2.0.3" targetFramework="net40" />
|
<package id="log4net" version="2.0.3" targetFramework="net40" />
|
||||||
<package id="MVC.GoogleMaps" version="1.0.0" targetFramework="net451" />
|
|
||||||
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
|
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
|
||||||
<package id="PayPalCoreSDK" version="1.6.0" targetFramework="net451" />
|
<package id="PayPalCoreSDK" version="1.6.0" targetFramework="net451" />
|
||||||
</packages>
|
</packages>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue