mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 08:34:29 +01:00
updated to new location for the show_date function
This commit is contained in:
parent
4f96cb127f
commit
a62486b000
@ -56,12 +56,12 @@
|
||||
$total = " ";
|
||||
|
||||
if ($phpgw->db->f("li"))
|
||||
$li = $phpgw->preferences->show_date($phpgw->db->f("li"));
|
||||
$li = $phpgw->common->show_date($phpgw->db->f("li"));
|
||||
else
|
||||
$li = " ";
|
||||
|
||||
if ($phpgw->db->f("lo"))
|
||||
$lo = $phpgw->preferences->show_date($phpgw->db->f("lo"));
|
||||
$lo = $phpgw->common->show_date($phpgw->db->f("lo"));
|
||||
else
|
||||
$lo = " ";
|
||||
|
||||
|
@ -64,7 +64,7 @@
|
||||
|
||||
$t->set_var("row_loginid",$phpgw->db->f("loginid"));
|
||||
$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"))));
|
||||
|
||||
if ($phpgw->db->f("sessionid") != $phpgw->session->id) {
|
||||
|
@ -86,7 +86,7 @@
|
||||
if (! $phpgw->db->f("lastlogin"))
|
||||
echo "Never";
|
||||
else
|
||||
echo $phpgw->preferences->show_date($phpgw->db->f("lastlogin"));
|
||||
echo $phpgw->common->show_date($phpgw->db->f("lastlogin"));
|
||||
|
||||
?></td></tr>
|
||||
<tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>">
|
||||
|
@ -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("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("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("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>
|
||||
|
@ -4,17 +4,17 @@
|
||||
|
||||
</td>
|
||||
<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">
|
||||
</a>
|
||||
</td>
|
||||
<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">
|
||||
</a>
|
||||
</td>
|
||||
<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">
|
||||
</a>
|
||||
</td>
|
||||
|
12
index.php
12
index.php
@ -89,17 +89,17 @@
|
||||
&& $phpgw_info["user"]["preferences"]["mainscreen_showbirthdays"]) {
|
||||
echo "<!-- Birthday info -->\n";
|
||||
$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='"
|
||||
. "public')");
|
||||
while ($phpgw->db->next_record()) {
|
||||
echo "<tr><td>" . lang_common("Today is x's birthday!", $phpgw->db->f("firstname") . " "
|
||||
. $phpgw->db->f("lastname")) . "</td></tr>\n";
|
||||
}
|
||||
$tommorow = $phpgw->preferences->show_date_other("n/d", mktime(0,0,0,
|
||||
$phpgw->preferences->show_date_other("m",time()),
|
||||
$phpgw->preferences->show_date_other("d",time())+1,
|
||||
$phpgw->preferences->show_date_other("Y",time())) );
|
||||
$tommorow = $phpgw->common->show_date(mktime(0,0,0,
|
||||
$phpgw->common->show_date(time(),"m"),
|
||||
$phpgw->common->show_date(time(),"d")+1,
|
||||
$phpgw->common->show_date(time(),"Y")),"n/d" );
|
||||
$phpgw->db->query("select firstname,lastname from addressbook where "
|
||||
. "bday like '$tommorow/%' and (owner='"
|
||||
. $phpgw->session->loginid . "' or access='public')");
|
||||
@ -121,7 +121,7 @@
|
||||
include($phpgw_info["server"]["server_root"] . "/calendar/inc/functions.inc.php");
|
||||
$repeated_events = read_repeated_events($phpgw->session->loginid);
|
||||
$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.cal_id = webcal_entry_user.cal_id) and "
|
||||
. "(cal_priority='3')");
|
||||
|
Loading…
Reference in New Issue
Block a user