From 37909ffef0bf729d88930725599f6f8926930f9a Mon Sep 17 00:00:00 2001 From: LX3JL Date: Tue, 24 Jan 2017 08:45:11 +0100 Subject: [PATCH] version 1.4.1 --- dashboard/changes.txt | 20 +++- dashboard/css/layout.css | 0 dashboard/favicon.ico | Bin dashboard/img/down.png | Bin dashboard/img/dvc.jpg | Bin dashboard/img/ear.png | Bin dashboard/img/easterheader.jpg | Bin dashboard/img/flags/ad.png | Bin dashboard/img/flags/ae.png | Bin dashboard/img/flags/af.png | Bin dashboard/img/flags/ag.png | Bin dashboard/img/flags/al.png | Bin dashboard/img/flags/am.png | Bin dashboard/img/flags/ao.png | Bin dashboard/img/flags/ar.png | Bin dashboard/img/flags/at.png | Bin dashboard/img/flags/au.png | Bin dashboard/img/flags/ax.png | Bin dashboard/img/flags/az.png | Bin dashboard/img/flags/ba.png | Bin dashboard/img/flags/bb.png | Bin dashboard/img/flags/bd.png | Bin dashboard/img/flags/be.png | Bin dashboard/img/flags/bf.png | Bin dashboard/img/flags/bg.png | Bin dashboard/img/flags/bh.png | Bin dashboard/img/flags/bi.png | Bin dashboard/img/flags/bj.png | Bin dashboard/img/flags/bn.png | Bin dashboard/img/flags/bo.png | Bin dashboard/img/flags/br.png | Bin dashboard/img/flags/bs.png | Bin dashboard/img/flags/bt.png | Bin dashboard/img/flags/bw.png | Bin dashboard/img/flags/by.png | Bin dashboard/img/flags/bz.png | Bin dashboard/img/flags/ca.png | Bin dashboard/img/flags/cd.png | Bin dashboard/img/flags/cf.png | Bin dashboard/img/flags/cg.png | Bin dashboard/img/flags/ch.png | Bin dashboard/img/flags/ci.png | Bin dashboard/img/flags/cl.png | Bin dashboard/img/flags/cm.png | Bin dashboard/img/flags/cn.png | Bin dashboard/img/flags/co.png | Bin dashboard/img/flags/cr.png | Bin dashboard/img/flags/cu.png | Bin dashboard/img/flags/cv.png | Bin dashboard/img/flags/cy.png | Bin dashboard/img/flags/cz.png | Bin dashboard/img/flags/de.png | Bin dashboard/img/flags/dj.png | Bin dashboard/img/flags/dk.png | Bin dashboard/img/flags/dm.png | Bin dashboard/img/flags/do.png | Bin dashboard/img/flags/dz.png | Bin dashboard/img/flags/ec.png | Bin dashboard/img/flags/ee.png | Bin dashboard/img/flags/eg.png | Bin dashboard/img/flags/eh.png | Bin dashboard/img/flags/er.png | Bin dashboard/img/flags/es.png | Bin dashboard/img/flags/et.png | Bin dashboard/img/flags/fi.png | Bin dashboard/img/flags/fj.png | Bin dashboard/img/flags/fm.png | Bin dashboard/img/flags/fr.png | Bin dashboard/img/flags/ga.png | Bin dashboard/img/flags/gate.png | Bin dashboard/img/flags/gb.png | Bin dashboard/img/flags/gd.png | Bin dashboard/img/flags/ge.png | Bin dashboard/img/flags/gh.png | Bin dashboard/img/flags/gm.png | Bin dashboard/img/flags/gn.png | Bin dashboard/img/flags/gq.png | Bin dashboard/img/flags/gr.png | Bin dashboard/img/flags/gt.png | Bin dashboard/img/flags/gw.png | Bin dashboard/img/flags/gy.png | Bin dashboard/img/flags/hk.png | Bin 1308 -> 0 bytes dashboard/img/flags/hn.png | Bin dashboard/img/flags/hr.png | Bin dashboard/img/flags/ht.png | Bin dashboard/img/flags/hu.png | Bin dashboard/img/flags/id.png | Bin dashboard/img/flags/ie.png | Bin dashboard/img/flags/il.png | Bin dashboard/img/flags/im.png | Bin dashboard/img/flags/in.png | Bin dashboard/img/flags/iq.png | Bin dashboard/img/flags/ir.png | Bin dashboard/img/flags/is.png | Bin dashboard/img/flags/it.png | Bin dashboard/img/flags/jm.png | Bin dashboard/img/flags/jo.png | Bin dashboard/img/flags/jp.png | Bin dashboard/img/flags/ke.png | Bin dashboard/img/flags/kg.png | Bin dashboard/img/flags/kh.png | Bin dashboard/img/flags/ki.png | Bin dashboard/img/flags/km.png | Bin dashboard/img/flags/kn.png | Bin dashboard/img/flags/kp.png | Bin dashboard/img/flags/kr.png | Bin dashboard/img/flags/ks.png | Bin dashboard/img/flags/kw.png | Bin dashboard/img/flags/kz.png | Bin dashboard/img/flags/la.png | Bin dashboard/img/flags/lb.png | Bin dashboard/img/flags/lc.png | Bin dashboard/img/flags/li.png | Bin dashboard/img/flags/lk.png | Bin dashboard/img/flags/lr.png | Bin dashboard/img/flags/ls.png | Bin dashboard/img/flags/lt.png | Bin dashboard/img/flags/lu.png | Bin dashboard/img/flags/lv.png | Bin dashboard/img/flags/ly.png | Bin dashboard/img/flags/ma.png | Bin dashboard/img/flags/mc.png | Bin dashboard/img/flags/md.png | Bin dashboard/img/flags/me.png | Bin dashboard/img/flags/mg.png | Bin dashboard/img/flags/mh.png | Bin dashboard/img/flags/mk.png | Bin dashboard/img/flags/ml.png | Bin dashboard/img/flags/mm.png | Bin dashboard/img/flags/mn.png | Bin dashboard/img/flags/mo.png | Bin dashboard/img/flags/mr.png | Bin dashboard/img/flags/mt.png | Bin dashboard/img/flags/mu.png | Bin dashboard/img/flags/mv.png | Bin dashboard/img/flags/mw.png | Bin dashboard/img/flags/mx.png | Bin dashboard/img/flags/my.png | Bin dashboard/img/flags/mz.png | Bin dashboard/img/flags/na.png | Bin dashboard/img/flags/ne.png | Bin dashboard/img/flags/ng.png | Bin dashboard/img/flags/ni.png | Bin dashboard/img/flags/nie.png | Bin dashboard/img/flags/nl.png | Bin dashboard/img/flags/no.png | Bin dashboard/img/flags/np.png | Bin dashboard/img/flags/nr.png | Bin dashboard/img/flags/nz.png | Bin dashboard/img/flags/om.png | Bin dashboard/img/flags/pa.png | Bin dashboard/img/flags/pe.png | Bin dashboard/img/flags/pg.png | Bin dashboard/img/flags/ph.png | Bin dashboard/img/flags/pk.png | Bin dashboard/img/flags/pl.png | Bin dashboard/img/flags/pr.png | Bin dashboard/img/flags/pt.png | Bin dashboard/img/flags/pw.png | Bin dashboard/img/flags/py.png | Bin dashboard/img/flags/qa.png | Bin dashboard/img/flags/re.png | Bin 0 -> 96 bytes dashboard/img/flags/ro.png | Bin dashboard/img/flags/rs.png | Bin dashboard/img/flags/ru.png | Bin dashboard/img/flags/rw.png | Bin dashboard/img/flags/sa.png | Bin dashboard/img/flags/sb.png | Bin dashboard/img/flags/sc.png | Bin dashboard/img/flags/sd.png | Bin dashboard/img/flags/se.png | Bin dashboard/img/flags/sg.png | Bin dashboard/img/flags/sh.png | Bin dashboard/img/flags/si.png | Bin dashboard/img/flags/sk.png | Bin dashboard/img/flags/sl.png | Bin dashboard/img/flags/sm.png | Bin dashboard/img/flags/sn.png | Bin dashboard/img/flags/so.png | Bin dashboard/img/flags/sr.png | Bin dashboard/img/flags/st.png | Bin dashboard/img/flags/sv.png | Bin dashboard/img/flags/sy.png | Bin dashboard/img/flags/sz.png | Bin dashboard/img/flags/td.png | Bin dashboard/img/flags/tg.png | Bin dashboard/img/flags/th.png | Bin dashboard/img/flags/tj.png | Bin dashboard/img/flags/tl.png | Bin dashboard/img/flags/tm.png | Bin dashboard/img/flags/tn.png | Bin dashboard/img/flags/to.png | Bin dashboard/img/flags/tr.png | Bin dashboard/img/flags/tt.png | Bin dashboard/img/flags/tv.png | Bin dashboard/img/flags/tw.png | Bin dashboard/img/flags/tz.png | Bin dashboard/img/flags/ua.png | Bin dashboard/img/flags/ug.png | Bin dashboard/img/flags/us.png | Bin dashboard/img/flags/uy.png | Bin dashboard/img/flags/uz.png | Bin dashboard/img/flags/va.png | Bin dashboard/img/flags/vc.png | Bin dashboard/img/flags/ve.png | Bin dashboard/img/flags/vn.png | Bin dashboard/img/flags/vu.png | Bin dashboard/img/flags/wl.png | Bin dashboard/img/flags/ws.png | Bin dashboard/img/flags/ye.png | Bin dashboard/img/flags/za.png | Bin dashboard/img/flags/zm.png | Bin dashboard/img/flags/zw.png | Bin dashboard/img/header.jpg | Bin dashboard/img/radio-waves-hi.png | Bin dashboard/img/sat.png | Bin dashboard/img/speaker.png | Bin dashboard/img/up.png | Bin dashboard/index.php | 26 +++-- dashboard/log/index.html | 0 dashboard/log/xlxlog.php | 0 dashboard/pgs/class.interlink.php | 0 dashboard/pgs/class.node.php | 9 +- dashboard/pgs/class.parsexml.php | 21 ++-- dashboard/pgs/class.peer.php | 0 dashboard/pgs/class.reflector.php | 36 ++++-- dashboard/pgs/class.station.php | 5 +- dashboard/pgs/config.inc.php | 2 +- dashboard/pgs/country.csv | 7 +- dashboard/pgs/functions.php | 0 dashboard/pgs/liveccs.php | 0 dashboard/pgs/liveircddb.php | 0 dashboard/pgs/peers.php | 176 +++++++++++++++--------------- dashboard/pgs/reflectors.php | 10 +- dashboard/pgs/repeaters.php | 0 dashboard/pgs/users.php | 30 +++-- src/cdcsprotocol.cpp | 2 +- src/cdextraprotocol.cpp | 2 +- src/cdplusprotocol.cpp | 2 +- src/cuser.cpp | 9 +- src/cuser.h | 3 +- src/cusers.cpp | 8 +- src/cusers.h | 2 +- src/cxlxprotocol.cpp | 2 +- src/main.h | 2 +- 245 files changed, 209 insertions(+), 165 deletions(-) mode change 100644 => 100755 dashboard/changes.txt mode change 100644 => 100755 dashboard/css/layout.css mode change 100644 => 100755 dashboard/favicon.ico mode change 100644 => 100755 dashboard/img/down.png mode change 100644 => 100755 dashboard/img/dvc.jpg mode change 100644 => 100755 dashboard/img/ear.png mode change 100644 => 100755 dashboard/img/easterheader.jpg mode change 100644 => 100755 dashboard/img/flags/ad.png mode change 100644 => 100755 dashboard/img/flags/ae.png mode change 100644 => 100755 dashboard/img/flags/af.png mode change 100644 => 100755 dashboard/img/flags/ag.png mode change 100644 => 100755 dashboard/img/flags/al.png mode change 100644 => 100755 dashboard/img/flags/am.png mode change 100644 => 100755 dashboard/img/flags/ao.png mode change 100644 => 100755 dashboard/img/flags/ar.png mode change 100644 => 100755 dashboard/img/flags/at.png mode change 100644 => 100755 dashboard/img/flags/au.png mode change 100644 => 100755 dashboard/img/flags/ax.png mode change 100644 => 100755 dashboard/img/flags/az.png mode change 100644 => 100755 dashboard/img/flags/ba.png mode change 100644 => 100755 dashboard/img/flags/bb.png mode change 100644 => 100755 dashboard/img/flags/bd.png mode change 100644 => 100755 dashboard/img/flags/be.png mode change 100644 => 100755 dashboard/img/flags/bf.png mode change 100644 => 100755 dashboard/img/flags/bg.png mode change 100644 => 100755 dashboard/img/flags/bh.png mode change 100644 => 100755 dashboard/img/flags/bi.png mode change 100644 => 100755 dashboard/img/flags/bj.png mode change 100644 => 100755 dashboard/img/flags/bn.png mode change 100644 => 100755 dashboard/img/flags/bo.png mode change 100644 => 100755 dashboard/img/flags/br.png mode change 100644 => 100755 dashboard/img/flags/bs.png mode change 100644 => 100755 dashboard/img/flags/bt.png mode change 100644 => 100755 dashboard/img/flags/bw.png mode change 100644 => 100755 dashboard/img/flags/by.png mode change 100644 => 100755 dashboard/img/flags/bz.png mode change 100644 => 100755 dashboard/img/flags/ca.png mode change 100644 => 100755 dashboard/img/flags/cd.png mode change 100644 => 100755 dashboard/img/flags/cf.png mode change 100644 => 100755 dashboard/img/flags/cg.png mode change 100644 => 100755 dashboard/img/flags/ch.png mode change 100644 => 100755 dashboard/img/flags/ci.png mode change 100644 => 100755 dashboard/img/flags/cl.png mode change 100644 => 100755 dashboard/img/flags/cm.png mode change 100644 => 100755 dashboard/img/flags/cn.png mode change 100644 => 100755 dashboard/img/flags/co.png mode change 100644 => 100755 dashboard/img/flags/cr.png mode change 100644 => 100755 dashboard/img/flags/cu.png mode change 100644 => 100755 dashboard/img/flags/cv.png mode change 100644 => 100755 dashboard/img/flags/cy.png mode change 100644 => 100755 dashboard/img/flags/cz.png mode change 100644 => 100755 dashboard/img/flags/de.png mode change 100644 => 100755 dashboard/img/flags/dj.png mode change 100644 => 100755 dashboard/img/flags/dk.png mode change 100644 => 100755 dashboard/img/flags/dm.png mode change 100644 => 100755 dashboard/img/flags/do.png mode change 100644 => 100755 dashboard/img/flags/dz.png mode change 100644 => 100755 dashboard/img/flags/ec.png mode change 100644 => 100755 dashboard/img/flags/ee.png mode change 100644 => 100755 dashboard/img/flags/eg.png mode change 100644 => 100755 dashboard/img/flags/eh.png mode change 100644 => 100755 dashboard/img/flags/er.png mode change 100644 => 100755 dashboard/img/flags/es.png mode change 100644 => 100755 dashboard/img/flags/et.png mode change 100644 => 100755 dashboard/img/flags/fi.png mode change 100644 => 100755 dashboard/img/flags/fj.png mode change 100644 => 100755 dashboard/img/flags/fm.png mode change 100644 => 100755 dashboard/img/flags/fr.png mode change 100644 => 100755 dashboard/img/flags/ga.png mode change 100644 => 100755 dashboard/img/flags/gate.png mode change 100644 => 100755 dashboard/img/flags/gb.png mode change 100644 => 100755 dashboard/img/flags/gd.png mode change 100644 => 100755 dashboard/img/flags/ge.png mode change 100644 => 100755 dashboard/img/flags/gh.png mode change 100644 => 100755 dashboard/img/flags/gm.png mode change 100644 => 100755 dashboard/img/flags/gn.png mode change 100644 => 100755 dashboard/img/flags/gq.png mode change 100644 => 100755 dashboard/img/flags/gr.png mode change 100644 => 100755 dashboard/img/flags/gt.png mode change 100644 => 100755 dashboard/img/flags/gw.png mode change 100644 => 100755 dashboard/img/flags/gy.png delete mode 100644 dashboard/img/flags/hk.png mode change 100644 => 100755 dashboard/img/flags/hn.png mode change 100644 => 100755 dashboard/img/flags/hr.png mode change 100644 => 100755 dashboard/img/flags/ht.png mode change 100644 => 100755 dashboard/img/flags/hu.png mode change 100644 => 100755 dashboard/img/flags/id.png mode change 100644 => 100755 dashboard/img/flags/ie.png mode change 100644 => 100755 dashboard/img/flags/il.png mode change 100644 => 100755 dashboard/img/flags/im.png mode change 100644 => 100755 dashboard/img/flags/in.png mode change 100644 => 100755 dashboard/img/flags/iq.png mode change 100644 => 100755 dashboard/img/flags/ir.png mode change 100644 => 100755 dashboard/img/flags/is.png mode change 100644 => 100755 dashboard/img/flags/it.png mode change 100644 => 100755 dashboard/img/flags/jm.png mode change 100644 => 100755 dashboard/img/flags/jo.png mode change 100644 => 100755 dashboard/img/flags/jp.png mode change 100644 => 100755 dashboard/img/flags/ke.png mode change 100644 => 100755 dashboard/img/flags/kg.png mode change 100644 => 100755 dashboard/img/flags/kh.png mode change 100644 => 100755 dashboard/img/flags/ki.png mode change 100644 => 100755 dashboard/img/flags/km.png mode change 100644 => 100755 dashboard/img/flags/kn.png mode change 100644 => 100755 dashboard/img/flags/kp.png mode change 100644 => 100755 dashboard/img/flags/kr.png mode change 100644 => 100755 dashboard/img/flags/ks.png mode change 100644 => 100755 dashboard/img/flags/kw.png mode change 100644 => 100755 dashboard/img/flags/kz.png mode change 100644 => 100755 dashboard/img/flags/la.png mode change 100644 => 100755 dashboard/img/flags/lb.png mode change 100644 => 100755 dashboard/img/flags/lc.png mode change 100644 => 100755 dashboard/img/flags/li.png mode change 100644 => 100755 dashboard/img/flags/lk.png mode change 100644 => 100755 dashboard/img/flags/lr.png mode change 100644 => 100755 dashboard/img/flags/ls.png mode change 100644 => 100755 dashboard/img/flags/lt.png mode change 100644 => 100755 dashboard/img/flags/lu.png mode change 100644 => 100755 dashboard/img/flags/lv.png mode change 100644 => 100755 dashboard/img/flags/ly.png mode change 100644 => 100755 dashboard/img/flags/ma.png mode change 100644 => 100755 dashboard/img/flags/mc.png mode change 100644 => 100755 dashboard/img/flags/md.png mode change 100644 => 100755 dashboard/img/flags/me.png mode change 100644 => 100755 dashboard/img/flags/mg.png mode change 100644 => 100755 dashboard/img/flags/mh.png mode change 100644 => 100755 dashboard/img/flags/mk.png mode change 100644 => 100755 dashboard/img/flags/ml.png mode change 100644 => 100755 dashboard/img/flags/mm.png mode change 100644 => 100755 dashboard/img/flags/mn.png mode change 100644 => 100755 dashboard/img/flags/mo.png mode change 100644 => 100755 dashboard/img/flags/mr.png mode change 100644 => 100755 dashboard/img/flags/mt.png mode change 100644 => 100755 dashboard/img/flags/mu.png mode change 100644 => 100755 dashboard/img/flags/mv.png mode change 100644 => 100755 dashboard/img/flags/mw.png mode change 100644 => 100755 dashboard/img/flags/mx.png mode change 100644 => 100755 dashboard/img/flags/my.png mode change 100644 => 100755 dashboard/img/flags/mz.png mode change 100644 => 100755 dashboard/img/flags/na.png mode change 100644 => 100755 dashboard/img/flags/ne.png mode change 100644 => 100755 dashboard/img/flags/ng.png mode change 100644 => 100755 dashboard/img/flags/ni.png mode change 100644 => 100755 dashboard/img/flags/nie.png mode change 100644 => 100755 dashboard/img/flags/nl.png mode change 100644 => 100755 dashboard/img/flags/no.png mode change 100644 => 100755 dashboard/img/flags/np.png mode change 100644 => 100755 dashboard/img/flags/nr.png mode change 100644 => 100755 dashboard/img/flags/nz.png mode change 100644 => 100755 dashboard/img/flags/om.png mode change 100644 => 100755 dashboard/img/flags/pa.png mode change 100644 => 100755 dashboard/img/flags/pe.png mode change 100644 => 100755 dashboard/img/flags/pg.png mode change 100644 => 100755 dashboard/img/flags/ph.png mode change 100644 => 100755 dashboard/img/flags/pk.png mode change 100644 => 100755 dashboard/img/flags/pl.png mode change 100644 => 100755 dashboard/img/flags/pr.png mode change 100644 => 100755 dashboard/img/flags/pt.png mode change 100644 => 100755 dashboard/img/flags/pw.png mode change 100644 => 100755 dashboard/img/flags/py.png mode change 100644 => 100755 dashboard/img/flags/qa.png create mode 100755 dashboard/img/flags/re.png mode change 100644 => 100755 dashboard/img/flags/ro.png mode change 100644 => 100755 dashboard/img/flags/rs.png mode change 100644 => 100755 dashboard/img/flags/ru.png mode change 100644 => 100755 dashboard/img/flags/rw.png mode change 100644 => 100755 dashboard/img/flags/sa.png mode change 100644 => 100755 dashboard/img/flags/sb.png mode change 100644 => 100755 dashboard/img/flags/sc.png mode change 100644 => 100755 dashboard/img/flags/sd.png mode change 100644 => 100755 dashboard/img/flags/se.png mode change 100644 => 100755 dashboard/img/flags/sg.png mode change 100644 => 100755 dashboard/img/flags/sh.png mode change 100644 => 100755 dashboard/img/flags/si.png mode change 100644 => 100755 dashboard/img/flags/sk.png mode change 100644 => 100755 dashboard/img/flags/sl.png mode change 100644 => 100755 dashboard/img/flags/sm.png mode change 100644 => 100755 dashboard/img/flags/sn.png mode change 100644 => 100755 dashboard/img/flags/so.png mode change 100644 => 100755 dashboard/img/flags/sr.png mode change 100644 => 100755 dashboard/img/flags/st.png mode change 100644 => 100755 dashboard/img/flags/sv.png mode change 100644 => 100755 dashboard/img/flags/sy.png mode change 100644 => 100755 dashboard/img/flags/sz.png mode change 100644 => 100755 dashboard/img/flags/td.png mode change 100644 => 100755 dashboard/img/flags/tg.png mode change 100644 => 100755 dashboard/img/flags/th.png mode change 100644 => 100755 dashboard/img/flags/tj.png mode change 100644 => 100755 dashboard/img/flags/tl.png mode change 100644 => 100755 dashboard/img/flags/tm.png mode change 100644 => 100755 dashboard/img/flags/tn.png mode change 100644 => 100755 dashboard/img/flags/to.png mode change 100644 => 100755 dashboard/img/flags/tr.png mode change 100644 => 100755 dashboard/img/flags/tt.png mode change 100644 => 100755 dashboard/img/flags/tv.png mode change 100644 => 100755 dashboard/img/flags/tw.png mode change 100644 => 100755 dashboard/img/flags/tz.png mode change 100644 => 100755 dashboard/img/flags/ua.png mode change 100644 => 100755 dashboard/img/flags/ug.png mode change 100644 => 100755 dashboard/img/flags/us.png mode change 100644 => 100755 dashboard/img/flags/uy.png mode change 100644 => 100755 dashboard/img/flags/uz.png mode change 100644 => 100755 dashboard/img/flags/va.png mode change 100644 => 100755 dashboard/img/flags/vc.png mode change 100644 => 100755 dashboard/img/flags/ve.png mode change 100644 => 100755 dashboard/img/flags/vn.png mode change 100644 => 100755 dashboard/img/flags/vu.png mode change 100644 => 100755 dashboard/img/flags/wl.png mode change 100644 => 100755 dashboard/img/flags/ws.png mode change 100644 => 100755 dashboard/img/flags/ye.png mode change 100644 => 100755 dashboard/img/flags/za.png mode change 100644 => 100755 dashboard/img/flags/zm.png mode change 100644 => 100755 dashboard/img/flags/zw.png mode change 100644 => 100755 dashboard/img/header.jpg mode change 100644 => 100755 dashboard/img/radio-waves-hi.png mode change 100644 => 100755 dashboard/img/sat.png mode change 100644 => 100755 dashboard/img/speaker.png mode change 100644 => 100755 dashboard/img/up.png mode change 100644 => 100755 dashboard/index.php mode change 100644 => 100755 dashboard/log/index.html mode change 100644 => 100755 dashboard/log/xlxlog.php mode change 100644 => 100755 dashboard/pgs/class.interlink.php mode change 100644 => 100755 dashboard/pgs/class.node.php mode change 100644 => 100755 dashboard/pgs/class.parsexml.php mode change 100644 => 100755 dashboard/pgs/class.peer.php mode change 100644 => 100755 dashboard/pgs/class.reflector.php mode change 100644 => 100755 dashboard/pgs/class.station.php mode change 100644 => 100755 dashboard/pgs/config.inc.php mode change 100644 => 100755 dashboard/pgs/country.csv mode change 100644 => 100755 dashboard/pgs/functions.php mode change 100644 => 100755 dashboard/pgs/liveccs.php mode change 100644 => 100755 dashboard/pgs/liveircddb.php mode change 100644 => 100755 dashboard/pgs/peers.php mode change 100644 => 100755 dashboard/pgs/reflectors.php mode change 100644 => 100755 dashboard/pgs/repeaters.php mode change 100644 => 100755 dashboard/pgs/users.php diff --git a/dashboard/changes.txt b/dashboard/changes.txt old mode 100644 new mode 100755 index 75ce59f..d20e112 --- a/dashboard/changes.txt +++ b/dashboard/changes.txt @@ -1,5 +1,23 @@ -xlx db v2.3.1 +xlx db v2.3.3 +now displays always the correct module for the last heard station. +db v2.3.3 requires xlxd v1.4.1 + +- "class.station.php" +- "class.reflector.php" +- "users.php" + +xlx db v2.3.2 + +add random id for nodes, to show the correct linked module for multiple nodes with +the same call signe linked to different modules. + +- "class.node.php" +- "class.reflector.php" +- "users.php" + +xlx db v2.3.1 + - "config.inc.php" $CallingHome['InterlinkFile'] added - "index.php" added support for interlink visualization - "class.reflector.php" callingHome redisigned for interlink visualization diff --git a/dashboard/css/layout.css b/dashboard/css/layout.css old mode 100644 new mode 100755 diff --git a/dashboard/favicon.ico b/dashboard/favicon.ico old mode 100644 new mode 100755 diff --git a/dashboard/img/down.png b/dashboard/img/down.png old mode 100644 new mode 100755 diff --git a/dashboard/img/dvc.jpg b/dashboard/img/dvc.jpg old mode 100644 new mode 100755 diff --git a/dashboard/img/ear.png b/dashboard/img/ear.png old mode 100644 new mode 100755 diff --git a/dashboard/img/easterheader.jpg b/dashboard/img/easterheader.jpg old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ad.png b/dashboard/img/flags/ad.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ae.png b/dashboard/img/flags/ae.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/af.png b/dashboard/img/flags/af.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ag.png b/dashboard/img/flags/ag.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/al.png b/dashboard/img/flags/al.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/am.png b/dashboard/img/flags/am.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ao.png b/dashboard/img/flags/ao.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ar.png b/dashboard/img/flags/ar.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/at.png b/dashboard/img/flags/at.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/au.png b/dashboard/img/flags/au.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ax.png b/dashboard/img/flags/ax.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/az.png b/dashboard/img/flags/az.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ba.png b/dashboard/img/flags/ba.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bb.png b/dashboard/img/flags/bb.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bd.png b/dashboard/img/flags/bd.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/be.png b/dashboard/img/flags/be.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bf.png b/dashboard/img/flags/bf.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bg.png b/dashboard/img/flags/bg.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bh.png b/dashboard/img/flags/bh.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bi.png b/dashboard/img/flags/bi.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bj.png b/dashboard/img/flags/bj.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bn.png b/dashboard/img/flags/bn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bo.png b/dashboard/img/flags/bo.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/br.png b/dashboard/img/flags/br.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bs.png b/dashboard/img/flags/bs.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bt.png b/dashboard/img/flags/bt.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bw.png b/dashboard/img/flags/bw.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/by.png b/dashboard/img/flags/by.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/bz.png b/dashboard/img/flags/bz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ca.png b/dashboard/img/flags/ca.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cd.png b/dashboard/img/flags/cd.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cf.png b/dashboard/img/flags/cf.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cg.png b/dashboard/img/flags/cg.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ch.png b/dashboard/img/flags/ch.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ci.png b/dashboard/img/flags/ci.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cl.png b/dashboard/img/flags/cl.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cm.png b/dashboard/img/flags/cm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cn.png b/dashboard/img/flags/cn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/co.png b/dashboard/img/flags/co.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cr.png b/dashboard/img/flags/cr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cu.png b/dashboard/img/flags/cu.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cv.png b/dashboard/img/flags/cv.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cy.png b/dashboard/img/flags/cy.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/cz.png b/dashboard/img/flags/cz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/de.png b/dashboard/img/flags/de.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/dj.png b/dashboard/img/flags/dj.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/dk.png b/dashboard/img/flags/dk.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/dm.png b/dashboard/img/flags/dm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/do.png b/dashboard/img/flags/do.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/dz.png b/dashboard/img/flags/dz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ec.png b/dashboard/img/flags/ec.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ee.png b/dashboard/img/flags/ee.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/eg.png b/dashboard/img/flags/eg.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/eh.png b/dashboard/img/flags/eh.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/er.png b/dashboard/img/flags/er.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/es.png b/dashboard/img/flags/es.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/et.png b/dashboard/img/flags/et.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/fi.png b/dashboard/img/flags/fi.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/fj.png b/dashboard/img/flags/fj.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/fm.png b/dashboard/img/flags/fm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/fr.png b/dashboard/img/flags/fr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ga.png b/dashboard/img/flags/ga.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gate.png b/dashboard/img/flags/gate.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gb.png b/dashboard/img/flags/gb.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gd.png b/dashboard/img/flags/gd.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ge.png b/dashboard/img/flags/ge.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gh.png b/dashboard/img/flags/gh.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gm.png b/dashboard/img/flags/gm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gn.png b/dashboard/img/flags/gn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gq.png b/dashboard/img/flags/gq.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gr.png b/dashboard/img/flags/gr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gt.png b/dashboard/img/flags/gt.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gw.png b/dashboard/img/flags/gw.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/gy.png b/dashboard/img/flags/gy.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/hk.png b/dashboard/img/flags/hk.png deleted file mode 100644 index 8e4a6637969b2c90ae54247355454bf171f4ba97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1308 zcmeAS@N?(olHy`uVBq!ia0vp^azHG?!3HE}t?oSnq!^2X+?^QKos)S9vL>4nJ za0`PlBg3pY5sd^Q;1whpd3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fx4~BGf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+BX*+8u}AWsb3~j(FQN*D3*yw{SM{*3rr(jW_SM9iL^x?r~$K`WKJ(7WeImXk)F~o!S z=+wK}BHeJKG?eD~vZ*u zoAbT${`0>USvlcxpY0D+W%}v#$C^p&{M# zD6U9)6T**WKll$%*egE?B181SXe;-sED7*B!p2%VI{W91g3g`Y*b`Sh*6p+uE z`g_jpbaPev{Kpe?B>hESWs2VCIw4mtzCK3n-uBj|69u!jw=JC-BQ<$)#7rK)g&v_w z>;4u^UJyF5t6pX04F$7X!sX{SMmxThJ+k|k^5*-s-Fpqyjo4M#**=Ir`!N69q^er; zx~*O>@2H=Vt?T}k9`Epz^VCGG>vg|p_;>^=2cJ%y`bJSg^0<|O%fCP7M?Tp`yfis` zN#$gCyGQQ*gMaw1YjnT)wy^fa&A^v?&KZ`T__%5FDW2X6Es-;pHFMrHHfOAF4Su64 zurhh(niGFp&PeA686J`fk~H{nsY&+2P2J)Po{P2nH-6_2`tu?=X{U_Vyaj<;8$VpF zw3%r6@swH9t}PQCPS*8o7VPMV;E8y2yQzC?x;XF4y9=%^GPQMmdT4ru{oRDLs;0Hm z>(gGId;8SLEA3+U<%vP=&n#qE&ar(tV$yi=lci2(@YZAwU1RIAXD0vl&UUhB^b%2d z^x~wbZ%#*#qN2Ly)K}j5$5M25oxjk#iKi>>OLO6s1y8O{yvOVFew)11u`67=l+AV@ zp6yw8_U)2XyLJJl$00$t);!e{pR&_qmxD`Rcw~g3#J6W!kC)|2h2GT2)~*hdjec#q nYt?nDpND>FxyMDs|9)&gTg`ULCx5wlpd!oD)z4*}Q$iB}d=@b* diff --git a/dashboard/img/flags/hn.png b/dashboard/img/flags/hn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/hr.png b/dashboard/img/flags/hr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ht.png b/dashboard/img/flags/ht.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/hu.png b/dashboard/img/flags/hu.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/id.png b/dashboard/img/flags/id.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ie.png b/dashboard/img/flags/ie.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/il.png b/dashboard/img/flags/il.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/im.png b/dashboard/img/flags/im.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/in.png b/dashboard/img/flags/in.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/iq.png b/dashboard/img/flags/iq.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ir.png b/dashboard/img/flags/ir.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/is.png b/dashboard/img/flags/is.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/it.png b/dashboard/img/flags/it.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/jm.png b/dashboard/img/flags/jm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/jo.png b/dashboard/img/flags/jo.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/jp.png b/dashboard/img/flags/jp.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ke.png b/dashboard/img/flags/ke.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/kg.png b/dashboard/img/flags/kg.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/kh.png b/dashboard/img/flags/kh.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ki.png b/dashboard/img/flags/ki.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/km.png b/dashboard/img/flags/km.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/kn.png b/dashboard/img/flags/kn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/kp.png b/dashboard/img/flags/kp.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/kr.png b/dashboard/img/flags/kr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ks.png b/dashboard/img/flags/ks.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/kw.png b/dashboard/img/flags/kw.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/kz.png b/dashboard/img/flags/kz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/la.png b/dashboard/img/flags/la.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/lb.png b/dashboard/img/flags/lb.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/lc.png b/dashboard/img/flags/lc.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/li.png b/dashboard/img/flags/li.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/lk.png b/dashboard/img/flags/lk.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/lr.png b/dashboard/img/flags/lr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ls.png b/dashboard/img/flags/ls.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/lt.png b/dashboard/img/flags/lt.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/lu.png b/dashboard/img/flags/lu.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/lv.png b/dashboard/img/flags/lv.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ly.png b/dashboard/img/flags/ly.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ma.png b/dashboard/img/flags/ma.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mc.png b/dashboard/img/flags/mc.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/md.png b/dashboard/img/flags/md.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/me.png b/dashboard/img/flags/me.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mg.png b/dashboard/img/flags/mg.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mh.png b/dashboard/img/flags/mh.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mk.png b/dashboard/img/flags/mk.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ml.png b/dashboard/img/flags/ml.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mm.png b/dashboard/img/flags/mm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mn.png b/dashboard/img/flags/mn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mo.png b/dashboard/img/flags/mo.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mr.png b/dashboard/img/flags/mr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mt.png b/dashboard/img/flags/mt.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mu.png b/dashboard/img/flags/mu.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mv.png b/dashboard/img/flags/mv.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mw.png b/dashboard/img/flags/mw.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mx.png b/dashboard/img/flags/mx.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/my.png b/dashboard/img/flags/my.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/mz.png b/dashboard/img/flags/mz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/na.png b/dashboard/img/flags/na.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ne.png b/dashboard/img/flags/ne.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ng.png b/dashboard/img/flags/ng.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ni.png b/dashboard/img/flags/ni.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/nie.png b/dashboard/img/flags/nie.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/nl.png b/dashboard/img/flags/nl.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/no.png b/dashboard/img/flags/no.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/np.png b/dashboard/img/flags/np.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/nr.png b/dashboard/img/flags/nr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/nz.png b/dashboard/img/flags/nz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/om.png b/dashboard/img/flags/om.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/pa.png b/dashboard/img/flags/pa.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/pe.png b/dashboard/img/flags/pe.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/pg.png b/dashboard/img/flags/pg.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ph.png b/dashboard/img/flags/ph.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/pk.png b/dashboard/img/flags/pk.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/pl.png b/dashboard/img/flags/pl.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/pr.png b/dashboard/img/flags/pr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/pt.png b/dashboard/img/flags/pt.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/pw.png b/dashboard/img/flags/pw.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/py.png b/dashboard/img/flags/py.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/qa.png b/dashboard/img/flags/qa.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/re.png b/dashboard/img/flags/re.png new file mode 100755 index 0000000000000000000000000000000000000000..a7684766369759520c38f5d1ef2c77fcf716f5b7 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^azHG?!2~2lPfAS&QtF;Ajv*e$lM@1F^t1mx&b=?g r@{uFYVz+)N+pI4uE`k{%y=)Bc@BVdLJ;xyjsD;7P)z4*}Q$iB}YL^_V literal 0 HcmV?d00001 diff --git a/dashboard/img/flags/ro.png b/dashboard/img/flags/ro.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/rs.png b/dashboard/img/flags/rs.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ru.png b/dashboard/img/flags/ru.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/rw.png b/dashboard/img/flags/rw.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sa.png b/dashboard/img/flags/sa.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sb.png b/dashboard/img/flags/sb.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sc.png b/dashboard/img/flags/sc.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sd.png b/dashboard/img/flags/sd.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/se.png b/dashboard/img/flags/se.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sg.png b/dashboard/img/flags/sg.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sh.png b/dashboard/img/flags/sh.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/si.png b/dashboard/img/flags/si.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sk.png b/dashboard/img/flags/sk.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sl.png b/dashboard/img/flags/sl.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sm.png b/dashboard/img/flags/sm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sn.png b/dashboard/img/flags/sn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/so.png b/dashboard/img/flags/so.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sr.png b/dashboard/img/flags/sr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/st.png b/dashboard/img/flags/st.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sv.png b/dashboard/img/flags/sv.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sy.png b/dashboard/img/flags/sy.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/sz.png b/dashboard/img/flags/sz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/td.png b/dashboard/img/flags/td.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tg.png b/dashboard/img/flags/tg.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/th.png b/dashboard/img/flags/th.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tj.png b/dashboard/img/flags/tj.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tl.png b/dashboard/img/flags/tl.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tm.png b/dashboard/img/flags/tm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tn.png b/dashboard/img/flags/tn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/to.png b/dashboard/img/flags/to.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tr.png b/dashboard/img/flags/tr.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tt.png b/dashboard/img/flags/tt.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tv.png b/dashboard/img/flags/tv.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tw.png b/dashboard/img/flags/tw.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/tz.png b/dashboard/img/flags/tz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ua.png b/dashboard/img/flags/ua.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ug.png b/dashboard/img/flags/ug.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/us.png b/dashboard/img/flags/us.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/uy.png b/dashboard/img/flags/uy.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/uz.png b/dashboard/img/flags/uz.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/va.png b/dashboard/img/flags/va.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/vc.png b/dashboard/img/flags/vc.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ve.png b/dashboard/img/flags/ve.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/vn.png b/dashboard/img/flags/vn.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/vu.png b/dashboard/img/flags/vu.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/wl.png b/dashboard/img/flags/wl.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ws.png b/dashboard/img/flags/ws.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/ye.png b/dashboard/img/flags/ye.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/za.png b/dashboard/img/flags/za.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/zm.png b/dashboard/img/flags/zm.png old mode 100644 new mode 100755 diff --git a/dashboard/img/flags/zw.png b/dashboard/img/flags/zw.png old mode 100644 new mode 100755 diff --git a/dashboard/img/header.jpg b/dashboard/img/header.jpg old mode 100644 new mode 100755 diff --git a/dashboard/img/radio-waves-hi.png b/dashboard/img/radio-waves-hi.png old mode 100644 new mode 100755 diff --git a/dashboard/img/sat.png b/dashboard/img/sat.png old mode 100644 new mode 100755 diff --git a/dashboard/img/speaker.png b/dashboard/img/speaker.png old mode 100644 new mode 100755 diff --git a/dashboard/img/up.png b/dashboard/img/up.png old mode 100644 new mode 100755 diff --git a/dashboard/index.php b/dashboard/index.php old mode 100644 new mode 100755 index f86cb73..74d0b5d --- a/dashboard/index.php +++ b/dashboard/index.php @@ -35,17 +35,23 @@ if ($CallingHome['Active']) { } } else { - include($CallingHome['HashFile']); - if ($LastSync < (time() - $CallingHome['PushDelay'])) { - $Ressource = @fopen($CallingHome['HashFile'],"w"); - if ($Ressource) { - @fwrite($Ressource, "'); - @fclose($Ressource); + if (is_readable($CallingHome['HashFile'])) { + include($CallingHome['HashFile']); + if (isset($Hash)) { + if (strlen($Hash) > 4) { + if ($LastSync < (time() - $CallingHome['PushDelay'])) { + $Ressource = @fopen($CallingHome['HashFile'],"w"); + if ($Ressource) { + @fwrite($Ressource, "'); + @fclose($Ressource); + } + $CallHomeNow = true; + } + } } - $CallHomeNow = true; } } diff --git a/dashboard/log/index.html b/dashboard/log/index.html old mode 100644 new mode 100755 diff --git a/dashboard/log/xlxlog.php b/dashboard/log/xlxlog.php old mode 100644 new mode 100755 diff --git a/dashboard/pgs/class.interlink.php b/dashboard/pgs/class.interlink.php old mode 100644 new mode 100755 diff --git a/dashboard/pgs/class.node.php b/dashboard/pgs/class.node.php old mode 100644 new mode 100755 index 0571786..e1076a5 --- a/dashboard/pgs/class.node.php +++ b/dashboard/pgs/class.node.php @@ -10,8 +10,9 @@ class Node { private $LastHeardTime; private $Suffix; private $Prefix; + private $RandomID; - public function __construct($Callsign, $IP, $LinkedModule, $Protocol, $ConnectTime, $LastHeardTime) { + public function __construct($Callsign, $IP, $LinkedModule, $Protocol, $ConnectTime, $LastHeardTime, $RandomID) { $this->IP = $IP; @@ -34,8 +35,8 @@ class Node { $this->Prefix = ""; } - - $this->LinkedModule = trim($LinkedModule); + $this->LinkedModule = trim($LinkedModule); + $this->RandomID = $RandomID; } public function GetFullCallsign() { return $this->FullCallsign; } @@ -47,6 +48,8 @@ class Node { public function GetLastHeardTime() { return $this->LastHeardTime; } public function GetSuffix() { return $this->Suffix; } public function GetPrefix() { return $this->Prefix; } + public function GetRandomID() { return $this->RandomID; } + } ?> diff --git a/dashboard/pgs/class.parsexml.php b/dashboard/pgs/class.parsexml.php old mode 100644 new mode 100755 index 9ebf722..8a54b1f --- a/dashboard/pgs/class.parsexml.php +++ b/dashboard/pgs/class.parsexml.php @@ -1,32 +1,29 @@ ") === false) return false; if (strpos($InputString, "") === false) return false; - + $Element = substr($InputString, strpos($InputString, "<".$ElementName.">")+strlen($ElementName)+2, strpos($InputString, "")-strpos($InputString, "<".$ElementName.">")-strlen($ElementName)-2); return $Element; - + } - + public function GetAllElements($InputString, $ElementName) { $Elements = array(); while (strpos($InputString, $ElementName) !== false) { $Elements[] = $this->GetElement($InputString, $ElementName); - $InputString = substr($InputString, strpos($InputString, "")+strlen($ElementName)+3, strlen($InputString)); + $InputString = substr($InputString, strpos($InputString, "")+strlen($ElementName)+3, strlen($InputString)); } return $Elements; } - - + } - - -?> \ No newline at end of file +?> diff --git a/dashboard/pgs/class.peer.php b/dashboard/pgs/class.peer.php old mode 100644 new mode 100755 diff --git a/dashboard/pgs/class.reflector.php b/dashboard/pgs/class.reflector.php old mode 100644 new mode 100755 index d36f2b0..6933dfc --- a/dashboard/pgs/class.reflector.php +++ b/dashboard/pgs/class.reflector.php @@ -59,14 +59,14 @@ class xReflector { $tmpNodes = $XML->GetAllElements($AllNodesString, "NODE"); for ($i=0;$iGetElement($tmpNodes[$i], 'Callsign'), $XML->GetElement($tmpNodes[$i], 'IP'), $XML->GetElement($tmpNodes[$i], 'LinkedModule'), $XML->GetElement($tmpNodes[$i], 'Protocol'), $XML->GetElement($tmpNodes[$i], 'ConnectTime'), $XML->GetElement($tmpNodes[$i], 'LastHeardTime')); + $Node = new Node($XML->GetElement($tmpNodes[$i], 'Callsign'), $XML->GetElement($tmpNodes[$i], 'IP'), $XML->GetElement($tmpNodes[$i], 'LinkedModule'), $XML->GetElement($tmpNodes[$i], 'Protocol'), $XML->GetElement($tmpNodes[$i], 'ConnectTime'), $XML->GetElement($tmpNodes[$i], 'LastHeardTime'), CreateCode(16)); $this->AddNode($Node); } $AllStationsString = $XML->GetElement($this->XMLContent, $LinkedUsersName); $tmpStations = $XML->GetAllElements($AllStationsString, "STATION"); for ($i=0;$iGetElement($tmpStations[$i], 'Callsign'), $XML->GetElement($tmpStations[$i], 'Via node'), $XML->GetElement($tmpStations[$i], 'Via peer'), $XML->GetElement($tmpStations[$i], 'LastHeardTime')); + $Station = new Station($XML->GetElement($tmpStations[$i], 'Callsign'), $XML->GetElement($tmpStations[$i], 'Via node'), $XML->GetElement($tmpStations[$i], 'Via peer'), $XML->GetElement($tmpStations[$i], 'LastHeardTime'), $XML->GetElement($tmpStations[$i], 'On module')); $this->AddStation($Station, false); } @@ -213,7 +213,7 @@ class xReflector { } } } - + public function GetSuffixOfRepeater($Repeater, $LinkedModul, $StartWithIndex = 0) { $suffix = ""; $found = false; @@ -230,6 +230,19 @@ class xReflector { return $suffix; } + public function GetCallsignAndSuffixByID($RandomId) { + $suffix = ""; + $callsign = ""; + $i = 0; + while ($i < $this->NodeCount()) { + if ($this->Nodes[$i]->GetRandomID() == $RandomId) { + return $this->Nodes[$i]->GetCallSign().'-'.$this->Nodes[$i]->GetSuffix(); + } + $i++; + } + return 'N/A'; + } + public function StationCount() { return count($this->Stations); } @@ -262,7 +275,6 @@ class xReflector { } $Letters--; } - return strtolower($Image); } @@ -285,6 +297,7 @@ class xReflector { } public function GetModuleOfNode($Node) { + die("FUNCTION DEPRECATED..."); $Node = trim(str_replace(" ", "-", $Node)); $Node = trim(str_replace(" ", "-", $Node)); $Node = trim(str_replace(" ", "-", $Node)); @@ -312,6 +325,16 @@ class xReflector { return $out; } + public function GetNodesInModulesById($Module) { + $out = array(); + for ($i=0;$i<$this->NodeCount();$i++) { + if ($this->Nodes[$i]->GetLinkedModule() == $Module) { + $out[] = $this->Nodes[$i]->GetRandomID(); + } + } + return $out; + } + public function SetCallingHome($CallingHomeVariables, $Hash) { if (!isset($CallingHomeVariables['Active'])) { $CallingHomeVariables['Active'] = false; } @@ -343,11 +366,6 @@ class xReflector { public function PushCallingHome() { $CallingHome = @fopen($this->CallingHomeServerURL."?ReflectorName=".$this->ReflectorName."&ReflectorUptime=".$this->ServiceUptime."&ReflectorHash=".$this->CallingHomeHash."&DashboardURL=".$this->CallingHomeDashboardURL."&Country=".urlencode($this->CallingHomeCountry)."&Comment=".urlencode($this->CallingHomeComment)."&OverrideIP=".$this->CallingHomeOverrideIP, "r"); - - - - - //debug($this->CallingHomeServerURL."?ReflectorName=".$this->ReflectorName."&ReflectorUptime=".$this->ServiceUptime."&ReflectorHash=".$this->CallingHomeHash."&DashboardURL=".$this->CallingHomeDashboardURL."&Country=".urlencode($this->CallingHomeCountry)."&Comment=".urlencode($this->CallingHomeComment)); } public function ReadInterlinkFile() { diff --git a/dashboard/pgs/class.station.php b/dashboard/pgs/class.station.php old mode 100644 new mode 100755 index 82e247c..208ffa1 --- a/dashboard/pgs/class.station.php +++ b/dashboard/pgs/class.station.php @@ -8,8 +8,9 @@ class Station { private $Suffix; private $CallsignOnly; private $Peer; + private $OnModule; - public function __construct($Callsign, $Via, $Peer, $LastHeardTime) { + public function __construct($Callsign, $Via, $Peer, $LastHeardTime, $OnModule) { $this->Callsign = trim($Callsign); $this->Via = trim($Via); $this->Peer = trim($Peer); @@ -23,6 +24,7 @@ class Station { $tmp = explode(" ", $Callsign); $this->CallsignOnly = $tmp[0]; + $this->OnModule = $OnModule; } public function GetCallsign() { return $this->Callsign; } @@ -31,6 +33,7 @@ class Station { public function GetLastHeardTime() { return $this->LastHeardTime; } public function GetSuffix() { return $this->Suffix; } public function GetCallsignOnly() { return $this->CallsignOnly; } + public function GetModule() { return $this->OnModule; } } diff --git a/dashboard/pgs/config.inc.php b/dashboard/pgs/config.inc.php old mode 100644 new mode 100755 index fe9fe40..d017795 --- a/dashboard/pgs/config.inc.php +++ b/dashboard/pgs/config.inc.php @@ -16,7 +16,7 @@ $PageOptions = array(); $PageOptions['ContactEmail'] = 'your_email'; // Support E-Mail address -$PageOptions['DashboardVersion'] = '2.3.1'; // Dashboard Version +$PageOptions['DashboardVersion'] = '2.3.3'; // Dashboard Version $PageOptions['PageRefreshActive'] = true; // Activate automatic refresh $PageOptions['PageRefreshDelay'] = '10000'; // Page refresh time in miliseconds diff --git a/dashboard/pgs/country.csv b/dashboard/pgs/country.csv old mode 100644 new mode 100755 index f63bdc7..7a9c236 --- a/dashboard/pgs/country.csv +++ b/dashboard/pgs/country.csv @@ -1,4 +1,3 @@ - Afghanistan;AF;YA-T6 Aland Islands;AX;OH0 Albania;AL;ZA @@ -44,7 +43,7 @@ Cayman Islands;KY;ZF Central African Republic;CF;TL Chad;TD;TT Chile;CL;CA-CB-CC-CD-CE -China;CN;BA-BB-BC-BD-BE-BF-BG-BH-BI-BJ-BK-BL-BN-BP-BQ-BR-BS-BT-BY-BZ +China;CN;BY Christmas Island;CX;VK9X Cocos (Keeling) Islands;CC;VK9C Colombia;CO;HJ-HK-5J-5K @@ -108,7 +107,7 @@ Iraq;IQ;YI Ireland;IE;EI-EJ Isle of Man;IM;GD-GT Israel;IL;4X-4Z -Italy;IT;I0-I1-I2-I3-I4-I5-I6-I7-I8-I9-IK-IN-IQ-IR-IS-IT-IU-IV-IW-IZ +Italy;IT;I0-I1-I2-I3-I4-I5-I6-I7-I8-I9-IC-IH-IK-IN-IQ-IR-IS-IT-IU-IV-IW-IX-IZ Jamaica;JM;6Y Japan;JP;JA-JB-JC-JD-JE-JF-JG-JH-JI-JJ-JK-JL-JM-JN-JO-JP-JQ-JR-JS-7J-7K-7L-7M-7N Jersey;JE;GJ-GH @@ -236,7 +235,7 @@ Uganda;UG;5X Ukraine;UA;UR-US-UT-UU-UV-UW-UX-UY-UZ United Arab Emirates;AE;A6 United Kingdom;GB;2E-M0-M1-M2-M3-M4-M5-M6-M7-M8-M9-MB-MM-G0-G1-G2-G3-G4-G5-G6-G7-G8-G9-GX -United States;US;AA-AB-AC-AD-AE-AF-AG-AH-AI-AJ-AK-AL-K0-K1-K2-K3-K4-K5-K6-K7-K8-K9-KA-KB-KC-KD-KE-KF-KG-KH-KI-KJ-KK-KL-KM-KN-KO-KP-KQ-KR-KS-KT-KU-KV-KW-KX-KY-KZ-N0-N1-N2-N3-N4-N5-N6-N7-N8-N9-NA-NB-NC-ND-NE-NF-NG-NH-NI-NJ-NK-NL-NM-NN-NO-NP-NQ-NR-NS-NT-NU-NV-NW-NX-NY-NZ-W0-W1-W2-W3-W4-W5-W6-W7-W8-W9-WA-WB-WC-WD-WE-WF-WG-WH-WI-WJ-WK-WL-WM-WN-WO-WP-WQ-WR-WS-WT-WU-WV-WW-WX-WY-WZ +United States;US;K0-K1-K2-K3-K4-K5-K6-K7-K8-K9-KA-KB-KC-KD-KE-KF-KG-KH-KI-KJ-KK-KM-KN-KO-KQ-KR-KS-KT-KU-KV-KW-KX-KY-KZ-W0-W1-W2-W3-W4-W5-W6-W7-W8-W9-WA-WB-WD-WF-WR-WV-WX-WZ-N0-N1-N2-N3-N4-N5-N6-N7-N8-N9-NA-NB-NE-NG-NN-NO-NQ-NS-NU-NW-AA-AB-AC-AD-AE-AF-AG-AH-AI-AJ-AK United States Minor Outlying Islands;UM; Uruguay;UY;CV-CW-CX Uzbekistan;UZ;UJ-UK-UL-UM diff --git a/dashboard/pgs/functions.php b/dashboard/pgs/functions.php old mode 100644 new mode 100755 diff --git a/dashboard/pgs/liveccs.php b/dashboard/pgs/liveccs.php old mode 100644 new mode 100755 diff --git a/dashboard/pgs/liveircddb.php b/dashboard/pgs/liveircddb.php old mode 100644 new mode 100755 diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php old mode 100644 new mode 100755 index c9eff13..161233d --- a/dashboard/pgs/peers.php +++ b/dashboard/pgs/peers.php @@ -1,88 +1,88 @@ -GetElement($INPUT, "reflectorlist"); - $Reflectors = $XML->GetAllElements($Reflectorlist, "reflector"); -} - -fclose($Result); -?> - - - - - - - - IP'; -} - -?> - -LoadFlags(); - -for ($i=0;$i<$Reflector->PeerCount();$i++) { - - if ($odd == "#FFFFFF") { $odd = "#F1FAFA"; } else { $odd = "#FFFFFF"; } - - echo ' - - '; - $Name = $Reflector->Peers[$i]->GetCallSign(); - $URL = ''; - for ($j=1;$jGetElement($Reflectors[$j], "name")) { - $URL = $XML->GetElement($Reflectors[$j], "dashboardurl"); - } - } - if ($Result && (trim($URL) != "")) { - echo ' - '; - } else { - echo ' - '; - } - echo ' - - - - '; - if ($PageOptions['PeerPage']['IPModus'] != 'HideIP') { - echo ' - '; - } - echo ' - '; - if ($i == $PageOptions['PeerPage']['LimitTo']) { $i = $Reflector->PeerCount()+1; } -} - -?> - -
#XLX PeerLast HeardLinked forProtocolModule
'.($i+1).''.$Name.''.$Name.''.date("d.m.Y H:i", $Reflector->Peers[$i]->GetLastHeardTime()).''.FormatSeconds(time()-$Reflector->Peers[$i]->GetConnectTime()).' s'.$Reflector->Peers[$i]->GetProtocol().''.$Reflector->Peers[$i]->GetLinkedModule().''; - $Bytes = explode(".", $Reflector->Peers[$i]->GetIP()); - if ($Bytes !== false && count($Bytes) == 4) { - switch ($PageOptions['PeerPage']['IPModus']) { - case 'ShowLast1ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[3]; break; - case 'ShowLast2ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[2].'.'.$Bytes[3]; break; - case 'ShowLast3ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[1].'.'.$Bytes[2].'.'.$Bytes[3]; break; - default : echo $Reflector->Peers[$i]->GetIP(); - } - } - echo '
+GetElement($INPUT, "reflectorlist"); + $Reflectors = $XML->GetAllElements($Reflectorlist, "reflector"); +} + +fclose($Result); +?> + + + + + + + + IP'; +} + +?> + +LoadFlags(); + +for ($i=0;$i<$Reflector->PeerCount();$i++) { + + if ($odd == "#FFFFFF") { $odd = "#F1FAFA"; } else { $odd = "#FFFFFF"; } + + echo ' + + '; + $Name = $Reflector->Peers[$i]->GetCallSign(); + $URL = ''; + for ($j=1;$jGetElement($Reflectors[$j], "name")) { + $URL = $XML->GetElement($Reflectors[$j], "dashboardurl"); + } + } + if ($Result && (trim($URL) != "")) { + echo ' + '; + } else { + echo ' + '; + } + echo ' + + + + '; + if ($PageOptions['PeerPage']['IPModus'] != 'HideIP') { + echo ' + '; + } + echo ' + '; + if ($i == $PageOptions['PeerPage']['LimitTo']) { $i = $Reflector->PeerCount()+1; } +} + +?> + +
#XLX PeerLast HeardLinked forProtocolModule
'.($i+1).''.$Name.''.$Name.''.date("d.m.Y H:i", $Reflector->Peers[$i]->GetLastHeardTime()).''.FormatSeconds(time()-$Reflector->Peers[$i]->GetConnectTime()).' s'.$Reflector->Peers[$i]->GetProtocol().''.$Reflector->Peers[$i]->GetLinkedModule().''; + $Bytes = explode(".", $Reflector->Peers[$i]->GetIP()); + if ($Bytes !== false && count($Bytes) == 4) { + switch ($PageOptions['PeerPage']['IPModus']) { + case 'ShowLast1ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[3]; break; + case 'ShowLast2ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[2].'.'.$Bytes[3]; break; + case 'ShowLast3ByteOfIP' : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[1].'.'.$Bytes[2].'.'.$Bytes[3]; break; + default : echo $Reflector->Peers[$i]->GetIP(); + } + } + echo '
diff --git a/dashboard/pgs/reflectors.php b/dashboard/pgs/reflectors.php old mode 100644 new mode 100755 index 3a12fc0..9f044a4 --- a/dashboard/pgs/reflectors.php +++ b/dashboard/pgs/reflectors.php @@ -18,7 +18,7 @@ $Reflectors = $XML->GetAllElements($Reflectorlist, "reflector"); - + @@ -30,15 +30,15 @@ $Reflectors = $XML->GetAllElements($Reflectorlist, "reflector"); $odd = ""; for ($i=0;$iGetElement($Reflectors[$i], "name"); $COUNTRY = $XML->GetElement($Reflectors[$i], "country"); $LASTCONTACT = $XML->GetElement($Reflectors[$i], "lastcontact"); $COMMENT = $XML->GetElement($Reflectors[$i], "comment"); $DASHBOARDURL = $XML->GetElement($Reflectors[$i], "dashboardurl"); - + if ($odd == "#FFFFFF") { $odd = "#F1FAFA"; } else { $odd = "#FFFFFF"; } - + echo ' @@ -51,5 +51,3 @@ for ($i=0;$i
# Reflector Country
'.($i+1).'
- - diff --git a/dashboard/pgs/repeaters.php b/dashboard/pgs/repeaters.php old mode 100644 new mode 100755 diff --git a/dashboard/pgs/users.php b/dashboard/pgs/users.php old mode 100644 new mode 100755 index dea06f4..9788b18 --- a/dashboard/pgs/users.php +++ b/dashboard/pgs/users.php @@ -23,7 +23,12 @@ for ($i=0;$i<$Reflector->StationCount();$i++) { echo ' '; - echo ($i==0 ? '' : $i+1); + if ($i==0 && $Reflector->Stations[$i]->GetLastHeardTime() > (time() - 60)) { + echo ''; + } + else { + echo ($i+1); + } echo ' @@ -42,11 +47,7 @@ for ($i=0;$i<$Reflector->StationCount();$i++) { } echo ' '.@date("d.m.Y H:i", $Reflector->Stations[$i]->GetLastHeardTime()).' - '; - if ($Reflector->Stations[$i]->GetPeer() == $Reflector->GetReflectorName()) { - echo trim($Reflector->GetModuleOfNode($Reflector->Stations[$i]->GetVia())); - } - echo ' + '.$Reflector->Stations[$i]->GetModule().' '; if ($i == 39) { $i = $Reflector->StationCount()+1; } } @@ -91,10 +92,12 @@ echo ' '; +$GlobalPositions = array(); + for ($i=0;$iGetCallSignsInModules($Modules[$i]); - echo ' + + $Users = $Reflector->GetNodesInModulesByID($Modules[$i]); + echo ' '; @@ -103,14 +106,9 @@ for ($i=0;$iGetSuffixOfRepeater($Users[$j], $Modules[$i], max($CurrentPositions)+1); - } - else { - $Displayname = $Users[$j].'-'.$Reflector->GetSuffixOfRepeater($Users[$j], $Modules[$i]); - } + $Displayname = $Reflector->GetCallsignAndSuffixByID($Users[$j]); echo ' diff --git a/src/cdcsprotocol.cpp b/src/cdcsprotocol.cpp index d787c89..48a0c52 100644 --- a/src/cdcsprotocol.cpp +++ b/src/cdcsprotocol.cpp @@ -243,7 +243,7 @@ bool CDcsProtocol::OnDvHeaderPacketIn(CDvHeaderPacket *Header, const CIp &Ip) g_Reflector.ReleaseClients(); // update last heard - g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), via); + g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), via, Header->GetRpt2Callsign()); g_Reflector.ReleaseUsers(); } else diff --git a/src/cdextraprotocol.cpp b/src/cdextraprotocol.cpp index 6237bc4..5c33331 100644 --- a/src/cdextraprotocol.cpp +++ b/src/cdextraprotocol.cpp @@ -329,7 +329,7 @@ bool CDextraProtocol::OnDvHeaderPacketIn(CDvHeaderPacket *Header, const CIp &Ip) g_Reflector.ReleaseClients(); // update last heard - g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), via); + g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), via, Header->GetRpt2Callsign()); g_Reflector.ReleaseUsers(); } else diff --git a/src/cdplusprotocol.cpp b/src/cdplusprotocol.cpp index 25a9951..a5c68ec 100644 --- a/src/cdplusprotocol.cpp +++ b/src/cdplusprotocol.cpp @@ -248,7 +248,7 @@ bool CDplusProtocol::OnDvHeaderPacketIn(CDvHeaderPacket *Header, const CIp &Ip) g_Reflector.ReleaseClients(); // update last heard - g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), via); + g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), via, Header->GetRpt2Callsign()); g_Reflector.ReleaseUsers(); } else diff --git a/src/cuser.cpp b/src/cuser.cpp index ce03b9f..6cf6024 100644 --- a/src/cuser.cpp +++ b/src/cuser.cpp @@ -35,10 +35,11 @@ CUser::CUser() m_LastHeardTime = std::time(NULL); } -CUser::CUser(const CCallsign &my, const CCallsign &rpt1, const CCallsign &xlx) +CUser::CUser(const CCallsign &my, const CCallsign &rpt1, const CCallsign &rpt2, const CCallsign &xlx) { m_My = my; m_Rpt1 = rpt1; + m_Rpt2 = rpt2; m_Xlx = xlx; m_LastHeardTime = std::time(NULL); } @@ -47,6 +48,7 @@ CUser::CUser(const CUser &user) { m_My = user.m_My; m_Rpt1 = user.m_Rpt1; + m_Rpt2 = user.m_Rpt2; m_Xlx = user.m_Xlx; m_LastHeardTime = user.m_LastHeardTime; } @@ -56,7 +58,7 @@ CUser::CUser(const CUser &user) bool CUser::operator ==(const CUser &user) const { - return ((user.m_My == m_My) && (user.m_Rpt1 == m_Rpt1) && (user.m_Xlx == m_Xlx)); + return ((user.m_My == m_My) && (user.m_Rpt1 == m_Rpt1) && (user.m_Rpt2 == m_Rpt2) && (user.m_Xlx == m_Xlx)); } @@ -74,8 +76,9 @@ void CUser::WriteXml(std::ofstream &xmlFile) xmlFile << "" << std::endl; xmlFile << "\t" << m_My << "" << std::endl; xmlFile << "\t" << m_Rpt1 << "" << std::endl; + xmlFile << "\t" << m_Rpt2.GetModule() << "" << std::endl; xmlFile << "\t" << m_Xlx << "" << std::endl; - + char mbstr[100]; if (std::strftime(mbstr, sizeof(mbstr), "%A %c", std::localtime(&m_LastHeardTime))) { diff --git a/src/cuser.h b/src/cuser.h index 1e3d53a..b111ae4 100644 --- a/src/cuser.h +++ b/src/cuser.h @@ -35,7 +35,7 @@ class CUser public: // constructor CUser(); - CUser(const CCallsign &, const CCallsign &, const CCallsign &); + CUser(const CCallsign &, const CCallsign &, const CCallsign &, const CCallsign &); CUser(const CUser &); // destructor @@ -56,6 +56,7 @@ protected: // data CCallsign m_My; CCallsign m_Rpt1; + CCallsign m_Rpt2; CCallsign m_Xlx; std::time_t m_LastHeardTime; }; diff --git a/src/cusers.cpp b/src/cusers.cpp index 1d32dc1..c4dddd7 100644 --- a/src/cusers.cpp +++ b/src/cusers.cpp @@ -58,14 +58,14 @@ void CUsers::AddUser(const CUser &user) //////////////////////////////////////////////////////////////////////////////////////// // operation -void CUsers::Hearing(const CCallsign &my, const CCallsign &rpt1) +void CUsers::Hearing(const CCallsign &my, const CCallsign &rpt1, const CCallsign &rpt2) { - Hearing(my, rpt1, g_Reflector.GetCallsign()); + Hearing(my, rpt1, rpt2, g_Reflector.GetCallsign()); } -void CUsers::Hearing(const CCallsign &my, const CCallsign &rpt1, const CCallsign &xlx) +void CUsers::Hearing(const CCallsign &my, const CCallsign &rpt1, const CCallsign &rpt2, const CCallsign &xlx) { - CUser heard(my, rpt1, xlx); + CUser heard(my, rpt1, rpt2, xlx); // first check if we have this user listed yet bool found = false; diff --git a/src/cusers.h b/src/cusers.h index 7f12445..460bde9 100644 --- a/src/cusers.h +++ b/src/cusers.h @@ -48,8 +48,8 @@ public: CUser *GetUser(int i) { return &m_Users[i]; } // operation - void Hearing(const CCallsign &, const CCallsign &); void Hearing(const CCallsign &, const CCallsign &, const CCallsign &); + void Hearing(const CCallsign &, const CCallsign &, const CCallsign &, const CCallsign &); protected: // data diff --git a/src/cxlxprotocol.cpp b/src/cxlxprotocol.cpp index 332ca29..4a20988 100644 --- a/src/cxlxprotocol.cpp +++ b/src/cxlxprotocol.cpp @@ -412,7 +412,7 @@ bool CXlxProtocol::OnDvHeaderPacketIn(CDvHeaderPacket *Header, const CIp &Ip) } // update last heard - g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), Header->GetRpt1Callsign(), peer); + g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), Header->GetRpt1Callsign(), Header->GetRpt2Callsign(), peer); g_Reflector.ReleaseUsers(); // done diff --git a/src/main.h b/src/main.h index 9ebaca6..8844bbc 100644 --- a/src/main.h +++ b/src/main.h @@ -48,7 +48,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 4 -#define VERSION_REVISION 0 +#define VERSION_REVISION 1 // global ------------------------------------------------------
'.$Displayname.'