# HG changeset patch # User Christophe Lincoln # Date 1389135004 -3600 # Node ID 2f4b9f31ee08f967d701e5187c127490fef18f83 # Parent 41bca604bd3174c121c554494dab2a0bb61eb191 Few small change diff -r 41bca604bd31 -r 2f4b9f31ee08 config.cgi --- a/config.cgi Tue Jan 07 18:28:46 2014 +0100 +++ b/config.cgi Tue Jan 07 23:50:04 2014 +0100 @@ -1,9 +1,6 @@ # CM configuration # -# CM URL for redirection and RSS -WEB_URL="http://localhost/cgi-bin/tinycm/" - # Administrator email. ADMIN_MAIL="root@$SERVER_NAME" diff -r 41bca604bd31 -r 2f4b9f31ee08 index.cgi --- a/index.cgi Tue Jan 07 18:28:46 2014 +0100 +++ b/index.cgi Tue Jan 07 23:50:04 2014 +0100 @@ -11,7 +11,6 @@ . config.cgi tiny="$PWD" -po="en fr" content="content" wiki="$content/wiki" index="index" @@ -658,12 +657,24 @@ cachesize="$(du -sh $cache | awk '{print $1}')" [ "$HG" != "yes" ] && hg=$(gettext "disabled") [ "$HG" == "yes" ] && hg=$(gettext "enabled") + # Source all plugins.conf to get DASHBOARD_TOOLS and ADMIN_TOOLS + ADMIN_TOOLS="" + DASHBOARD_TOOLS="" + for p in $(ls $plugins) + do + . $plugins/$p/$p.conf + done + if check_auth && ! admin_user; then + ADMIN_TOOLS="" + fi echo "

$d

" if check_auth; then cat << EOT
Activity log List files + $DASHBOARD_TOOLS + $ADMIN_TOOLS
@@ -735,7 +746,7 @@
 		# Generate a default index on first run
 		if [ ! -f "$wiki/$index.txt" ]; then
 			if ! default_index; then
-				echo "
Directory : content/ is not writable"
+				echo "
Directory : content/ is not writable
" html_footer && exit 0 fi fi diff -r 41bca604bd31 -r 2f4b9f31ee08 plugins/cloud/cloud.cgi --- a/plugins/cloud/cloud.cgi Tue Jan 07 18:28:46 2014 +0100 +++ b/plugins/cloud/cloud.cgi Tue Jan 07 23:50:04 2014 +0100 @@ -111,7 +111,7 @@ for f in $(ls ${cloud}) do case $f in - *.png|*.jpg) image="images/image.png" ;; + *.png|*.jpg|*.gif) image="images/image.png" ;; *) image="images/empty.png" ;; esac cat << EOT