Removed references to session->id and added a few missing link()s

This commit is contained in:
jengo 2000-09-05 03:24:51 +00:00
parent ade3d1ab28
commit ef2bc22fba
7 changed files with 11 additions and 21 deletions

View File

@ -36,9 +36,7 @@
<br><center><a href="<?php <br><center><a href="<?php
echo $phpgw->link("view.php","&con=$con&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"); echo $phpgw->link("view.php","&con=$con&order=$order&sort=$sort&filter=$filter&start=$start&query=$query");
?>"><?php echo lang_common("NO"); ?></a> &nbsp; &nbsp; &nbsp; &nbsp; ?>"><?php echo lang_common("NO"); ?></a> &nbsp; &nbsp; &nbsp; &nbsp;
<a href="delete.php?sessionid=<?php <a href="<?php echo $phpgw->link("delete.php","con=$con&confirm=true&order=$order&sort=$sort&filter=$filter&start=$start&query=$query");
echo $phpgw->session->id . "&con=$con&confirm=true&order=$order&sort="
. "$sort&filter=$filter&start=$start&query=$query";
?>"><?php echo lang_common("YES"); ?></a><center> ?>"><?php echo lang_common("YES"); ?></a><center>
<?php <?php

View File

@ -17,7 +17,7 @@
$phpgw_flags["currentapp"] = "admin"; $phpgw_flags["currentapp"] = "admin";
include("../header.inc.php"); include("../header.inc.php");
if ($ksessionid == $phpgw->session->id) { if ($ksessionid == $phpgw_info["user"]["sessionid"]) {
Header("Location: " . $phpgw->link("currentusers.php")); Header("Location: " . $phpgw->link("currentusers.php"));
exit; exit;
} }

View File

@ -16,14 +16,13 @@
include("../header.inc.php"); include("../header.inc.php");
if (! $con) if (! $con)
Header("Location: accounts.php?sessionid=" . $phpgw->session->id); Header("Location: " . $phpgw->link("accounts.php"));
$db_perms = $phpgw->accounts->read_apps($phpgw->db->f("loginid")); $db_perms = $phpgw->accounts->read_apps($phpgw->db->f("loginid"));
$phpgw->db->query("select * from accounts where con='$con'"); $phpgw->db->query("select * from accounts where con='$con'");
$phpgw->db->next_record(); $phpgw->db->next_record();
?> ?>
<center> <center>
<p><table border=0 width=50%> <p><table border=0 width=50%>

View File

@ -31,5 +31,4 @@
$phpgw->db->query("DELETE FROM webcal_entry_groups WHERE cal_id = $id"); $phpgw->db->query("DELETE FROM webcal_entry_groups WHERE cal_id = $id");
} }
Header("Location: index.php?sessionid=" . $phpgw->session->id . "&" Header("Location: " . $phpgw->link("index.php,"year=$thisyear&month=$thismonth"));
. ($thisyear > 0 ? "year=$thisyear&month=$thismonth" : "") );

View File

@ -84,10 +84,7 @@
<FONT COLOR="<?php echo $H2COLOR;?>" SIZE="+1"> <FONT COLOR="<?php echo $H2COLOR;?>" SIZE="+1">
<br> <br>
<?php <?php
if ($phpgw->session->firstname) echo $phpgw->common->display_fullname($phpgw_info["user"]["userid"],$phpgw_info["user"]["firstname"],$phpgw_info["user"]["lastname"]);
echo $phpgw->session->firstname . " ";
if ($phpgw->session->lastname)
echo $phpgw->session->lastname;
?> ?>
</FONT></TD> </FONT></TD>
<?php <?php
@ -144,7 +141,7 @@
} else { } else {
echo " BGCOLOR=\"$CELLBG\">"; echo " BGCOLOR=\"$CELLBG\">";
} }
print_date_entries($date,$friendly,$phpgw->session->id); print_date_entries($date,$friendly,$phpgw_info["user"]["sessionid"]);
echo "</TD>\n"; echo "</TD>\n";
} else { } else {
echo "<TD></TD>\n"; echo "<TD></TD>\n";

View File

@ -78,8 +78,7 @@
if (! strlen($error)) { if (! strlen($error)) {
arsort ($ids); arsort ($ids);
for (reset($ids); $key = key($ids); next($ids)) { for (reset($ids); $key = key($ids); next($ids)) {
echo "<LI><A HREF=\"view.php?sessionid=" . $phpgw->session->id echo "<LI><A HREF=\"" . $phpgw->link("view.php","id=$key") . "\">" . $info[$key] . "</A>\n";
. "&id=$key\">" . $info[$key] . "</A>\n";
} }
} else { } else {

View File

@ -29,8 +29,7 @@
<tr> <tr>
<?php <?php
if (! $friendly) if (! $friendly)
echo "<td align=\"left\"><A HREF=\"year.php?sessionid=" . $phpgw->session->id echo "<td align=\"left\"><A HREF=\"" . $phpgw->link("year.php","year=" . ($year - 1)) . "\">&lt;&lt;</A>";
. "&year=" . ($year - 1) . "\">&lt;&lt;</A>";
?> ?>
</td> </td>
</td> </td>
@ -39,8 +38,7 @@
</td> </td>
<?php <?php
if (! $friendly) if (! $friendly)
echo "<td align=\"right\"><A HREF=\"year.php?sessionid=" . $phpgw->session->id echo "<td align=\"right\"><A HREF=\"" . $phpgw->link("year.php","year=" . ($year + 1)) . "\">&gt;&gt;</A>";
. "&year=" . ($year + 1) . "\">&gt;&gt;</A>";
?> ?>
</td> </td>
</tr> </tr>
@ -65,8 +63,8 @@
<?php <?php
if (! $friendly) { if (! $friendly) {
echo "&nbsp;<A HREF=\"year.php?sessionid=" . $phpgw->session->id . "&friendly=1&" echo "&nbsp;<A HREF=\"" . $phpgw->link("year.php","friendly=1&"
. "&year=$year\"TARGET=\"cal_printer_friendly\" onMouseOver=\"window." . "&year=$year") . "\"TARGET=\"cal_printer_friendly\" onMouseOver=\"window."
. "status = '" . lang_calendar("Generate printer-friendly version") . "'\">[" . "status = '" . lang_calendar("Generate printer-friendly version") . "'\">["
. lang_calendar("Printer Friendly") . "]</A>"; . lang_calendar("Printer Friendly") . "]</A>";
} }