Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2012-12-27 19:21:02
|
Revision: 8695
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8695&view=rev
Author: vargenau
Date: 2012-12-27 19:20:56 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Fix return
Modified Paths:
--------------
trunk/lib/plugin/PasswordReset.php
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2012-12-27 18:07:00 UTC (rev 8694)
+++ trunk/lib/plugin/PasswordReset.php 2012-12-27 19:20:56 UTC (rev 8695)
@@ -142,9 +142,11 @@
}
if ($userid and !empty($post_args['verify'])) {
if ($user->isAdmin()) {
- return $this->doReset($userid);
+ $this->doReset($userid);
+ return '';
} else {
- return $this->doEmail($request, $userid);
+ $this->doEmail($request, $userid);
+ return '';
}
} elseif (empty($post_args['verify'])) {
//TODO: verify should check if the user exists, his prefs can be read/safed
@@ -161,7 +163,7 @@
$alert = new Alert(_("Already logged in"),
HTML(fmt("Changing passwords is done at "), WikiLink(_("UserPreferences"))));
$alert->show();
- return;
+ return '';
}
$thisuser = WikiUser($userid);
$prefs = $thisuser->getPreferences();
@@ -173,7 +175,7 @@
fmt("You need to ask an Administrator to reset this password. See below: "),
HTML::br(), WikiLink(ADMIN_USER)));
$alert->show();
- return;
+ return '';
}
$verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified');
if (!$verified)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-12-27 19:31:16
|
Revision: 8697
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8697&view=rev
Author: vargenau
Date: 2012-12-27 19:31:09 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Remove unused
Modified Paths:
--------------
trunk/lib/plugin/PasswordReset.php
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2012-12-27 19:27:07 UTC (rev 8696)
+++ trunk/lib/plugin/PasswordReset.php 2012-12-27 19:31:09 UTC (rev 8697)
@@ -94,7 +94,6 @@
function doForm(&$request, $userid = '', $header = '', $footer = '')
{
- $post_args = $request->getArg('admin_reset');
if (!$header) {
$header = HTML::p(_("Reset password of user: "),
HTML::Raw(' '),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-08-09 13:59:51
|
Revision: 10465
http://sourceforge.net/p/phpwiki/code/10465
Author: vargenau
Date: 2021-08-09 13:59:49 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
Avoid warning
Modified Paths:
--------------
trunk/lib/plugin/PasswordReset.php
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2021-08-09 13:47:12 UTC (rev 10464)
+++ trunk/lib/plugin/PasswordReset.php 2021-08-09 13:59:49 UTC (rev 10465)
@@ -143,9 +143,9 @@
if (!$userid) $userid = $request->getArg('user');
$isadmin = $user->isAdmin();
if ($request->isPost()) {
- @$reset = $post_args['reset'];
- if (empty($reset))
+ if (!array_key_exists('reset', $post_args)) {
return $this->doForm($request, $userid);
+ }
if (!$userid) {
$alert = new Alert(_("Warning:"),
_("You need to specify the userid!"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-08-10 12:35:27
|
Revision: 10476
http://sourceforge.net/p/phpwiki/code/10476
Author: vargenau
Date: 2021-08-10 12:35:26 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
lib/plugin/PasswordReset.php: avoid warning
Modified Paths:
--------------
trunk/lib/plugin/PasswordReset.php
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2021-08-10 10:04:30 UTC (rev 10475)
+++ trunk/lib/plugin/PasswordReset.php 2021-08-10 12:35:26 UTC (rev 10476)
@@ -144,6 +144,9 @@
if (!$userid) $userid = $request->getArg('user');
$isadmin = $user->isAdmin();
if ($request->isPost()) {
+ if ($post_args === false) {
+ return $this->doForm($request, $userid);
+ }
if (!array_key_exists('reset', $post_args)) {
return $this->doForm($request, $userid);
}
@@ -162,7 +165,7 @@
return '';
}
} elseif (empty($post_args['verify'])) {
- //TODO: verify should check if the user exists, his prefs can be read/safed
+ //TODO: verify should check if the user exists, his prefs can be read/saved
// and the email is verified, even if admin.
$buttons = HTML::p(Button('submit:admin_reset[reset]',
$isadmin ? _("Yes") : _("Send e-mail"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-07-04 15:54:08
|
Revision: 8828
http://sourceforge.net/p/phpwiki/code/8828
Author: vargenau
Date: 2013-07-04 15:54:04 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
private
Modified Paths:
--------------
trunk/lib/plugin/PasswordReset.php
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2013-07-04 14:52:25 UTC (rev 8827)
+++ trunk/lib/plugin/PasswordReset.php 2013-07-04 15:54:04 UTC (rev 8828)
@@ -49,7 +49,7 @@
}
/* reset password, verified */
- function doReset($userid)
+ private function doReset($userid)
{
$user = WikiUser($userid);
@@ -65,7 +65,7 @@
$alert->show();
}
- function doEmail(&$request, $userid)
+ private function doEmail(&$request, $userid)
{
$thisuser = WikiUser($userid);
@@ -87,7 +87,7 @@
$alert->show();
}
- function doForm(&$request, $userid = '', $header = '', $footer = '')
+ private function doForm(&$request, $userid = '', $header = '', $footer = '')
{
if (!$header) {
$header = HTML::p(_("Reset password of user: "),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-08-09 14:17:24
|
Revision: 10466
http://sourceforge.net/p/phpwiki/code/10466
Author: vargenau
Date: 2021-08-09 14:17:22 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
lib/plugin/PasswordReset.php: user name is mandatory
Modified Paths:
--------------
trunk/lib/plugin/PasswordReset.php
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2021-08-09 13:59:49 UTC (rev 10465)
+++ trunk/lib/plugin/PasswordReset.php 2021-08-09 14:17:22 UTC (rev 10466)
@@ -107,7 +107,8 @@
$header = HTML::p(_("Reset password of user: "),
HTML::raw(' '),
HTML::input(array('type' => 'text',
- 'name' => "user",
+ 'required' => 'required',
+ 'name' => 'user',
'value' => $userid))
);
}
@@ -117,7 +118,7 @@
$isadmin ? _("Yes") : _("Send e-mail"),
$isadmin ? 'wikiadmin' : 'button'),
HTML::raw(' '),
- Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
+ Button('submit:admin_reset[cancel]', _("Cancel"), 'button', array('formnovalidate' => 'formnovalidate')));
}
return HTML::form(array('action' => $request->getPostURL(),
'method' => 'post'),
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