Changeset 1188

Timestamp:

02/16/10 13:29:26 (2 years ago)

Author:

Hugo

Message:

ispClient: save commit

Location:

trunk/unxsISP/interfaces/customer

Files:

• customer.c (modified) (4 diffs)
• interface.h (modified) (3 diffs)
• main.c (modified) (4 diffs)
• purchase.c (modified) (3 diffs)
• templates-english/FirstTime.Body (modified) (1 diff)

trunk/unxsISP/interfaces/customer/customer.c

@@ -690 +690 @@
 
                         printf("\n<!-- Start htmlCustomerPage(%s) -->\n",cTemplateName); 
-//                      fpTemplate(stdout,cTemplateName,&template);
                         Template(field[0], &template, stdout);
                         printf("\n<!-- End htmlCustomerPage(%s) -->\n",cTemplateName); 
@@ -1309 +1308 @@
 }//void funcSelectCardType(FILE *fp)
 
-
 void funcSelectExpMonth(FILE *fp)
 {
+        sysfuncSelectExpMonth(fp,cuExpMonthStyle,uExpMonth,1);
+}
+
+void sysfuncSelectExpMonth(FILE *fp,char *cStyle,unsigned uSelector,unsigned uUseStatus)
+{
         fprintf(fp,"<!-- funcSelectExpMonth(fp) start -->\n");
-
-        fprintf(fp,"<select class=%s name=uExpMonth %s>\n",cuExpMonthStyle,gcInputStatus);
+        
+        if(uUseStatus)
+                fprintf(fp,"<select class=%s name=uExpMonth %s>\n",cStyle,gcInputStatus);
+        else
+                fprintf(fp,"<select class=%s name=uExpMonth>\n",cStyle);
         
         fprintf(fp,"<option value=0 ");
-        if(uExpMonth==0)
+        if(uSelector==0)
                 fprintf(fp,"selected");
         fprintf(fp,">---</option>\n");
 
         fprintf(fp,"<option value=1 ");
-        if(uExpMonth==1)
+        if(uSelector==1)
                 fprintf(fp,"selected");
         fprintf(fp,">January</option>\n");
 
         fprintf(fp,"<option value=2 ");
-        if(uExpMonth==2)
+        if(uSelector==2)
                 fprintf(fp,"selected");
         fprintf(fp,">February</option>\n");
 
         fprintf(fp,"<option value=3 ");
-        if(uExpMonth==3)
+        if(uSelector==3)
                 fprintf(fp,"selected");
         fprintf(fp,">March</option>\n");
 
         fprintf(fp,"<option value=4 ");
-        if(uExpMonth==4)
+        if(uSelector==4)
                 fprintf(fp,"selected");
         fprintf(fp,">April</option>\n");
 
         fprintf(fp,"<option value=5 ");
-        if(uExpMonth==5)
+        if(uSelector==5)
                 fprintf(fp,"selected");
         fprintf(fp,">May</option>\n");
 
         fprintf(fp,"<option value=6 ");
-        if(uExpMonth==6)
+        if(uSelector==6)
                 fprintf(fp,"selected");
         fprintf(fp,">June</option>\n");
 
         fprintf(fp,"<option value=7 ");
-        if(uExpMonth==7)
+        if(uSelector==7)
                 fprintf(fp,"selected");
         fprintf(fp,">July</option>\n");
 
         fprintf(fp,"<option value=8 ");
-        if(uExpMonth==8)
+        if(uSelector==8)
                 fprintf(fp,"selected");
         fprintf(fp,">August</option>\n");
 
         fprintf(fp,"<option value=9 ");
-        if(uExpMonth==9)
+        if(uSelector==9)
                 fprintf(fp,"selected");
         fprintf(fp,">September</option>\n");
 
         fprintf(fp,"<option value=10 ");
-        if(uExpMonth==10)
+        if(uSelector==10)
                 fprintf(fp,"selected");
         fprintf(fp,">October</option>\n");
 
         fprintf(fp,"<option value=11 ");
-        if(uExpMonth==11)
+        if(uSelector==11)
                 fprintf(fp,"selected");
         fprintf(fp,">November</option>\n");
 
         fprintf(fp,"<option value=12 ");
-        if(uExpMonth==12)
+        if(uSelector==12)
                 fprintf(fp,"selected");
         fprintf(fp,">December</option>\n");
@@ -1390 +1396 @@
 void funcSelectExpYear(FILE *fp)
 {
+        sysfuncSelectExpYear(fp,cuExpYearStyle,uExpYear,1);
+
+}//void funcSelectExpYear(FILE *fp)
+
+
+void sysfuncSelectExpYear(FILE *fp,char *cStyle,unsigned uSelector,unsigned uUseStatus)
+{
         fprintf(fp,"<!-- funcSelectExpYear(fp) start -->\n");
         
-        fprintf(fp,"<select class=%s name=uExpYear %s>\n",cuExpYearStyle,gcInputStatus);
+        if(uUseStatus)
+                fprintf(fp,"<select class=%s name=uExpYear %s>\n",cStyle,gcInputStatus);
+        else
+                fprintf(fp,"<select class=%s name=uExpYear %s>\n",cStyle);
         
         fprintf(fp,"<option value=0 ");
@@ -1399 +1415 @@
         fprintf(fp,">---</option>\n");
 
-        fprintf(fp,"<option value=2009 ");
-        if(uExpYear==2009)
-                fprintf(fp,"selected");
-        fprintf(fp,">2009</option>\n");
-
         fprintf(fp,"<option value=2010 ");
-        if(uExpYear==2010)
+        if(uSelector==2010)
                 fprintf(fp,"selected");
         fprintf(fp,">2010</option>\n");
 
         fprintf(fp,"<option value=2011 ");
-        if(uExpYear==2011)
+        if(uSelector==2011)
                 fprintf(fp,"selected");
         fprintf(fp,">2011</option>\n");
 
         fprintf(fp,"<option value=2012 ");
-        if(uExpYear==2012)
+        if(uSelector==2012)
                 fprintf(fp,"selected");
         fprintf(fp,">2012</option>\n");

trunk/unxsISP/interfaces/customer/interface.h

@@ -89 +89 @@
 unsigned uGetAdminCompany(void);
 void GetClientOwner(unsigned uClient, unsigned *uOwner);
+void Logout(void);
 
 //Global vars all declared in main.c
@@ -138 +139 @@
 void ShowPurchaseRadiusPage(void);
 unsigned IsFirstTimeLogin(void);
+void sysfuncSelectExpMonth(FILE *fp,char *cStyle,unsigned uSelector,unsigned uUseStatus);
+void sysfuncSelectExpYear(FILE *fp,char *cStyle,unsigned uSelector,unsigned uUseStatus);
 
 typedef struct {
@@ -217 +220 @@
 void RegistrationCommands(pentry entries[], int x);
 
+//purchase.c
+void PurchaseCommands(pentry entries[], int x);
+

trunk/unxsISP/interfaces/customer/main.c

@@ -114 +114 @@
 
                 SSLCookieLogin();
+                
                 if(gcPage[0])
                 {
+                        if(IsFirstTimeLogin()) ShowPurchaseRadiusPage();
+                        
                         if(!strcmp(gcPage,"Customer"))
                                 CustomerGetHook(gentries,i);
@@ -153 +156 @@
         if(gcFunction[0])
         {
-                if(!strncmp(gcFunction,"Logout",5))
-                {
-                printf("Set-Cookie: ispClientLogin=; expires=\"Mon, 01-Jan-1971 00:10:10 GMT\"\n");
-                printf("Set-Cookie: ispClientPasswd=; expires=\"Mon, 01-Jan-1971 00:10:10 GMT\"\n");
-                sprintf(gcQuery,"INSERT INTO tLog SET cLabel='logout %.99s',uLogType=7,uPermLevel=%u,uLoginClient=%u,cLogin='%.99s',cHost='%.99s',cServer='%.99s',uOwner=%u,uCreatedBy=1,uCreatedDate=UNIX_TIMESTAMP(NOW())",gcLogin,guPermLevel,guLoginClient,gcLogin,gcHost,gcHostname,guOrg);
-                        mysql_query(&gMysql,gcQuery);
-                        guPermLevel=0;
-                        gcUser[0]=0;
-                        guLoginClient=0;
-                        htmlLogin();
-                }
+                if(!strncmp(gcFunction,"Logout",5)) Logout();
         }
         RegistrationCommands(entries,i);
@@ -180 +173 @@
 
         //Per page command tree
+        PurchaseCommands(entries,i);
         CustomerCommands(entries,i);
         ProductCommands(entries,i);
         InvoiceCommands(entries,i);
-
+        
         //default logged in page
         if(IsFirstTimeLogin()) ShowPurchaseRadiusPage();
@@ -190 +184 @@
 
 }//end of main()
+
+void Logout(void)
+{
+        printf("Set-Cookie: ispClientLogin=; expires=\"Mon, 01-Jan-1971 00:10:10 GMT\"\n");
+        printf("Set-Cookie: ispClientPasswd=; expires=\"Mon, 01-Jan-1971 00:10:10 GMT\"\n");
+        sprintf(gcQuery,"INSERT INTO tLog SET cLabel='logout %.99s',uLogType=7,uPermLevel=%u,"
+                        "uLoginClient=%u,cLogin='%.99s',cHost='%.99s',cServer='%.99s',uOwner=%u,"
+                        "uCreatedBy=1,uCreatedDate=UNIX_TIMESTAMP(NOW())"
+                        ,gcLogin,guPermLevel,guLoginClient,gcLogin,gcHost,gcHostname,guOrg);
+        mysql_query(&gMysql,gcQuery);
+        guPermLevel=0;
+        gcUser[0]=0;
+        guLoginClient=0;
+        htmlLogin();
+
+}//void Logout(void)
 
 

trunk/unxsISP/interfaces/customer/purchase.c

@@ -9 +9 @@
 */
 #include "interface.h"
+
+void ShowConfirmPurchasePage(void);
+void htmlPurchasePage(char *cTitle,char *cTemplateName);
+
 
 void ProcessPurchaseVars(pentry entries[], int x)
@@ -29 +33 @@
                 ProcessPurchaseVars(entries,x);
 
+                if(!strcmp(gcFunction,"Skip"))
+                {
+                        sprintf(gcNewStep,"Confirm ");
+                }
+                else if(!strcmp(gcFunction,"Confirm Skip"))
+                {
+                        Logout();
+                }
+                else if(!strcmp(gcFunction,"Proceed"))
+                {
+                        sprintf(gcModStep,"Confirm ");
+                }
+                else if(!strcmp(gcFunction,"Confirm Proceed"))
+                {
+                        ShowConfirmPurchasePage();
+                }
+
+
         }
 }//void PurchaseCommands(pentry entries[], int x)
@@ -36 +58 @@
 {
         htmlHeader("unxsISP Client Interface","Header");
-        htmlCustomerPage("","FirstTime.Body");
+        htmlPurchasePage("","FirstTime.Body");
         htmlFooter("Footer");
+
 }//void ShowPurchaseRadiusPage(void)
+
+
+void ShowConfirmPurchasePage(void)
+{
+        htmlHeader("unxsISP Client Interface","Header");
+        htmlPurchasePage("","Purchase.Body");
+        htmlFooter("Footer");
+
+}//void ShowConfirmPurchasePage(void)
+
+
+void htmlPurchasePage(char *cTitle,char *cTemplateName)
+{
+        if(cTemplateName[0])
+        {
+                MYSQL_RES *res;
+                MYSQL_ROW field;
+
+                TemplateSelect(cTemplateName,guTemplateSet);
+                res=mysql_store_result(&gMysql);
+                if((field=mysql_fetch_row(res)))
+                {
+                        struct t_template template;
+                        
+                        template.cpName[0]="cTitle";
+                        template.cpValue[0]=cTitle;
+                        
+                        template.cpName[1]="cCGI";
+                        template.cpValue[1]="ispClient.cgi";
+                        
+                        template.cpName[2]="gcLogin";
+                        template.cpValue[2]=gcLogin;
+
+                        template.cpName[3]="gcName";
+                        template.cpValue[3]=gcName;
+
+                        template.cpName[4]="gcOrgName";
+                        template.cpValue[4]=gcOrgName;
+
+                        template.cpName[5]="cUserLevel";
+                        template.cpValue[5]=(char *)cUserLevel(guPermLevel);
+
+                        template.cpName[6]="gcHost";
+                        template.cpValue[6]=gcHost;
+
+                        template.cpName[7]="gcMessage";
+                        template.cpValue[7]=gcMessage;
+
+                        template.cpName[8]="gcInputStatus";
+                        template.cpValue[8]=gcInputStatus;
+                                
+                        template.cpName[9]="gcNewStep";
+                        template.cpValue[9]=gcNewStep;
+                        
+                        template.cpName[10]="gcModStep";
+                        template.cpValue[10]=gcModStep;
+
+                        template.cpName[11]="cISPName";
+                        template.cpValue[11]="AstraQom";
+
+                        template.cpName[12]="mProductPrice";
+                        template.cpValue[12]="15.95";
+
+                        template.cpName[13]="";
+                        
+                        printf("\n<!-- Start htmlPurchasePage(%s) -->\n",cTemplateName); 
+                        Template(field[0], &template, stdout);
+                        printf("\n<!-- End htmlPurchasePage(%s) -->\n",cTemplateName); 
+                }
+                else
+                {
+                        printf("<hr>");
+                        printf("<center><font size=1>%s</font>\n",cTemplateName);
+                }
+                mysql_free_result(res);
+        }
+
+}//void htmlPurchasePage(char *cTemplateName)
 
 

trunk/unxsISP/interfaces/customer/templates-english/FirstTime.Body

@@ -92 +92 @@
 <tr>
 <td align=center><input class=largeButton type=submit name=gcFunction value="{{gcNewStep}}Skip"></td>
-<td align=center><input class=largeButton type=submit name=gcFunction value="{{gcModStep}}Confirm"></td>
+<td align=center><input class=largeButton type=submit name=gcFunction value="{{gcModStep}}Proceed"></td>
 </tr>
 </table>