mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-24 17:04:14 +01:00
Disable mainscreen_showbirthdays until the new hook file is working,
also cleaned up formatting of code.
This commit is contained in:
parent
f01f85354c
commit
315c62514b
117
index.php
117
index.php
@ -12,28 +12,36 @@
|
|||||||
|
|
||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
|
|
||||||
if (! is_file("header.inc.php")) {
|
if (!is_file("header.inc.php"))
|
||||||
|
{
|
||||||
echo '<center>It appears that phpGroupWare is not setup yet, please click <a href="setup/index.php">'
|
echo '<center>It appears that phpGroupWare is not setup yet, please click <a href="setup/index.php">'
|
||||||
. 'here</a>.</center>';
|
. 'here</a>.</center>';
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($sessionid) || !$sessionid) {
|
if (!isset($sessionid) || !$sessionid)
|
||||||
|
{
|
||||||
Header("Location: login.php");
|
Header("Location: login.php");
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "home",
|
$phpgw_info["flags"] = array(
|
||||||
|
"noheader" => True, "nonavbar" => True, "currentapp" => "home",
|
||||||
"enable_network_class" => True, "enable_todo_class" => True,
|
"enable_network_class" => True, "enable_todo_class" => True,
|
||||||
"enable_addressbook_class" => True, "enable_nextmatchs_class" => True
|
"enable_contacts_class" => True, "enable_nextmatchs_class" => True
|
||||||
);
|
);
|
||||||
include("header.inc.php");
|
include("header.inc.php");
|
||||||
// Note: I need to add checks to make sure these apps are installed.
|
// Note: I need to add checks to make sure these apps are installed.
|
||||||
|
|
||||||
if ($phpgw_forward) {
|
if ($phpgw_forward)
|
||||||
if ($phpgw_forward) {
|
{
|
||||||
while (list($name,$value) = each($HTTP_GET_VARS)) {
|
// Why again?
|
||||||
if (ereg("phpgw_",$name)) {
|
if ($phpgw_forward)
|
||||||
|
{
|
||||||
|
while (list($name,$value) = each($HTTP_GET_VARS))
|
||||||
|
{
|
||||||
|
if (ereg("phpgw_",$name))
|
||||||
|
{
|
||||||
$extra_vars .= "&" . $name . "=" . urlencode($value);
|
$extra_vars .= "&" . $name . "=" . urlencode($value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -41,52 +49,64 @@
|
|||||||
$phpgw->redirect($phpgw->link($phpgw_forward,$extra_vars));
|
$phpgw->redirect($phpgw->link($phpgw_forward,$extra_vars));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($phpgw_info["user"]["preferences"]["common"]["useframes"] && $phpgw_info["server"]["useframes"] == "allowed")
|
if (($phpgw_info["user"]["preferences"]["common"]["useframes"] &&
|
||||||
|| ($phpgw_info["server"]["useframes"] == "always")) {
|
$phpgw_info["server"]["useframes"] == "allowed") ||
|
||||||
|
($phpgw_info["server"]["useframes"] == "always"))
|
||||||
if ($cd == "yes") {
|
{
|
||||||
|
if ($cd == "yes")
|
||||||
if (! $navbarframe && ! $framebody) {
|
{
|
||||||
|
if (! $navbarframe && ! $framebody)
|
||||||
|
{
|
||||||
$tpl = new Template($phpgw_info["server"]["template_dir"]);
|
$tpl = new Template($phpgw_info["server"]["template_dir"]);
|
||||||
$tpl->set_file(array("frames" => "frames.tpl",
|
$tpl->set_file(array(
|
||||||
|
"frames" => "frames.tpl",
|
||||||
"frame_body" => "frames_body.tpl",
|
"frame_body" => "frames_body.tpl",
|
||||||
"frame_navbar" => "frames_navbar.tpl"
|
"frame_navbar" => "frames_navbar.tpl"
|
||||||
));
|
));
|
||||||
$tpl->set_var("navbar_link",$phpgw->link("index.php","navbarframe=True&cd=yes"));
|
$tpl->set_var("navbar_link",$phpgw->link("index.php","navbarframe=True&cd=yes"));
|
||||||
if ($forward) {
|
if ($forward)
|
||||||
|
{
|
||||||
$tpl->set_var("body_link",$phpgw->link($forward));
|
$tpl->set_var("body_link",$phpgw->link($forward));
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$tpl->set_var("body_link",$phpgw->link("index.php","framebody=True&cd=yes"));
|
$tpl->set_var("body_link",$phpgw->link("index.php","framebody=True&cd=yes"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($phpgw_info["user"]["preferences"]["common"]["frame_navbar_location"] == "bottom") {
|
if ($phpgw_info["user"]["preferences"]["common"]["frame_navbar_location"] == "bottom")
|
||||||
|
{
|
||||||
$tpl->set_var("frame_size","*,60");
|
$tpl->set_var("frame_size","*,60");
|
||||||
$tpl->parse("frames_","frame_body",True);
|
$tpl->parse("frames_","frame_body",True);
|
||||||
$tpl->parse("frames_","frame_navbar",True);
|
$tpl->parse("frames_","frame_navbar",True);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$tpl->set_var("frame_size","60,*");
|
$tpl->set_var("frame_size","60,*");
|
||||||
$tpl->parse("frames_","frame_navbar",True);
|
$tpl->parse("frames_","frame_navbar",True);
|
||||||
$tpl->parse("frames_","frame_body",True);
|
$tpl->parse("frames_","frame_body",True);
|
||||||
}
|
}
|
||||||
$tpl->pparse("out","frames");
|
$tpl->pparse("out","frames");
|
||||||
}
|
}
|
||||||
if ($navbarframe) {
|
if ($navbarframe)
|
||||||
|
{
|
||||||
$phpgw->common->phpgw_header();
|
$phpgw->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elseif ($cd=="yes" && $phpgw_info["user"]["preferences"]["common"]["default_app"]
|
}
|
||||||
&& $phpgw_info["user"]["apps"][$phpgw_info["user"]["preferences"]["common"]["default_app"]]) {
|
elseif ($cd=="yes" && $phpgw_info["user"]["preferences"]["common"]["default_app"]
|
||||||
|
&& $phpgw_info["user"]["apps"][$phpgw_info["user"]["preferences"]["common"]["default_app"]])
|
||||||
|
{
|
||||||
$phpgw->redirect($phpgw->link('/' . $phpgw_info["user"]["preferences"]["common"]["default_app"] . "/" . "index.php"));
|
$phpgw->redirect($phpgw->link('/' . $phpgw_info["user"]["preferences"]["common"]["default_app"] . "/" . "index.php"));
|
||||||
$phpgw->common->phpgw_exit();
|
$phpgw->common->phpgw_exit();
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$phpgw->common->phpgw_header();
|
$phpgw->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// $phpgw->hooks->proccess("location","mainscreen");
|
// $phpgw->hooks->proccess("location","mainscreen");
|
||||||
|
|
||||||
// $phpgw->preferences->read_preferences("addressbook");
|
// $phpgw->preferences->read_preferences("addressbook");
|
||||||
// $phpgw->preferences->read_preferences("email");
|
// $phpgw->preferences->read_preferences("email");
|
||||||
// $phpgw->preferences->read_preferences("calendar");
|
// $phpgw->preferences->read_preferences("calendar");
|
||||||
@ -95,29 +115,35 @@
|
|||||||
$phpgw->db->query("select app_version from phpgw_applications where app_name='admin'",__LINE__,__FILE__);
|
$phpgw->db->query("select app_version from phpgw_applications where app_name='admin'",__LINE__,__FILE__);
|
||||||
$phpgw->db->next_record();
|
$phpgw->db->next_record();
|
||||||
|
|
||||||
if ($phpgw_info["server"]["versions"]["phpgwapi"] > $phpgw->db->f("app_version")) {
|
if ($phpgw_info["server"]["versions"]["phpgwapi"] > $phpgw->db->f("app_version"))
|
||||||
|
{
|
||||||
echo "<p><b>" . lang("Your are running a newer version of phpGroupWare then your database is setup for")
|
echo "<p><b>" . lang("Your are running a newer version of phpGroupWare then your database is setup for")
|
||||||
. "<br>" . lang("It is recommend that you run setup to upgrade your tables to the current version")
|
. "<br>" . lang("It is recommend that you run setup to upgrade your tables to the current version")
|
||||||
. "</b>";
|
. "</b>";
|
||||||
}
|
}
|
||||||
|
|
||||||
$phpgw->translation->add_app("mainscreen");
|
$phpgw->translation->add_app("mainscreen");
|
||||||
if (lang("mainscreen_message") != "mainscreen_message*") {
|
if (lang("mainscreen_message") != "mainscreen_message*")
|
||||||
|
{
|
||||||
echo "<center>" . stripslashes(lang("mainscreen_message")) . "</center>";
|
echo "<center>" . stripslashes(lang("mainscreen_message")) . "</center>";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((isset($phpgw_info["user"]["apps"]["admin"]) &&
|
if ((isset($phpgw_info["user"]["apps"]["admin"]) &&
|
||||||
$phpgw_info["user"]["apps"]["admin"]) &&
|
$phpgw_info["user"]["apps"]["admin"]) &&
|
||||||
(isset($phpgw_info["server"]["checkfornewversion"]) &&
|
(isset($phpgw_info["server"]["checkfornewversion"]) &&
|
||||||
$phpgw_info["server"]["checkfornewversion"])) {
|
$phpgw_info["server"]["checkfornewversion"]))
|
||||||
|
{
|
||||||
$phpgw->network->set_addcrlf(False);
|
$phpgw->network->set_addcrlf(False);
|
||||||
$lines = $phpgw->network->gethttpsocketfile("http://www.phpgroupware.org/currentversion");
|
$lines = $phpgw->network->gethttpsocketfile("http://www.phpgroupware.org/currentversion");
|
||||||
for ($i=0; $i<count($lines); $i++) {
|
for ($i=0; $i<count($lines); $i++)
|
||||||
if (ereg("currentversion",$lines[$i])) {
|
{
|
||||||
|
if (ereg("currentversion",$lines[$i]))
|
||||||
|
{
|
||||||
$line_found = explode(":",chop($lines[$i]));
|
$line_found = explode(":",chop($lines[$i]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($phpgw->common->cmp_version($phpgw_info["server"]["versions"]["phpgwapi"],$line_found[1])) {
|
if($phpgw->common->cmp_version($phpgw_info["server"]["versions"]["phpgwapi"],$line_found[1]))
|
||||||
|
{
|
||||||
echo "<p>There is a new version of phpGroupWare available. <a href=\""
|
echo "<p>There is a new version of phpGroupWare available. <a href=\""
|
||||||
. "http://www.phpgroupware.org\">http://www.phpgroupware.org</a>";
|
. "http://www.phpgroupware.org\">http://www.phpgroupware.org</a>";
|
||||||
}
|
}
|
||||||
@ -149,33 +175,14 @@
|
|||||||
//Uncomment the next line to enable the notify window. It will not work until a notifywindow app is added.
|
//Uncomment the next line to enable the notify window. It will not work until a notifywindow app is added.
|
||||||
//echo '<a href="javascript:opennotifywindow()">Open notify window</a>';
|
//echo '<a href="javascript:opennotifywindow()">Open notify window</a>';
|
||||||
|
|
||||||
if ($phpgw_info["user"]["apps"]["stocks"] && $phpgw_info["user"]["preferences"]["stocks"]["enabled"]) {
|
if ($phpgw_info["user"]["apps"]["stocks"] && $phpgw_info["user"]["preferences"]["stocks"]["enabled"])
|
||||||
|
{
|
||||||
include(PHPGW_INCLUDE_ROOT . "/stocks/inc/functions.inc.php");
|
include(PHPGW_INCLUDE_ROOT . "/stocks/inc/functions.inc.php");
|
||||||
echo '<tr><td align="right">' . return_quotes($quotes) . '</td></tr>';
|
echo '<tr><td align="right">' . return_quotes($quotes) . '</td></tr>';
|
||||||
}
|
}
|
||||||
$phpgw->common->hook('',array('email','calendar','news'));
|
|
||||||
if ($phpgw_info["user"]["apps"]["addressbook"]
|
$phpgw->common->hook('',array('email','calendar','news')); //,'addressbook'));
|
||||||
&& $phpgw_info["user"]["preferences"]["addressbook"]["mainscreen_showbirthdays"]) {
|
|
||||||
echo "<!-- Birthday info -->\n";
|
|
||||||
$phpgw->db->query("select owner,access,n_given,n_family,bday from phpgw_addressbook where bday like '"
|
|
||||||
. $phpgw->common->show_date(time(),"n/d")."/%'"
|
|
||||||
. " and owner='" . $phpgw_info["user"]["account_id"] . "' and access='public'",__LINE__,__FILE__);
|
|
||||||
while ($phpgw->db->next_record()) {
|
|
||||||
echo "<tr><td>" . lang("Today is x's birthday!", $phpgw->db->f("n_given") . " "
|
|
||||||
. $phpgw->db->f("n_family")) . "</td></tr>\n";
|
|
||||||
}
|
|
||||||
$tomorrow = $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 owner,access,n_given,n_family,bday from phpgw_addressbook where bday like '$tomorrow/%'"
|
|
||||||
. " and owner='" . $phpgw_info["user"]["account_id"] . "' and access='public'",__LINE__,__FILE__);
|
|
||||||
while ($phpgw->db->next_record()) {
|
|
||||||
echo "<tr><td>" . lang("Tomorrow is x's birthday.", $phpgw->db->f("n_given") . " "
|
|
||||||
. $phpgw->db->f("n_family")) . "</td></tr>\n";
|
|
||||||
}
|
|
||||||
echo "<!-- Birthday info -->\n";
|
|
||||||
}
|
|
||||||
//$phpgw->common->debug_phpgw_info();
|
//$phpgw->common->debug_phpgw_info();
|
||||||
//$phpgw->common->debug_list_core_functions();
|
//$phpgw->common->debug_list_core_functions();
|
||||||
?>
|
?>
|
||||||
|
Loading…
Reference in New Issue
Block a user