Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2009-09-22 12:57:51
|
Revision: 7149
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7149&view=rev
Author: vargenau
Date: 2009-09-22 12:57:43 +0000 (Tue, 22 Sep 2009)
Log Message:
-----------
Add fieldset
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2009-09-22 12:35:44 UTC (rev 7148)
+++ trunk/lib/plugin/UserPreferences.php 2009-09-22 12:57:43 UTC (rev 7149)
@@ -2,6 +2,7 @@
rcs_id('$Id$');
/**
Copyright (C) 2001,2002,2003,2004,2005 $ThePhpWikiProgrammingTeam
+ Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
This file is part of PhpWiki.
@@ -109,7 +110,8 @@
$args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
return Template('userprefs', $args);
} elseif ($delete and !$request->getArg('verify')) {
- return HTML::form(array('action' => $request->getPostURL(),
+ return HTML::fieldset(
+ HTML::form(array('action' => $request->getPostURL(),
'method' => 'post'),
HiddenInputs(array('verify' => 1)),
HiddenInputs($request->getArgs()),
@@ -117,7 +119,7 @@
HTML::p(Button('submit:delete', _("Yes"), 'delete'),
HTML::Raw(' '),
Button('cancel', _("Cancel")))
- );
+ ));
} elseif ($rp = $request->getArg('pref')) {
// replace only changed prefs in $pref with those from request
if (!empty($rp['passwd']) and ($rp['passwd2'] != $rp['passwd'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-11-10 15:13:15
|
Revision: 7266
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7266&view=rev
Author: vargenau
Date: 2009-11-10 15:13:07 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Use "errors" class to display error; specific error for Gforge
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2009-11-10 14:57:05 UTC (rev 7265)
+++ trunk/lib/plugin/UserPreferences.php 2009-11-10 15:13:07 UTC (rev 7266)
@@ -72,6 +72,12 @@
$user =& $request->_user;
if (isa($request,'MockRequest'))
return '';
+ if (defined('GFORGE') and GFORGE) {
+ if (!($user->isAuthenticated())) {
+ return HTML::div(array('class' => 'errors'),
+ _("Error: You are not logged in, cannot display UserPreferences."));
+ }
+ }
if ((!$request->isActionPage($request->getArg('pagename'))
and (!isset($user->_prefs->_method)
or !in_array($user->_prefs->_method, array('ADODB','SQL','PDO'))))
@@ -83,7 +89,8 @@
// foreach ($no_args as $key => $value) {
// $no_args[$value] = false;
// }
- $no_args['errmsg'] = HTML(HTML::h2(_("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."),HTML::hr()));
+ $no_args['errmsg'] = HTML::div(array('class' => 'errors'),
+ _("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."));
$no_args['isForm'] = false;
return Template('userprefs', $no_args);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-12 11:36:59
|
Revision: 10884
http://sourceforge.net/p/phpwiki/code/10884
Author: vargenau
Date: 2022-01-12 11:36:57 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
UserPreferences: If user has changed theme, we redirect so that the display is not ugly (mix of old and new templates)
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2022-01-11 11:37:40 UTC (rev 10883)
+++ trunk/lib/plugin/UserPreferences.php 2022-01-12 11:36:57 UTC (rev 10884)
@@ -74,6 +74,8 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
+ $pref = &$request->_prefs;
+ $old_theme = $pref->get('theme');
$args = $this->getArgs($argstr, $request);
$user =& $request->_user;
$user->_request = $request;
@@ -111,6 +113,10 @@
$request->_setUser($user);
$request->setArg("verify", false);
$request->setArg("delete", false);
+ if ($old_theme != THEME) {
+ return HTML($request->redirect(WikiURL(__("UserPreferences"), array(), 'absurl'), false));
+ }
+
$errmsg .= _("Your UserPreferences have been successfully reset to default.");
$args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
return Template('userprefs', $args);
@@ -172,6 +178,12 @@
$args['errmsg'] = HTML::div(array('class' => 'error'), HTML::p($errmsg));
} else {
$args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
+ $new_theme = $rp['theme'];
+ // 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));
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sle...@us...> - 2010-08-10 07:38:19
|
Revision: 7636
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7636&view=rev
Author: slecallonnec
Date: 2010-08-10 07:38:13 +0000 (Tue, 10 Aug 2010)
Log Message:
-----------
Fixed UserPreferences by setting again in user
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2010-08-09 16:40:16 UTC (rev 7635)
+++ trunk/lib/plugin/UserPreferences.php 2010-08-10 07:38:13 UTC (rev 7636)
@@ -65,6 +65,7 @@
function run($dbi, $argstr, &$request, $basepage) {
$args = $this->getArgs($argstr, $request);
$user =& $request->_user;
+ $user->_request = $request;
if (isa($request,'MockRequest'))
return '';
if (defined('GFORGE') and GFORGE) {
@@ -80,22 +81,16 @@
or (isa($user,'_ForbiddenUser')))
{
$no_args = $this->getDefaultArguments();
-// ?
-// foreach ($no_args as $key => $value) {
-// $no_args[$value] = false;
-// }
$no_args['errmsg'] = HTML::div(array('class' => 'errors'),
_("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."));
$no_args['isForm'] = false;
return Template('userprefs', $no_args);
}
$userid = $user->UserName();
- if (// ((defined('ALLOW_BOGO_LOGIN') && ALLOW_BOGO_LOGIN && $user->isSignedIn()) ||
- $user->isAuthenticated() and !empty($userid))
+ if ($user->isAuthenticated() and !empty($userid))
{
$pref = &$request->_prefs;
$args['isForm'] = true;
- //trigger_error("DEBUG: reading prefs from getPreferences".print_r($pref));
if ($request->isPost()) {
$errmsg = '';
@@ -127,8 +122,6 @@
if (!empty($rp['passwd']) and ($rp['passwd2'] != $rp['passwd'])) {
$errmsg = _("Wrong password. Try again.");
} else {
- //trigger_error("DEBUG: reading prefs from request".print_r($rp));
- //trigger_error("DEBUG: writing prefs with setPreferences".print_r($pref));
if (empty($rp['passwd'])) unset($rp['passwd']);
// fix to set system pulldown's. empty values don't get posted
if (empty($rp['theme'])) $rp['theme'] = '';
@@ -175,7 +168,6 @@
} else {
// wrong or unauthenticated user
return $request->_notAuthorized(WIKIAUTH_BOGO);
- //return $user->PrintLoginForm ($request, $args, false, false);
}
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2019-07-20 03:42:57
|
Revision: 10127
http://sourceforge.net/p/phpwiki/code/10127
Author: vargenau
Date: 2019-07-20 03:42:55 +0000 (Sat, 20 Jul 2019)
Log Message:
-----------
Add whitespace
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2019-05-02 16:21:49 UTC (rev 10126)
+++ trunk/lib/plugin/UserPreferences.php 2019-07-20 03:42:55 UTC (rev 10127)
@@ -146,7 +146,7 @@
$passchanged = $user->changePass($rp['passwd']);
}
if ($passchanged) {
- $errmsg = _("Password updated.");
+ $errmsg = _("Password updated.") . " ";
} else {
$errmsg = _("Password was not changed.");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2019-09-03 09:49:07
|
Revision: 10149
http://sourceforge.net/p/phpwiki/code/10149
Author: vargenau
Date: 2019-09-03 09:49:06 +0000 (Tue, 03 Sep 2019)
Log Message:
-----------
Add whitespace
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2019-09-02 20:14:58 UTC (rev 10148)
+++ trunk/lib/plugin/UserPreferences.php 2019-09-03 09:49:06 UTC (rev 10149)
@@ -148,7 +148,7 @@
if ($passchanged) {
$errmsg = _("Password updated.") . " ";
} else {
- $errmsg = _("Password was not changed.");
+ $errmsg = _("Password was not changed.") . " ";
}
} else {
$errmsg = _("Password cannot be changed.");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2020-12-31 16:54:01
|
Revision: 10216
http://sourceforge.net/p/phpwiki/code/10216
Author: vargenau
Date: 2020-12-31 16:53:59 +0000 (Thu, 31 Dec 2020)
Log Message:
-----------
UserPreferences: update locale in case user has changed language
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2020-12-31 16:35:40 UTC (rev 10215)
+++ trunk/lib/plugin/UserPreferences.php 2020-12-31 16:53:59 UTC (rev 10216)
@@ -58,7 +58,7 @@
}
$prefs = array();
if ($pref) {
- //we need a hash of pref => default_value
+ // We need a hash of pref => default_value
foreach ($pref->_prefs as $name => $obj) {
$prefs[$name] = $obj->default_value;
}
@@ -159,6 +159,7 @@
} else {
$request->_setUser($user);
$pref = $user->_prefs;
+ update_locale($rp['lang']); // Update locale in case user has changed language
if ($num == 1) {
$errmsg .= _("One UserPreferences field successfully updated.");
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-03-01 13:47:49
|
Revision: 10276
http://sourceforge.net/p/phpwiki/code/10276
Author: vargenau
Date: 2021-03-01 13:47:42 +0000 (Mon, 01 Mar 2021)
Log Message:
-----------
Use class "error" when appropriate
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2021-02-23 19:00:50 UTC (rev 10275)
+++ trunk/lib/plugin/UserPreferences.php 2021-03-01 13:47:42 UTC (rev 10276)
@@ -78,6 +78,7 @@
$args = $this->getArgs($argstr, $request);
$user =& $request->_user;
$user->_request = $request;
+ $iserror = false;
if (defined('FUSIONFORGE') && FUSIONFORGE) {
if (!($user->isAuthenticated())) {
return HTML::p(array('class' => 'error'),
@@ -129,6 +130,7 @@
} elseif ($rp = $request->getArg('pref')) {
// replace only changed prefs in $pref with those from request
if (!empty($rp['passwd']) and ($rp['passwd2'] != $rp['passwd'])) {
+ $iserror = true;
$errmsg = _("Wrong password. Try again.");
} else {
if (empty($rp['passwd'])) unset($rp['passwd']);
@@ -148,9 +150,11 @@
if ($passchanged) {
$errmsg = _("Password updated.") . " ";
} else {
+ $iserror = true;
$errmsg = _("Password was not changed.") . " ";
}
} else {
+ $iserror = true;
$errmsg = _("Password cannot be changed.");
}
}
@@ -167,7 +171,11 @@
}
}
}
- $args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
+ if ($iserror) {
+ $args['errmsg'] = HTML::div(array('class' => 'error'), HTML::p($errmsg));
+ } else {
+ $args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-11 11:37:42
|
Revision: 10883
http://sourceforge.net/p/phpwiki/code/10883
Author: vargenau
Date: 2022-01-11 11:37:40 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
UserPreferences plugin: remove unused variable; no need to update_locale
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2022-01-11 10:50:09 UTC (rev 10882)
+++ trunk/lib/plugin/UserPreferences.php 2022-01-11 11:37:40 UTC (rev 10883)
@@ -36,7 +36,6 @@
class WikiPlugin_UserPreferences
extends WikiPlugin
{
- public $bool_args;
public $_request;
function getDescription()
@@ -162,7 +161,6 @@
} else {
$request->_setUser($user);
$pref = $user->_prefs;
- update_locale($rp['lang']); // Update locale in case user has changed language
if ($num == 1) {
$errmsg .= _("One UserPreferences field successfully updated.");
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-12 17:08:24
|
Revision: 10891
http://sourceforge.net/p/phpwiki/code/10891
Author: vargenau
Date: 2022-01-12 17:08:23 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
UserPreferences plugin has no arguements
Modified Paths:
--------------
trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2022-01-12 16:14:08 UTC (rev 10890)
+++ trunk/lib/plugin/UserPreferences.php 2022-01-12 17:08:23 UTC (rev 10891)
@@ -28,9 +28,6 @@
* This must be used in the page "UserPreferences".
* Prefs are stored in metadata in the current session,
* within the user's home page or in a database.
- *
- * WikiTheme extension: WikiThemes are able to extend the predefined list
- * of preferences.
*/
class WikiPlugin_UserPreferences
@@ -45,24 +42,7 @@
function getDefaultArguments()
{
- global $request;
- $user = $request->getUser();
- if (isset($user->_prefs) and
- isset($user->_prefs->_prefs) and
- isset($user->_prefs->_method)
- ) {
- $pref =& $user->_prefs;
- } else {
- $pref = $user->getPreferences();
- }
- $prefs = array();
- if ($pref) {
- // We need a hash of pref => default_value
- foreach ($pref->_prefs as $name => $obj) {
- $prefs[$name] = $obj->default_value;
- }
- }
- return $prefs;
+ return array();
}
/**
@@ -94,13 +74,11 @@
$no_args = $this->getDefaultArguments();
$no_args['errmsg'] = HTML::p(array('class' => 'error'),
_("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."));
- $no_args['isForm'] = false;
return Template('userprefs', $no_args);
}
$userid = $user->UserName();
if ($user->isAuthenticated() and !empty($userid)) {
$pref = &$request->_prefs;
- $args['isForm'] = true;
if ($request->isPost()) {
$errmsg = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X