egg-tcls: feeds.tcl comparison

feeds: Improve admin checks.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 20 Feb 2021 17:52:49 +0200
parents	8bde8f798188
children	2737e90aad83

comparison

equal deleted inserted replaced

-:4156adacdc31
+:79b5d8944eea
 # Check and handle arguments
 set rarglist [::textutil::split::splitx $uargs {\s+}]
 set rcmd [lindex $rarglist 0]
 set rargs [lrange $rarglist 1 end]
+set qadmin [matchattr $uhand n]
+#  set qadmin 0
 if {[feeds_cmd_match "help" $rcmd]} {
 # Show help
 foreach ukey $feeds_messages(help_full) {
 feeds_msg $upublic $unick $uchan $ukey
 if {$ufound == 0} {
 feeds_msg $upublic $unick $uchan "search_no_matches" [list $utext]
 }
 } elseif {[feeds_cmd_match "force" $rcmd]} {
 # Force check for new entries
-if {![matchattr $uhand n]} {
+if {!$qadmin} {
 feeds_msg $upublic $unick $uchan "no_access"
+return 0
 }
 feeds_check_do 1 $upublic $unick $uchan
 } elseif {[feeds_cmd_match "list" $rcmd]} {
 # List feeds
 if {[feeds_cmd_match "all" $uarg]} {
 # Long list
 set utext [string tolower [join [lrange $rargs 1 end] " "]]
-if {$upublic && ![matchattr $uhand n]} {
+if {$upublic && !$qadmin} {
 feeds_msg $upublic $unick $uchan "feed_list_long_denied" [list $rcmd $utext]
 return 0
 }
 set ulistitem [feeds_qm "feed_list_item_long"]
 feeds_msg $upublic $unick $uchan "help_history"
 return 0
 }
 set utext [string tolower [join $rargs " "]]
-if {$upublic && ![matchattr $uhand n]} {
+if {$upublic && !$qadmin} {
 feeds_msg $upublic $unick $uchan "feed_list_long_denied" [list $rcmd $utext]
 return 0
 }
 # Validate feed name

Mercurial > hg > egg-tcls