summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/xline.h6
-rw-r--r--src/InspIRCd.layout30
-rw-r--r--src/xline.cpp4
3 files changed, 23 insertions, 17 deletions
diff --git a/include/xline.h b/include/xline.h
index 15de2113d..fdd5fb5d1 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -72,6 +72,9 @@ class ZLine : public XLine
* May contain wildcards.
*/
char ipaddr[MAXBUF];
+ /** Set if this is a global Z:line
+ * (e.g. it came from another server)
+ */
bool is_global;
};
@@ -84,6 +87,9 @@ class QLine : public XLine
* May contain wildcards.
*/
char nick[MAXBUF];
+ /** Set if this is a global Z:line
+ * (e.g. it came from another server)
+ */
bool is_global;
};
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 741140b89..579edf005 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
[Editors]
-Focused=46
+Focused=-1
Order=2,4,6,3,7,25,5,24,39,42,43,-1,1,46,0
[Editor_0]
@@ -14,8 +14,8 @@ LeftChar=1
Open=1
Top=0
CursorCol=1
-CursorRow=2924
-TopLine=2877
+CursorRow=1
+TopLine=1
LeftChar=1
[Editor_2]
@@ -295,9 +295,9 @@ LeftChar=1
[Editor_38]
Open=1
Top=0
-CursorCol=39
-CursorRow=52
-TopLine=13
+CursorCol=1
+CursorRow=1
+TopLine=1
LeftChar=1
[Editor_39]
Open=1
@@ -330,8 +330,8 @@ LeftChar=1
[Editor_43]
Open=1
Top=0
-CursorCol=9
-CursorRow=2333
+CursorCol=10
+CursorRow=2321
TopLine=2290
LeftChar=1
[Editor_44]
@@ -343,15 +343,15 @@ TopLine=16
LeftChar=1
[Editor_45]
Open=1
-Top=0
-CursorCol=1
-CursorRow=124
-TopLine=3
+Top=1
+CursorCol=5
+CursorRow=92
+TopLine=41
LeftChar=1
[Editor_46]
Open=1
-Top=1
-CursorCol=30
-CursorRow=339
+Top=0
+CursorCol=57
+CursorRow=346
TopLine=297
LeftChar=1
diff --git a/src/xline.cpp b/src/xline.cpp
index d83967aa0..64753674d 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -336,14 +336,14 @@ void sync_xlines(serverrec* serv, char* tcp_host)
{
if (i->is_global)
{
- snprintf(data,MAXBUF,"{ %s %s %ld %ld :%s",i->ipaddr,i->source,i->set_time,i->duration,i->reason);
+ snprintf(data,MAXBUF,"{ %s %s %ld %ld :%s",i->nick,i->source,i->set_time,i->duration,i->reason);
serv->SendPacket(data,tcp_host);
}
}
// glines are always global, so no need to check
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
- snprintf(data,MAXBUF,"# %s %s %ld %ld :%s",i->ipaddr,i->source,i->set_time,i->duration,i->reason);
+ snprintf(data,MAXBUF,"# %s %s %ld %ld :%s",i->hostmask,i->source,i->set_time,i->duration,i->reason);
serv->SendPacket(data,tcp_host);
}
}