[Yafdotnet-cvs] yafsrc/pages cp_inbox.ascx, 1.7.2.1, 1.7.2.2 cp_inbox.ascx.cs, 1.14.2.1, 1.14.2.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/yafdotnet/yafsrc/pages
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25386/yafsrc/pages

Modified Files:
      Tag: v1_0_2_NETv2
	cp_inbox.ascx cp_inbox.ascx.cs cp_inbox.ascx.designer.cs 
	postmessage.ascx.cs 
Log Message:
v1.9.1 updates and fixes... very minor stuff

Index: postmessage.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/postmessage.ascx.cs,v
retrieving revision 1.38.2.6
retrieving revision 1.38.2.7
diff -C2 -d -r1.38.2.6 -r1.38.2.7
*** postmessage.ascx.cs	13 Sep 2006 11:04:52 -0000	1.38.2.6
--- postmessage.ascx.cs	8 Feb 2007 00:48:42 -0000	1.38.2.7
***************
*** 80,84 ****
  			if ( PageForumID == 0 )
  				Data.AccessDenied();
! 			if ( Request ["t"] != null && !ForumPostAccess )
  				Data.AccessDenied();
  			if ( Request ["t"] != null && !ForumReplyAccess )
--- 80,84 ----
  			if ( PageForumID == 0 )
  				Data.AccessDenied();
! 			if ( Request ["t"] == null && !ForumPostAccess )
  				Data.AccessDenied();
  			if ( Request ["t"] != null && !ForumReplyAccess )

Index: cp_inbox.ascx.designer.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_inbox.ascx.designer.cs,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** cp_inbox.ascx.designer.cs	28 Jun 2006 11:42:46 -0000	1.1.2.2
--- cp_inbox.ascx.designer.cs	8 Feb 2007 00:48:42 -0000	1.1.2.3
***************
*** 2,6 ****
  // <auto-generated>
  //     This code was generated by a tool.
! //     Runtime Version:2.0.50727.42
  //
  //     Changes to this file may cause incorrect behavior and will be lost if
--- 2,6 ----
  // <auto-generated>
  //     This code was generated by a tool.
! //     Runtime Version:2.0.50727.91
  //
  //     Changes to this file may cause incorrect behavior and will be lost if

Index: cp_inbox.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_inbox.ascx,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** cp_inbox.ascx	28 Jun 2006 11:42:46 -0000	1.7.2.1
--- cp_inbox.ascx	8 Feb 2007 00:48:42 -0000	1.7.2.2
***************
*** 1,37 ****
! <%@ Control language="c#" Codebehind="cp_inbox.ascx.cs" AutoEventWireup="True" Inherits="yaf.pages.cp_inbox" %>
  <%@ Register TagPrefix="yaf" Namespace="yaf.controls" Assembly="yaf" %>
! 
! <yaf:PageLinks runat="server" id="PageLinks"/>
! 
! <table class=content cellspacing=1 cellpadding=0 width=100%>
! <tr>
! 	<td class=header1 colspan=6><%# GetText(IsSentItems ? "sentitems" : "title") %></td>
! </tr>
! <tr class=header2>
! 	<td>&nbsp;</td>
! 	<td><img runat="server" id="SortSubject" align="absmiddle"/> <asp:linkbutton runat="server" id="SubjectLink"/></td>
! 	<td><img runat="server" id="SortFrom" align="absmiddle"/> <asp:linkbutton runat="server" id="FromLink"/></td>
! 	<td><img runat="server" id="SortDate" align="absmiddle"/> <asp:linkbutton runat="server" id="DateLink"/></td>
! 	<td>&nbsp;</td>
! </tr>
! 
! <asp:repeater id=Inbox runat=server>
! <FooterTemplate>
! 	<tr class=footer1>
! 		<td colspan="6" align="right"><asp:button runat="server" onload="DeleteSelected_Load" commandname="delete" text='<%# GetText("deleteselected") %>'/></td>
! 	</tr>
! 	</table>
! </FooterTemplate>
! <ItemTemplate>
! 	<tr class=post>
! 		<td align="center"><img src='<%# GetImage(Container.DataItem) %>'/></td>
! 		<td><a href='<%# yaf.Forum.GetLink(yaf.Pages.cp_message,"pm={0}",DataBinder.Eval(Container.DataItem,"UserPMessageID")) %>'><%# HtmlEncode(DataBinder.Eval(Container.DataItem,"Subject")) %></a></td>
! 		<td><%# DataBinder.Eval(Container.DataItem,IsSentItems ? "ToUser" : "FromUser") %></td>
! 		<td><%# FormatDateTime((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Created"]) %></td>
! 		<td align="center"><asp:checkbox runat="server" id="ItemCheck" /></td>
! 		<asp:label runat="server" id="UserPMessageID" visible="false" text='<%# DataBinder.Eval(Container.DataItem,"UserPMessageID") %>'/>
! 	</tr>
! </ItemTemplate>
! </asp:repeater>
! 
! <yaf:SmartScroller id="SmartScroller1" runat = "server" />
--- 1,54 ----
! <%@ Control Language="c#" Codebehind="cp_inbox.ascx.cs" AutoEventWireup="True" Inherits="yaf.pages.cp_inbox" %>
  <%@ Register TagPrefix="yaf" Namespace="yaf.controls" Assembly="yaf" %>
! <yaf:PageLinks runat="server" ID="PageLinks" />
! <table class="content" cellspacing="1" cellpadding="0" width="100%">
!     <tr>
!         <td class="header1" colspan="6">
!             <%# GetText(IsSentItems ? "sentitems" : "title") %>
!         </td>
!     </tr>
!     <tr class="header2">
!         <td>
!             &nbsp;</td>
!         <td>
!             <img runat="server" id="SortSubject" align="absmiddle" />
!             <asp:LinkButton runat="server" ID="SubjectLink" /></td>
!         <td>
!             <img runat="server" id="SortFrom" align="absmiddle" />
!             <asp:LinkButton runat="server" ID="FromLink" /></td>
!         <td>
!             <img runat="server" id="SortDate" align="absmiddle" />
!             <asp:LinkButton runat="server" ID="DateLink" /></td>
!         <td>
!             &nbsp;</td>
!     </tr>
!     <asp:Repeater ID="Inbox" runat="server">
!         <FooterTemplate>
!             <tr class="footer1">
!                 <td colspan="6" align="right">
!                     <asp:Button runat="server" OnLoad="DeleteSelected_Load" CommandName="delete" Text='<%# GetText("deleteselected") %>' /></td>
!             </tr>
!             </table>
!         </FooterTemplate>
!         <ItemTemplate>
!             <tr class="post">
!                 <td align="center">
!                     <img src="<%# GetImage(Container.DataItem) %>" /></td>
!                 <td>
!                     <a href='<%# yaf.Forum.GetLink(yaf.Pages.cp_message,"pm={0}",DataBinder.Eval(Container.DataItem,"UserPMessageID")) %>'>
!                         <%# HtmlEncode(DataBinder.Eval(Container.DataItem,"Subject")) %>
!                     </a>
!                 </td>
!                 <td>
!                     <%# DataBinder.Eval(Container.DataItem,IsSentItems ? "ToUser" : "FromUser") %>
!                 </td>
!                 <td>
!                     <%# FormatDateTime((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Created"]) %>
!                 </td>
!                 <td align="center">
!                     <asp:CheckBox runat="server" ID="ItemCheck" /></td>
!                 <asp:Label runat="server" ID="UserPMessageID" Visible="false" Text='<%# DataBinder.Eval(Container.DataItem,"UserPMessageID") %>' />
!             </tr>
!         </ItemTemplate>
!     </asp:Repeater>
!     <yaf:SmartScroller ID="SmartScroller1" runat="server" />

Index: cp_inbox.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_inbox.ascx.cs,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** cp_inbox.ascx.cs	28 Jun 2006 11:42:46 -0000	1.14.2.1
--- cp_inbox.ascx.cs	8 Feb 2007 00:48:42 -0000	1.14.2.2
***************
*** 36,157 ****
  	{
  
! 		public cp_inbox() : base("CP_INBOX")
  		{
  		}
  
! 		private void SetSort(string field,bool asc) 
  		{
! 			if(ViewState["SortField"]!=null && (string)ViewState["SortField"]==field) 
  			{
! 				ViewState["SortAsc"] = !(bool)ViewState["SortAsc"];
! 			} 
! 			else 
  			{
! 				ViewState["SortField"] = field;
! 				ViewState["SortAsc"] = asc;
  			}
  		}
  
! 		private void SubjectLink_Click(object sender, System.EventArgs e) 
  		{
! 			SetSort("Subject",true);
  			BindData();
  		}
  
! 		private void FromLink_Click(object sender, System.EventArgs e) 
  		{
! 			if(IsSentItems)
! 				SetSort("ToUser",true);
  			else
! 				SetSort("FromUser",true);
  			BindData();
  		}
  
! 		private void DateLink_Click(object sender, System.EventArgs e) 
  		{
! 			SetSort("Created",false);
  			BindData();
  		}
  
! 		protected void DeleteSelected_Load(object sender, System.EventArgs e) 
  		{
! 			((Button)sender).Attributes["onclick"] = String.Format("return confirm('{0}')",GetText("confirm_delete"));
  		}
  
! 		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!User.IsAuthenticated)
  			{
! 				if(User.CanLogin)
! 					Forum.Redirect(Pages.login,"ReturnUrl={0}",Utils.GetSafeRawUrl());
  				else
! 					Forum.Redirect(Pages.forum);
  			}
! 			
! 			if(!IsPostBack) 
  			{
! 				SetSort("Created",false);
! 				IsSentItems = Request.QueryString["sent"]!=null;
  				BindData();
  
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink(Pages.forum));
! 				PageLinks.AddLink(PageUserName,Forum.GetLink(Pages.cp_profile));
! 				PageLinks.AddLink(GetText(IsSentItems ? "sentitems" : "title"),"");
  
! 				SubjectLink.Text = Server.HtmlEncode(GetText("subject"));
! 				FromLink.Text = GetText(IsSentItems ? "to" : "from");
! 				DateLink.Text = GetText("date");
  			}
  		}
  
! 		protected bool IsSentItems 
  		{
! 			get 
  			{
! 				return (bool)ViewState["IsSentItems"];
  			}
! 			set 
  			{
! 				ViewState["IsSentItems"] = value;
  			}
  		}
  
! 		private void BindData() {
  			object toUserID = null;
  			object fromUserID = null;
! 			if(IsSentItems)
  				fromUserID = PageUserID;
  			else
  				toUserID = PageUserID;
! 			using(DataView dv = DB.pmessage_list(toUserID,fromUserID,null).DefaultView) 
  			{
! 				dv.Sort = String.Format("{0} {1}",ViewState["SortField"],(bool)ViewState["SortAsc"] ? "asc" : "desc");
  				Inbox.DataSource = dv;
  				DataBind();
  			}
! 			if(IsSentItems)
! 				SortFrom.Visible = (string)ViewState["SortField"] == "ToUser";
  			else
! 				SortFrom.Visible = (string)ViewState["SortField"] == "FromUser";
! 			SortFrom.Src = GetThemeContents("SORT",(bool)ViewState["SortAsc"] ? "ASCENDING" : "DESCENDING");
! 			SortSubject.Visible = (string)ViewState["SortField"] == "Subject";
! 			SortSubject.Src = GetThemeContents("SORT",(bool)ViewState["SortAsc"] ? "ASCENDING" : "DESCENDING");
! 			SortDate.Visible = (string)ViewState["SortField"] == "Created";
! 			SortDate.Src = GetThemeContents("SORT",(bool)ViewState["SortAsc"] ? "ASCENDING" : "DESCENDING");
  		}
  
! 		protected string FormatBody(object o) {
! 			DataRowView row = (DataRowView)o;
! 			return FormatMsg.ForumCodeToHtml(this,(string)row["Body"]);
  		}
  
! 		private void Inbox_ItemCommand(object source, System.Web.UI.WebControls.RepeaterCommandEventArgs e) {
! 			if(e.CommandName == "delete") {
  				long nItemCount = 0;
! 				foreach(RepeaterItem item in Inbox.Items) 
  				{
! 					if(((CheckBox)item.FindControl("ItemCheck")).Checked) 
  					{
! 						DB.userpmessage_delete(((Label)item.FindControl("UserPMessageID")).Text);
  						nItemCount++;
  					}
--- 36,162 ----
  	{
  
! 		public cp_inbox()
! 			: base( "CP_INBOX" )
  		{
  		}
  
! 		private void SetSort( string field, bool asc )
  		{
! 			if ( ViewState ["SortField"] != null && ( string ) ViewState ["SortField"] == field )
  			{
! 				ViewState ["SortAsc"] = !( bool ) ViewState ["SortAsc"];
! 			}
! 			else
  			{
! 				ViewState ["SortField"] = field;
! 				ViewState ["SortAsc"] = asc;
  			}
  		}
  
! 		private void SubjectLink_Click( object sender, System.EventArgs e )
  		{
! 			SetSort( "Subject", true );
  			BindData();
  		}
  
! 		private void FromLink_Click( object sender, System.EventArgs e )
  		{
! 			if ( IsSentItems )
! 				SetSort( "ToUser", true );
  			else
! 				SetSort( "FromUser", true );
  			BindData();
  		}
  
! 		private void DateLink_Click( object sender, System.EventArgs e )
  		{
! 			SetSort( "Created", false );
  			BindData();
  		}
  
! 		protected void DeleteSelected_Load( object sender, System.EventArgs e )
  		{
! 			( ( Button ) sender ).Attributes ["onclick"] = String.Format( "return confirm('{0}')", GetText( "confirm_delete" ) );
  		}
  
! 		protected void Page_Load( object sender, System.EventArgs e )
  		{
! 			if ( !User.IsAuthenticated )
  			{
! 				if ( User.CanLogin )
! 					Forum.Redirect( Pages.login, "ReturnUrl={0}", Utils.GetSafeRawUrl() );
  				else
! 					Forum.Redirect( Pages.forum );
  			}
! 
! 			if ( !IsPostBack )
  			{
! 				SetSort( "Created", false );
! 				IsSentItems = Request.QueryString ["sent"] != null;
  				BindData();
  
! 				PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( Pages.forum ) );
! 				PageLinks.AddLink( PageUserName, Forum.GetLink( Pages.cp_profile ) );
! 				PageLinks.AddLink( GetText( IsSentItems ? "sentitems" : "title" ), "" );
  
! 				SubjectLink.Text = Server.HtmlEncode( GetText( "subject" ) );
! 				FromLink.Text = GetText( IsSentItems ? "to" : "from" );
! 				DateLink.Text = GetText( "date" );
  			}
  		}
  
! 		protected bool IsSentItems
  		{
! 			get
  			{
! 				return ( bool ) ViewState ["IsSentItems"];
  			}
! 			set
  			{
! 				ViewState ["IsSentItems"] = value;
  			}
  		}
  
! 		private void BindData()
! 		{
  			object toUserID = null;
  			object fromUserID = null;
! 			if ( IsSentItems )
  				fromUserID = PageUserID;
  			else
  				toUserID = PageUserID;
! 			using ( DataView dv = DB.pmessage_list( toUserID, fromUserID, null ).DefaultView )
  			{
! 				dv.Sort = String.Format( "{0} {1}", ViewState ["SortField"], ( bool ) ViewState ["SortAsc"] ? "asc" : "desc" );
  				Inbox.DataSource = dv;
  				DataBind();
  			}
! 			if ( IsSentItems )
! 				SortFrom.Visible = ( string ) ViewState ["SortField"] == "ToUser";
  			else
! 				SortFrom.Visible = ( string ) ViewState ["SortField"] == "FromUser";
! 			SortFrom.Src = GetThemeContents( "SORT", ( bool ) ViewState ["SortAsc"] ? "ASCENDING" : "DESCENDING" );
! 			SortSubject.Visible = ( string ) ViewState ["SortField"] == "Subject";
! 			SortSubject.Src = GetThemeContents( "SORT", ( bool ) ViewState ["SortAsc"] ? "ASCENDING" : "DESCENDING" );
! 			SortDate.Visible = ( string ) ViewState ["SortField"] == "Created";
! 			SortDate.Src = GetThemeContents( "SORT", ( bool ) ViewState ["SortAsc"] ? "ASCENDING" : "DESCENDING" );
  		}
  
! 		protected string FormatBody( object o )
! 		{
! 			DataRowView row = ( DataRowView ) o;
! 			return FormatMsg.ForumCodeToHtml( this, ( string ) row ["Body"] );
  		}
  
! 		private void Inbox_ItemCommand( object source, System.Web.UI.WebControls.RepeaterCommandEventArgs e )
! 		{
! 			if ( e.CommandName == "delete" )
! 			{
  				long nItemCount = 0;
! 				foreach ( RepeaterItem item in Inbox.Items )
  				{
! 					if ( ( ( CheckBox ) item.FindControl( "ItemCheck" ) ).Checked )
  					{
! 						DB.userpmessage_delete( ( ( Label ) item.FindControl( "UserPMessageID" ) ).Text );
  						nItemCount++;
  					}
***************
*** 160,191 ****
  				//TODO DB.pmessage_delete(e.CommandArgument);
  				BindData();
! 				if(nItemCount==1)
! 					AddLoadMessage(GetText("msgdeleted1"));
  				else
! 					AddLoadMessage(String.Format(GetText("msgdeleted2"),nItemCount));
  			}
  		}
  
! 		protected string GetImage(object o) 
  		{
! 			if((bool)((DataRowView)o)["IsRead"]) 
! 				return GetThemeContents("ICONS","TOPIC");
  			else
! 				return GetThemeContents("ICONS","TOPIC_NEW");
  		}
  
  		#region Web Form Designer generated code
! 		override protected void OnInit(EventArgs e)
  		{
! 			SubjectLink.Click += new EventHandler(SubjectLink_Click);
! 			FromLink.Click += new EventHandler(FromLink_Click);
! 			DateLink.Click += new EventHandler(DateLink_Click);
  			//
  			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
  			//
  			InitializeComponent();
! 			base.OnInit(e);
  		}
! 		
  		/// <summary>
  		/// Required method for Designer support - do not modify
--- 165,196 ----
  				//TODO DB.pmessage_delete(e.CommandArgument);
  				BindData();
! 				if ( nItemCount == 1 )
! 					AddLoadMessage( GetText( "msgdeleted1" ) );
  				else
! 					AddLoadMessage( String.Format( GetText( "msgdeleted2" ), nItemCount ) );
  			}
  		}
  
! 		protected string GetImage( object o )
  		{
! 			if ( ( bool ) ( ( DataRowView ) o ) ["IsRead"] )
! 				return GetThemeContents( "ICONS", "TOPIC" );
  			else
! 				return GetThemeContents( "ICONS", "TOPIC_NEW" );
  		}
  
  		#region Web Form Designer generated code
! 		override protected void OnInit( EventArgs e )
  		{
! 			SubjectLink.Click += new EventHandler( SubjectLink_Click );
! 			FromLink.Click += new EventHandler( FromLink_Click );
! 			DateLink.Click += new EventHandler( DateLink_Click );
  			//
  			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
  			//
  			InitializeComponent();
! 			base.OnInit( e );
  		}
! 
  		/// <summary>
  		/// Required method for Designer support - do not modify
***************
*** 193,198 ****
  		/// </summary>
  		private void InitializeComponent()
! 		{    
! 			this.Inbox.ItemCommand += new System.Web.UI.WebControls.RepeaterCommandEventHandler(this.Inbox_ItemCommand);
  		}
  		#endregion
--- 198,203 ----
  		/// </summary>
  		private void InitializeComponent()
! 		{
! 			this.Inbox.ItemCommand += new System.Web.UI.WebControls.RepeaterCommandEventHandler( this.Inbox_ItemCommand );
  		}
  		#endregion

[Yafdotnet-cvs] yafsrc/pages cp_inbox.ascx, 1.7.2.1, 1.7.2.2 cp_inbox.ascx.cs, 1.14.2.1, 1.14.2.2

[Yafdotnet-cvs] yafsrc/pages cp_inbox.ascx, 1.7.2.1, 1.7.2.2 cp_inbox.ascx.cs, 1.14.2.1, 1.14.2.2 cp_inbox.ascx.designer.cs, 1.1.2.2, 1.1.2.3 postmessage.ascx.cs, 1.38.2.6, 1.38.2.7