tazbug rev 112
Small fixes
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat Feb 11 00:00:17 2017 +0100 (2017-02-11) |
parents | 0dfc02021c92 |
children | d24cd6951458 |
files | data/tazbug-web.desktop web/bugs.cgi web/plugins/users/users.cgi |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/data/tazbug-web.desktop Sat Feb 11 00:00:17 2017 +0100 1.3 @@ -0,0 +1,9 @@ 1.4 +[Desktop Entry] 1.5 +Encoding=UTF-8 1.6 +Name=SliTaz bug report (Web) 1.7 +Name[fr]=Rapport de bug SliTaz (Web) 1.8 +Name[ru]=Баг-репорт SliTaz (Web) 1.9 +Exec=tazweb --notoolbar http://bugs.slitaz.org/ 1.10 +Icon=slitaz-icon 1.11 +Type=Application 1.12 +Categories=Application;Network;
2.1 --- a/web/bugs.cgi Fri Feb 10 23:43:16 2017 +0100 2.2 +++ b/web/bugs.cgi Sat Feb 11 00:00:17 2017 +0100 2.3 @@ -217,22 +217,6 @@ 2.4 EOT 2.5 } 2.6 2.7 -# Display user public profile. 2.8 -public_people() { 2.9 - cat << EOT 2.10 -</pre> 2.11 -EOT 2.12 -} 2.13 - 2.14 -# Display authenticated user profile. TODO: change password 2.15 -auth_people() { 2.16 - cat << EOT 2.17 -Email : $MAIL 2.18 -Secure key : $KEY 2.19 -</pre> 2.20 -EOT 2.21 -} 2.22 - 2.23 # Usage: list_bug ID 2.24 list_bug() { 2.25 id="$1" 2.26 @@ -706,7 +690,7 @@ 2.27 js_redirection_to "$script" 2.28 fi ;; 2.29 *\ user\ *) 2.30 - # User profile 2.31 + # User profile. Use the users plugin for more functions 2.32 last="$(cat $PEOPLE/"$(GET user)"/last)" 2.33 header 2.34 html_header 2.35 @@ -718,14 +702,8 @@ 2.36 <pre> 2.37 $(gettext "User name :") $USER 2.38 $(gettext "Last login :") $last 2.39 +</pre> 2.40 EOT 2.41 - if check_auth && [ "$(GET user)" == "$user" ]; then 2.42 - auth_people 2.43 - else 2.44 - # check_auth will set VARS to current logged user: re-source 2.45 - . $PEOPLE/"$(GET user)"/account.conf 2.46 - public_people 2.47 - fi 2.48 html_footer ;; 2.49 *\ newbug\ *) 2.50 # Create a bug from web interface.
3.1 --- a/web/plugins/users/users.cgi Fri Feb 10 23:43:16 2017 +0100 3.2 +++ b/web/plugins/users/users.cgi Sat Feb 11 00:00:17 2017 +0100 3.3 @@ -6,10 +6,6 @@ 3.4 # Display user public profile. 3.5 public_people() { 3.6 echo "</pre>" 3.7 - # Display personal user profile 3.8 - if [ -f "$PEOPLE/$USER/profile.txt" ]; then 3.9 - cat $PEOPLE/$USER/profile.txt | wiki_parser 3.10 - fi 3.11 } 3.12 3.13 # Display authenticated user profile. TODO: change password 3.14 @@ -20,7 +16,6 @@ 3.15 EOT 3.16 # Each user can have personal profile page 3.17 if [ -f "$PEOPLE/$USER/profile.txt" ]; then 3.18 - cat $PEOPLE/$USER/profile.txt | wiki_parser 3.19 cat << EOT 3.20 <div id="tools"> 3.21 <a href="$script?modprofile">$(gettext "Modify profile")</a> 3.22 @@ -123,6 +118,11 @@ 3.23 . $PEOPLE/"$(GET user)"/account.conf 3.24 public_people 3.25 fi 3.26 + # Display personal user profile 3.27 + if [ -f "$PEOPLE/$USER/profile.txt" ]; then 3.28 + echo "<h2>$(gettext "About me")</h2>" 3.29 + cat $PEOPLE/$USER/profile.txt | wiki_parser 3.30 + fi 3.31 html_footer && exit 0 ;; 3.32 3.33 *\ modprofile\ *)