Merge branch 'configdb' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / modules / autocompletion / serv_autocompletion.c

diff --git a/citadel/modules/autocompletion/serv_autocompletion.c b/citadel/modules/autocompletion/serv_autocompletion.c
index 9c1c97991fda592e54d95ec0b3f6d78c4cf3951c..ca7c0ae426f61c32f7a971e0c481718d575532cd 100644 (file)
--- a/citadel/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/modules/autocompletion/serv_autocompletion.c
@@ -1,27 +1,21 @@
 /*
  * Autocompletion of email recipients, etc.
  *
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 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 "ctdl_module.h"
 
 
+#include "ctdl_module.h"
 #include "serv_autocompletion.h"
-
+#include "config.h"
 
 
 /*
@@ -65,11 +59,11 @@ void hunt_for_autocomplete(long msgnum, char *search_string) {
        int i = 0;
        char *nnn = NULL;
 
-       msg = CtdlFetchMessage(msgnum, 1);
+       msg = CtdlFetchMessage(msgnum, 1, 1);
        if (msg == NULL) return;
 
-       v = vcard_load(msg->cm_fields['M']);
-       CtdlFreeMessage(msg);
+       v = vcard_load(msg->cm_fields[eMesageText]);
+       CM_Free(msg);
 
        /*
         * Try to match from a friendly name (the "fn" field).  If there is
@@ -176,7 +170,7 @@ void cmd_auto(char *argbuf) {
        /*
         * Search-reduce the results if we have the full text index available
         */
-       if (config.c_enable_fulltext) {
+       if (CtdlGetConfigInt("c_enable_fulltext")) {
                CtdlModuleDoSearch(&fts_num_msgs, &fts_msgs, search_string, "fulltext");
                if (fts_msgs) {
                        for (i=0; i<num_msgs; ++i) {
@@ -222,11 +216,12 @@ void cmd_auto(char *argbuf) {
 }
 
 
-CTDL_MODULE_INIT(autocompletion) {
+CTDL_MODULE_INIT(autocompletion)
+{
        if (!threading)
        {
                CtdlRegisterProtoHook(cmd_auto, "AUTO", "Do recipient autocompletion");
        }
-       /* return our Subversion id for the Log */
+       /* return our module name for the log */
        return "autocompletion";
 }