X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=textclient%2Fcitadel.rc;h=fb2dc0755826394a3fd7750508e4f9c16e87dc0a;hb=HEAD;hp=351f5b57c79cfbf92e572ea59821d00200e1dad6;hpb=5a202656af01ddc9db0640e4cc7a84f5974bc2d4;p=citadel.git

diff --git a/textclient/citadel.rc b/textclient/citadel.rc
index 351f5b57c..7db4f04ff 100644
--- a/textclient/citadel.rc
+++ b/textclient/citadel.rc
@@ -4,8 +4,9 @@
 # The standard client looks for this file in:
 # 1. $HOME/.citadelrc
 # 2. <compiled CTDLDIR>/citadel.rc
-# 3. /etc/citadel.rc
-# 4. <current directory>/citadel.rc
+# 3. /usr/local/etc/citadel.rc
+# 4. /etc/citadel.rc
+# 5. <current directory>/citadel.rc
 
 # Set ENCRYPT to yes to force SSL/TLS encryption when connecting to a
 # Citadel server, even if the server is on the same machine as the
@@ -33,7 +34,14 @@ encrypt=default
 # color on the screen.  If it is set to "auto" then an autodetect will be
 # attempted.  If it is set to "user" then it's a user-configurable option.
 #
-ansi_color=user
+ansi_color=auto
+
+# Sixel graphics support (experimental and probably insecure)
+# Set this to "on" to output images embedded in HTML messages to the terminal
+# in Sixel graphics format.  This obviously requires a terminal that has
+# support for Sixel.  It also requires the "curl", "img2sixel", and "fold"
+# commands to be available on your system.
+use_sixel=off
 
 # USE_BACKGROUND controls Citadel's use of the background.  If it is turned
 # off, then Citadel will set the background to black.  When it is turned on,
@@ -153,7 +161,7 @@ opencmd=xdg-open "%s"
 # Keep a copy of the original version of this file around as a reference
 # for the command numbers.  They are not documented anywhere else.
 #
-# Access is:  0 (all users), 1 (aides or room aides), 2 (aides only).
+# Access is:  0 (all users), 1 (admins or room admins), 2 (admins only).
 # Please be aware that it is futile to attempt to gain unauthorized access to
 # the administrative functions of the system by changing all the access levels
 # to 0.  If you do this, you'll simply be able to enter a lot of commands that
@@ -216,28 +224,25 @@ cmd=20,0,&Jump:
 cmd=20,0,&.,&Goto:
 #
 cmd=21,0,&.,&Help:
-cmd=22,1,&.,&Aide,&Kill this room
-cmd=23,1,&.,&Aide,&Edit this room
-cmd=24,0,&.,&Aide,&Who knows room
-cmd=25,2,&.,&Aide,&User,&Edit
-cmd=96,2,&.,&Aide,&User,&Delete
-cmd=26,2,&.,&Aide,&Validate new users
-cmd=48,1,&.,&Aide,enter &Info file
-cmd=27,0,&.,&Aide,&Room,&Invite user
-cmd=28,0,&.,&Aide,&Room,&Kick out user
-cmd=51,1,&.,&Aide,&File,&Delete
-cmd=54,1,&.,&Aide,&File,&Move
-cmd=70,2,&.,&Aide,&Message edit:
-cmd=78,1,&.,&Aide,&Post
-cmd=80,2,&.,&Aide,&System configuration,&General
-cmd=82,2,&.,&Aide,&System configuration,&Internet
-cmd=88,2,&.,&Aide,&System configuration,&Network
-cmd=92,2,&.,&Aide,&System configuration,network &Filter list
-cmd=85,2,&.,&Aide,&Terminate server,&Now
-cmd=86,2,&.,&Aide,&Terminate server,&Scheduled
-cmd=87,1,&.,&Aide,mailing &List recipients
-cmd=94,1,&.,&Aide,mailing list &Digest recipients
-cmd=89,1,&.,&Aide,&Network room sharing
+cmd=22,1,&.,&Admin,&Kill this room
+cmd=23,1,&.,&Admin,&Edit this room
+cmd=24,0,&.,&Admin,&Who knows room
+cmd=25,2,&.,&Admin,&User,&Edit
+cmd=96,2,&.,&Admin,&User,&Delete
+cmd=26,2,&.,&Admin,&Validate new users
+cmd=48,1,&.,&Admin,enter &Info file
+cmd=27,0,&.,&Admin,&Room,&Invite user
+cmd=28,0,&.,&Admin,&Room,&Kick out user
+cmd=51,1,&.,&Admin,&File,&Delete
+cmd=54,1,&.,&Admin,&File,&Move
+cmd=70,2,&.,&Admin,&Message edit:
+cmd=78,1,&.,&Admin,&Post
+cmd=80,2,&.,&Admin,&System configuration,&General
+cmd=82,2,&.,&Admin,&System configuration,&Internet
+cmd=85,2,&.,&Admin,&Terminate server,&Now
+cmd=86,2,&.,&Admin,&Terminate server,&Scheduled
+cmd=87,1,&.,&Admin,mailing &List recipients
+cmd=94,1,&.,&Admin,mailing list &Digest recipients
 
 cmd=29,0,&.,&Terminate,and &Quit
 cmd=30,0,&.,&Terminate,and &Stay online
@@ -280,18 +285,16 @@ cmd=36,0,&.,&Enter,&ASCII message
 cmd=37,0,&.,&Enter,&Configuration
 cmd=38,0,&.,&Enter,a new &Room
 cmd=39,0,&.,&Enter,&Textfile
-cmd=77,0,&.,&Enter,&Username
 # cmd=40,0,&.,&Enter,file using &Xmodem
 # cmd=42,0,&.,&Enter,file using &Ymodem
 # cmd=44,0,&.,&Enter,file using &Zmodem
 #
 # Command 57 is the local-file-upload command for users with their own
-# copy of the clientware.  Commands 72-74 are for image uploads.
+# copy of the clientware.  Commands 72-73 are for image uploads.
 #
 #cmd=57,0,&.,&Enter,&File
 #cmd=72,0,&.,&Enter,&Image,user &Picture
 #cmd=73,0,&.,&Enter,&Image,&Room banner
-#cmd=74,0,&.,&Enter,&Image,&Floor label
 #
 cmd=41,0,&.,&Enter,re&Gistration
 cmd=4,0,&.,&Enter,&Message
@@ -311,16 +314,14 @@ cmd=60,0,&;,&Goto floor:
 cmd=60,0,&.,&Enter,&Floor:
 cmd=61,0,&;,&Skip to floor:
 cmd=62,0,&;,&Zap (forget) floor
-cmd=63,2,&;,&Aide,&Create floor
-cmd=64,2,&;,&Aide,&Edit this floor
-cmd=65,2,&;,&Aide,&Kill this floor
+cmd=63,2,&;,&Admin,&Create floor
+cmd=64,2,&;,&Admin,&Edit this floor
+cmd=65,2,&;,&Admin,&Kill this floor
 cmd=68,0,&;,&Known rooms
 cmd=66,0,&.,&Enter,&Bio
 cmd=67,0,&.,&Read,&Bio
 
 cmd=79,0,&.,&Wholist,&Long
-cmd=75,0,&.,&Wholist,&Roomname
-cmd=76,0,&.,&Wholist,&Hostname
 cmd=91,0,&.,&Wholist,&Active
 cmd=93,0,&.,&Wholist,&Stealth mode
 
@@ -341,7 +342,6 @@ cmd=122,0,&.,&Known,&Match rooms:
 cmd=123,0,&.,&Known,preferred &Only rooms
 cmd=124,0,&.,&Known,&Private rooms
 cmd=125,0,&.,&Known,&Read only rooms
-cmd=126,0,&.,&Known,&Shared rooms
 cmd=19,0,&.,&Known,&Zapped rooms
 
 #