apps/tuxbox/plugins/tuxmail tuxmail.c tuxmail.h

[lazyt@cvs.tuxbox.org (Thomas Loewe)]

lazyt       05/05/13 00:24:23

  Modified:    tuxbox/plugins/tuxmail tuxmail.c tuxmail.h
  Log:
  - PIN-Fix
  - add Messageboxes for send Mail done/fail
  
  Revision  Changes    Path
  1.21      +41 -4     apps/tuxbox/plugins/tuxmail/tuxmail.c
  
  file : http://cvs.tuxbox.org/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.c?rev=1.21&content-type=text/vnd.viewcvs-markup
  plain: http://cvs.tuxbox.org/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.c?rev=1.21&content-type=text/plain
  revision graph: http://cvs.tuxbox.org/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.c?graph=1.21
  diff : http://cvs.tuxbox.org/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.c.diff?r1=1.20&r2=1.21
  
  Index: tuxmail.c
  ===================================================================
  RCS file: /cvs/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- tuxmail.c	12 May 2005 14:28:28 -0000	1.20
  +++ tuxmail.c	12 May 2005 22:24:23 -0000	1.21
  @@ -3,6 +3,10 @@
    *                (c) Thomas "LazyT" Loewe 2003 (LazyT@gmx.net)
    *-----------------------------------------------------------------------------
    * $Log: tuxmail.c,v $
  + * Revision 1.21  2005/05/12 22:24:23  lazyt
  + * - PIN-Fix
  + * - add Messageboxes for send Mail done/fail
  + *
    * Revision 1.20  2005/05/12 14:28:28  lazyt
    * - PIN-Protection for complete Account
    * - Preparation for sending Mails ;-)
  @@ -257,6 +261,8 @@
   
   				send(fd_sock, "W", 1, 0);
   				recv(fd_sock, &mailsend, 1, 0);
  +
  +				mailsend ? ShowMessage(SENDMAILDONE) : ShowMessage(SENDMAILFAIL);
   		}
   
   		close(fd_sock);
  @@ -274,6 +280,13 @@
   {
   	static __u16 rc_last_key = KEY_RESERVED;
   
  +	if(sim_key)
  +	{
  +		sim_key = 0;
  +
  +		return rccode;
  +	}
  +
   	if(read(rc, &ev, sizeof(ev)) == sizeof(ev))
   	{
   		if(ev.value)
  @@ -466,6 +479,13 @@
   {
   	static unsigned short LastKey = -1;
   
  +	if(sim_key)
  +	{
  +		sim_key = 0;
  +
  +		return rccode;
  +	}
  +
   	read(rc, &rccode, sizeof(rccode));
   
   	if(rccode != LastKey)
  @@ -1302,6 +1322,18 @@
   
   				break;
   
  +			case SENDMAILDONE:
  +
  +				RenderString((osd == 'G') ? "Mail wurde gesendet." : "Mailing successful.", 157, 265, 306, CENTER, BIG, WHITE);
  +
  +				break;
  +
  +			case SENDMAILFAIL:
  +
  +				RenderString((osd == 'G') ? "Mail nicht gesendet!" : "Mailing failed!", 157, 265, 306, CENTER, BIG, WHITE);
  +
  +				break;
  +
   			case INFO:
   
   				ControlDaemon(GET_VERSION,0,0);
  @@ -1382,6 +1414,14 @@
   
   		if(!CheckPIN(account))
   		{
  +			do
  +			{
  +				GetRCCode();
  +			}
  +			while(rccode != RC_HOME && rccode != RC_0 && rccode != RC_1 && rccode != RC_2 && rccode != RC_3 && rccode != RC_4 && rccode != RC_5 && rccode != RC_6 && rccode != RC_7 && rccode != RC_8 && rccode != RC_9 && rccode != RC_PLUS && rccode != RC_MINUS);
  +
  +			sim_key = 1;
  +
   			return;
   		}
   		else
  @@ -1823,8 +1863,6 @@
   			memcpy(lfb, lbb, var_screeninfo.xres*var_screeninfo.yres);
   		}
   
  -		rccode = -1;
  -
   		return result;
   }
   
  @@ -1834,7 +1872,7 @@
   
   void plugin_exec(PluginParam *par)
   {
  -	char cvs_revision[] = "$Revision: 1.20 $";
  +	char cvs_revision[] = "$Revision: 1.21 $";
   	int loop, account, mailindex;
   	FILE *fd_run;
   	FT_Error error;
  @@ -2040,7 +2078,7 @@
   		ShowMailInfo(account, mailindex);
   
   	// main loop
  -		
  +
   		do
   		{
   			switch((rccode = GetRCCode()))
  @@ -2462,7 +2500,6 @@
   			}
   
   			ShowMailInfo(account, mailindex);
  -
   		}
   		while(rccode != RC_HOME);
   
  
  
  
  1.17      +6 -1      apps/tuxbox/plugins/tuxmail/tuxmail.h
  
  file : http://cvs.tuxbox.org/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.h?rev=1.17&content-type=text/vnd.viewcvs-markup
  plain: http://cvs.tuxbox.org/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.h?rev=1.17&content-type=text/plain
  revision graph: http://cvs.tuxbox.org/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.h?graph=1.17
  diff : http://cvs.tuxbox.org/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.h.diff?r1=1.16&r2=1.17
  
  Index: tuxmail.h
  ===================================================================
  RCS file: /cvs/tuxbox/apps/tuxbox/plugins/tuxmail/tuxmail.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- tuxmail.h	12 May 2005 14:28:28 -0000	1.16
  +++ tuxmail.h	12 May 2005 22:24:23 -0000	1.17
  @@ -3,6 +3,10 @@
    *                (c) Thomas "LazyT" Loewe 2003 (LazyT@gmx.net)
    *-----------------------------------------------------------------------------
    * $Log: tuxmail.h,v $
  + * Revision 1.17  2005/05/12 22:24:23  lazyt
  + * - PIN-Fix
  + * - add Messageboxes for send Mail done/fail
  + *
    * Revision 1.16  2005/05/12 14:28:28  lazyt
    * - PIN-Protection for complete Account
    * - Preparation for sending Mails ;-)
  @@ -250,7 +254,7 @@
   
   enum {FILL, GRID};
   enum {TRANSP, WHITE, SKIN0, SKIN1, SKIN2, ORANGE, GREEN, YELLOW, RED};
  -enum {NODAEMON, STARTDONE, STARTFAIL, STOPDONE, STOPFAIL, BOOTON, BOOTOFF, ADD2SPAM, DELSPAM, SPAMFAIL, INFO, GETMAIL, GETMAILFAIL};
  +enum {NODAEMON, STARTDONE, STARTFAIL, STOPDONE, STOPFAIL, BOOTON, BOOTOFF, ADD2SPAM, DELSPAM, SPAMFAIL, INFO, GETMAIL, GETMAILFAIL, SENDMAILDONE, SENDMAILFAIL};
   
   unsigned char *lfb = 0, *lbb = 0;
   
  @@ -281,6 +285,7 @@
   #endif
   
   unsigned short rccode;
  +int sim_key = 0;
   
   char scroll_up[] =
   {
  
  
  

-- 
To UNSUBSCRIBE, email to tuxbox-cvs-request@cvs.tuxbox.org
with a subject of "unsubscribe". Trouble? Contact listmaster@cvs.tuxbox.org