3 files changed, 91 insertions, 0 deletions

diff --git a/src/datafiles.c b/src/datafiles.c
index 117f2c32e..60434a28f 100644
--- a/src/datafiles.c
+++ b/src/datafiles.c
@@ -711,3 +711,63 @@ void backup_databases(void)
         send_event(EVENT_DB_BACKUP, 1, EVENT_STOP);
     }
 }
+
+/*************************************************************************/
+
+void ModuleDatabaseBackup(char *dbname)
+{
+
+    time_t t;
+    struct tm tm;
+
+    if (!KeepBackups) {
+        return;
+    }
+
+    time(&t);
+    tm = *localtime(&t);
+
+    if (!curday) {
+        curday = tm.tm_yday;
+        return;
+    }
+
+    if (curday != tm.tm_yday) {
+
+        char ext[9];
+
+	if (debug) {
+	        alog("Module Database Backing up %s", dbname);
+	}
+        ModuleRemoveBackups(dbname);
+        curday = tm.tm_yday;
+        strftime(ext, sizeof(ext), "%Y%m%d", &tm);
+        rename_database(dbname, ext);
+    }
+}
+
+/*************************************************************************/
+
+void ModuleRemoveBackups(char *dbname)
+{
+    char ext[9];
+    char path[PATH_MAX];
+
+    time_t t;
+    struct tm tm;
+
+    time(&t);
+    t -= (60 * 60 * 24 * KeepBackups);
+    tm = *localtime(&t);
+    strftime(ext, sizeof(ext), "%Y%m%d", &tm);
+
+    snprintf(path, sizeof(path), "backups/%s.%s", dbname, ext);
+#ifndef _WIN32
+    unlink(path);
+#else
+    DeleteFile(path);
+#endif
+}
+
+/*************************************************************************/
+
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index 0494a08c9..38ec0e04d 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -76,6 +76,7 @@ int ns_do_drop(User * u);
 void hsreq_save_db(void);
 void hsreq_load_db(void);
 int hsreqevt_db_saving(int argc, char **argv);
+int hsreqevt_db_backup(int argc, char **argv);
 
 void my_load_config(void);
 void my_add_languages(void);
@@ -117,6 +118,9 @@ int AnopeInit(int argc, char **argv)
     hook = createEventHook(EVENT_DB_SAVING, hsreqevt_db_saving);
     moduleAddEventHook(hook);
 
+    hook = createEventHook(EVENT_DB_BACKUP, hsreqevt_db_backup);
+    moduleAddEventHook(hook);
+
     moduleSetHostHelp(hs_help);
     moduleAddAuthor(AUTHOR);
     moduleAddVersion(VERSION);
@@ -680,6 +684,18 @@ int hsreqevt_db_saving(int argc, char **argv)
     return MOD_CONT;
 }
 
+int hsreqevt_db_backup(int argc, char **argv)
+{
+    if ((argc >= 1) && (stricmp(argv[0], EVENT_START) == 0)) {
+	    if (HSRequestDBName)
+    	    ModuleDatabaseBackup(HSRequestDBName);
+	    else
+    	    ModuleDatabaseBackup(HSREQ_DEFAULT_DBNAME);
+	}
+	
+    return MOD_CONT;
+}
+
 void my_load_config(void)
 {
     int i;
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index e1af20d8c..9f2d3aa05 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -55,6 +55,7 @@ void m_AddLanguages(void);
 
 int mLoadData(void);
 int mSaveData(int argc, char **argv);
+int mBackupData(int argc, char **argv);
 int mLoadConfig();
 int mEventReload(int argc, char **argv);
 
@@ -99,6 +100,9 @@ int AnopeInit(int argc, char **argv)
     hook = createEventHook(EVENT_DB_SAVING, mSaveData);
     status = moduleAddEventHook(hook);
 
+    hook = createEventHook(EVENT_DB_BACKUP, mBackupData);
+    status = moduleAddEventHook(hook);
+
     hook = createEventHook(EVENT_RELOAD, mEventReload);
     status = moduleAddEventHook(hook);
 
@@ -450,6 +454,17 @@ int mSaveData(int argc, char **argv)
 }
 
 /** 
+ * Backup our databases using the commands provided by Anope
+ * @return MOD_CONT
+ **/
+int mBackupData(int argc, char **argv)
+{
+	ModuleDatabaseBackup(OSInfoDBName);
+	
+	return MOD_CONT;
+}
+
+/** 
  * Load the configuration directives from Services configuration file.
  * @return 0 for success
  **/