style cleanup

diff --git a/webcit/preferences.c b/webcit/preferences.c
index bf7bacbe59767c6f01f609f4faad3791a8ef683c..f0a1776c1d8d058dfb8e06d35ef373017d1b8e6c 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -5,20 +5,13 @@
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
- * 
- * 
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * 
- * 
- * 
  */
 
-
 #include "webcit.h"
 #include "webserver.h"
 #include "dav.h"
@@ -44,7 +37,7 @@ typedef struct _Preference {
        long lval;
        long decoded;
        StrBuf *DeQPed;
-}Preference;
+} Preference;
 
 void DestroyPrefDef(void *vPrefDef)
 {
@@ -63,6 +56,7 @@ void DestroyPreference(void *vPref)
        free(Pref);
 
 }
+
 void _RegisterPreference(const char *Setting, long SettingLen, 
                         const char *PrefStr, 
                         ePrefType Type, 
@@ -238,10 +232,8 @@ void load_preferences(void)
                serv_puts("subj|__ WebCit Preferences __");
                serv_puts("000");
        }
-       while (!Done &&
-              (StrBuf_ServGetln(ReadBuf) >= 0)) {
-               if ( (StrLength(ReadBuf)==3) && 
-                    !strcmp(ChrPtr(ReadBuf), "000")) {
+       while (!Done && (StrBuf_ServGetln(ReadBuf) >= 0)) {
+               if ( (StrLength(ReadBuf)==3) && !strcmp(ChrPtr(ReadBuf), "000")) {
                        Done = 1;
                        break;
                }
@@ -252,9 +244,11 @@ void load_preferences(void)
                serv_printf("MSG0 %ld", msgnum);
                StrBuf_ServGetln(ReadBuf);
                if (GetServerStatus(ReadBuf, NULL) == 1) {
-                       while ((StrBuf_ServGetln(ReadBuf) >= 0) && 
-                              (strcmp(ChrPtr(ReadBuf), "text") && 
-                               strcmp(ChrPtr(ReadBuf), "000"))) {
+                       while ( (StrBuf_ServGetln(ReadBuf) >= 0)
+                               && (strcmp(ChrPtr(ReadBuf), "text")
+                               && strcmp(ChrPtr(ReadBuf), "000"))
+                       ) {
+                               /* flush */
                        }
                        if (!strcmp(ChrPtr(ReadBuf), "text")) {
                                ParsePref(&WCC->hash_prefs, ReadBuf);
@@ -272,8 +266,9 @@ void load_preferences(void)
        FlushFolder(&Room);
 }
 
+
 /*
- * Goto the user's configuration room, creating it if necessary.
+ * Go to the user's configuration room, creating it if necessary.
  * returns 0 on success or nonzero upon failure.
  */
 int goto_config_room(StrBuf *Buf, folder *Room) 
@@ -332,10 +327,12 @@ void WritePrefsToServer(HashList *Hash)
                                
                                nchars = StrBufSub(SubBuf, Pref->Val, offset, nchars);
                                
-                               if (n == 0)
+                               if (n == 0) {
                                        serv_printf("%s|%s", ChrPtr(Pref->Key), ChrPtr(SubBuf));
-                               else
+                               }
+                               else {
                                        serv_printf(" %s", ChrPtr(SubBuf));
+                               }
                                
                                offset += nchars;
                                nchars = StrLength(Pref->Val) - offset;
@@ -343,16 +340,17 @@ void WritePrefsToServer(HashList *Hash)
                        }
                        
                }
-               else
+               else {
                        serv_printf("%s|%s", ChrPtr(Pref->Key), ChrPtr(Pref->Val));
+               }
                
        }
        FreeStrBuf(&SubBuf);
        DeleteHashPos(&HashPos);
 }
 
-/**
- * \brief save the modifications
+/*
+ * save the modifications
  */
 void save_preferences(void) 
 {
@@ -392,10 +390,8 @@ void save_preferences(void)
                serv_puts("subj|__ WebCit Preferences __");
                serv_puts("000");
        }
-       while (!Done &&
-              (StrBuf_ServGetln(ReadBuf) >= 0)) {
-               if ( (StrLength(ReadBuf)==3) && 
-                    !strcmp(ChrPtr(ReadBuf), "000")) {
+       while (!Done && (StrBuf_ServGetln(ReadBuf) >= 0)) {
+               if ( (StrLength(ReadBuf)==3) && !strcmp(ChrPtr(ReadBuf), "000")) {
                        Done = 1;
                        break;
                }
@@ -427,12 +423,13 @@ void save_preferences(void)
        FlushFolder(&Room);
 }
 
-/**
- * \brief query the actual setting of key in the citadel database
- * \param key config key to query
- * \param keylen length of the key string
- * \param value StrBuf-value to the key to get
- * \returns found?
+/*
+ * query the actual setting of key in the citadel database
+ *
+ * key         config key to query
+ * keylen      length of the key string
+ * value       StrBuf-value to the key to get
+ * returns:    found?
  */
 int get_pref_backend(const char *key, size_t keylen, Preference **Pref)
 {
@@ -463,49 +460,54 @@ int get_PREFERENCE(const char *key, size_t keylen, StrBuf **value)
        return Ret;
 }
 
-/**
- * \brief      Write a key into the webcit preferences database for this user
+/*
+ * Write a key into the webcit preferences database for this user
  *
- * \params     key             key whichs value is to be modified
- * \param keylen length of the key string
- * \param      value           value to set
- * \param      save_to_server  1 = flush all data to the server, 0 = cache it for now
+ * key                 key whichs value is to be modified
+ * keylen              length of the key string
+ * value               value to set
+ * save_to_server      1 = flush all data to the server, 0 = cache it for now
  */
-long compare_preference(const Preference *PrefA, 
-                       const Preference *PrefB)
+long compare_preference(const Preference *PrefA, const Preference *PrefB)
 {
        ePrefType TypeA, TypeB;
 
-       if (PrefA->Type != NULL)
+       if (PrefA->Type != NULL) {
                TypeA = PrefA->Type->eType;
-       else 
+       }
+       else {
                TypeA = PrefA->eFlatPrefType;
+       }
 
-       if (PrefB->Type != NULL)
+       if (PrefB->Type != NULL) {
                TypeB = PrefB->Type->eType;
-       else 
+       }
+       else {
                TypeB = PrefB->eFlatPrefType;
+       }
 
-       if ((TypeA != PRF_UNSET) && 
-           (TypeB != PRF_UNSET) && 
-           (TypeA != TypeB))
-       {
-               if (TypeA > TypeB)
+       if (    (TypeA != PRF_UNSET)
+               && (TypeB != PRF_UNSET)
+               && (TypeA != TypeB)
+       ) {
+               if (TypeA > TypeB) {
                        return 1;
-               else /* (PrefA->Type < PrefB->Type) */
+               }
+               else {  /* (PrefA->Type < PrefB->Type) */
                        return -1;
+               }
        }
 
-       if (TypeB == PRF_UNSET)
+       if (TypeB == PRF_UNSET) {
                TypeA = PRF_UNSET;
+       }
                    
        switch (TypeA)
        {
        default:
        case PRF_UNSET:
        case PRF_STRING:
-               return strcmp(ChrPtr(PrefA->Val), 
-                             ChrPtr(PrefB->Val));
+               return strcmp(ChrPtr(PrefA->Val), ChrPtr(PrefB->Val));
        case PRF_YESNO:
        case PRF_INT:
                if (PrefA->lval == PrefB->lval)
@@ -520,13 +522,14 @@ long compare_preference(const Preference *PrefA,
        }
 }
 
-/**
- * \brief      Write a key into the webcit preferences database for this user
+
+/*
+ * Write a key into the webcit preferences database for this user
  *
- * \params     key             key whichs value is to be modified
- * \param keylen length of the key string
- * \param      value           value to set
- * \param      save_to_server  1 = flush all data to the server, 0 = cache it for now
+ * key                 key which value is to be modified
+ * keylen              length of the key string
+ * value               value to set
+ * save_to_server      1 = flush all data to the server, 0 = cache it for now
  */
 void set_preference_backend(const char *key, size_t keylen, 
                            long lvalue, 
@@ -854,8 +857,8 @@ void GetPreferences(HashList *Setting)
 }
 
 
-/**
- * \brief Commit new preferences and settings
+/*
+ * Commit new preferences and settings
  */
 void set_preferences(void)
 {      
@@ -1222,7 +1225,3 @@ SessionDestroyModule_PREFERENCES
 {
        DeleteHash(&sess->hash_prefs);
 }
-
-
-
-/*@}*/

diff --git a/webcit/static/t/menu/basic_commands.html b/webcit/static/t/menu/basic_commands.html
index 168cd07e408d7fac37caa2edf337d13bb7255e99..07b203fee17c7c83575d462bed2656d3be19dc23 100644 (file)
--- a/webcit/static/t/menu/basic_commands.html
+++ b/webcit/static/t/menu/basic_commands.html
@@ -14,7 +14,7 @@
 </ul>
 <!-- start of third column -->
 <ul class="adminitems lastcol">
-       <li><a href="do_template?template=summary_page"><?_("Summary page")></a><span><?_("Summary of my account")></span></li>
+       <li><a href="summary"><?_("Summary page")></a><span><?_("Summary of my account")></span></li>
        <li><a href="do_template?template=user_list"><?_("User list")></a><span><?_("(all registered users)")></span></li>
        <li><a href="termquit" target="_top"><?_("Log off")></a><span><?_("Bye!")></span></li>
 </ul>