arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Set some redirects to user_edit instead of user_account

Browse Source 
Disable the importantdates box again
This commit is contained in:
james 2010-08-19 20:07:08 +00:00
parent ffcab968d3
commit 78614ef309
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common.inc.php
View File

@ -139,11 +139,9 @@ if(!$_SESSION['conferences_id']) {
if(isset($_SESSION['roles']) && $_SESSION['username']) { if(isset($_SESSION['roles']) && $_SESSION['username']) {
echo i18n("Logged in as %1",array($_SESSION['username']))."<br />"; echo i18n("Logged in as %1",array($_SESSION['username']))."<br />";
echo "<div style=\"margin-top: 8px;\">\n"; echo "<div style=\"margin-top: 8px;\">\n";
echo "My: <a href=\"{$config['SFIABDIRECTORY']}/user_account.php\">".i18n("Account")."</a>"; echo "My: <a href=\"{$config['SFIABDIRECTORY']}/user_edit.php\">".i18n("Account Profile")."</a>";
echo "&nbsp;|&nbsp;"; echo "&nbsp;|&nbsp;";
echo "<a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("Profile")."</a>"; echo "<a href=\"{$config['SFIABDIRECTORY']}/user_main.php\">".i18n("Main Page")."</a>";
echo "&nbsp;|&nbsp;";
echo "<a href=\"{$config['SFIABDIRECTORY']}/user_main.php\">".i18n("Main")."</a>";
echo "</div>"; echo "</div>";
echo "<div style=\"margin-top: 5px;\">\n"; echo "<div style=\"margin-top: 5px;\">\n";
echo "<a href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=logout\">".i18n("Logout")."</a>"; echo "<a href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=logout\">".i18n("Logout")."</a>";
@ -376,12 +374,14 @@ if(is_array($_SESSION['roles'])) {
admin_warnings(); admin_warnings();
} }
/*
if(substr(getcwd(),-6)!="/admin" && substr(getcwd(),-7)!="/config" && substr(getcwd(),-6)!="/super") { if(substr(getcwd(),-6)!="/admin" && substr(getcwd(),-7)!="/config" && substr(getcwd(),-6)!="/super") {
?> ?>
<div id="importantdatesbox"> <div id="importantdatesbox">
</div> </div>
<? <?
} }
*/
if($icon && theme_icon($icon)) { if($icon && theme_icon($icon)) {
echo "<div style=\"float: left; margin-right: 5px;\">"; echo "<div style=\"float: left; margin-right: 5px;\">";

2
user.inc.php
View File

@ -548,7 +548,7 @@ function user_auth_required($all_required = array(), $one_required = array())
/* Forward to password expired, remember the target URI */ /* Forward to password expired, remember the target URI */
if($_SESSION['password_expired'] == true) { if($_SESSION['password_expired'] == true) {
$_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; $_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];
header("location: {$config['SFIABDIRECTORY']}/user_account.php"); header("location: {$config['SFIABDIRECTORY']}/user_edit.php");
exit; exit;
} }

2
user_login.php
View File

@ -73,7 +73,7 @@ function user_conference_load($accounts_id,$conferences_id) {
$q = mysql_query("SELECT id FROM users WHERE accounts_id=$accounts_id AND conferences_id=$conferences_id"); $q = mysql_query("SELECT id FROM users WHERE accounts_id=$accounts_id AND conferences_id=$conferences_id");
if(mysql_num_rows($q) == 0) { if(mysql_num_rows($q) == 0) {
/* FIXME: this should probably just return false, but for now, see if there's an error */ /* FIXME: this should probably just return false, but for now, see if there's an error */
header("location: user_account.php"); header("location: user_edit.php");
// echo "No user {$accounts_id} for conference {$_SESSION['conferences_id']}"; // echo "No user {$accounts_id} for conference {$_SESSION['conferences_id']}";
exit; exit;
} }