projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8837983)
* depricate <?=subtemplate> in favour of <?=("subtemplate")> so our syntax is more...
authorWilfried Göesgens <willi@citadel.org>
Sat, 6 Sep 2008 11:54:56 +0000 (11:54 +0000)
committerWilfried Göesgens <willi@citadel.org>
Sat, 6 Sep 2008 11:54:56 +0000 (11:54 +0000)
webcit/static/t/display_aide_menu.html patch | blob | history
webcit/static/t/display_main_menu.html patch | blob | history
webcit/static/t/display_serverrestart.html patch | blob | history
webcit/static/t/display_serverrestartpage.html patch | blob | history
webcit/static/t/display_serverrestartpagedo.html patch | blob | history
webcit/static/t/login.html patch | blob | history
webcit/static/t/openid_login.html patch | blob | history
webcit/static/t/openid_manual_create.html patch | blob | history
webcit/static/t/who.html patch | blob | history
webcit/static/t/whosimplesection.html patch | blob | history
webcit/subst.c patch | blob | history

diff --git a/webcit/static/t/display_aide_menu.html b/webcit/static/t/display_aide_menu.html
index 09386b4c209dee55c1045d0a86d103e4ac5186a0..dd4b7c045ca4fabb77f9f4133000166125fa295d 100644 (file)
--- a/webcit/static/t/display_aide_menu.html
+++ b/webcit/static/t/display_aide_menu.html
@@ -1,5 +1,5 @@
-<?=head>
-<?=important_msg>
+<?=("head")>
+<?=("important_msg")>
 <?ICONBAR>
 <div id="banner">
 <h1>
@@ -19,4 +19,4 @@
 </td><td width=50%% valign="top">
 <?DOBOXED("aide_floorconfig", "subject_floorconfig")>
 </td></tr></table></div>
-<?=trailing>
+<?=("trailing")>
diff --git a/webcit/static/t/display_main_menu.html b/webcit/static/t/display_main_menu.html
index 4cac1cd9048446649fe66896f00d20fe2d2aafd4..dc6d1e0bb3649d67a1382ecada96770cb6ba1464 100644 (file)
--- a/webcit/static/t/display_main_menu.html
+++ b/webcit/static/t/display_main_menu.html
@@ -1,5 +1,5 @@
-<?=head>
-<?=important_msg>
+<?=("head")>
+<?=("important_msg")>
 <?ICONBAR>
 <?ROOMBANNER>
 <div id="content">
@@ -16,4 +16,4 @@
 </table>
 </div>
 </div>
-<?=trailing>
+<?=("trailing")>
diff --git a/webcit/static/t/display_serverrestart.html b/webcit/static/t/display_serverrestart.html
index e534ddffee7a59a8ffc482ca6a3a48ffb09eb502..5f9f240d9ff1e275907893dc5c06089a2ad027e6 100644 (file)
--- a/webcit/static/t/display_serverrestart.html
+++ b/webcit/static/t/display_serverrestart.html
@@ -22,11 +22,11 @@
 </head>
 <body>
 <div id="global">
-<?=important_msg>
+<?=("important_msg")>
 <div id="content" class="service">
 <div class="fix_scrollbar_bug">
 <table>
 <td width=50%% valign="top">
 <?DOBOXED("box_serverrestart", "subject_floorconfig")>
 </td></tr></table></div>
-<?=trailing>
+<?=("trailing")>
diff --git a/webcit/static/t/display_serverrestartpage.html b/webcit/static/t/display_serverrestartpage.html
index 26bf8d98051fed614d8c70a7ebc640f8689451ef..c83a4cd6b1e24106b38ed9861ad338bcf51b39f0 100644 (file)
--- a/webcit/static/t/display_serverrestartpage.html
+++ b/webcit/static/t/display_serverrestartpage.html
@@ -1,6 +1,6 @@
-<?=head>
-<?=important_msg>
+<?=("head")>
+<?=("important_msg")>
 <div id="resatrt_page">
 <?DOBOXED("box_serverrestartpage", "subject_serverrestartpage")>
 </div>
-<?=trailing>
+<?=("trailing")>
diff --git a/webcit/static/t/display_serverrestartpagedo.html b/webcit/static/t/display_serverrestartpagedo.html
index a5c03ea11dfa440e2daefb13eed7b921640e194a..ac1bedd61f3aed72a728b24c7e0b540e4fab0429 100644 (file)
--- a/webcit/static/t/display_serverrestartpagedo.html
+++ b/webcit/static/t/display_serverrestartpagedo.html
@@ -22,11 +22,11 @@
 </head>
 <body>
 <div id="global">
-<?=important_msg>
+<?=("important_msg")>
 <div id="content" class="service">
 <div class="fix_scrollbar_bug">
 <table>
 <td width=50%% valign="top">
 <?DOBOXED("box_serverrestartpagedo")>
 </td></tr></table></div>
-<?=trailing>
+<?=("trailing")>
diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index 2307562ffe7bbe10292183cc3ad27fba0227d5c5..495e4919eb435383ff5e8639d05a3f0c2555b926 100644 (file)
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -1,4 +1,4 @@
-<?=beginbox>
+<?=("beginbox")>
 <?HELLO>
 <div class="login_message"><?MESG></div>
 <form action="login" method="POST"  class="box" id="login_form">
@@ -20,4 +20,4 @@
 <?OFFER_OPENID_LOGIN>
 <div class="login_image"><img src="image&name=hello"></div>
 <div class="login_infos"><?LOGIN_INSTRUCTIONS></div>
-<?=endbox>
+<?=("endbox")>
diff --git a/webcit/static/t/openid_login.html b/webcit/static/t/openid_login.html
index 9c0f81155a0c465901b60aa84c78d03c8ef756c1..f43bfd631dd5c3181b67fb503943bda7d50dea92 100644 (file)
--- a/webcit/static/t/openid_login.html
+++ b/webcit/static/t/openid_login.html
@@ -1,4 +1,4 @@
-<?=beginbox>
+<?=("beginbox")>
 <?HELLO>
 <div class="login_message"><?MESG></div>
 <form action="openid_login" method="POST"  class="box" id="login_form">
@@ -15,4 +15,4 @@
 <?OFFER_CONVENTIONAL_LOGIN>
 <div class="login_image"><img src="image&name=hello"></div>
 <div class="login_infos"><?LOGIN_INSTRUCTIONS></div>
-<?=endbox>
+<?=("endbox")>
diff --git a/webcit/static/t/openid_manual_create.html b/webcit/static/t/openid_manual_create.html
index 7b4807de0f6c31ca016f320776cb8ef3623d0459..170b80a0ce97dd1e94cf46496258f2510b125fa3 100644 (file)
--- a/webcit/static/t/openid_manual_create.html
+++ b/webcit/static/t/openid_manual_create.html
@@ -1,4 +1,4 @@
-<?=beginbox>
+<?=("beginbox")>
 <?HELLO>
 <div class="login_infos">
        <img src="static/openid-small.gif"><?VERIFIED><br />
@@ -15,4 +15,4 @@
         <br>
         </div>
 </form>
-<?=endbox>
+<?=("endbox")>
diff --git a/webcit/static/t/who.html b/webcit/static/t/who.html
index 98c16898937b4c66f593b0c05dd8f3431c0642a6..08a1b7b20602f8abccec96c15a54826a9784468b 100644 (file)
--- a/webcit/static/t/who.html
+++ b/webcit/static/t/who.html
@@ -1,5 +1,5 @@
-<?=head>
-<?=important_msg>
+<?=("head")>
+<?=("important_msg")>
 <?ICONBAR>
 
 <script type="text/javascript">
@@ -27,5 +27,5 @@ return confirm('<?_("Do you really want to kill this session?")>');
  new Ajax.PeriodicalUpdater('do_template', 'template=wholiststatic',
                             { method: 'get', frequency: 30 }  );
 </script>
-<?=trailing>
+<?=("trailing")>
 
diff --git a/webcit/static/t/whosimplesection.html b/webcit/static/t/whosimplesection.html
index dee4e3e1967fbe551b3d835fa7778296444d65ca..4ac61b109d7654bd9312fb19de76ce220e332539 100644 (file)
--- a/webcit/static/t/whosimplesection.html
+++ b/webcit/static/t/whosimplesection.html
@@ -1 +1 @@
-<li class="<??("COND:SUBST", 4, "WHO:IDLE")>activeuser<?!("X", 4)><?!("COND:SUBST", 5, "WHO:IDLE")>inactiveuser<?!("X", 5)>"><a href="showuser?who=<?WHO:NAME("U")>"><?WHO:NAME("U")</a></li>
+<li class="<??("COND:SUBST", 4, "WHO:IDLE")>activeuser<?!("X", 4)><?!("COND:SUBST", 5, "WHO:IDLE")>inactiveuser<?!("X", 5)>"><a href='showuser?who=<?WHO:NAME("U")>'><?WHO:NAME("U")></a></li>
diff --git a/webcit/subst.c b/webcit/subst.c
index 6f4efa91ef4e447a4c4777e3c07c99642fa04a16..36630a89ca6b0663657c5d064cb9ba48a465ff6d 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -36,6 +36,7 @@ int LoadTemplates = 0;
 #define SV_GETTEXT 1
 #define SV_CONDITIONAL 2
 #define SV_NEG_CONDITIONAL 3
+#define SV_SUBTEMPL 4
 
 typedef struct _WCTemplate {
        StrBuf *Data;
@@ -434,6 +435,7 @@ void print_value_of(StrBuf *Target, const char *keyname, size_t keylen) {
        void *vVar;
 
        /*if (WCC->vars != NULL) PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
+       /// TODO: debricated!
        if (keyname[0] == '=') {
                DoTemplate(keyname+1, keylen - 1, NULL, NULL);
        }
@@ -548,7 +550,7 @@ TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe)
                }
                else {
                        Parm->lvalue = 0;
-                       lprintf(1, "Error evaluating template long param [%s]", *pCh);
+                       lprintf(1, "Error evaluating template long param [%s]\n", *pCh);
                        free(Parm);
                        return NULL;
                }
@@ -611,6 +613,9 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
                                if ((NewToken->nParameters == 1) &&
                                    (*(NewToken->pName) == '_'))
                                        NewToken->Flags = SV_GETTEXT;
+                               else if ((NewToken->nParameters == 1) &&
+                                        (*(NewToken->pName) == '='))
+                                       NewToken->Flags = SV_SUBTEMPL;
                                else if ((NewToken->nParameters >= 2) &&
                                         (*(NewToken->pName) == '?'))
                                        NewToken->Flags = SV_CONDITIONAL;
@@ -693,36 +698,43 @@ int EvaluateToken(StrBuf *Target, WCTemplateToken *Token, void *Context, int sta
        void *vVar;
 // much output, since pName is not terminated...
 //     lprintf(1,"Doing token: %s\n",Token->pName);
-       if (Token->Flags == SV_GETTEXT) {
+       switch (Token->Flags) {
+       case SV_GETTEXT:
                TmplGettext(Target, Token->nParameters, Token);
-       }
-       else if (Token->Flags == SV_CONDITIONAL) {
+               break;
+       case SV_CONDITIONAL:
                return EvaluateConditional(Token, Context, 1, state);
-       }
-       else if (Token->Flags == SV_NEG_CONDITIONAL) {
+               break;
+       case SV_NEG_CONDITIONAL:
                return EvaluateConditional(Token, Context, 0, state);
-       }
-       else if (GetHash(GlobalNS, Token->pName, Token->NameEnd, &vVar)) {
-               HashHandler *Handler;
-               Handler = (HashHandler*) vVar;
-               if ((Token->nParameters < Handler->nMinArgs) || 
-                   (Token->nParameters > Handler->nMaxArgs)) {
-                       lprintf(1, "Handler [%s] doesn't work with %ld params", 
-                               Token->pName,
-                               Token->nParameters);
+               break;
+       case SV_SUBTEMPL:
+               if (Token->nParameters == 1)
+                       DoTemplate(Token->Params[0]->Start, Token->Params[0]->len, NULL, NULL);
+               break;
+       default:
+               if (GetHash(GlobalNS, Token->pName, Token->NameEnd, &vVar)) {
+                       HashHandler *Handler;
+                       Handler = (HashHandler*) vVar;
+                       if ((Token->nParameters < Handler->nMinArgs) || 
+                           (Token->nParameters > Handler->nMaxArgs)) {
+                               lprintf(1, "Handler [%s] doesn't work with %ld params", 
+                                       Token->pName,
+                                       Token->nParameters);
+                       }
+                       else {
+                               Handler->HandlerFunc(Target, 
+                                                    Token->nParameters,
+                                                    Token,
+                                                    Context); /*TODO: subset of that */
+                               
+                               
+                       }
                }
                else {
-                       Handler->HandlerFunc(Target, 
-                                            Token->nParameters,
-                                            Token,
-                                            Context); /*TODO: subset of that */
-               
-                       
+                       print_value_of(Target, Token->pName, Token->NameEnd);
                }
        }
-       else {
-               print_value_of(Target, Token->pName, Token->NameEnd);
-       }
        return 0;
 }
 
Citadel server, clients, utilities