exordium-dev-cvs Mailing List for Exordium Network Services
Status: Pre-Alpha
Brought to you by:
ircdome
Menu
▾
▴
exordium-dev-cvs — Exordium CVS commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(328) |
Oct
(294) |
Nov
(91) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
(6) |
Mar
(427) |
Apr
(134) |
May
(73) |
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(41) |
Nov
|
Dec
|
|
From: <ir...@us...> - 2003-10-27 16:03:36
|
Update of /cvsroot/exordium/services/include/exordium
In directory sc8-pr-cvs1:/tmp/cvs-serv20526/include/exordium
Modified Files:
service.h
Log Message:
BROKE BROKE BROKE BROKE BROKE :|
Index: service.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/service.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- service.h 27 Oct 2003 11:55:16 -0000 1.49
+++ service.h 27 Oct 2003 16:01:55 -0000 1.50
@@ -52,9 +52,9 @@
public:
struct moduleInfo_type {
// Version information about the module
- const char* const fullName;
- const unsigned short versionMajor;
- const unsigned short versionMinor;
+// const char* const fullName;
+// const unsigned short versionMajor;
+// const unsigned short versionMinor;
// Information about which events we want to receive
struct Events { // Should be namespace, but g++ is dumb
@@ -199,19 +199,19 @@
*/
// Return the nickname of the module
- const Kine::Name& getNickname(void) const
+ const Kine::ClientName& getNickname(void) const
{ return getConfigData().getName(); };
// Return the username/identity of the service
- const std::string& getUsername(void) const
+ const Kine::Name& getUsername(void) const
{ return getConfigData().getIdent(); };
// Return the hostname of this service module
- const std::string& getHostname(void) const
+ const Kine::Name& getHostname(void) const
{ return getConfigData().getHostname(); };
// Return the description of this service module
- const std::string& getDescription(void) const
+ const Kine::Name& getDescription(void) const
{ return getConfigData().getDescription(); };
// Return the time this module was created/signed on to the network
|
|
From: <ir...@us...> - 2003-10-27 16:03:28
|
Update of /cvsroot/exordium/services/source/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv20526/source/lib
Modified Files:
modules.h
Log Message:
BROKE BROKE BROKE BROKE BROKE :|
Index: modules.h
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/modules.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- modules.h 6 Apr 2003 17:40:58 -0000 1.13
+++ modules.h 27 Oct 2003 16:01:55 -0000 1.14
@@ -56,7 +56,7 @@
~Module(void);
};
- typedef std::map <AISutil::String, Module *> modules_type;
+ typedef std::map <AIS::Util::String, Module *> modules_type;
private:
// The list of modules
@@ -71,43 +71,43 @@
~Modules(void);
/* Event handler(s) */
- void handleAway(User&, const AISutil::String &);
+ void handleAway(User&, const AIS::Util::String &);
void handleClientSignon(User&);
- void handleTopic(const AISutil::String &origin, dChan& channel, const AISutil::String& newTopic);
+ void handleTopic(const AIS::Util::String &origin, dChan& channel, const AIS::Util::String& newTopic);
void handleChannelJoin(User& origin, dChan& channel, const int& status);
void handleChannelPart(User& origin, dChan& channel);
- void handleChannelMode(dChan& channel, const AISutil::String& modes, const AISutil::String& target,
- const AISutil::String& source);
+ void handleChannelMode(dChan& channel, const AIS::Util::String& modes, const AIS::Util::String& target,
+ const AIS::Util::String& source);
// Add a module to the list
- Service* const loadModule(const AISutil::String& fileName,
- AISutil::String& errString);
+ Service* const loadModule(const AIS::Util::String& fileName,
+ AIS::Util::String& errString);
// Remove a module from the list, and unload it
void unloadModule(const Kine::Name& name,
- const AISutil::String& reason);
+ const AIS::Util::String& reason);
// Start all modules in the list
void startAll(Exordium::Services& services);
// Stop and unload all the modules in the list
- void unloadAll(const AISutil::String& reason);
+ void unloadAll(const AIS::Util::String& reason);
// Check if a module exists
bool exists(const Kine::Name& name) const;
// Throw a line at the appropriate service (sent directly)
- void throwLine(const Kine::Name& name, AISutil::StringTokens& line,
+ void throwLine(const Kine::Name& name, AIS::Util::StringTokens& line,
User &origin, const bool safe);
// Throw a line at the appropriate service (sent to a channel)
- void throwLine(const Kine::Name& name, AISutil::StringTokens& line,
- User& origin, const AISutil::String& channel);
+ void throwLine(const Kine::Name& name, AIS::Util::StringTokens& line,
+ User& origin, const AIS::Util::String& channel);
// Dump a list of modules
- AISutil::String dumpModules(void) const;
+ AIS::Util::String dumpModules(void) const;
};
}; // namespace Exordium
|
|
From: <ir...@us...> - 2003-10-27 12:20:03
|
Update of /cvsroot/exordium/services/source/modules/mod.game/cards
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.game/cards
Modified Files:
card.cpp card.h hand.cpp
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: card.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/cards/card.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- card.cpp 31 Mar 2003 09:01:47 -0000 1.9
+++ card.cpp 27 Oct 2003 12:15:12 -0000 1.10
@@ -33,8 +33,8 @@
#include "card.h"
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
/* This relates closely to the enumeration list in the card class. For
Index: card.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/cards/card.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- card.h 31 Mar 2003 09:01:48 -0000 1.7
+++ card.h 27 Oct 2003 12:15:13 -0000 1.8
@@ -117,7 +117,7 @@
{};
// Constructor, but using a string (such as "Queen of hearts")
- Card(const AISutil::String& name);
+ Card(const AIS::Util::String& name);
// Return the suit this card belongs to
const unsigned char getSuit(void) const
@@ -170,7 +170,7 @@
bool operator<(const Card& rhs) const;
// Help people find a suit..
- static unsigned char findSuit(const AISutil::String& suitName);
+ static unsigned char findSuit(const AIS::Util::String& suitName);
// Help people name a suit..
static const char* nameSuit(const unsigned char suit);
Index: hand.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/cards/hand.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hand.cpp 12 Mar 2003 18:31:38 -0000 1.4
+++ hand.cpp 27 Oct 2003 12:15:13 -0000 1.5
@@ -33,7 +33,7 @@
#include "hand.h"
-using AISutil::String;
+using AIS::Util::String;
/* getHandStr - Grab the name of the cards in this hand
|
|
From: <ir...@us...> - 2003-10-27 12:20:01
|
Update of /cvsroot/exordium/services/source/modules/mod.help
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.help
Modified Files:
help.cpp help.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: help.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.help/help.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- help.cpp 29 Mar 2003 23:06:24 -0000 1.5
+++ help.cpp 27 Oct 2003 12:15:13 -0000 1.6
@@ -33,8 +33,8 @@
#include <exordium/services.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium::HelpModule;
Index: help.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.help/help.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- help.h 26 Oct 2003 21:42:13 -0000 1.5
+++ help.h 27 Oct 2003 12:15:13 -0000 1.6
@@ -32,7 +32,7 @@
#include <aisutil/string.h>
#define HELP_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& tokens)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& tokens)
namespace Exordium {
@@ -61,9 +61,9 @@
// Start the module
bool start(Exordium::Services& s);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel)
{};
|
|
From: <ir...@us...> - 2003-10-27 12:19:58
|
Update of /cvsroot/exordium/services/source/modules/mod.love
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.love
Modified Files:
love.cpp love.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: love.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.love/love.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- love.cpp 31 Mar 2003 09:28:15 -0000 1.14
+++ love.cpp 27 Oct 2003 12:15:13 -0000 1.15
@@ -42,8 +42,8 @@
#include <kineircd/config.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium::LoveModule;
Index: love.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.love/love.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- love.h 26 Oct 2003 21:42:14 -0000 1.12
+++ love.h 27 Oct 2003 12:15:13 -0000 1.13
@@ -33,7 +33,7 @@
# define LOVE_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& line)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& line)
namespace Exordium {
@@ -60,7 +60,7 @@
// How to send private-messages (stepping-stone)
void sendMessage(Exordium::User& recipient,
- const AISutil::String& message)
+ const AIS::Util::String& message)
{ recipient.sendMessage(message, getNickname()); };
public:
@@ -77,12 +77,12 @@
bool start(Exordium::Services& s);
// Parser for incoming stuff sent on a channel
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel)
{ /* Nothing! Bwa ha ha ha hahahahaHEHhEHahehaheAEhaHAEhaE!!! */ };
// Parser for incoming stuff sent directly to us
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
// Grab the information structure of a module
|
|
From: <ir...@us...> - 2003-10-27 12:19:48
|
Update of /cvsroot/exordium/services/source/modules/mod.credits
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.credits
Modified Files:
credits.cpp credits.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: credits.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.credits/credits.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- credits.cpp 31 Mar 2003 09:28:14 -0000 1.13
+++ credits.cpp 27 Oct 2003 12:15:11 -0000 1.14
@@ -37,8 +37,8 @@
using namespace Exordium::CreditsModule;
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using Exordium::User;
Index: credits.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.credits/credits.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- credits.h 26 Oct 2003 21:42:13 -0000 1.12
+++ credits.h 27 Oct 2003 12:15:11 -0000 1.13
@@ -36,8 +36,8 @@
# include <libbank/bank.h>
# define CREDITS_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& line, \
- const AISutil::String& channel)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& line, \
+ const AIS::Util::String& channel)
namespace Exordium {
namespace CreditsModule {
@@ -84,11 +84,11 @@
bool start(Exordium::Services& s);
// Stop the module (called just before a module is unloaded)
- void stop(const AISutil::String& reason);
+ void stop(const AIS::Util::String& reason);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel)
{};
|
|
From: <ir...@us...> - 2003-10-27 12:19:45
|
Update of /cvsroot/exordium/services/source/modules/mod.game
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.game
Modified Files:
channelgame.h config.cpp config.h exordi8.cpp exordi8.h
factory.h game.cpp game.h hangman.cpp hangman.h poker.cpp
poker.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: channelgame.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/channelgame.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- channelgame.h 29 Mar 2003 23:06:23 -0000 1.8
+++ channelgame.h 27 Oct 2003 12:15:11 -0000 1.9
@@ -36,7 +36,7 @@
# define CHANNEL_GAME_CREATOR_FUNC_NO_EXTERN(x) \
ChannelGame* x(Exordium::GameModule::Module& module, \
- const AISutil::String& channel, Exordium::User& caller)
+ const AIS::Util::String& channel, Exordium::User& caller)
# define CHANNEL_GAME_CREATOR_FUNCTION \
extern "C" CHANNEL_GAME_CREATOR_FUNC_NO_EXTERN(game_init)
@@ -48,7 +48,7 @@
Exordium::GameModule::Module& module;
// The channel we are playing on
- const AISutil::String channel;
+ const AIS::Util::String channel;
public:
// Our convenient type-definition of a creator function
@@ -61,7 +61,7 @@
} static const channelGameTable[];
// Constructor
- ChannelGame(Exordium::GameModule::Module& m, const AISutil::String& c)
+ ChannelGame(Exordium::GameModule::Module& m, const AIS::Util::String& c)
: module(m),
channel(c)
{};
@@ -71,15 +71,15 @@
{};
// Our line parser - where channel commands for us are sent
- virtual bool parseLine(Exordium::User& origin, AISutil::String& command,
- AISutil::StringTokens& tokens) = 0;
+ virtual bool parseLine(Exordium::User& origin, AIS::Util::String& command,
+ AIS::Util::StringTokens& tokens) = 0;
// Grab the channel this channel game is on
- const AISutil::String& getChannel(void) const
+ const AIS::Util::String& getChannel(void) const
{ return channel; };
// Send a message to the channel
- void sendMessage(const AISutil::String& message) const
+ void sendMessage(const AIS::Util::String& message) const
{
module.getServices().servicePrivmsg(message, module.getNickname(),
channel);
@@ -87,7 +87,7 @@
// Send a message to someone (specified)
void sendMessage(Exordium::User& nick,
- const AISutil::String& message) const
+ const AIS::Util::String& message) const
{ nick.sendMessage(message, module.getNickname()); };
};
Index: config.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/config.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config.cpp 12 Mar 2003 18:31:35 -0000 1.7
+++ config.cpp 27 Oct 2003 12:15:11 -0000 1.8
@@ -32,7 +32,7 @@
#include "factory.h"
// Game module configuration table
-const AISutil::ConfigParser::defTable_type Game::ConfigData::defTable = {
+const AIS::Util::ConfigParser::defTable_type Game::ConfigData::defTable = {
{
"DESCRIPTION", 4,
(void *)&ConfigData::defDescription, &varHandleString,
Index: config.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/config.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.h 26 Oct 2003 21:42:13 -0000 1.6
+++ config.h 27 Oct 2003 12:15:11 -0000 1.7
@@ -34,22 +34,22 @@
class ConfigData : public Exordium::Service::ConfigData {
private:
// Configuration information
- static const AISutil::ConfigParser::defTable_type defTable;
+ static const AIS::Util::ConfigParser::defTable_type defTable;
- const AISutil::String defModule;
+ const AIS::Util::String defModule;
static LIBAISUTIL_CONFIG_VARIABLE_HANDLER(varHandleModule);
public:
// Constructor
- ConfigData(const AISutil::String& d)
+ ConfigData(const AIS::Util::String& d)
: Exordium::Service::ConfigData(d, "exordium.org", "Game", "game")
{};
// Grab the configuration definition table (over-write the original)
- const AISutil::ConfigParser::defTable_type& getDefinitions(void) const
+ const AIS::Util::ConfigParser::defTable_type& getDefinitions(void) const
{ return defTable; };
- const AISutil::String& getModule(void) const
+ const AIS::Util::String& getModule(void) const
{ return defModule; };
};
Index: exordi8.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/exordi8.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- exordi8.cpp 7 Apr 2003 13:10:50 -0000 1.15
+++ exordi8.cpp 27 Oct 2003 12:15:11 -0000 1.16
@@ -34,8 +34,8 @@
#include "exordi8.h"
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
CHANNEL_GAME_CREATOR_FUNCTION
{
Index: exordi8.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/exordi8.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exordi8.h 7 Apr 2003 13:10:54 -0000 1.8
+++ exordi8.h 27 Oct 2003 12:15:12 -0000 1.9
@@ -38,7 +38,7 @@
# include "cards/stock.h"
# define EXORDI8_FUNC(x) \
- bool x(Exordium::User& origin, AISutil::StringTokens& line)
+ bool x(Exordium::User& origin, AIS::Util::StringTokens& line)
class Exordi8 : public ChannelGame {
@@ -98,7 +98,7 @@
void showHand(const player_type& player) const;
// Jump to the next player, telling the channel why
- void nextPlayer(const AISutil::String& why, bool withMatchNotify = true);
+ void nextPlayer(const AIS::Util::String& why, bool withMatchNotify = true);
// Function handlers
EXORDI8_FUNC(parseDEAL);
@@ -116,8 +116,8 @@
Exordium::User& caller);
// Parse a line..
- bool parseLine(Exordium::User& origin, AISutil::String& command,
- AISutil::StringTokens& tokens);
+ bool parseLine(Exordium::User& origin, AIS::Util::String& command,
+ AIS::Util::StringTokens& tokens);
};
#endif // _SOURCE_MODULES_GAME_EXORDI8_H_
Index: factory.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/factory.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- factory.h 5 Nov 2002 10:29:10 -0000 1.3
+++ factory.h 27 Oct 2003 12:15:12 -0000 1.4
@@ -38,11 +38,11 @@
namespace Exordium {
namespace GameModule {
typedef ChannelGame* (*GameCallback)(Exordium::GameModule::Module& module,
- const AISutil::String& channel, Exordium::User& caller);
+ const AIS::Util::String& channel, Exordium::User& caller);
class Factory {
private:
- typedef std::map<const AISutil::String, GameCallback> CallbackMap;
+ typedef std::map<const AIS::Util::String, GameCallback> CallbackMap;
CallbackMap callbacks;
Factory() { }
@@ -57,12 +57,12 @@
}
~Factory() { }
- bool registerType(const AISutil::String& name, GameCallback createFn)
+ bool registerType(const AIS::Util::String& name, GameCallback createFn)
{
return callbacks.insert(CallbackMap::value_type(name, createFn)).second;
};
- bool registerModule(const AISutil::String& fileName)
+ bool registerModule(const AIS::Util::String& fileName)
{
// Try to load the module
void* const handle = dlopen(fileName.c_str(), RTLD_NOW);
@@ -88,9 +88,9 @@
}
// Extract the name of the game from the filename
- AISutil::String::size_type pos = fileName.find("game_",0) + 5;
+ AIS::Util::String::size_type pos = fileName.find("game_",0) + 5;
- AISutil::String name = fileName.substr(pos,
+ AIS::Util::String name = fileName.substr(pos,
(fileName.length() - pos - 3));
#ifdef DEBUG
@@ -99,18 +99,18 @@
return registerType(name, initfunc);
}
- bool unregisterType(const AISutil::String& name)
+ bool unregisterType(const AIS::Util::String& name)
{
return callbacks.erase(name);
};
- bool unregisterModule(const AISutil::String& name)
+ bool unregisterModule(const AIS::Util::String& name)
{
};
- const std::list<AISutil::String> listModules(void)
+ const std::list<AIS::Util::String> listModules(void)
{
- std::list<AISutil::String> retList;
+ std::list<AIS::Util::String> retList;
for(CallbackMap::const_iterator iter = callbacks.begin();
iter != callbacks.end(); iter++)
{
@@ -120,9 +120,9 @@
return retList;
};
- ChannelGame* createGame(const AISutil::String& name,
+ ChannelGame* createGame(const AIS::Util::String& name,
Exordium::GameModule::Module& module,
- const AISutil::String& channel, Exordium::User& caller)
+ const AIS::Util::String& channel, Exordium::User& caller)
{
CallbackMap::const_iterator iter = callbacks.find(name);
if(iter == callbacks.end())
Index: game.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/game.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- game.cpp 7 Apr 2003 13:10:55 -0000 1.20
+++ game.cpp 27 Oct 2003 12:15:12 -0000 1.21
@@ -38,8 +38,8 @@
#include "factory.h"
using namespace Exordium::GameModule;
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using Exordium::Channel;
using Exordium::User;
@@ -268,7 +268,7 @@
*/
GAME_FUNC(Module::handleLIST)
{
- typedef std::list<AISutil::String> StringList;
+ typedef std::list<AIS::Util::String> StringList;
StringList::const_iterator iter;
// Get module list
Index: game.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/game.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- game.h 7 Apr 2003 13:10:56 -0000 1.9
+++ game.h 27 Oct 2003 12:15:12 -0000 1.10
@@ -34,8 +34,8 @@
# include "config.h"
# define GAME_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& line, \
- const AISutil::String& channel)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& line, \
+ const AIS::Util::String& channel)
// Forward declarations
@@ -69,7 +69,7 @@
static const commandTable_type channelCommandTable[];
// A list of channel games currently in progress
- typedef std::map < AISutil::String, ChannelGame* > channelGames_type;
+ typedef std::map < AIS::Util::String, ChannelGame* > channelGames_type;
channelGames_type channelGames;
// Command handlers
@@ -96,12 +96,12 @@
bool start(Exordium::Services& s);
// Stop the module (called just before a module is unloaded)
- void stop(const AISutil::String& reason);
+ void stop(const AIS::Util::String& reason);
// Parser for incoming stuff
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel);
// Grab the information structure of a module
Index: hangman.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/hangman.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hangman.cpp 7 Apr 2003 13:10:56 -0000 1.13
+++ hangman.cpp 27 Oct 2003 12:15:12 -0000 1.14
@@ -38,8 +38,8 @@
#include "hangman.h"
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
// This is needed for translate since it doesn't like tolower gcc 3.x
//inline char tolower_wrapper (char ch) { return tolower(ch); }
Index: hangman.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/hangman.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hangman.h 7 Apr 2003 13:10:57 -0000 1.9
+++ hangman.h 27 Oct 2003 12:15:12 -0000 1.10
@@ -37,7 +37,7 @@
# include "cards/card.h"
# define EXORDI8_FUNC(x) \
- bool x(Exordium::User& origin, AISutil::StringTokens& line)
+ bool x(Exordium::User& origin, AIS::Util::StringTokens& line)
class Hangman : public ChannelGame {
private:
@@ -75,7 +75,7 @@
bool quiet = false);
// Jump to the next player, telling the channel why
- void nextPlayer(const AISutil::String& why, bool withMatchNotify = true);
+ void nextPlayer(const AIS::Util::String& why, bool withMatchNotify = true);
// Read in a random word depending on the number of chars set
bool getLevelData(unsigned int numChars);
@@ -85,7 +85,7 @@
void showHangman(const Exordium::User& player);
// Temporary list of words selected from
- typedef std::vector <AISutil::String> WordList;
+ typedef std::vector <AIS::Util::String> WordList;
// Function handlers
EXORDI8_FUNC(parsePLAY);
@@ -96,11 +96,11 @@
// EXORDI8_FUNC(parseDIFFICULTY);
// This is the word to be guessed
- AISutil::String word;
+ AIS::Util::String word;
// Letters already tried
- AISutil::String wrongGuesses;
- AISutil::String correctGuesses;
+ AIS::Util::String wrongGuesses;
+ AIS::Util::String correctGuesses;
// Number of wrong guesses
unsigned int numWrongGuesses;
@@ -115,8 +115,8 @@
// { return new Hangman(module, channel, caller); }
// Parse a line..
- bool parseLine(Exordium::User& origin, AISutil::String& command,
- AISutil::StringTokens& tokens);
+ bool parseLine(Exordium::User& origin, AIS::Util::String& command,
+ AIS::Util::StringTokens& tokens);
};
#endif // _SOURCE_MODULES_GAME_HANGMAN_H_
Index: poker.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/poker.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- poker.cpp 7 Apr 2003 13:10:57 -0000 1.10
+++ poker.cpp 27 Oct 2003 12:15:12 -0000 1.11
@@ -35,8 +35,8 @@
#include "poker.h"
#include "cards/pack.h"
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
CHANNEL_GAME_CREATOR_FUNCTION
{
Index: poker.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.game/poker.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- poker.h 7 Apr 2003 13:10:58 -0000 1.9
+++ poker.h 27 Oct 2003 12:15:12 -0000 1.10
@@ -38,7 +38,7 @@
# include "cards/stock.h"
# define EXORDI8_FUNC(x) \
- bool x(Exordium::User& origin, AISutil::StringTokens& line)
+ bool x(Exordium::User& origin, AIS::Util::StringTokens& line)
class Poker : public ChannelGame {
private:
@@ -95,7 +95,7 @@
void showHand(const player_type& player) const;
// Jump to the next player, telling the channel why
- void nextPlayer(const AISutil::String& why, bool withMatchNotify = true);
+ void nextPlayer(const AIS::Util::String& why, bool withMatchNotify = true);
// Function handlers
EXORDI8_FUNC(parseDEAL);
@@ -112,8 +112,8 @@
Exordium::User& caller);
// Parse a line..
- bool parseLine(Exordium::User& origin, AISutil::String& command,
- AISutil::StringTokens& tokens);
+ bool parseLine(Exordium::User& origin, AIS::Util::String& command,
+ AIS::Util::StringTokens& tokens);
};
#endif // _SOURCE_MODULES_GAME_POKER_H_
|
|
From: <ir...@us...> - 2003-10-27 12:19:41
|
Update of /cvsroot/exordium/services/source/modules/mod.chan
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.chan
Modified Files:
chan.cpp chan.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: chan.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.chan/chan.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- chan.cpp 26 Oct 2003 21:42:13 -0000 1.58
+++ chan.cpp 27 Oct 2003 12:15:11 -0000 1.59
@@ -40,9 +40,9 @@
#include <exordium/database/database.h>
#include <aisutil/utils.h>
-using AISutil::String;
-using AISutil::StringTokens;
-using AISutil::Utils;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
+using AIS::Util::Utils;
using namespace Exordium::ChanModule;
struct Module::functionTableStruct const
@@ -179,7 +179,7 @@
if(command=="log")
{
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
ptr->setChanLog(true);
ptr->log(origin,getNickname(),"Enabled channel log email",channel);
@@ -201,7 +201,7 @@
if(command=="secureops" || command=="secure")
{
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
ptr->setChanSecure(true);
ptr->log(origin,getNickname(),"Enabled secure ops",channel);
@@ -222,7 +222,7 @@
//
if(command=="enforcebans")
{
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
ptr->setEnforceBans(true);
ptr->log(origin,getNickname(),"Enabled ban enforcement",channel);
@@ -244,7 +244,7 @@
//
if(command=="tracktopics")
{
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
ptr->setTrackTopics(true);
ptr->log(origin,getNickname(),"Enabled topic tracking",channel);
@@ -265,7 +265,7 @@
if(command=="mlock")
{
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
ptr->setModeLock(true);
ptr->log(origin,getNickname(),"Enabled mode lock",channel);
@@ -359,7 +359,7 @@
if(command=="private")
{
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
ptr->setPrivate(true);
ptr->log(origin,getNickname(),"Enabled Private mode",channel);
Index: chan.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.chan/chan.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- chan.h 26 Oct 2003 21:42:13 -0000 1.19
+++ chan.h 27 Oct 2003 12:15:11 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Id$
+T/* $Id$
*
* Exordium Network Services
* Copyright (C) 2002 IRCDome Development Team
@@ -36,8 +36,8 @@
# include <aisutil/string.h>
# define CHAN_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& tokens, \
- AISutil::String &chan)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& tokens, \
+ AIS::Util::String &chan)
namespace Exordium {
@@ -67,23 +67,23 @@
bool start(Exordium::Services& s);
// Stop the module (called just before a module is unloaded)
- void stop(const AISutil::String& reason);
+ void stop(const AIS::Util::String& reason);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel);
void handleAway(Exordium::User& origin,
- const AISutil::String& reason);
+ const AIS::Util::String& reason);
- void handleTopic(const Kine::Name&, dChan& channel, const AISutil::String &);
+ void handleTopic(const Kine::Name&, dChan& channel, const AIS::Util::String &);
void handleChannelJoin(User& origin, dChan &channel, const int &status);
void handleChannelPart(User& origin, dChan &channel);
- void handleChannelMode( dChan &channel, const AISutil::String &modes,
- const AISutil::String &target, const AISutil::String &source );
+ void handleChannelMode( dChan &channel, const AIS::Util::String &modes,
+ const AIS::Util::String &target, const AIS::Util::String &source );
// Grab the information structure of a module
virtual const moduleInfo_type& getModuleInfo(void) const
|
|
From: <ir...@us...> - 2003-10-27 12:19:21
|
Update of /cvsroot/exordium/services/source/modules/mod.vote
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.vote
Modified Files:
vote.cpp vote.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: vote.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.vote/vote.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- vote.cpp 29 Mar 2003 23:06:26 -0000 1.15
+++ vote.cpp 27 Oct 2003 12:15:14 -0000 1.16
@@ -33,8 +33,8 @@
#include <exordium/channel.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium::VoteModule;
Index: vote.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.vote/vote.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- vote.h 26 Oct 2003 21:42:15 -0000 1.16
+++ vote.h 27 Oct 2003 12:15:15 -0000 1.17
@@ -34,7 +34,7 @@
#include <aisutil/string.h>
# define VOTE_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& tokens)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& tokens)
#include <exordium/service.h>
@@ -65,9 +65,9 @@
// Start the module
bool start(Exordium::Services& s);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel)
{};
|
|
From: <ir...@us...> - 2003-10-27 12:19:20
|
Update of /cvsroot/exordium/services/source/modules/mod.serv
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.serv
Modified Files:
serv.cpp serv.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: serv.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.serv/serv.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- serv.cpp 26 Oct 2003 21:42:14 -0000 1.42
+++ serv.cpp 27 Oct 2003 12:15:14 -0000 1.43
@@ -42,8 +42,8 @@
#include <stdio.h>
#include <time.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium::ServModule;
const Module::functionTableStruct Module::functionTable[] =
Index: serv.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.serv/serv.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serv.h 26 Oct 2003 21:42:14 -0000 1.17
+++ serv.h 27 Oct 2003 12:15:14 -0000 1.18
@@ -30,7 +30,7 @@
# include <aisutil/string.h>
# define SERV_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& tokens)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& tokens)
# include <exordium/service.h>
# include <kineircd/config.h>
@@ -62,9 +62,9 @@
// Start the module
bool start(Exordium::Services& s);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel)
{};
@@ -78,8 +78,8 @@
{ return configData; };
// Public functions here please!.
- void addFreeze(Kine::Name const &,AISutil::String const &,
- int const &,AISutil::String const &);
+ void addFreeze(Kine::Name const &,AIS::Util::String const &,
+ int const &,AIS::Util::String const &);
int timesFreezed(Kine::Name const &);
bool isFreezed(Kine::Name const &);
void delFreeze(Kine::Name const &);
|
|
From: <ir...@us...> - 2003-10-27 12:19:18
|
Update of /cvsroot/exordium/services/source/modules/mod.oper
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.oper
Modified Files:
oper.cpp oper.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: oper.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.oper/oper.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- oper.cpp 11 Apr 2003 17:42:22 -0000 1.37
+++ oper.cpp 27 Oct 2003 12:15:14 -0000 1.38
@@ -35,8 +35,8 @@
#include <exordium/services.h>
#include <exordium/server.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium::OperModule;
const Module::functionTableStruct Module::functionTable[] =
Index: oper.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.oper/oper.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- oper.h 26 Oct 2003 21:42:14 -0000 1.19
+++ oper.h 27 Oct 2003 12:15:14 -0000 1.20
@@ -32,7 +32,7 @@
#include <aisutil/string.h>
#define OPER_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& tokens)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& tokens)
namespace Exordium {
@@ -61,9 +61,9 @@
// Start the module
bool start(Exordium::Services& s);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel)
{};
|
|
From: <ir...@us...> - 2003-10-27 12:19:14
|
Update of /cvsroot/exordium/services/source/modules/mod.note
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.note
Modified Files:
note.cpp note.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: note.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.note/note.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- note.cpp 31 Mar 2003 09:38:00 -0000 1.21
+++ note.cpp 27 Oct 2003 12:15:13 -0000 1.22
@@ -36,8 +36,8 @@
#include "language.h"
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium::NoteModule;
Index: note.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.note/note.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- note.h 26 Oct 2003 21:42:14 -0000 1.16
+++ note.h 27 Oct 2003 12:15:13 -0000 1.17
@@ -34,7 +34,7 @@
# include <aisutil/string.h>
# define NOTE_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& tokens)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& tokens)
# include <exordium/service.h>
@@ -68,11 +68,11 @@
bool start(Exordium::Services& s);
// Stop the module (called just before a module is unloaded)
- void stop(const AISutil::String& reason);
+ void stop(const AIS::Util::String& reason);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util ::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel)
{ return; };
|
|
From: <ir...@us...> - 2003-10-27 12:17:39
|
Update of /cvsroot/exordium/services/source
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source
Modified Files:
module.cpp
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: module.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/module.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- module.cpp 29 Mar 2003 07:16:53 -0000 1.58
+++ module.cpp 27 Oct 2003 12:15:10 -0000 1.59
@@ -124,7 +124,7 @@
{ return moduleInfo; };
// Return our configuration data class
- AISutil::ConfigData* const getConfigData(void)
+ AIS::Util::ConfigData* const getConfigData(void)
{ return &config; };
// this is called just before the module is actually going to be used
|
|
From: <ir...@us...> - 2003-10-27 12:17:39
|
Update of /cvsroot/exordium/services/source/modules/mod.bot
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.bot
Modified Files:
bot.cpp bot.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: bot.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.bot/bot.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bot.cpp 7 Apr 2003 13:10:44 -0000 1.14
+++ bot.cpp 27 Oct 2003 12:15:10 -0000 1.15
@@ -35,8 +35,8 @@
#include <exordium/services.h>
#include <map>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium::BotModule;
Index: bot.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.bot/bot.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- bot.h 7 Apr 2003 13:10:45 -0000 1.13
+++ bot.h 27 Oct 2003 12:15:10 -0000 1.14
@@ -39,8 +39,8 @@
#define BOT_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& tokens, \
- AISutil::String& chan)
+ void x(Exordium::User& origin, AIS::Util::StringTokens& tokens, \
+ AIS::Util::String& chan)
namespace Exordium {
@@ -58,8 +58,8 @@
BOT_FUNC((Module::* const function));
} static const functionTable[];
- void sendMessage(const AISutil::String& to,
- const AISutil::String& message)
+ void sendMessage(const AIS::Util::String& to,
+ const AIS::Util::String& message)
{ services->serviceNotice(message,getNickname(),to); };
public:
@@ -73,9 +73,9 @@
// Start the module
bool start(Exordium::Services& s);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const Kine::Name& channel);
|
|
From: <ir...@us...> - 2003-10-27 12:17:11
|
Update of /cvsroot/exordium/services/source/modules/mod.nick
In directory sc8-pr-cvs1:/tmp/cvs-serv11500/source/modules/mod.nick
Modified Files:
nick.cpp nick.h
Log Message:
Should be the last of the AISutil ->> AIS::Util commits
Index: nick.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.nick/nick.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- nick.cpp 26 Oct 2003 21:42:14 -0000 1.52
+++ nick.cpp 27 Oct 2003 12:15:13 -0000 1.53
@@ -38,9 +38,9 @@
#include <sstream>
#include <aisutil/utils.h>
-using AISutil::String;
-using AISutil::StringTokens;
-using AISutil::Utils;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
+using AIS::Util::Utils;
using namespace Exordium::NickModule;
/* Event Handlers */
@@ -283,7 +283,7 @@
return;
}
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
origin.setModNick(true);
origin.sendMessage(GETLANG(nick_MODNICK_NOW_ON),
@@ -292,7 +292,7 @@
return;
}
- if(AISutil::Utils::toBool(value)==0)
+ if(AIS::Util::Utils::toBool(value)==0)
{
origin.setModNick(false);
origin.sendMessage(GETLANG(nick_MODNICK_NOW_OFF),
@@ -313,7 +313,7 @@
getNickname());
return;
}
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
origin.setDeopAway(true);
origin.sendMessage(GETLANG(nick_DEOPAWAY_NOW_ON),
@@ -321,7 +321,7 @@
origin.log(getNickname(),"Changed deoponaway to enabled");
return;
}
- if(AISutil::Utils::toBool(value)==0)
+ if(AIS::Util::Utils::toBool(value)==0)
{
origin.setDeopAway(false);
origin.sendMessage(GETLANG(nick_DEOPAWAY_NOW_OFF),
@@ -558,7 +558,7 @@
getNickname());
return;
}
- if(AISutil::Utils::toBool(value)==1)
+ if(AIS::Util::Utils::toBool(value)==1)
{
origin.setPrivmsg(true);
origin.sendMessage(GETLANG(nick_PRIVMSG_NOW_ON),
@@ -566,7 +566,7 @@
origin.log(getNickname(),"Changed privmsg interface to enabled");
return;
}
- if(AISutil::Utils::toBool(value)==0)
+ if(AIS::Util::Utils::toBool(value)==0)
{
origin.setPrivmsg(false);
origin.sendMessage(GETLANG(nick_PRIVMSG_NOW_OFF),
Index: nick.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.nick/nick.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- nick.h 26 Oct 2003 21:42:14 -0000 1.18
+++ nick.h 27 Oct 2003 12:15:13 -0000 1.19
@@ -32,7 +32,7 @@
# include <aisutil/string.h>
# define NICK_FUNC(x) \
- void x(Exordium::User& origin, AISutil::StringTokens& tokens, \
+ void x(Exordium::User& origin, AIS::Util::StringTokens& tokens, \
const bool safe)
@@ -46,8 +46,8 @@
// Configuration data class
Exordium::Service::ConfigData configData;
- void sendMessage(const AISutil::String& to,
- const AISutil::String& message)
+ void sendMessage(const AIS::Util::String& to,
+ const AIS::Util::String& message)
{ services->serviceNotice(message,getNickname(),to); };
public:
@@ -62,16 +62,16 @@
bool start(Exordium::Services& s);
// Stop the module (called just before a module is unloaded)
- void stop(const AISutil::String& reason);
+ void stop(const AIS::Util::String& reason);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
const bool safe);
- void parseLine(AISutil::StringTokens& line, Exordium::User& origin,
+ void parseLine(AIS::Util::StringTokens& line, Exordium::User& origin,
Kine::Name const &)
{};
- void nickLinkAdd(AISutil::String const &, AISutil::String const &);
- void nickLinkDel(AISutil::String const &, AISutil::String const &);
+ void nickLinkAdd(AIS::Util::String const &, AIS::Util::String const &);
+ void nickLinkDel(AIS::Util::String const &, AIS::Util::String const &);
/* Our Event Handler(s) */
void handleClientSignon(Exordium::User& origin);
|
|
From: <ir...@us...> - 2003-10-27 12:04:53
|
Update of /cvsroot/exordium/services/source/lib/database/postgresql
In directory sc8-pr-cvs1:/tmp/cvs-serv9494/source/lib/database/postgresql
Modified Files:
dbpgsql.cpp dbpgsql.h
Log Message:
source/lib/* changed over to AIS::UTil
Index: dbpgsql.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/database/postgresql/dbpgsql.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dbpgsql.cpp 12 Mar 2003 18:31:28 -0000 1.12
+++ dbpgsql.cpp 27 Oct 2003 12:03:29 -0000 1.13
@@ -35,7 +35,7 @@
#include "dbpgsql.h"
using namespace Exordium;
-using AISutil::String;
+using AIS::Util::String;
CPgSQL::~CPgSQL(void)
{
Index: dbpgsql.h
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/database/postgresql/dbpgsql.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dbpgsql.h 12 Mar 2003 18:31:28 -0000 1.5
+++ dbpgsql.h 27 Oct 2003 12:03:29 -0000 1.6
@@ -65,12 +65,12 @@
void dbConnect(void);
void dbDisconnect(void);
- void dbSelectDB(AISutil::String const &dbName);
+ void dbSelectDB(AIS::Util::String const &dbName);
- int dbQuery(AISutil::String const &query);
+ int dbQuery(AIS::Util::String const &query);
- AISutil::String dbGetValue(void);
- AISutil::String dbGetValue(int field);
+ AIS::Util::String dbGetValue(void);
+ AIS::Util::String dbGetValue(int field);
void dbGetRow(void);
@@ -83,7 +83,7 @@
// Locking is done automatically by postgresql
- void dbLock(AISutil::String const &table) {}
+ void dbLock(AIS::Util::String const &table) {}
void dbUnlock(void) {}
private:
|
|
From: <ir...@us...> - 2003-10-27 12:03:49
|
Update of /cvsroot/exordium/services/source/lib/database/mysql
In directory sc8-pr-cvs1:/tmp/cvs-serv9494/source/lib/database/mysql
Modified Files:
dbmysql.cpp dbmysql.h dbmysqlres.cpp dbmysqlres.h
Log Message:
source/lib/* changed over to AIS::UTil
Index: dbmysql.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/database/mysql/dbmysql.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dbmysql.cpp 26 Oct 2003 21:42:13 -0000 1.26
+++ dbmysql.cpp 27 Oct 2003 12:03:29 -0000 1.27
@@ -41,7 +41,7 @@
using namespace Exordium;
-using AISutil::String;
+using AIS::Util::String;
CMySQL::~CMySQL()
{
@@ -163,7 +163,7 @@
}
}
-void CMySQL::dbLock(AISutil::String const &table)
+void CMySQL::dbLock(AIS::Util::String const &table)
{
dbQuery("LOCK TABLES " + table + " WRITE");
}
Index: dbmysql.h
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/database/mysql/dbmysql.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dbmysql.h 26 Oct 2003 21:42:13 -0000 1.8
+++ dbmysql.h 27 Oct 2003 12:03:29 -0000 1.9
@@ -58,18 +58,18 @@
void dbConnect(void);
void dbDisconnect(void);
- void dbSelectDB(AISutil::String const &dbName);
+ void dbSelectDB(AIS::Util::String const &dbName);
- int dbQuery(AISutil::String const &query);
+ int dbQuery(AIS::Util::String const &query);
- AISutil::String dbGetValue(void);
- AISutil::String dbGetValue(int field);
+ AIS::Util::String dbGetValue(void);
+ AIS::Util::String dbGetValue(int field);
void dbGetRow(void);
void dbClearRes(void);
- void dbLock(AISutil::String const &table);
+ void dbLock(AIS::Util::String const &table);
void dbUnlock(void);
// Commit and roolback (transaction mode) not implemented in MySQL
Index: dbmysqlres.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/database/mysql/dbmysqlres.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbmysqlres.cpp 17 Mar 2003 12:50:13 -0000 1.4
+++ dbmysqlres.cpp 27 Oct 2003 12:03:29 -0000 1.5
@@ -38,7 +38,7 @@
#include <mysql/mysql.h>
using namespace Exordium;
-using AISutil::String;
+using AIS::Util::String;
// Constructor thingy ma bob
CMySQLRes::CMySQLRes(MYSQL_RES ptr)
Index: dbmysqlres.h
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/database/mysql/dbmysqlres.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbmysqlres.h 17 Mar 2003 12:50:14 -0000 1.4
+++ dbmysqlres.h 27 Oct 2003 12:03:29 -0000 1.5
@@ -55,7 +55,7 @@
{};
// Defintions
- AISutil::String getValue(const int &,const int &);
+ AIS::UTil::String getValue(const int &,const int &);
//functions.
int getRows(void)
|
|
From: <ir...@us...> - 2003-10-27 12:03:48
|
Update of /cvsroot/exordium/services/source/lib/database
In directory sc8-pr-cvs1:/tmp/cvs-serv9494/source/lib/database
Modified Files:
database.cpp
Log Message:
source/lib/* changed over to AIS::UTil
Index: database.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/database/database.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- database.cpp 26 Mar 2003 21:45:01 -0000 1.19
+++ database.cpp 27 Oct 2003 12:03:29 -0000 1.20
@@ -39,7 +39,7 @@
#endif
using namespace Exordium;
-using AISutil::String;
+using AIS::Util::String;
CDatabase::CDatabase(Config &c) : config(c)
{
@@ -133,7 +133,7 @@
return database->dbGetValue().toInt();
}
-int CDatabase::dbSelect(AISutil::String const &fields, AISutil::String const &table, AISutil::String const &whereargs,AISutil::String const &orderargs)
+int CDatabase::dbSelect(AIS::Util::String const &fields, AIS::Util::String const &table, AIS::Util::String const &whereargs,AIS::Util::String const &orderargs)
{
database->dbQuery("SELECT COUNT(*) FROM " + table + " WHERE " + whereargs + " ORDER BY " + orderargs);
return database->dbGetValue().toInt();
|
|
From: <ir...@us...> - 2003-10-27 12:03:47
|
Update of /cvsroot/exordium/services/source/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv9494/source/lib
Modified Files:
channel.cpp config.cpp config.h console.cpp dchan.cpp
modules.cpp parser.cpp server.cpp service.cpp services.cpp
services.h static.cpp user.cpp utils.cpp
Log Message:
source/lib/* changed over to AIS::UTil
Index: channel.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/channel.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- channel.cpp 26 Oct 2003 21:42:13 -0000 1.51
+++ channel.cpp 27 Oct 2003 12:03:28 -0000 1.52
@@ -34,8 +34,8 @@
#include "exordium/services.h"
using namespace Exordium;
-using AISutil::String;
-using AISutil::StringMask;
+using AIS::Util::String;
+using AIS::Util::StringMask;
namespace Exordium
{
Index: config.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/config.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config.cpp 27 Oct 2003 11:49:14 -0000 1.10
+++ config.cpp 27 Oct 2003 12:03:28 -0000 1.11
@@ -40,7 +40,7 @@
// Information used by the configuration parser
-const AISutil::ConfigParser::defTable_type ConfigInternal::definitionTable =
+const AIS::Util::ConfigParser::defTable_type ConfigInternal::definitionTable =
{
{
"CONSOLE", 7,
@@ -98,7 +98,7 @@
// 'CONSOLE' class definition table
-const AISutil::ConfigParser::defTable_type ConfigInternal::defClassConsole =
+const AIS::Util::ConfigParser::defTable_type ConfigInternal::defClassConsole =
{
{
"DESCRIPTION", 4,
@@ -130,7 +130,7 @@
// 'SQL' class definition table
-const AISutil::ConfigParser::defTable_type ConfigInternal::defClassSql =
+const AIS::Util::ConfigParser::defTable_type ConfigInternal::defClassSql =
{
{
"DATABASE", 8,
@@ -280,7 +280,7 @@
// Parse the module's configuration data
return
- AISutil::ConfigParser::parse(configData, position,
+ AIS::Util::ConfigParser::parse(configData, position,
((void *)
&(service->getConfigData().getDefinitions())),
service->getConfigData());
@@ -292,7 +292,7 @@
* 18/09/2002 pickle - Modified to suit Exordium
* Note: This is the same as the class handler, except the module is
* responsible for the configuration of its defaults. Remember that
- * the AISutil::ConfigParser routines are designed to be totally
+ * the AIS::Util::ConfigParser routines are designed to be totally
* passive..
*/
LIBAISUTIL_CONFIG_VARIABLE_HANDLER(ConfigInternal::varHandleModule)
Index: config.h
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/config.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config.h 6 Apr 2003 17:40:58 -0000 1.10
+++ config.h 27 Oct 2003 12:03:28 -0000 1.11
@@ -36,21 +36,21 @@
class ConfigInternal : public Exordium::Config {
public:
// The definition table used by Kine's configuration parser
- static const AISutil::ConfigParser::defTable_type definitionTable;
+ static const AIS::Util::ConfigParser::defTable_type definitionTable;
private:
// Variables (top class from the definition table above)
Kine::Logger::Mask::lazy_type defLogMask; // Database logging mask
- AISutil::String defUnderlingDescription; // Underling server description
- AISutil::String defUplinkHost; // Uplink Host (temporary)
+ AIS::Util::String defUnderlingDescription; // Underling server description
+ AIS::Util::String defUplinkHost; // Uplink Host (temporary)
unsigned short defUplinkPort; // Uplink Port (temporary)
- AISutil::String defUplinkPass; // Uplink Pass (temporary)
+ AIS::Util::String defUplinkPass; // Uplink Pass (temporary)
// 'CONSOLE' class and variables
- static const AISutil::ConfigParser::defTable_type defClassConsole;
- AISutil::String defConsoleDescription; // Console's real name field
+ static const AIS::Util::ConfigParser::defTable_type defClassConsole;
+ AIS::Util::String defConsoleDescription; // Console's real name field
bool defConsoleEnabled; // Is the console active?
- AISutil::String defConsoleHostname; // The console's host name
+ AIS::Util::String defConsoleHostname; // The console's host name
Kine::Name defConsoleName; // The console's nickname
Kine::Name defConsoleChan; // Console's channel
@@ -64,7 +64,7 @@
static LIBAISUTIL_CONFIG_VARIABLE_HANDLER(varHandleModule);
// 'SQL' class
- static const AISutil::ConfigParser::defTable_type defClassSql;
+ static const AIS::Util::ConfigParser::defTable_type defClassSql;
public:
// Constructor
@@ -77,23 +77,23 @@
const bool checkConfig(void) const;
// Top variables
- const AISutil::String& getUnderlingDescription(void) const
+ const AIS::Util::String& getUnderlingDescription(void) const
{ return defUnderlingDescription; };
- const AISutil::String& getUplinkHost(void) const
+ const AIS::Util::String& getUplinkHost(void) const
{ return defUplinkHost; };
const unsigned short getUplinkPort(void) const
{ return defUplinkPort; };
- const AISutil::String& getUplinkPass(void) const
+ const AIS::Util::String& getUplinkPass(void) const
{ return defUplinkPass; };
const Kine::Logger::Mask::lazy_type getLogMask(void) const
{ return defLogMask; };
// 'CONSOLE' class
- const AISutil::String& getConsoleDescription(void) const
+ const AIS::Util::String& getConsoleDescription(void) const
{ return defConsoleDescription; };
const bool getConsoleEnabled(void) const
{ return defConsoleEnabled; };
- const AISutil::String& getConsoleHostname(void) const
+ const AIS::Util::String& getConsoleHostname(void) const
{ return defConsoleHostname; };
const Kine::Name& getConsoleName(void) const
{ return defConsoleName; };
Index: console.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/console.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- console.cpp 26 Oct 2003 21:42:13 -0000 1.16
+++ console.cpp 27 Oct 2003 12:03:28 -0000 1.17
@@ -33,8 +33,8 @@
#include "core_language.h"
#include <assert.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium;
const struct Console::functionTableStruct Console::functionTable[] = {
Index: dchan.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/dchan.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dchan.cpp 11 Apr 2003 09:59:49 -0000 1.25
+++ dchan.cpp 27 Oct 2003 12:03:28 -0000 1.26
@@ -32,8 +32,8 @@
#include "exordium/dchan.h"
#include <aisutil/string.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium;
Index: modules.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/modules.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- modules.cpp 6 Apr 2003 17:40:58 -0000 1.34
+++ modules.cpp 27 Oct 2003 12:03:28 -0000 1.35
@@ -34,8 +34,8 @@
#include "modules.h"
using namespace Exordium;
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
/* ~Modules - Shut down all existing modules in the list
* Original 17/09/2002 pickle
@@ -260,7 +260,7 @@
*
*/
-void Modules::handleAway(User& origin, const AISutil::String &message) {
+void Modules::handleAway(User& origin, const AIS::Util::String &message) {
for (modules_type::const_iterator it = modules.begin();
it != modules.end(); it++) {
@@ -283,7 +283,7 @@
* to the appropiate modules who are listening for this event type.
*
*/
-void Modules::handleTopic(const AISutil::String &origin, dChan& channel, const AISutil::String &newTopic) {
+void Modules::handleTopic(const AIS::Util::String &origin, dChan& channel, const AIS::Util::String &newTopic) {
for (modules_type::const_iterator it = modules.begin();
it != modules.end(); it++) {
@@ -343,8 +343,8 @@
-void Modules::handleChannelMode(dChan &channel, const AISutil::String &modes, const AISutil::String &target,
- const AISutil::String& source) {
+void Modules::handleChannelMode(dChan &channel, const AIS::Util::String &modes, const AIS::Util::String &target,
+ const AIS::Util::String& source) {
for (modules_type::const_iterator it = modules.begin();
it != modules.end(); it++) {
Index: parser.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/parser.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- parser.cpp 26 Oct 2003 21:42:13 -0000 1.99
+++ parser.cpp 27 Oct 2003 12:03:28 -0000 1.100
@@ -45,8 +45,8 @@
#include <aisutil/string.h>
#include <kineircd/config.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium;
const struct Parser::functionTableStruct Parser::functionTable[] =
Index: server.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/server.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- server.cpp 11 Apr 2003 17:42:21 -0000 1.2
+++ server.cpp 27 Oct 2003 12:03:28 -0000 1.3
@@ -34,8 +34,8 @@
#include <aisutil/string.h>
#include <kineircd/config.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium;
Index: service.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/service.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- service.cpp 24 Mar 2003 18:31:54 -0000 1.9
+++ service.cpp 27 Oct 2003 12:03:28 -0000 1.10
@@ -31,7 +31,7 @@
#include "exordium/service.h"
// Default configuration definition table (for uninherited ConfigData classes)
-const AISutil::ConfigParser::defTable_type
+const AIS::Util::ConfigParser::defTable_type
Exordium::Service::ConfigData::defaultDefinitions = {
{
"DESCRIPTION", 4,
Index: services.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/services.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- services.cpp 26 Oct 2003 21:42:13 -0000 1.174
+++ services.cpp 27 Oct 2003 12:03:28 -0000 1.175
@@ -74,10 +74,10 @@
#include <aisutil/socket/sockets.h>
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using Kine::Password;
-using AISutil::StringMask;
+using AIS::Util::StringMask;
using Kine::Signals;
using namespace Exordium;
@@ -723,11 +723,11 @@
queueAdd (String (":") + service + " PART " + target);
}
-void ServicesInternal::serviceJoin(AISutil::String const &service,
- AISutil::String const &target)
+void ServicesInternal::serviceJoin(AIS::Util::String const &service,
+ AIS::Util::String const &target)
{
queueAdd(":" + Kine::config().getOptionsServerName() + " SJOIN " +
- AISutil::String::convert(currentTime) + " " + target +
+ AIS::Util::String::convert(currentTime) + " " + target +
" + :" + service);
};
Index: services.h
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/services.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- services.h 16 Apr 2003 20:09:15 -0000 1.36
+++ services.h 27 Oct 2003 12:03:28 -0000 1.37
@@ -44,15 +44,15 @@
ConfigInternal& config;
- typedef std::map <AISutil::String, User *> user_map;
- typedef std::map <AISutil::String, dChan *> chan_map;
- typedef std::map <AISutil::String, Server *> server_map;
+ typedef std::map <AIS::Util::String, User *> user_map;
+ typedef std::map <AIS::Util::String, dChan *> chan_map;
+ typedef std::map <AIS::Util::String, Server *> server_map;
user_map users;
chan_map chans;
server_map servers;
- const AISutil::String buffer;
+ const AIS::Util::String buffer;
int sock;
int maxSock;
char *inputBuffer;
@@ -73,9 +73,9 @@
unsigned long countTx;
unsigned long countRx;
unsigned long remoteAddress;
- std::queue < AISutil::String > outputQueue;
+ std::queue < AIS::Util::String > outputQueue;
std::string inputQueue;
- AISutil::SocketIPv4TCP socky;
+ AIS::Util::SocketIPv4TCP socky;
bool handleInput(void);
@@ -93,7 +93,7 @@
void disconnect(void);
bool connect(void);
bool queueFlush(void);
- AISutil::String parseHelp(AISutil::String const &);
+ AIS::Util::String parseHelp(AIS::Util::String const &);
void checkpoint(void);
@@ -128,10 +128,10 @@
void run(void);
// Function Declrations below here.
- void shutdown(const AISutil::String &);
+ void shutdown(const AIS::Util::String &);
- User* const addUser(const AISutil::String& name, const int oid);
+ User* const addUser(const AIS::Util::String& name, const int oid);
bool delUser(Kine::Name &);
User* findUser(Kine::Name &);
@@ -139,44 +139,44 @@
bool delChan(Kine::Name &);
dChan* findChan(Kine::Name &);
- Server* const addServer(const AISutil::String&, const int&,
- const AISutil::String&);
- bool delServer(AISutil::String &);
- Server* findServer(AISutil::String &);
+ Server* const addServer(const AIS::Util::String&, const int&,
+ const AIS::Util::String&);
+ bool delServer(AIS::Util::String &);
+ Server* findServer(AIS::Util::String &);
void setNick(User &,Kine::Name &);
- void mode(AISutil::String const &, AISutil::String const &,
- AISutil::String const &, AISutil::String const &);
+ void mode(AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &, AIS::Util::String const &);
// This shold be in the Service:: class
- void doHelp(User&, AISutil::String const &, AISutil::String const &,
- AISutil::String const &);
+ void doHelp(User&, AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &);
- void log(User&, AISutil::String const &, AISutil::String const &,
- AISutil::String const &);
- void log(User&, AISutil::String const &, AISutil::String const &);
+ void log(User&, AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &);
+ void log(User&, AIS::Util::String const &, AIS::Util::String const &);
// This is in the wrong place, surely
- void sendEmail(AISutil::String const &, AISutil::String const &,
- AISutil::String const &);
+ void sendEmail(AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &);
- void servicePart (AISutil::String const &, AISutil::String const &);
- void queueAdd (const AISutil::String& line);
+ void servicePart (AIS::Util::String const &, AIS::Util::String const &);
+ void queueAdd (const AIS::Util::String& line);
- void killnick (AISutil::String const &target,
- AISutil::String const &from,
- AISutil::String const &reason)
+ void killnick (AIS::Util::String const &target,
+ AIS::Util::String const &from,
+ AIS::Util::String const &reason)
{
queueAdd(":" + from + " KILL " + target + " :" + reason);
};
- void serviceNotice(AISutil::String const &line,
- AISutil::String const &service,
- AISutil::String const &target)
+ void serviceNotice(AIS::Util::String const &line,
+ AIS::Util::String const &service,
+ AIS::Util::String const &target)
{
if (usePrivmsg(target.toLower())) {
queueAdd(":" + service + " PRIVMSG " + target + " :" + line);
@@ -185,86 +185,86 @@
}
}
- void serviceNoticeForce(AISutil::String const &line,
- AISutil::String const &service,
- AISutil::String const &target)
+ void serviceNoticeForce(AIS::Util::String const &line,
+ AIS::Util::String const &service,
+ AIS::Util::String const &target)
{
queueAdd(":" + service + " NOTICE " + target + " :" + line);
}
- void servicePrivmsg(AISutil::String const &line,
- AISutil::String const &service,
- AISutil::String const &target)
+ void servicePrivmsg(AIS::Util::String const &line,
+ AIS::Util::String const &service,
+ AIS::Util::String const &target)
{
queueAdd(":" + service + " PRIVMSG " + target + " :" + line);
}
- void serviceQuit(const AISutil::String& name,
- const AISutil::String& reason)
+ void serviceQuit(const AIS::Util::String& name,
+ const AIS::Util::String& reason)
{
queueAdd(":" + name + " QUIT :" + reason);
};
// This does not modify a server mode, it should be renamed.
- void serverMode(AISutil::String const &chan, AISutil::String const &mode,
- AISutil::String const &target)
+ void serverMode(AIS::Util::String const &chan, AIS::Util::String const &mode,
+ AIS::Util::String const &target)
{
queueAdd(":Chan MODE " + chan + " " + mode + " " + target);
}
- void registerService(AISutil::String const &nick,
- AISutil::String const &user,
- AISutil::String const &host,
- AISutil::String const &realname)
+ void registerService(AIS::Util::String const &nick,
+ AIS::Util::String const &user,
+ AIS::Util::String const &host,
+ AIS::Util::String const &realname)
{
queueAdd ("NICK " + nick + " 1 1 +o " + user +
" " + host + " " + Kine::config().getOptionsServerName() +
" 0 0 :" + realname);
};
- void serviceJoin(AISutil::String const &service,
- AISutil::String const &target);
+ void serviceJoin(AIS::Util::String const &service,
+ AIS::Util::String const &target);
- bool usePrivmsg(AISutil::String const &);
+ bool usePrivmsg(AIS::Util::String const &);
// These should be moved to the new channel classes
- void serviceKick(AISutil::String const &, AISutil::String const &,
- AISutil::String const &);
- bool isOp(AISutil::String const &, AISutil::String const &);
- bool isVoice(AISutil::String const &, AISutil::String const &);
+ void serviceKick(AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &);
+ bool isOp(AIS::Util::String const &, AIS::Util::String const &);
+ bool isVoice(AIS::Util::String const &, AIS::Util::String const &);
// This should be moved to the NOTE MODULE
void sendNote(Kine::Name const &, Kine::Name const &,
- AISutil::String const &);
+ AIS::Util::String const &);
int locateID(Kine::Name const &nick);
- User* addClient(Kine::Name const &, AISutil::String const &,
- AISutil::String const &, AISutil::String const &,
- AISutil::String const &, AISutil::String const &,
- AISutil::String const &,
- AISutil::String const &);
- int getRequiredAccess(AISutil::String const &, AISutil::String const &);
- bool isNickRegistered(AISutil::String const &);
+ User* addClient(Kine::Name const &, AIS::Util::String const &,
+ AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &,
+ AIS::Util::String const &);
+ int getRequiredAccess(AIS::Util::String const &, AIS::Util::String const &);
+ bool isNickRegistered(AIS::Util::String const &);
// This should be in the NICK MODULE
- void modeIdentify(AISutil::String const &);
- void updateLastID(AISutil::String const &);
+ void modeIdentify(AIS::Util::String const &);
+ void updateLastID(AIS::Util::String const &);
- AISutil::String getNick(int const &);
- AISutil::String getOnlineNick(int const &);
- int getOnlineChanID(AISutil::String const &);
- AISutil::String getpendingCode(AISutil::String const &);
- void registerNick(AISutil::String const &, AISutil::String const &,
- AISutil::String const &);
- void addOper(AISutil::String const &, int access);
- void delOper(AISutil::String const &);
- bool isOper(AISutil::String const &);
+ AIS::Util::String getNick(int const &);
+ AIS::Util::String getOnlineNick(int const &);
+ int getOnlineChanID(AIS::Util::String const &);
+ AIS::Util::String getpendingCode(AIS::Util::String const &);
+ void registerNick(AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &);
+ void addOper(AIS::Util::String const &, int access);
+ void delOper(AIS::Util::String const &);
+ bool isOper(AIS::Util::String const &);
void validateOper(Kine::Name &);
- void sendGOper(AISutil::String const &, AISutil::String const &);
- void sendHelpme(AISutil::String const &, AISutil::String const &);
- void setMode(AISutil::String const &, AISutil::String const &);
+ void sendGOper(AIS::Util::String const &, AIS::Util::String const &);
+ void sendHelpme(AIS::Util::String const &, AIS::Util::String const &);
+ void setMode(AIS::Util::String const &, AIS::Util::String const &);
unsigned long getCountTx(void);
// { return countTx; };
unsigned long getCountRx(void);
Index: static.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/static.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- static.cpp 11 Apr 2003 10:01:11 -0000 1.1
+++ static.cpp 27 Oct 2003 12:03:28 -0000 1.2
@@ -39,7 +39,7 @@
#include "exordium/static.h"
#include <aisutil/string.h>
-using AISutil::String;
+using AIS::Util::String;
using namespace Exordium;
namespace Exordium
Index: user.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/user.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- user.cpp 10 Apr 2003 20:58:55 -0000 1.46
+++ user.cpp 27 Oct 2003 12:03:28 -0000 1.47
@@ -35,8 +35,8 @@
#include <kineircd/config.h>
#include "core_language.h"
-using AISutil::String;
-using AISutil::StringTokens;
+using AIS::Util::String;
+using AIS::Util::StringTokens;
using namespace Exordium;
/* sendMessage(String,String,<bool>)
Index: utils.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/utils.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- utils.cpp 16 Apr 2003 20:09:16 -0000 1.9
+++ utils.cpp 27 Oct 2003 12:03:28 -0000 1.10
@@ -33,7 +33,7 @@
#include "exordium/utils.h"
-using AISutil::String;
+using AIS::Util::String;
using namespace Exordium;
// Random number generator
@@ -55,7 +55,7 @@
password << ":" << std::endl;
// static const Kine::Utils::base_type PasswordStrBase = 85;
- // static const AISutil::String::size_type PasswordStrBaseLongPad = 5;
+ // static const AIS::Util::String::size_type PasswordStrBaseLongPad = 5;
//String pass =
//Kine::Utils::SHA1::digestToStr(Kine::Password::makePassword(nickname,password),PasswordStrBase,PasswordStrBaseLongPad);
//std::cout << "GeneratePassword() :" << pass << ":" << std::endl;
@@ -79,9 +79,9 @@
password << ":" << std::endl;
static const unsigned char PasswordStrBase = 85;
- static const AISutil::String::size_type PasswordStrBaseLongPad = 5;
+ static const AIS::Util::String::size_type PasswordStrBaseLongPad = 5;
String pass =
- AISutil::SHA1::digestToStr(Kine::Password::makePassword(nickname,password),PasswordStrBase,PasswordStrBaseLongPad);
+ AIS::Util::SHA1::digestToStr(Kine::Password::makePassword(nickname,password),PasswordStrBase,PasswordStrBaseLongPad);
std::cout << "GeneratePassword() :" << pass << ":" << std::endl;
return pass;
//
|
Update of /cvsroot/exordium/services/include/exordium
In directory sc8-pr-cvs1:/tmp/cvs-serv8183/include/exordium
Modified Files:
channel.h config.h dchan.h regchannel.h reguser.h server.h
service.h services.h static.h user.h utils.h
Log Message:
Finished include/exordium directory p of AISutil -> AIS::Util
Index: channel.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/channel.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- channel.h 6 Apr 2003 17:40:57 -0000 1.24
+++ channel.h 27 Oct 2003 11:55:10 -0000 1.25
@@ -45,34 +45,34 @@
~Channel(void)
{};
- AISutil::String getChanCount(void);
- void setChanLog(AISutil::String const &,bool const &);
- bool ChanLog(AISutil::String const &);
- int getChanID(AISutil::String const &);
- int getOnlineChanID(AISutil::String const &);
- bool isChanRegistered(AISutil::String const &);
- int getChanAccess(AISutil::String const &, AISutil::String const &);
- bool ifChanExists(AISutil::String const &);
+ AIS::Util::String getChanCount(void);
+ void setChanLog(AIS::Util::String const &,bool const &);
+ bool ChanLog(AIS::Util::String const &);
+ int getChanID(AIS::Util::String const &);
+ int getOnlineChanID(AIS::Util::String const &);
+ bool isChanRegistered(AIS::Util::String const &);
+ int getChanAccess(AIS::Util::String const &, AIS::Util::String const &);
+ bool ifChanExists(AIS::Util::String const &);
int maxChannels(void);
- int maxChannelsUser(AISutil::String const &);
+ int maxChannelsUser(AIS::Util::String const &);
int maxChannelsAccess(void);
Kine::Name getChanName(int const &);
- AISutil::String getChanIDName(int const &);
- void setTopic(AISutil::String const &,AISutil::String const &);
- void updateTopic(AISutil::String const &, AISutil::String const &);
- AISutil::String getChanOwner(int const &);
- void chanAddAccess(AISutil::String const &,AISutil::String const &,AISutil::String const &);
- void chanDelAccess(AISutil::String const &, AISutil::String const &);
+ AIS::Util::String getChanIDName(int const &);
+ void setTopic(AIS::Util::String const &,AIS::Util::String const &);
+ void updateTopic(AIS::Util::String const &, AIS::Util::String const &);
+ AIS::Util::String getChanOwner(int const &);
+ void chanAddAccess(AIS::Util::String const &,AIS::Util::String const &,AIS::Util::String const &);
+ void chanDelAccess(AIS::Util::String const &, AIS::Util::String const &);
void deregisterChannel(const Kine::Name&);
void synchChannels(void);
- void synchChannel(AISutil::String const &, AISutil::String const &, AISutil::String const &);
- void registerChannel(const Kine::Name&, AISutil::String const &);
- int ownedChannels(AISutil::String const &);
- void addChanBan(int const &,AISutil::String const &,AISutil::String const &,int const &,AISutil::String const &);
- void banChan(AISutil::String const &, AISutil::String const &, AISutil::String const &);
- void RemoveBan(AISutil::String const &, AISutil::String const &, AISutil::String const &);
- AISutil::String getModes(void);
- int getNbUsers(AISutil::String const &);
+ void synchChannel(AIS::Util::String const &, AIS::Util::String const &, AIS::Util::String const &);
+ void registerChannel(const Kine::Name&, AIS::Util::String const &);
+ int ownedChannels(AIS::Util::String const &);
+ void addChanBan(int const &,AIS::Util::String const &,AIS::Util::String const &,int const &,AIS::Util::String const &);
+ void banChan(AIS::Util::String const &, AIS::Util::String const &, AIS::Util::String const &);
+ void RemoveBan(AIS::Util::String const &, AIS::Util::String const &, AIS::Util::String const &);
+ AIS::Util::String getModes(void);
+ int getNbUsers(AIS::Util::String const &);
};
}; // namespace Exordium
Index: config.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/config.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- config.h 27 Oct 2003 11:49:13 -0000 1.16
+++ config.h 27 Oct 2003 11:55:13 -0000 1.17
@@ -32,20 +32,20 @@
# include <exordium/database/database.h>
namespace Exordium {
- class Config : public AISutil::ConfigData {
+ class Config : public AIS::Util::ConfigData {
protected:
// Variables (top class from the definition table above)
- AISutil::String defUnderlingHostname; // Underling server hostname
- AISutil::String defUplinkPass;
+ AIS::Util::String defUnderlingHostname; // Underling server hostname
+ AIS::Util::String defUplinkPass;
// 'SQL' variables
- AISutil::String defSqlDatabase; // MySql server database name
- AISutil::String defSqlHostname; // MySql server hostname
- AISutil::String defSqlPassword; // MySql server password
+ AIS::Util::String defSqlDatabase; // MySql server database name
+ AIS::Util::String defSqlHostname; // MySql server hostname
+ AIS::Util::String defSqlPassword; // MySql server password
unsigned short defSqlPort; // MySql server port
bool defSqlSSLEnabled; // Mysql SSL Boolean
- AISutil::String defSqlUsername; // MySql server username
- AISutil::String defSqlEngine; // Database engine
+ AIS::Util::String defSqlUsername; // MySql server username
+ AIS::Util::String defSqlEngine; // Database engine
// Constructor (sets up defaults mainly)
Config(void);
@@ -56,20 +56,20 @@
{};
// Top variables
- const AISutil::String& getUnderlingHostname(void) const
+ const AIS::Util::String& getUnderlingHostname(void) const
{ return defUnderlingHostname; };
// 'SQL' class
- const AISutil::String& getSqlDatabase(void) const
+ const AIS::Util::String& getSqlDatabase(void) const
{ return defSqlDatabase; };
- const AISutil::String& getSqlHostname(void) const
+ const AIS::Util::String& getSqlHostname(void) const
{ return defSqlHostname; };
- const AISutil::String& getSqlPassword(void) const
+ const AIS::Util::String& getSqlPassword(void) const
{ return defSqlPassword; };
const unsigned short getSqlPort(void) const
{ return defSqlPort; };
- const AISutil::String& getSqlUsername(void) const
+ const AIS::Util::String& getSqlUsername(void) const
{ return defSqlUsername; };
- const AISutil::String& getSqlEngine(void) const
+ const AIS::Util::String& getSqlEngine(void) const
{ return defSqlEngine; };
const bool getSqlSSLEnabled(void) const
{ return defSqlSSLEnabled; };
Index: dchan.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/dchan.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dchan.h 6 Apr 2003 17:40:57 -0000 1.25
+++ dchan.h 27 Oct 2003 11:55:14 -0000 1.26
@@ -37,7 +37,7 @@
class User;
class dChan {
private:
- AISutil::String name;
+ AIS::Util::String name;
int onlineID;
Services& services;
bool registered; /* Are we a registered channel? */
@@ -49,7 +49,7 @@
/* delUser - delete's a user from a channels member list */
void const delUser(Exordium::User &ptr);
int const getChanCount(void);
- const AISutil::String& getName(void) const
+ const AIS::Util::String& getName(void) const
{ return name; };
@@ -68,27 +68,27 @@
*
* This is redundant imho. - simon
*/
- const AISutil::String getOnlineIDString(void) const
- { return AISutil::String::convert(onlineID); };
+ const AIS::Util::String getOnlineIDString(void) const
+ { return AIS::Util::String::convert(onlineID); };
const int getRegisteredID(void);
const bool isRegistered(void);
- const int getAccess(AISutil::String const &);
+ const int getAccess(AIS::Util::String const &);
const void setChanLog(bool const &);
const void setChanSecure(bool const &);
const bool isChanSecure(void);
- const void sendBans(Kine::Name &,AISutil::String const &);
- const AISutil::String getOwner(void);
+ const void sendBans(Kine::Name &,AIS::Util::String const &);
+ const AIS::Util::String getOwner(void);
const int getCount(void);
- const void addAccess(AISutil::String &,AISutil::String const &);
- const void log(User& origin, AISutil::String const &, AISutil::String const &, AISutil::String const &);
- const void updateTopic(AISutil::String const &);
- const void setTopic(AISutil::String const &, AISutil::String const &);
- const AISutil::String getTopic(void);
- const bool isOp(AISutil::String const &);
- const void mode(AISutil::String const &, AISutil::String const &,AISutil::String const &);
- const bool isVoice(AISutil::String const &);
- const void kick(AISutil::String const &,AISutil::String const &,AISutil::String const &);
- const void ban(User& origin,AISutil::String const &,AISutil::String const &,AISutil::String const &);
+ const void addAccess(AIS::Util::String &,AIS::Util::String const &);
+ const void log(User& origin, AIS::Util::String const &, AIS::Util::String const &, AIS::Util::String const &);
+ const void updateTopic(AIS::Util::String const &);
+ const void setTopic(AIS::Util::String const &, AIS::Util::String const &);
+ const AIS::Util::String getTopic(void);
+ const bool isOp(AIS::Util::String const &);
+ const void mode(AIS::Util::String const &, AIS::Util::String const &,AIS::Util::String const &);
+ const bool isVoice(AIS::Util::String const &);
+ const void kick(AIS::Util::String const &,AIS::Util::String const &,AIS::Util::String const &);
+ const void ban(User& origin,AIS::Util::String const &,AIS::Util::String const &,AIS::Util::String const &);
const bool getTrackTopics( void );
const void setTrackTopics( bool Value );
@@ -99,27 +99,27 @@
const bool getModeLock( void );
const void setModeLock( bool Value );
- const AISutil::String getChannelModes( void );
- const void setChannelModes( const AISutil::String& modes );
+ const AIS::Util::String getChannelModes( void );
+ const void setChannelModes( const AIS::Util::String& modes );
- const AISutil::String getEntryMsg( void );
- const void setEntryMsg( const AISutil::String& entrymsg );
+ const AIS::Util::String getEntryMsg( void );
+ const void setEntryMsg( const AIS::Util::String& entrymsg );
- const AISutil::String getPartMsg( void );
- const void setPartMsg( const AISutil::String& partmsg );
+ const AIS::Util::String getPartMsg( void );
+ const void setPartMsg( const AIS::Util::String& partmsg );
const bool getPrivate( void );
const void setPrivate( bool Value );
- const AISutil::String getChanDescription( void );
- const void setChanDescription( const AISutil::String& chandesc );
+ const AIS::Util::String getChanDescription( void );
+ const void setChanDescription( const AIS::Util::String& chandesc );
- const AISutil::String getUrl( void );
- const void setUrl( const AISutil::String& url );
+ const AIS::Util::String getUrl( void );
+ const void setUrl( const AIS::Util::String& url );
- const AISutil::String dChan::getRegistrationDate();
+ const AIS::Util::String dChan::getRegistrationDate();
- dChan(AISutil::String const &n, int const &oid, Services &s)
+ dChan(AIS::Util::String const &n, int const &oid, Services &s)
: name(n), //their current nickname.. duh
onlineID(oid), //as dictated by the sql server..
services(s)// Gives us access to the full suite of services..
Index: regchannel.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/regchannel.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- regchannel.h 29 Mar 2003 21:16:55 -0000 1.5
+++ regchannel.h 27 Oct 2003 11:55:16 -0000 1.6
@@ -44,34 +44,34 @@
public:
int ID;
int chanid;
- AISutil::String mask;
- AISutil::String setby;
+ AIS::Util::String mask;
+ AIS::Util::String setby;
time_t seton;
int expireon;
- AISutil::String reason;
+ AIS::Util::String reason;
};
class RegisteredChannel {
private:
int ID;
- AISutil::String name;
- AISutil::String owner;
- AISutil::String topic;
- AISutil::String modes;
- AISutil::String cdesc;
- AISutil::String url;
+ AIS::Util::String name;
+ AIS::Util::String owner;
+ AIS::Util::String topic;
+ AIS::Util::String modes;
+ AIS::Util::String cdesc;
+ AIS::Util::String url;
int clog;
// Maps chanaccess (Username, access level)
- map<AISutil::String, int> access;
+ map<AIS::Util::String, int> access;
// Lists chanbans
vector<chanbans> bans;
public:
- RegisteredChannel(AISutil::String const &channame)
+ RegisteredChannel(AIS::Util::String const &channame)
{ name=channame; ID=-1; }
~RegisteredChannel(void)
@@ -80,35 +80,35 @@
// Getters
int getID(void) { return ID; }
- AISutil::String getName(void) { return name; }
- AISutil::String getOwner(void) { return owner; }
- AISutil::String getTopic(void) { return topic; }
- AISutil::String getModes(void) { return modes; }
- AISutil::String getCdesc(void) { return cdesc; }
- AISutil::String getUrl(void) { return url; }
+ AIS::Util::String getName(void) { return name; }
+ AIS::Util::String getOwner(void) { return owner; }
+ AIS::Util::String getTopic(void) { return topic; }
+ AIS::Util::String getModes(void) { return modes; }
+ AIS::Util::String getCdesc(void) { return cdesc; }
+ AIS::Util::String getUrl(void) { return url; }
int getClog(void) { return clog; }
// Setters
void setID(int id) { ID=id; }
- void setName(AISutil::String const &channame) { name=channame; }
- void setOwner (AISutil::String const &myowner);
- void setTopic (AISutil::String const &mytopic);
- void setModes (AISutil::String const &mymodes);
- void setCdesc (AISutil::String const &mycdesc);
- void setUrl (AISutil::String const &myurl);
+ void setName(AIS::Util::String const &channame) { name=channame; }
+ void setOwner (AIS::Util::String const &myowner);
+ void setTopic (AIS::Util::String const &mytopic);
+ void setModes (AIS::Util::String const &mymodes);
+ void setCdesc (AIS::Util::String const &mycdesc);
+ void setUrl (AIS::Util::String const &myurl);
void setClog (int myclog);
// Channel access map manipulation
- int getChanAccess(AISutil::String const &nick);
- void chanAddAccess(AISutil::String const &nick, int accesslvl);
- void chanDelAccess(AISutil::String const &nick);
+ int getChanAccess(AIS::Util::String const &nick);
+ void chanAddAccess(AIS::Util::String const &nick, int accesslvl);
+ void chanDelAccess(AIS::Util::String const &nick);
// Channel bans list manipulation
- void addChanBan(AISutil::String const &,AISutil::String const &,int const &,AISutil::String const &);
- void banChan(AISutil::String const &, AISutil::String const &, AISutil::String const &);
- void RemoveBan(AISutil::String const &);
+ void addChanBan(AIS::Util::String const &,AIS::Util::String const &,int const &,AIS::Util::String const &);
+ void banChan(AIS::Util::String const &, AIS::Util::String const &, AIS::Util::String const &);
+ void RemoveBan(AIS::Util::String const &);
};
@@ -120,16 +120,16 @@
~RegisteredChannelList(void);
void registerChannel(RegisteredChannel *newregchan);
- void registerChannel(AISutil::String const &myname, AISutil::String const &myowner,
- AISutil::String const &mytopic, AISutil::String const &mymodes,
- AISutil::String const &mycdesc, AISutil::String const &myurl,
+ void registerChannel(AIS::Util::String const &myname, AIS::Util::String const &myowner,
+ AIS::Util::String const &mytopic, AIS::Util::String const &mymodes,
+ AIS::Util::String const &mycdesc, AIS::Util::String const &myurl,
int myclog);
- void unregisterChannel(AISutil::String const &name);
- RegisteredChannel* getRegisteredChannel(AISutil::String const &name);
+ void unregisterChannel(AIS::Util::String const &name);
+ RegisteredChannel* getRegisteredChannel(AIS::Util::String const &name);
RegisteredChannel* getRegisteredChannelByID(int id);
- bool isRegistered(AISutil::String const &name);
+ bool isRegistered(AIS::Util::String const &name);
int nbRegChans(void);
// Synchronize with DB (Load or reload data)
@@ -137,7 +137,7 @@
private:
- map<AISutil::String, RegisteredChannel*> regchans;
+ map<AIS::Util::String, RegisteredChannel*> regchans;
RegisteredChannelList(void) {}
};
Index: reguser.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/reguser.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- reguser.h 29 Mar 2003 21:16:55 -0000 1.4
+++ reguser.h 27 Oct 2003 11:55:16 -0000 1.5
@@ -41,30 +41,30 @@
class RegisteredUser {
private:
int ID;
- AISutil::String name;
- AISutil::String pass;
- AISutil::String email;
- AISutil::String regdate;
- AISutil::String lastid;
- AISutil::String lasthost;
+ AIS::Util::String name;
+ AIS::Util::String pass;
+ AIS::Util::String email;
+ AIS::Util::String regdate;
+ AIS::Util::String lastid;
+ AIS::Util::String lasthost;
unsigned short int privmsg;
- AISutil::String lang;
- AISutil::String icq;
- AISutil::String msn;
- AISutil::String url;
+ AIS::Util::String lang;
+ AIS::Util::String icq;
+ AIS::Util::String msn;
+ AIS::Util::String url;
unsigned short int deopaway;
- AISutil::String yahoo;
- AISutil::String aim;
- AISutil::String quitmsg;
+ AIS::Util::String yahoo;
+ AIS::Util::String aim;
+ AIS::Util::String quitmsg;
unsigned short int modnick;
// Lists owned chans
- list<AISutil::String> ownedchans;
+ list<AIS::Util::String> ownedchans;
public:
- RegisteredUser(AISutil::String const &nickname)
+ RegisteredUser(AIS::Util::String const &nickname)
{ name=nickname; ID=-1; }
~RegisteredUser(void)
@@ -73,47 +73,47 @@
// Getters
int getID(void) { return ID; }
- AISutil::String getName(void) { return name; }
- AISutil::String getPass(void) { return pass; }
- AISutil::String getEmail(void) { return email; }
- AISutil::String getRegdate(void) { return regdate; }
- AISutil::String getLastID(void) { return lastid; }
- AISutil::String getLasthost(void) { return lasthost; }
+ AIS::Util::String getName(void) { return name; }
+ AIS::Util::String getPass(void) { return pass; }
+ AIS::Util::String getEmail(void) { return email; }
+ AIS::Util::String getRegdate(void) { return regdate; }
+ AIS::Util::String getLastID(void) { return lastid; }
+ AIS::Util::String getLasthost(void) { return lasthost; }
unsigned short int getPrivmsg(void) { return privmsg; }
- AISutil::String getLang(void) { return lang; }
- AISutil::String getIcq(void) { return icq; }
- AISutil::String getMsn(void) { return msn; }
- AISutil::String getUrl(void) { return url; }
- AISutil::String getYahoo(void) { return yahoo; }
- AISutil::String getAim(void) { return aim; }
- AISutil::String getQuitmsg(void) { return quitmsg; }
+ AIS::Util::String getLang(void) { return lang; }
+ AIS::Util::String getIcq(void) { return icq; }
+ AIS::Util::String getMsn(void) { return msn; }
+ AIS::Util::String getUrl(void) { return url; }
+ AIS::Util::String getYahoo(void) { return yahoo; }
+ AIS::Util::String getAim(void) { return aim; }
+ AIS::Util::String getQuitmsg(void) { return quitmsg; }
unsigned short int getModnick(void) { return modnick; }
unsigned short int getDeopaway(void) { return deopaway; }
// Setters
void setID (int id) { ID=id; }
- void setName (AISutil::String const &channame) { name=channame; }
- void setPass (AISutil::String const &mypass);
- void setEmail (AISutil::String const &myemail);
- void setRegdate (AISutil::String myregdate);
- void setLastID (AISutil::String mylastid);
- void setLasthost (AISutil::String const &mylasthost);
+ void setName (AIS::Util::String const &channame) { name=channame; }
+ void setPass (AIS::Util::String const &mypass);
+ void setEmail (AIS::Util::String const &myemail);
+ void setRegdate (AIS::Util::String myregdate);
+ void setLastID (AIS::Util::String mylastid);
+ void setLasthost (AIS::Util::String const &mylasthost);
void setPrivmsg (unsigned short int myprivmsg);
- void setLang (AISutil::String const &mylang);
- void setIcq (AISutil::String const &myicq);
- void setMsn (AISutil::String const &mymsn);
- void setUrl (AISutil::String const &myurl);
- void setYahoo (AISutil::String const &myyahoo);
- void setAim (AISutil::String const &myaim);
- void setQuitmsg (AISutil::String const &myquitmsg);
+ void setLang (AIS::Util::String const &mylang);
+ void setIcq (AIS::Util::String const &myicq);
+ void setMsn (AIS::Util::String const &mymsn);
+ void setUrl (AIS::Util::String const &myurl);
+ void setYahoo (AIS::Util::String const &myyahoo);
+ void setAim (AIS::Util::String const &myaim);
+ void setQuitmsg (AIS::Util::String const &myquitmsg);
void setModnick (unsigned short int mymodnick);
void setDeopaway (unsigned short int mydeopaway);
- void addOwnedChannel(AISutil::String const &name);
- void delOwnedChannel(AISutil::String const &name);
- bool ownsChannel(AISutil::String const &name);
+ void addOwnedChannel(AIS::Util::String const &name);
+ void delOwnedChannel(AIS::Util::String const &name);
+ bool ownsChannel(AIS::Util::String const &name);
};
@@ -127,17 +127,17 @@
void registerNick(RegisteredUser *newregnick);
- void unregisterNick(AISutil::String const &name);
- RegisteredUser* getRegisteredNick(AISutil::String const &name);
+ void unregisterNick(AIS::Util::String const &name);
+ RegisteredUser* getRegisteredNick(AIS::Util::String const &name);
- bool isRegistered(AISutil::String const &name);
+ bool isRegistered(AIS::Util::String const &name);
int nbRegUsers(void);
// Synchronize with DB (Load or reload data)
void SyncDB(void);
private:
- map<AISutil::String, RegisteredUser*> regusers;
+ map<AIS::Util::String, RegisteredUser*> regusers;
RegisteredUserList(void) {}
};
Index: server.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/server.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- server.h 11 Apr 2003 17:42:19 -0000 1.2
+++ server.h 27 Oct 2003 11:55:16 -0000 1.3
@@ -37,23 +37,23 @@
class Server
{
private:
- AISutil::String name;
+ AIS::Util::String name;
int hops;
- AISutil::String desc;
+ AIS::Util::String desc;
Services& services;
public:
/* Inline functions here */
- const AISutil::String& getName(void) const
+ const AIS::Util::String& getName(void) const
{ return name; };
const int getHops(void) const
{ return hops; };
- const AISutil::String& getDesc(void) const
+ const AIS::Util::String& getDesc(void) const
{ return desc; };
/* Our constructor definition */
- Server(AISutil::String const &sname, int const &shops, AISutil::String const &sdesc, Services &s)
+ Server(AIS::Util::String const &sname, int const &shops, AIS::Util::String const &sdesc, Services &s)
: name(sname),
hops(shops),
desc(sdesc),
Index: service.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/service.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- service.h 7 Apr 2003 14:15:59 -0000 1.48
+++ service.h 27 Oct 2003 11:55:16 -0000 1.49
@@ -94,22 +94,22 @@
unsigned int getEventsMask(void);
- class ConfigData : public AISutil::ConfigData {
+ class ConfigData : public AIS::Util::ConfigData {
private:
// Configuration information (this is a default list for this base)
- static const AISutil::ConfigParser::defTable_type defaultDefinitions;
+ static const AIS::Util::ConfigParser::defTable_type defaultDefinitions;
protected:
- AISutil::String defDescription; // Our description
- AISutil::String defDistribution; // Our scope mask
- AISutil::String defHostname; // Our hostname
+ AIS::Util::String defDescription; // Our description
+ AIS::Util::String defDistribution; // Our scope mask
+ AIS::Util::String defHostname; // Our hostname
Kine::Name defName; // Our name
- AISutil::String defIdent; // Out ident
+ AIS::Util::String defIdent; // Out ident
public:
// Constructor
- ConfigData(const AISutil::String& d, const AISutil::String& h,
- const AISutil::String& n, const AISutil::String& u)
+ ConfigData(const AIS::Util::String& d, const AIS::Util::String& h,
+ const AIS::Util::String& n, const AIS::Util::String& u)
: defDescription(d),
defDistribution("*"), // <=- network-wide distribution scope
defHostname(h),
@@ -122,20 +122,20 @@
{};
// Grab the configuration definition table
- virtual const AISutil::ConfigParser::defTable_type&
+ virtual const AIS::Util::ConfigParser::defTable_type&
getDefinitions(void) const
{ return defaultDefinitions; };
// Return variables..
- const AISutil::String& getDescription(void) const
+ const AIS::Util::String& getDescription(void) const
{ return defDescription; };
- const AISutil::String& getDistribution(void) const
+ const AIS::Util::String& getDistribution(void) const
{ return defDistribution; };
- const AISutil::String& getHostname(void) const
+ const AIS::Util::String& getHostname(void) const
{ return defHostname; };
const Kine::Name& getName(void) const
{ return defName; };
- const AISutil::String& getIdent(void) const
+ const AIS::Util::String& getIdent(void) const
{ return defIdent; };
};
@@ -165,22 +165,22 @@
virtual bool start(Exordium::Services& s) = 0;
// Stop the module (called just before a module is unloaded)
- virtual void stop(const AISutil::String& reason) {};
+ virtual void stop(const AIS::Util::String& reason) {};
// Parsers
- virtual void parseLine(AISutil::StringTokens& line, User& origin,
+ virtual void parseLine(AIS::Util::StringTokens& line, User& origin,
const bool safe) = 0;
- virtual void parseLine(AISutil::StringTokens& line, User& origin,
+ virtual void parseLine(AIS::Util::StringTokens& line, User& origin,
const Kine::Name& channel) = 0;
- virtual void handleAway(User& origin, const AISutil::String& reason) {} ;
+ virtual void handleAway(User& origin, const AIS::Util::String& reason) {} ;
virtual void handleClientSignon(User& origin) {};
- virtual void handleTopic(const AISutil::String& origin, dChan& channel, const AISutil::String& newTopic) {};
+ virtual void handleTopic(const AIS::Util::String& origin, dChan& channel, const AIS::Util::String& newTopic) {};
virtual void handleChannelJoin(User& origin, dChan& channel, const int& status) {};
virtual void handleChannelPart(User& origin, dChan& channel) {};
- virtual void handleChannelMode(dChan& channel, const AISutil::String& modes,
- const AISutil::String& target, const AISutil::String& source) {};
+ virtual void handleChannelMode(dChan& channel, const AIS::Util::String& modes,
+ const AIS::Util::String& target, const AIS::Util::String& source) {};
// Grab the information structure of a module
Index: services.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/services.h,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- services.h 16 Apr 2003 20:09:14 -0000 1.105
+++ services.h 27 Oct 2003 11:55:16 -0000 1.106
@@ -94,10 +94,10 @@
Kine::daemon().log(line, (Kine::Logger::Mask::type)mask);
};
// Function Declrations below here.
- virtual void shutdown(const AISutil::String &) = 0;
+ virtual void shutdown(const AIS::Util::String &) = 0;
// 'User' operability functions
- virtual User* const addUser(const AISutil::String& name,
+ virtual User* const addUser(const AIS::Util::String& name,
const int oid) = 0;
virtual bool delUser(Kine::Name &) = 0;
virtual User* findUser(Kine::Name &) = 0;
@@ -109,119 +109,119 @@
virtual dChan* findChan(Kine::Name &) = 0;
// 'Server' operability functions
- virtual Server* const addServer(const AISutil::String&,
+ virtual Server* const addServer(const AIS::Util::String&,
const int &,
- const AISutil::String &) = 0;
+ const AIS::Util::String &) = 0;
- virtual bool delServer(AISutil::String &) = 0;
+ virtual bool delServer(AIS::Util::String &) = 0;
- virtual Server* findServer(AISutil::String &)= 0;
+ virtual Server* findServer(AIS::Util::String &)= 0;
// Allows Services:: to change a User's nick.
virtual void setNick(User &, Kine::Name &) = 0;
// Send modes.
- virtual void mode(AISutil::String const &, AISutil::String const &,
- AISutil::String const &, AISutil::String const &) = 0;
+ virtual void mode(AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &, AIS::Util::String const &) = 0;
// This shold be in the Service:: class
- virtual void doHelp(User&, AISutil::String const &,
- AISutil::String const &,
- AISutil::String const &) = 0;
+ virtual void doHelp(User&, AIS::Util::String const &,
+ AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
- virtual void log(User&, AISutil::String const &,
- AISutil::String const &, AISutil::String const &) = 0;
- virtual void log(User&, AISutil::String const &,
- AISutil::String const &) = 0;
+ virtual void log(User&, AIS::Util::String const &,
+ AIS::Util::String const &, AIS::Util::String const &) = 0;
+ virtual void log(User&, AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
// This is in the wrong place, surely
- virtual void sendEmail(AISutil::String const &, AISutil::String const &,
- AISutil::String const &) = 0;
+ virtual void sendEmail(AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
- virtual void servicePart (AISutil::String const &,
- AISutil::String const &) = 0;
+ virtual void servicePart (AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
//Inline Functions Below here.
- virtual void killnick (AISutil::String const &target,
- AISutil::String const &from,
- AISutil::String const &reason) = 0;
+ virtual void killnick (AIS::Util::String const &target,
+ AIS::Util::String const &from,
+ AIS::Util::String const &reason) = 0;
- virtual void serviceNotice(AISutil::String const &line,
- AISutil::String const &service,
- AISutil::String const &target) = 0;
+ virtual void serviceNotice(AIS::Util::String const &line,
+ AIS::Util::String const &service,
+ AIS::Util::String const &target) = 0;
- virtual void serviceNoticeForce(AISutil::String const &line,
- AISutil::String const &service,
- AISutil::String const &target) = 0;
+ virtual void serviceNoticeForce(AIS::Util::String const &line,
+ AIS::Util::String const &service,
+ AIS::Util::String const &target) = 0;
- virtual void servicePrivmsg(AISutil::String const &line,
- AISutil::String const &service,
- AISutil::String const &target) = 0;
+ virtual void servicePrivmsg(AIS::Util::String const &line,
+ AIS::Util::String const &service,
+ AIS::Util::String const &target) = 0;
- virtual void serviceQuit(const AISutil::String& name,
- const AISutil::String& reason) = 0;
+ virtual void serviceQuit(const AIS::Util::String& name,
+ const AIS::Util::String& reason) = 0;
// This does not modify a server mode, it should be renamed.
- virtual void serverMode(AISutil::String const &chan,
- AISutil::String const &mode,
- AISutil::String const &target) = 0;
+ virtual void serverMode(AIS::Util::String const &chan,
+ AIS::Util::String const &mode,
+ AIS::Util::String const &target) = 0;
- virtual void registerService(AISutil::String const &nick,
- AISutil::String const &user,
- AISutil::String const &host,
- AISutil::String const &realname) = 0;
+ virtual void registerService(AIS::Util::String const &nick,
+ AIS::Util::String const &user,
+ AIS::Util::String const &host,
+ AIS::Util::String const &realname) = 0;
- virtual void serviceJoin(AISutil::String const &service,
- AISutil::String const &target) = 0;
+ virtual void serviceJoin(AIS::Util::String const &service,
+ AIS::Util::String const &target) = 0;
- virtual bool usePrivmsg(AISutil::String const &) = 0;
+ virtual bool usePrivmsg(AIS::Util::String const &) = 0;
// These should be moved to the new channel classes
- virtual void serviceKick(AISutil::String const &,
- AISutil::String const &,
- AISutil::String const &) = 0;
- virtual bool isOp(AISutil::String const &,
- AISutil::String const &) = 0;
- virtual bool isVoice(AISutil::String const &,
- AISutil::String const &) = 0;
+ virtual void serviceKick(AIS::Util::String const &,
+ AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
+ virtual bool isOp(AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
+ virtual bool isVoice(AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
// And this should be removed when the new channel classes are done.
- virtual void queueAdd(const AISutil::String&) = 0;
+ virtual void queueAdd(const AIS::Util::String&) = 0;
// This should be moved to the NOTE MODULE
virtual void sendNote(Kine::Name const &, Kine::Name const &,
- AISutil::String const &) = 0;
+ AIS::Util::String const &) = 0;
virtual int locateID(Kine::Name const &nick) = 0;
- virtual User* addClient(Kine::Name const &, AISutil::String const &,
- AISutil::String const &, AISutil::String const &,
- AISutil::String const &, AISutil::String const &,
- AISutil::String const &,
- AISutil::String const &) = 0;
- virtual int getRequiredAccess(AISutil::String const &,
- AISutil::String const &) = 0;
- virtual bool isNickRegistered(AISutil::String const &) = 0;
+ virtual User* addClient(Kine::Name const &, AIS::Util::String const &,
+ AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &, AIS::Util::String const &,
+ AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
+ virtual int getRequiredAccess(AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
+ virtual bool isNickRegistered(AIS::Util::String const &) = 0;
// This should be in the NICK MODULE
- virtual void modeIdentify(AISutil::String const &) = 0;
- virtual void updateLastID(AISutil::String const &) = 0;
+ virtual void modeIdentify(AIS::Util::String const &) = 0;
+ virtual void updateLastID(AIS::Util::String const &) = 0;
- virtual AISutil::String getNick(int const &) = 0;
- virtual AISutil::String getOnlineNick(int const &) = 0;
- virtual int getOnlineChanID(AISutil::String const &) = 0;
- virtual void addOper(AISutil::String const &, int access) = 0;
- virtual void delOper(AISutil::String const &) = 0;
- virtual bool isOper(AISutil::String const &) = 0;
+ virtual AIS::Util::String getNick(int const &) = 0;
+ virtual AIS::Util::String getOnlineNick(int const &) = 0;
+ virtual int getOnlineChanID(AIS::Util::String const &) = 0;
+ virtual void addOper(AIS::Util::String const &, int access) = 0;
+ virtual void delOper(AIS::Util::String const &) = 0;
+ virtual bool isOper(AIS::Util::String const &) = 0;
virtual void validateOper(Kine::Name &) = 0;
- virtual void sendGOper(AISutil::String const &,
- AISutil::String const &) = 0;
- virtual void sendHelpme(AISutil::String const &,
- AISutil::String const &) = 0;
- virtual void setMode(AISutil::String const &,
- AISutil::String const &) = 0;
+ virtual void sendGOper(AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
+ virtual void sendHelpme(AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
+ virtual void setMode(AIS::Util::String const &,
+ AIS::Util::String const &) = 0;
virtual unsigned long getCountTx(void) = 0;
virtual unsigned long getCountRx(void) = 0;
virtual time_t getStartTime(void) = 0;
Index: static.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/static.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- static.h 11 Apr 2003 10:01:09 -0000 1.1
+++ static.h 27 Oct 2003 11:55:17 -0000 1.2
@@ -45,8 +45,8 @@
~Static(void)
{};
- int getServiceAccess(AISutil::String const &service,AISutil::String const &nickname);
- int getRegisteredNickID(AISutil::String const &nick);
+ int getServiceAccess(AIS::Util::String const &service,AIS::Util::String const &nickname);
+ int getRegisteredNickID(AIS::Util::String const &nick);
};
}; // namespace Exordium
Index: user.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/user.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- user.h 8 Apr 2003 13:42:56 -0000 1.38
+++ user.h 27 Oct 2003 11:55:17 -0000 1.39
@@ -68,25 +68,25 @@
*
* This is redundant imho. - simon
*/
- const AISutil::String getOnlineIDString(void) const
- { return AISutil::String::convert(onlineID); };
+ const AIS::Util::String getOnlineIDString(void) const
+ { return AIS::Util::String::convert(onlineID); };
/* setNick(String)
*
* Update our records to show a new nickname.....
*
*/
- void setNick(const AISutil::String& nick)
+ void setNick(const AIS::Util::String& nick)
{ nickname = nick; };
/* Take note. Their are two sendMessages, the latter allowing
* you to override services default behaviour of using the
* nicknames settings of notice/privmsg
*/
- void sendMessage(AISutil::String const &message,
- AISutil::String const &service);
- void sendMessage(AISutil::String const &message,
- AISutil::String const &service,
+ void sendMessage(AIS::Util::String const &message,
+ AIS::Util::String const &service);
+ void sendMessage(AIS::Util::String const &message,
+ AIS::Util::String const &service,
bool const &privmsg);
/* setModNick(bool)
@@ -122,14 +122,14 @@
* Update the clients hostname.
*
*/
- void updateHost(AISutil::String const &);
+ void updateHost(AIS::Util::String const &);
/* getQuitMessage()
*
* Return the last known quit message for this user
*
*/
- AISutil::String getQuitMessage(void);
+ AIS::Util::String getQuitMessage(void);
int getTimeStamp(void);
@@ -139,7 +139,7 @@
* service.
*
*/
- int getAccess(AISutil::String const &);
+ int getAccess(AIS::Util::String const &);
/* addCheckIdentify()
*
@@ -161,21 +161,21 @@
* Return the users hostname.
*
*/
- AISutil::String getHost(void);
+ AIS::Util::String getHost(void);
/* getIdent()
*
* Return the users ident (username)
*
*/
- AISutil::String getIdent(void);
+ AIS::Util::String getIdent(void);
/* getVWHost()
*
* Return the users vw host
*
*/
- AISutil::String getVWHost(void);
+ AIS::Util::String getVWHost(void);
/* isIdentified()
*
@@ -196,21 +196,21 @@
* Return the server this user is using..
*
*/
- AISutil::String getServer(void);
+ AIS::Util::String getServer(void);
/* getModes()
*
* Query the DB for current user's modes
*
*/
- AISutil::String getModes(void);
+ AIS::Util::String getModes(void);
/* getIDList(String)
*
* Return a list of nicknames we are identified as...
*
*/
- AISutil::String getIDList(void);
+ AIS::Util::String getIDList(void);
/* isPending()
*
@@ -227,7 +227,7 @@
* its not a serious quirk (relating to the possibiltiy of someone
* changing the language for a nick not in use... )
*/
- void setLanguage(AISutil::String const &);
+ void setLanguage(AIS::Util::String const &);
const bool isRegistered(); /* ARE WE registered?!?! */
@@ -235,36 +235,36 @@
*
* Retrieve users language
*/
- AISutil::String getLanguage(void);
+ AIS::Util::String getLanguage(void);
/* getPendingCode()
*
* Get the pending code (if any) for this nick
*/
const void clearPendingCode(void);
- const void registerNick(AISutil::String const &,
- AISutil::String const &);
- const void log(AISutil::String const &, AISutil::String const &);
- const AISutil::String genAuth(void);
+ const void registerNick(AIS::Util::String const &,
+ AIS::Util::String const &);
+ const void log(AIS::Util::String const &, AIS::Util::String const &);
+ const AIS::Util::String genAuth(void);
// update* Functions.
const void updateIdentified(void);
// set* Functions.
- const void setPassword(AISutil::String const &);
- const void setEmail(AISutil::String const &);
- const void setInfo(AISutil::String const &,AISutil::String const &);
+ const void setPassword(AIS::Util::String const &);
+ const void setEmail(AIS::Util::String const &);
+ const void setInfo(AIS::Util::String const &,AIS::Util::String const &);
const void setPrivmsg(bool const &);
// get* Functions.
- const AISutil::String getPendingCode(void);
- const AISutil::String getPass(void);
- const AISutil::String getURL(void);
- const AISutil::String getMSN(void);
- const AISutil::String getYAHOO(void);
- const AISutil::String getAIM(void);
- const AISutil::String getICQ(void);
- const AISutil::String getEmail(void);
- const AISutil::String getRegDate(void);
- const AISutil::String getLastID(void);
- const AISutil::String getLastHost(void);
+ const AIS::Util::String getPendingCode(void);
+ const AIS::Util::String getPass(void);
+ const AIS::Util::String getURL(void);
+ const AIS::Util::String getMSN(void);
+ const AIS::Util::String getYAHOO(void);
+ const AIS::Util::String getAIM(void);
+ const AIS::Util::String getICQ(void);
+ const AIS::Util::String getEmail(void);
+ const AIS::Util::String getRegDate(void);
+ const AIS::Util::String getLastID(void);
+ const AIS::Util::String getLastHost(void);
const int getRegisteredNickID(void);
/* Flood control */
@@ -285,7 +285,7 @@
}
/* Our constructor definition */
- User(AISutil::String const &nick, int const &oid, Services &s)
+ User(AIS::Util::String const &nick, int const &oid, Services &s)
: nickname(nick), //their current nickname.. duh
onlineID(oid), //as dictated by the sql server..
services(s)// Gives us access to the full suite of services..
Index: utils.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/utils.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- utils.h 13 Mar 2003 14:14:37 -0000 1.7
+++ utils.h 27 Oct 2003 11:55:17 -0000 1.8
@@ -35,11 +35,11 @@
extern unsigned long random(unsigned long max);
// Generate a password (uniform password types)
- extern AISutil::String generatePassword(AISutil::String const &nickname,
- AISutil::String const &password);
+ extern AIS::Util::String generatePassword(AIS::Util::String const &nickname,
+ AIS::Util::String const &password);
- extern AISutil::String generateRegcode(AISutil::String const &nickname,
- AISutil::String const &password);
+ extern AIS::Util::String generateRegcode(AIS::Util::String const &nickname,
+ AIS::Util::String const &password);
}; // namespace Utils
}; // namespace Exordium
|
|
From: <ir...@us...> - 2003-10-27 11:56:25
|
Update of /cvsroot/exordium/services/include/exordium/database
In directory sc8-pr-cvs1:/tmp/cvs-serv8183/include/exordium/database
Modified Files:
database.h
Log Message:
Finished include/exordium directory p of AISutil -> AIS::Util
Index: database.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/database/database.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- database.h 27 Oct 2003 11:49:14 -0000 1.20
+++ database.h 27 Oct 2003 11:55:17 -0000 1.21
@@ -101,23 +101,23 @@
// Delete * from <table> using <usingargs> WHERE <whereargs>
- void dbDelete(AISutil::String const &table, AISutil::String const &usingargs, AISutil::String const &whereargs);
+ void dbDelete(AIS::Util::String const &table, AIS::Util::String const &usingargs, AIS::Util::String const &whereargs);
// Delete * from <table> where <whereargs>
- void dbDelete(AISutil::String const &table, AISutil::String const &whereargs);
+ void dbDelete(AIS::Util::String const &table, AIS::Util::String const &whereargs);
// Delete * from <table>
- void dbDelete(AISutil::String const &table);
+ void dbDelete(AIS::Util::String const &table);
// Return a result set
CResult* dbGetResultSet(void);
- int dbQuery(AISutil::String const &query) { return(database->dbQuery(query)); }
+ int dbQuery(AIS::Util::String const &query) { return(database->dbQuery(query)); }
- AISutil::String dbGetValue(void) { return(database->dbGetValue()); }
- AISutil::String dbGetValue(int field) { return(database->dbGetValue(field)); }
+ AIS::Util::String dbGetValue(void) { return(database->dbGetValue()); }
+ AIS::Util::String dbGetValue(int field) { return(database->dbGetValue(field)); }
void dbGetRow(void) { database->dbGetRow(); }
@@ -156,7 +156,7 @@
void dbCommit(void) { database->dbCommit(); }
void dbRollback(void) { database->dbRollback(); }
- void dbSelectDB(AISutil::String const &dbName) { database->dbSelectDB(dbName); }
+ void dbSelectDB(AIS::Util::String const &dbName) { database->dbSelectDB(dbName); }
}; // class CDatabase
|
|
From: <ir...@us...> - 2003-10-27 11:50:17
|
Update of /cvsroot/exordium/services/include/exordium/database
In directory sc8-pr-cvs1:/tmp/cvs-serv7141/include/exordium/database
Modified Files:
base.h database.h result.h
Log Message:
Changes for CVS copy of libais.
Index: base.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/database/base.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- base.h 15 Mar 2003 23:14:31 -0000 1.14
+++ base.h 27 Oct 2003 11:49:14 -0000 1.15
@@ -60,18 +60,18 @@
virtual void dbCommit(void)=0;
virtual void dbRollback(void)=0;
- virtual void dbSelectDB(AISutil::String const &dbName)=0;
+ virtual void dbSelectDB(AIS::Util::String const &dbName)=0;
- virtual int dbQuery(AISutil::String const &query)=0;
+ virtual int dbQuery(AIS::Util::String const &query)=0;
- virtual AISutil::String dbGetValue(void)=0;
- virtual AISutil::String dbGetValue(int field)=0;
+ virtual AIS::Util::String dbGetValue(void)=0;
+ virtual AIS::Util::String dbGetValue(int field)=0;
virtual void dbGetRow(void)=0;
virtual void dbClearRes(void)=0;
- virtual void dbLock(AISutil::String const &table)=0;
+ virtual void dbLock(AIS::Util::String const &table)=0;
virtual void dbUnlock(void)=0;
virtual CResult* dbGetResultSet(void)=0;
Index: database.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/database/database.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- database.h 24 Mar 2003 16:36:09 -0000 1.19
+++ database.h 27 Oct 2003 11:49:14 -0000 1.20
@@ -71,33 +71,33 @@
// Select * from <table>
- int dbSelect(AISutil::String const &table);
+ int dbSelect(AIS::Util::String const &table);
// Select <fields> from <table>
- int dbSelect(AISutil::String const &fields, AISutil::String const &table);
+ int dbSelect(AIS::Util::String const &fields, AIS::Util::String const &table);
// Select <fields> from <table> where <whereargs>
- int dbSelect(AISutil::String const &fields, AISutil::String const &table, AISutil::String const &whereargs);
+ int dbSelect(AIS::Util::String const &fields, AIS::Util::String const &table, AIS::Util::String const &whereargs);
// Select <fields> from <table> where <whereargs> order by <orderargs>
- int dbSelect(AISutil::String const &fields, AISutil::String const &table, AISutil::String const &whereargs, AISutil::String const &orderargs);
+ int dbSelect(AIS::Util::String const &fields, AIS::Util::String const &table, AIS::Util::String const &whereargs, AIS::Util::String const &orderargs);
// Select count(*) from <table>
- int dbCount(AISutil::String const &table);
+ int dbCount(AIS::Util::String const &table);
// Select count(*) from <table> where <whereargs>
- int dbCount(AISutil::String const &table, AISutil::String const &whereargs);
+ int dbCount(AIS::Util::String const &table, AIS::Util::String const &whereargs);
// Insert into <table> values <values>
- void dbInsert(AISutil::String const &table, AISutil::String const &values);
+ void dbInsert(AIS::Util::String const &table, AIS::Util::String const &values);
// (Delayed - Not important) Insert into <table> values <values>
- void dbDelayedInsert(AISutil::String const &table, AISutil::String const &values);
+ void dbDelayedInsert(AIS::Util::String const &table, AIS::Util::String const &values);
- void dbUpdate(AISutil::String const &table, AISutil::String const &values, AISutil::String const &whereargs);
+ void dbUpdate(AIS::Util::String const &table, AIS::Util::String const &values, AIS::Util::String const &whereargs);
// Delete * from <table> using <usingargs> WHERE <whereargs>
Index: result.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/database/result.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- result.h 17 Mar 2003 14:48:38 -0000 1.4
+++ result.h 27 Oct 2003 11:49:14 -0000 1.5
@@ -39,7 +39,7 @@
virtual ~CResult(void)
{};
- virtual AISutil::String getValue(const int &,const int &)=0;
+ virtual AIS::Util::String getValue(const int &,const int &)=0;
};
};
|
|
From: <ir...@us...> - 2003-10-27 11:50:16
|
Update of /cvsroot/exordium/services/source/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv7141/source/lib
Modified Files:
config.cpp
Log Message:
Changes for CVS copy of libais.
Index: config.cpp
===================================================================
RCS file: /cvsroot/exordium/services/source/lib/config.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- config.cpp 6 Apr 2003 17:40:58 -0000 1.9
+++ config.cpp 27 Oct 2003 11:49:14 -0000 1.10
@@ -162,6 +162,13 @@
(void *)&Config::defSqlUsername, &varHandleStringOneWord,
0, 0
},
+ {
+ "SSLENABLED", 6,
+ (void *)&ConfigInternal::defSqlSSLEnabled, &varHandleBoolean,
+ 0, 0
+ }
+ ,
+
{ 0, 0, 0, 0, 0, 0 }
};
@@ -177,7 +184,8 @@
defSqlHostname("localhost"),
defSqlPassword(""),
defSqlPort(3306), // mysql port, as assigned by the iana
- defSqlUsername("root")
+ defSqlUsername("root"),
+ defSqlSSLEnabled(false)
{}
|
|
From: <ir...@us...> - 2003-10-27 11:49:22
|
Update of /cvsroot/exordium/services/include/exordium
In directory sc8-pr-cvs1:/tmp/cvs-serv7141/include/exordium
Modified Files:
config.h
Log Message:
Changes for CVS copy of libais.
Index: config.h
===================================================================
RCS file: /cvsroot/exordium/services/include/exordium/config.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- config.h 13 Mar 2003 14:14:37 -0000 1.15
+++ config.h 27 Oct 2003 11:49:13 -0000 1.16
@@ -43,7 +43,7 @@
AISutil::String defSqlHostname; // MySql server hostname
AISutil::String defSqlPassword; // MySql server password
unsigned short defSqlPort; // MySql server port
-
+ bool defSqlSSLEnabled; // Mysql SSL Boolean
AISutil::String defSqlUsername; // MySql server username
AISutil::String defSqlEngine; // Database engine
@@ -71,6 +71,9 @@
{ return defSqlUsername; };
const AISutil::String& getSqlEngine(void) const
{ return defSqlEngine; };
+ const bool getSqlSSLEnabled(void) const
+ { return defSqlSSLEnabled; };
+
};
}; // namespace Exordium
|
|
From: <ir...@us...> - 2003-10-27 05:56:53
|
Update of /cvsroot/exordium/services/source/modules/mod.note
In directory sc8-pr-cvs1:/tmp/cvs-serv13374/source/modules/mod.note
Modified Files:
note.h
Log Message:
o) Changes to work with kind snapshot Simon sent.
o) Re-enabled nickname registration
o) Removed some hard-coded stuff.
Index: note.h
===================================================================
RCS file: /cvsroot/exordium/services/source/modules/mod.note/note.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- note.h 7 Apr 2003 17:47:40 -0000 1.15
+++ note.h 26 Oct 2003 21:42:14 -0000 1.16
@@ -58,7 +58,7 @@
public:
Module(void)
- : configData(moduleInfo.fullName, "peoplechat.org", "Note", "note")
+ : configData(moduleInfo.fullName, "exordium.org", "Note", "note")
{};
~Module(void)
|
3 messages has been excluded from this view by a project administrator.
