mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00
Code Issues Releases Wiki Activity

Usersettings stays in admin area when editing a users details. - still need to add admin menu navigation

Browse Source
This commit is contained in:
CaMer0n
2009-08-05 21:47:18 +00:00
parent eef711a95c
commit 206d6d7f97
2 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_themes/templates/usersettings_template.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/usersettings_template.php,v $ | $Source: /cvs_backup/e107_0.8/e107_themes/templates/usersettings_template.php,v $
| $Revision: 1.6 $ | $Revision: 1.7 $
| $Date: 2008-12-28 22:37:43 $ | $Date: 2009-08-05 21:47:18 $
| $Author: e107steved $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -101,8 +101,11 @@ $REQUIRED_FIELD = "{FIELDNAME}<span style='text-align:right;font-size:15px; colo
$USERSETTINGS_EDIT = " $USERSETTINGS_EDIT = "
<div style='text-align:center'> <div style='text-align:center'>
<table style='".USER_WIDTH."' class='fborder'> <table style='".USER_WIDTH."' class='fborder adminform'>
<colgroup span='2'>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tr> <tr>
<td colspan='2' class='forumheader'>".LAN_USET_31."</td> <td colspan='2' class='forumheader'>".LAN_USET_31."</td>
</tr> </tr>

56
usersettings.php
View File

@@ -9,9 +9,9 @@
* User settings modify * User settings modify
* *
* $Source: /cvs_backup/e107_0.8/usersettings.php,v $ * $Source: /cvs_backup/e107_0.8/usersettings.php,v $
* $Revision: 1.36 $ * $Revision: 1.37 $
* $Date: 2009-07-21 19:21:27 $ * $Date: 2009-08-05 21:47:18 $
* $Author: e107steved $ * $Author: e107coders $
* *
*/ */
/* /*
@@ -21,11 +21,14 @@ Admin log events:
USET_01 - admin changed user data USET_01 - admin changed user data
*/ */
if(is_numeric($_SERVER["QUERY_STRING"]))
{
$eplug_admin = TRUE;
}
require_once ('class2.php'); require_once ('class2.php');
//define("US_DEBUG",TRUE); define("US_DEBUG",FALSE);
define('US_DEBUG', false); //define('US_DEBUG', false);
if (!USER) if (!USER)
@@ -41,6 +44,7 @@ if ((!ADMIN || !getperms("4")) && e_QUERY && e_QUERY != "update" )
} }
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php'); // Generic user-related language defines include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php'); // Generic user-related language defines
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_usersettings.php');
require_once (e_HANDLER.'ren_help.php'); require_once (e_HANDLER.'ren_help.php');
require_once (e_HANDLER.'user_extended_class.php'); require_once (e_HANDLER.'user_extended_class.php');
@@ -97,10 +101,17 @@ if(is_numeric(e_QUERY))
header('location:'.e_BASE.'index.php'); header('location:'.e_BASE.'index.php');
exit(); exit();
} }
}
if($adminEdit) // try to stay in Admin when admin is editing.
{
include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_admin.php");
require_once (e_ADMIN."auth.php");
}
else
{
require_once (HEADERF);
} }
require_once (HEADERF);
// Save user settings (changes only) // Save user settings (changes only)
@@ -311,7 +322,14 @@ elseif (isset($_POST['SaveValidatedInfo']))
{ // Invalid password { // Invalid password
echo "<br />".LAN_USET_22."<br />"; echo "<br />".LAN_USET_22."<br />";
require_once (FOOTERF); if(!$adminEdit)
{
require_once (FOOTERF);
}
else
{
require_once(e_ADMIN."footer.php");
}
exit(); exit();
} }
$changedUserData = unserialize($new_data); $changedUserData = unserialize($new_data);
@@ -607,7 +625,14 @@ if ($promptPassword)
</table> </table>
</form>"; </form>";
$ns->tablerender(LAN_USET_39, $text); $ns->tablerender(LAN_USET_39, $text);
require_once (FOOTERF); if(!$adminEdit)
{
require_once (FOOTERF);
}
else
{
require_once(e_ADMIN."footer.php");
}
} }
@@ -658,7 +683,14 @@ $text .= "
"; ";
$ns->tablerender(LAN_USET_39, $text); $ns->tablerender(LAN_USET_39, $text);
require_once (FOOTERF); if(!$adminEdit)
{
require_once (FOOTERF);
}
else
{
require_once(e_ADMIN."footer.php");
}