updated to new location for the show_date function

This commit is contained in:
seek3r 2000-08-30 07:55:42 +00:00
parent 4f96cb127f
commit a62486b000
6 changed files with 14 additions and 14 deletions

View File

@ -56,12 +56,12 @@
$total = " "; $total = " ";
if ($phpgw->db->f("li")) if ($phpgw->db->f("li"))
$li = $phpgw->preferences->show_date($phpgw->db->f("li")); $li = $phpgw->common->show_date($phpgw->db->f("li"));
else else
$li = " "; $li = " ";
if ($phpgw->db->f("lo")) if ($phpgw->db->f("lo"))
$lo = $phpgw->preferences->show_date($phpgw->db->f("lo")); $lo = $phpgw->common->show_date($phpgw->db->f("lo"));
else else
$lo = " "; $lo = " ";

View File

@ -64,7 +64,7 @@
$t->set_var("row_loginid",$phpgw->db->f("loginid")); $t->set_var("row_loginid",$phpgw->db->f("loginid"));
$t->set_var("row_ip",$phpgw->db->f("ip")); $t->set_var("row_ip",$phpgw->db->f("ip"));
$t->set_var("row_logintime",$phpgw->preferences->show_date($phpgw->db->f("logintime"))); $t->set_var("row_logintime",$phpgw->common->show_date($phpgw->db->f("logintime")));
$t->set_var("row_idle",gmdate("G:i:s",(time() - $phpgw->db->f("dla")))); $t->set_var("row_idle",gmdate("G:i:s",(time() - $phpgw->db->f("dla"))));
if ($phpgw->db->f("sessionid") != $phpgw->session->id) { if ($phpgw->db->f("sessionid") != $phpgw->session->id) {

View File

@ -86,7 +86,7 @@
if (! $phpgw->db->f("lastlogin")) if (! $phpgw->db->f("lastlogin"))
echo "Never"; echo "Never";
else else
echo $phpgw->preferences->show_date($phpgw->db->f("lastlogin")); echo $phpgw->common->show_date($phpgw->db->f("lastlogin"));
?></td></tr> ?></td></tr>
<tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>"> <tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>">

View File

@ -27,7 +27,7 @@
<tr><td><?php echo lang_admin("Display"); ?></td> <td><?php echo $phpgw->db->f("display"); ?></td></tr> <tr><td><?php echo lang_admin("Display"); ?></td> <td><?php echo $phpgw->db->f("display"); ?></td></tr>
<tr><td><?php echo lang_admin("Base Url"); ?></td> <td><?php echo $phpgw->db->f("base_url"); ?></td></tr> <tr><td><?php echo lang_admin("Base Url"); ?></td> <td><?php echo $phpgw->db->f("base_url"); ?></td></tr>
<tr><td><?php echo lang_admin("News File"); ?></td> <td><?php echo $phpgw->db->f("newsfile"); ?></td></tr> <tr><td><?php echo lang_admin("News File"); ?></td> <td><?php echo $phpgw->db->f("newsfile"); ?></td></tr>
<tr><td><?php echo lang_admin("Last Time Read"); ?></td> <td><?php echo $phpgw->preferences->show_date($phpgw->db->f("lastread")); ?></td></tr> <tr><td><?php echo lang_admin("Last Time Read"); ?></td> <td><?php echo $phpgw->common->show_date($phpgw->db->f("lastread")); ?></td></tr>
<tr><td><?php echo lang_admin("minutes between reloads"); ?></td> <td><?php echo $phpgw->db->f("cachetime"); ?></td></tr> <tr><td><?php echo lang_admin("minutes between reloads"); ?></td> <td><?php echo $phpgw->db->f("cachetime"); ?></td></tr>
<tr><td><?php echo lang_admin("Listings Displayed"); ?></td> <td><?php echo $phpgw->db->f("listings"); ?></td></tr> <tr><td><?php echo lang_admin("Listings Displayed"); ?></td> <td><?php echo $phpgw->db->f("listings"); ?></td></tr>
<tr><td><?php echo lang_admin("News Type"); ?></td> <td><?php echo $phpgw->db->f("newstype"); ?></td></tr> <tr><td><?php echo lang_admin("News Type"); ?></td> <td><?php echo $phpgw->db->f("newstype"); ?></td></tr>

View File

@ -4,17 +4,17 @@
&nbsp; &nbsp;
</td> </td>
<td width="2%"> <td width="2%">
<a href="<?php echo $phpgw->link("day.php","year=".$phpgw->preferences->show_date_other("Y",time())."&month=".$phpgw->preferences->show_date_other("m", time())."&day=".$phpgw->preferences->show_date_other("d",time())); ?>"> <a href="<?php echo $phpgw->link("day.php","year=".$phpgw->common->show_date(time(),"Y")."&month=".$phpgw->common->show_date(time(),"m")."&day=".$phpgw->common->show_date(time(),"d")); ?>">
<img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/today.gif" alt="<?php echo lang_calendar("Today"); ?>" border="0"> <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/today.gif" alt="<?php echo lang_calendar("Today"); ?>" border="0">
</a> </a>
</td> </td>
<td width="2%" align="left"> <td width="2%" align="left">
<a href="<?php echo $phpgw->link("week.php","date=".$phpgw->preferences->show_date_other("Ymd",time())); ?>"> <a href="<?php echo $phpgw->link("week.php","date=".$phpgw->common->show_date(time(),"Ymd")); ?>">
<img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/week.gif" alt="<?php echo lang_calendar("This week"); ?>" border="0"> <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/week.gif" alt="<?php echo lang_calendar("This week"); ?>" border="0">
</a> </a>
</td> </td>
<td width="2%" align="left"> <td width="2%" align="left">
<a href="<?php echo $phpgw->link("index.php","date=".$phpgw->preferences->show_date_other("Ymd",time())); ?>"> <a href="<?php echo $phpgw->link("index.php","date=".$phpgw->common->show_date(time(),"Ymd")); ?>">
<img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/month.gif" alt="<?php echo lang_calendar("This month"); ?>" border="0"> <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/month.gif" alt="<?php echo lang_calendar("This month"); ?>" border="0">
</a> </a>
</td> </td>

View File

@ -89,17 +89,17 @@
&& $phpgw_info["user"]["preferences"]["mainscreen_showbirthdays"]) { && $phpgw_info["user"]["preferences"]["mainscreen_showbirthdays"]) {
echo "<!-- Birthday info -->\n"; echo "<!-- Birthday info -->\n";
$phpgw->db->query("select DISTINCT firstname,lastname from addressbook where " $phpgw->db->query("select DISTINCT firstname,lastname from addressbook where "
. "bday like '" . $phpgw->preferences->show_date_other("n/d",time()) . "bday like '" . $phpgw->common->show_date(time(),"n/d")
. "/%' and (owner='" . $phpgw->session->loginid . "' or access='" . "/%' and (owner='" . $phpgw->session->loginid . "' or access='"
. "public')"); . "public')");
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
echo "<tr><td>" . lang_common("Today is x's birthday!", $phpgw->db->f("firstname") . " " echo "<tr><td>" . lang_common("Today is x's birthday!", $phpgw->db->f("firstname") . " "
. $phpgw->db->f("lastname")) . "</td></tr>\n"; . $phpgw->db->f("lastname")) . "</td></tr>\n";
} }
$tommorow = $phpgw->preferences->show_date_other("n/d", mktime(0,0,0, $tommorow = $phpgw->common->show_date(mktime(0,0,0,
$phpgw->preferences->show_date_other("m",time()), $phpgw->common->show_date(time(),"m"),
$phpgw->preferences->show_date_other("d",time())+1, $phpgw->common->show_date(time(),"d")+1,
$phpgw->preferences->show_date_other("Y",time())) ); $phpgw->common->show_date(time(),"Y")),"n/d" );
$phpgw->db->query("select firstname,lastname from addressbook where " $phpgw->db->query("select firstname,lastname from addressbook where "
. "bday like '$tommorow/%' and (owner='" . "bday like '$tommorow/%' and (owner='"
. $phpgw->session->loginid . "' or access='public')"); . $phpgw->session->loginid . "' or access='public')");
@ -121,7 +121,7 @@
include($phpgw_info["server"]["server_root"] . "/calendar/inc/functions.inc.php"); include($phpgw_info["server"]["server_root"] . "/calendar/inc/functions.inc.php");
$repeated_events = read_repeated_events($phpgw->session->loginid); $repeated_events = read_repeated_events($phpgw->session->loginid);
$phpgw->db->query("select count(*) from webcal_entry,webcal_entry_user" $phpgw->db->query("select count(*) from webcal_entry,webcal_entry_user"
. " where cal_date='" . $phpgw->preferences->show_date_other("Ymd", time()) . " where cal_date='" . $phpgw->common->show_date(time(),"Ymd")
. "' and (webcal_entry_user.cal_login='" . $phpgw->session->loginid . "' and (webcal_entry_user.cal_login='" . $phpgw->session->loginid
. "' and webcal_entry.cal_id = webcal_entry_user.cal_id) and " . "' and webcal_entry.cal_id = webcal_entry_user.cal_id) and "
. "(cal_priority='3')"); . "(cal_priority='3')");