Merge branch 'master' into newevent

Conflicts:
	include/zot.php

43 files changed, 87 insertions, 0 deletions

diff --git a/app/admin.apd b/app/admin.apd
new file mode 100644
index 000000000..dbd2f6971
--- /dev/null
+++ b/app/admin.apd
@@ -0,0 +1,4 @@
+url: $baseurl/admin
+requires: admin
+name: Site Admin
+photo: $baseurl/app/admin.png
diff --git a/app/admin.png b/app/admin.png
new file mode 100644
index 000000000..f1954e52a
--- /dev/null
+++ b/app/admin.png
diff --git a/app/bookmarks.apd b/app/bookmarks.apd
new file mode 100644
index 000000000..f126a35c5
--- /dev/null
+++ b/app/bookmarks.apd
@@ -0,0 +1,4 @@
+url: $baseurl/bookmarks
+requires: local_user
+name: Bookmarks
+photo: $baseurl/app/bookmarks.png
diff --git a/app/bookmarks.png b/app/bookmarks.png
new file mode 100644
index 000000000..fffad3329
--- /dev/null
+++ b/app/bookmarks.png
diff --git a/app/channel.apd b/app/channel.apd
new file mode 100644
index 000000000..be13ee77b
--- /dev/null
+++ b/app/channel.apd
@@ -0,0 +1,4 @@
+url: $baseurl/channel/$nick
+requires: local_user
+name: Channel Home
+photo: $baseurl/app/home.png
diff --git a/app/chat.apd b/app/chat.apd
new file mode 100644
index 000000000..2eba8edba
--- /dev/null
+++ b/app/chat.apd
@@ -0,0 +1,4 @@
+url: $baseurl/chat/$nick
+requires: local_user
+name: Chat
+photo: $baseurl/app/chat.png
diff --git a/app/chat.png b/app/chat.png
new file mode 100644
index 000000000..aa03c75dd
--- /dev/null
+++ b/app/chat.png
diff --git a/app/connections.apd b/app/connections.apd
new file mode 100644
index 000000000..80f9b4570
--- /dev/null
+++ b/app/connections.apd
@@ -0,0 +1,4 @@
+url: $baseurl/connections
+requires: local_user
+name: Address Book
+photo: $baseurl/app/connections.png
diff --git a/app/connections.png b/app/connections.png
new file mode 100644
index 000000000..6f6100761
--- /dev/null
+++ b/app/connections.png
diff --git a/app/directory.apd b/app/directory.apd
new file mode 100644
index 000000000..c4a6f12d9
--- /dev/null
+++ b/app/directory.apd
@@ -0,0 +1,3 @@
+url: $baseurl/directory
+name: Directory
+photo: $baseurl/app/directory.png
diff --git a/app/directory.png b/app/directory.png
new file mode 100644
index 000000000..2df872d94
--- /dev/null
+++ b/app/directory.png
diff --git a/app/events.apd b/app/events.apd
new file mode 100644
index 000000000..2f43efbe1
--- /dev/null
+++ b/app/events.apd
@@ -0,0 +1,4 @@
+url: $baseurl/events
+requires: local_user
+name: Events
+photo: $baseurl/app/events.png
diff --git a/app/events.png b/app/events.png
new file mode 100644
index 000000000..411ee51f9
--- /dev/null
+++ b/app/events.png
diff --git a/app/help.apd b/app/help.apd
new file mode 100644
index 000000000..ca7208e6a
--- /dev/null
+++ b/app/help.apd
@@ -0,0 +1,3 @@
+url: $baseurl/help
+name: Help
+photo: $baseurl/app/help.png
diff --git a/app/help.png b/app/help.png
new file mode 100644
index 000000000..e1348231c
--- /dev/null
+++ b/app/help.png
diff --git a/app/home.png b/app/home.png
new file mode 100644
index 000000000..3f1b864fc
--- /dev/null
+++ b/app/home.png
diff --git a/app/login.apd b/app/login.apd
new file mode 100644
index 000000000..e4cccbc7e
--- /dev/null
+++ b/app/login.apd
@@ -0,0 +1,4 @@
+url: $baseurl/login
+requires: nologin
+name: Login
+photo: $baseurl/app/login.png
diff --git a/app/login.png b/app/login.png
new file mode 100644
index 000000000..4e5625ee7
--- /dev/null
+++ b/app/login.png
diff --git a/app/mail.apd b/app/mail.apd
new file mode 100644
index 000000000..e916829ad
--- /dev/null
+++ b/app/mail.apd
@@ -0,0 +1,4 @@
+url: $baseurl/message
+requires: local_user
+name: Mail
+photo: $baseurl/app/mail.png
diff --git a/app/mail.png b/app/mail.png
new file mode 100644
index 000000000..74fbdb03e
--- /dev/null
+++ b/app/mail.png
diff --git a/app/manage.apd b/app/manage.apd
new file mode 100644
index 000000000..ed6cb9f0a
--- /dev/null
+++ b/app/manage.apd
@@ -0,0 +1,4 @@
+url: $baseurl/manage
+requires: local_user
+name: Channel Select
+photo: $baseurl/app/manage.png
diff --git a/app/manage.png b/app/manage.png
new file mode 100644
index 000000000..4c4d13162
--- /dev/null
+++ b/app/manage.png
diff --git a/app/matrix.apd b/app/matrix.apd
new file mode 100644
index 000000000..96df48690
--- /dev/null
+++ b/app/matrix.apd
@@ -0,0 +1,4 @@
+url: $baseurl/network
+requires: local_user
+name: Matrix
+photo: $baseurl/app/matrix.png
diff --git a/app/matrix.png b/app/matrix.png
new file mode 100644
index 000000000..1ee7c1b97
--- /dev/null
+++ b/app/matrix.png
diff --git a/app/mood.apd b/app/mood.apd
new file mode 100644
index 000000000..ef90650f0
--- /dev/null
+++ b/app/mood.apd
@@ -0,0 +1,4 @@
+url: $baseurl/mood
+requires: local_user
+name: Mood
+photo: $baseurl/app/mood.png
diff --git a/app/mood.png b/app/mood.png
new file mode 100644
index 000000000..7df642b96
--- /dev/null
+++ b/app/mood.png
diff --git a/app/photos.apd b/app/photos.apd
new file mode 100644
index 000000000..d0a314406
--- /dev/null
+++ b/app/photos.apd
@@ -0,0 +1,4 @@
+url: $baseurl/photos/$nick
+requires: local_user
+name: Photos
+photo: $baseurl/app/photos.png
diff --git a/app/photos.png b/app/photos.png
new file mode 100644
index 000000000..b4b2c519e
--- /dev/null
+++ b/app/photos.png
diff --git a/app/poke.apd b/app/poke.apd
new file mode 100644
index 000000000..b7d189224
--- /dev/null
+++ b/app/poke.apd
@@ -0,0 +1,4 @@
+url: $baseurl/poke
+requires: local_user
+name: Poke
+photo: $baseurl/app/poke.png
diff --git a/app/poke.png b/app/poke.png
new file mode 100644
index 000000000..1d264dd1b
--- /dev/null
+++ b/app/poke.png
diff --git a/app/pphoto.apd b/app/pphoto.apd
new file mode 100644
index 000000000..e7da9cf9c
--- /dev/null
+++ b/app/pphoto.apd
@@ -0,0 +1,4 @@
+url: $baseurl/profile_photo
+requires: local_user
+name: Profile Photo
+photo: $baseurl/app/pphoto.png
diff --git a/app/pphoto.png b/app/pphoto.png
new file mode 100644
index 000000000..eda371e8b
--- /dev/null
+++ b/app/pphoto.png
diff --git a/app/profile.apd b/app/profile.apd
new file mode 100644
index 000000000..ce52f960b
--- /dev/null
+++ b/app/profile.apd
@@ -0,0 +1,4 @@
+url: $baseurl/profile/$nick
+requires: local_user
+name: Profile
+
diff --git a/app/randprof.apd b/app/randprof.apd
new file mode 100644
index 000000000..9534c77f6
--- /dev/null
+++ b/app/randprof.apd
@@ -0,0 +1,6 @@
+url: $baseurl/randprof
+name: Random Channel
+target: randprof
+photo: $baseurl/app/randprof.png
+
+
diff --git a/app/randprof.png b/app/randprof.png
new file mode 100644
index 000000000..3280ef8ee
--- /dev/null
+++ b/app/randprof.png
diff --git a/app/search.apd b/app/search.apd
new file mode 100644
index 000000000..ed48909b4
--- /dev/null
+++ b/app/search.apd
@@ -0,0 +1,3 @@
+url: $baseurl/search
+name: Search
+photo: $baseurl/app/search.png
diff --git a/app/search.png b/app/search.png
new file mode 100644
index 000000000..e483280ec
--- /dev/null
+++ b/app/search.png
diff --git a/app/settings.apd b/app/settings.apd
new file mode 100644
index 000000000..311f793ff
--- /dev/null
+++ b/app/settings.apd
@@ -0,0 +1,4 @@
+url: $baseurl/settings
+requires: local_user
+name: Settings
+photo: $baseurl/app/settings.png
diff --git a/app/settings.png b/app/settings.png
new file mode 100644
index 000000000..ff5d8e5d2
--- /dev/null
+++ b/app/settings.png
diff --git a/app/storage.apd b/app/storage.apd
new file mode 100644
index 000000000..5900faae8
--- /dev/null
+++ b/app/storage.apd
@@ -0,0 +1,4 @@
+url: $baseurl/cloud/$nick
+requires: local_user
+name: Files
+photo: $baseurl/app/storage.png
diff --git a/app/storage.png b/app/storage.png
new file mode 100644
index 000000000..c1f2df801
--- /dev/null
+++ b/app/storage.png
diff --git a/app/webpages.apd b/app/webpages.apd
new file mode 100644
index 000000000..4241dbb8e
--- /dev/null
+++ b/app/webpages.apd
@@ -0,0 +1,4 @@
+url: $baseurl/webpages/$nick
+requires: local_user
+name: Webpages
+photo: $baseurl/app/webpages.png
diff --git a/app/webpages.png b/app/webpages.png
new file mode 100644
index 000000000..460117bae
--- /dev/null
+++ b/app/webpages.png