[phpwiki-checkins] SF.net SVN: phpwiki:[10885] trunk

[<var...@us...>]

Revision: 10885
          http://sourceforge.net/p/phpwiki/code/10885
Author:   vargenau
Date:     2022-01-12 12:19:57 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
UserPreferences: display feedback banner in case of redirect

Modified Paths:
--------------
    trunk/lib/plugin/UserPreferences.php
    trunk/themes/default/templates/userprefs.tmpl

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2022-01-12 11:36:57 UTC (rev 10884)
+++ trunk/lib/plugin/UserPreferences.php	2022-01-12 12:19:57 UTC (rev 10885)
@@ -114,7 +114,8 @@
                     $request->setArg("verify", false);
                     $request->setArg("delete", false);
                     if ($old_theme != THEME) {
-                        return HTML($request->redirect(WikiURL(__("UserPreferences"), array(), 'absurl'), false));
+                        $url = WikiURL(__("UserPreferences"), array(), 'absurl')."?num=reset";
+                        return HTML($request->redirect($url, false));
                     }
 
                     $errmsg .= _("Your UserPreferences have been successfully reset to default.");
@@ -182,7 +183,8 @@
                         // If user has changed theme, we redirect so that the display is not ugly
                         // (mix of old and new templates)
                         if ($new_theme && ($new_theme != $old_theme)) {
-                            return HTML($request->redirect(WikiURL(__("UserPreferences"), array(), 'absurl'), false));
+                            $url = WikiURL(__("UserPreferences"), array(), 'absurl').'?num='.$num;
+                            return HTML($request->redirect($url, false));
                         }
                     }
 

Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2022-01-12 11:36:57 UTC (rev 10884)
+++ trunk/themes/default/templates/userprefs.tmpl	2022-01-12 12:19:57 UTC (rev 10885)
@@ -9,6 +9,7 @@
 $time = time();
 $user =& $request->getUser();
 $pref =& $request->_prefs;
+$num = $request->getArg('num');
 
 if (!$pref) return;
 $offset = $pref->get('timeOffset');
@@ -118,6 +119,15 @@
 
 ?>
 <?php echo $errmsg ?>
+<?php if (empty($errmsg)) { ?>
+<?php if ($num=='reset') { ?>
+<div class="feedback"><p><?php echo _('Your UserPreferences have been successfully reset to default.') ?></p></div>
+<?php } elseif ($num==1) { ?>
+<div class="feedback"><p><?php echo _('One UserPreferences field successfully updated.') ?></p></div>
+<?php } elseif ($num) { ?>
+<div class="feedback"><p><?php echo sprintf(_("%d UserPreferences fields successfully updated."), $num) ?></p></div>
+<?php } ?>
+<?php } ?>
 <p>
 <?php echo fmt("User preferences for user %s", WikiLink($user->UserName())) ?>
 </p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.