diff --git a/addressbook/add.php b/addressbook/add.php index 1f612b9e78..64cd975276 100755 --- a/addressbook/add.php +++ b/addressbook/add.php @@ -88,5 +88,5 @@ common->phpgw_footer(); diff --git a/addressbook/edit.php b/addressbook/edit.php index 23e79b3f0b..129a155559 100755 --- a/addressbook/edit.php +++ b/addressbook/edit.php @@ -111,5 +111,5 @@ common->phpgw_footer(); ?> diff --git a/addressbook/index.php b/addressbook/index.php index 3fff25a5c5..4953ffc7d0 100755 --- a/addressbook/index.php +++ b/addressbook/index.php @@ -228,5 +228,5 @@ common->phpgw_footer(); ?> diff --git a/addressbook/view.php b/addressbook/view.php index 8c4a33d272..94aa4ded03 100755 --- a/addressbook/view.php +++ b/addressbook/view.php @@ -78,4 +78,6 @@ - +common->phpgw_footer(); +?> diff --git a/admin/accesslog.php b/admin/accesslog.php index 30ef1ae7cf..f359cfe0a8 100755 --- a/admin/accesslog.php +++ b/admin/accesslog.php @@ -95,5 +95,4 @@ $t->pparse("out","footer"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); - + $phpgw->common->phpgw_footer(); diff --git a/admin/accounts.php b/admin/accounts.php index 64b2abfe9a..18458ccd7c 100755 --- a/admin/accounts.php +++ b/admin/accounts.php @@ -104,5 +104,5 @@ $t->pparse("out","footer"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/admin/applications.php b/admin/applications.php index 209e7423b2..acafe5e7ff 100644 --- a/admin/applications.php +++ b/admin/applications.php @@ -62,4 +62,4 @@ . "
"; - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); diff --git a/admin/currentusers.php b/admin/currentusers.php index 441317a095..7ce58e43b7 100755 --- a/admin/currentusers.php +++ b/admin/currentusers.php @@ -84,5 +84,5 @@ } $t->pparse("out","footer"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/admin/deleteaccount.php b/admin/deleteaccount.php index 1250dfcf19..d2a82079eb 100755 --- a/admin/deleteaccount.php +++ b/admin/deleteaccount.php @@ -51,7 +51,7 @@ common->phpgw_footer(); } if ($confirm) { diff --git a/admin/deleteapplication.php b/admin/deleteapplication.php index ce60e7e54d..c021091771 100644 --- a/admin/deleteapplication.php +++ b/admin/deleteapplication.php @@ -49,5 +49,5 @@ common->phpgw_footer(); ?> diff --git a/admin/deletegroup.php b/admin/deletegroup.php index 4a962c1edc..58ec5ef01f 100755 --- a/admin/deletegroup.php +++ b/admin/deletegroup.php @@ -106,5 +106,5 @@ common->phpgw_footer(); ?> diff --git a/admin/deleteheadline.php b/admin/deleteheadline.php index 41cc6ac3c2..dce38eff9f 100755 --- a/admin/deleteheadline.php +++ b/admin/deleteheadline.php @@ -49,7 +49,7 @@ common->phpgw_footer(); } else { $table_locks = array('news_site','news_headlines','users_headlines'); diff --git a/admin/editaccount.php b/admin/editaccount.php index 29e38ac412..007963560e 100755 --- a/admin/editaccount.php +++ b/admin/editaccount.php @@ -213,4 +213,6 @@ - +common->phpgw_footer(); +?> diff --git a/admin/editapplication.php b/admin/editapplication.php index cf729c209b..3f1f5fce08 100644 --- a/admin/editapplication.php +++ b/admin/editapplication.php @@ -64,5 +64,5 @@ $t->pparse("out","form"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/admin/editgroup.php b/admin/editgroup.php index f67e123096..ded6315300 100755 --- a/admin/editgroup.php +++ b/admin/editgroup.php @@ -163,5 +163,5 @@ $t->pparse("out","form"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/admin/editheadline.php b/admin/editheadline.php index ca0453de9c..7e130c9808 100755 --- a/admin/editheadline.php +++ b/admin/editheadline.php @@ -72,7 +72,7 @@ common->phpgw_footer(); } else { $phpgw->db->lock("news_site"); diff --git a/admin/groups.php b/admin/groups.php index 55d5345bbd..f289d656f7 100755 --- a/admin/groups.php +++ b/admin/groups.php @@ -71,5 +71,5 @@ . "" . lang("search") . " " . ""; - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/admin/headlines.php b/admin/headlines.php index 9091421c68..4ae6cdc250 100755 --- a/admin/headlines.php +++ b/admin/headlines.php @@ -42,5 +42,5 @@ . ""; - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/admin/index.php b/admin/index.php index 0f17db4252..9a591a5998 100755 --- a/admin/index.php +++ b/admin/index.php @@ -67,5 +67,5 @@ else { } ?> common->phpgw_footer(); ?> diff --git a/admin/newaccount.php b/admin/newaccount.php index 19cb3d0e0e..8de597eabb 100755 --- a/admin/newaccount.php +++ b/admin/newaccount.php @@ -192,5 +192,5 @@ common->phpgw_footer(); ?> diff --git a/admin/newapplication.php b/admin/newapplication.php index 08a074ed9d..4c2be1c862 100644 --- a/admin/newapplication.php +++ b/admin/newapplication.php @@ -62,5 +62,5 @@ $t->pparse("out","form"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/admin/newgroup.php b/admin/newgroup.php index 6851aa79a2..1ec3dfbc9e 100755 --- a/admin/newgroup.php +++ b/admin/newgroup.php @@ -121,5 +121,5 @@ $t->pparse("out","form"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/admin/newheadline.php b/admin/newheadline.php index 9c644382d7..5280b691c1 100755 --- a/admin/newheadline.php +++ b/admin/newheadline.php @@ -62,7 +62,7 @@ common->phpgw_footer(); } else { if (! $n_display) diff --git a/admin/nntp.php b/admin/nntp.php index d451c22f46..48e7537c2f 100755 --- a/admin/nntp.php +++ b/admin/nntp.php @@ -171,7 +171,7 @@ $t->pparse("out","nntp_footer"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); } else { $phpgw->db->lock("newsgroups"); diff --git a/admin/viewaccount.php b/admin/viewaccount.php index 6f63aa1106..4730e625af 100755 --- a/admin/viewaccount.php +++ b/admin/viewaccount.php @@ -99,5 +99,5 @@ common->phpgw_footer(); +?> diff --git a/calendar/day.php b/calendar/day.php index 6a6f1319e7..5740bafd29 100644 --- a/calendar/day.php +++ b/calendar/day.php @@ -178,6 +178,6 @@ for ($i = $wkstart; date("Ymd", $i) <= date("Ymd", $monthend); $i += (24 * 3600 . "status = '" . lang("Generate printer-friendly version"). "'"; echo "link($PHP_SELF,$param)."\">"; echo "[". lang("Printer Friendly") . "]"; - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); } ?> diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php index 26b0aa4c41..f58fdbe541 100755 --- a/calendar/edit_entry.php +++ b/calendar/edit_entry.php @@ -414,5 +414,5 @@ function validate_and_submit() { } // ***** This might be out of place. I was getting tons of parse errors // from if ($can_edit) { This needs to be rewritten, because if you do // not own the entry. You should not get into this portion of the program. - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php index 9d6e7512f3..0a8cc2e11d 100755 --- a/calendar/edit_entry_handler.php +++ b/calendar/edit_entry_handler.php @@ -239,5 +239,5 @@ $phpgw->common->phpgw_header(); } $phpgw->db->unlock(); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); ?> diff --git a/calendar/index.php b/calendar/index.php index 4e32892a9b..37ebcc70c2 100755 --- a/calendar/index.php +++ b/calendar/index.php @@ -166,6 +166,6 @@ . "status = '" . lang("Generate printer-friendly version"). "'"; echo "link($PHP_SELF,$param)."\">"; echo "[". lang("Printer Friendly") . "]"; - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); + $phpgw->common->phpgw_footer(); } ?> diff --git a/calendar/search.php b/calendar/search.php index 822f875a39..48b253b833 100755 --- a/calendar/search.php +++ b/calendar/search.php @@ -89,5 +89,5 @@

common->phpgw_footer(); +?> diff --git a/calendar/view.php b/calendar/view.php index 84d2dcfa6e..f8523af839 100755 --- a/calendar/view.php +++ b/calendar/view.php @@ -202,6 +202,6 @@ ?> common->phpgw_footer(); ?> diff --git a/calendar/week.php b/calendar/week.php index 4210dfc7a7..4ec629ceb1 100755 --- a/calendar/week.php +++ b/calendar/week.php @@ -96,8 +96,8 @@ db->query("SELECT lastname, firstname FROM accounts WHERE loginid='" - . $phpgw_info["user"]["userid"]. "'"); + $phpgw->db->query("SELECT account_lastname, account_firstname FROM accounts WHERE account_lid='" + . $phpgw_info["user"]["account_lid"]. "'"); echo "
\n"; if ($phpgw->db->next_record()) { if (strlen($phpgw->db->f(0)) || strlen($phpgw->db->f(1))) { @@ -170,4 +170,5 @@ onMouseOver="window.status = ''">[] common->phpgw_footer(); +?> diff --git a/calendar/year.php b/calendar/year.php index f4a29ca220..ed64cc8044 100755 --- a/calendar/year.php +++ b/calendar/year.php @@ -68,6 +68,5 @@ . "status = '" . lang("Generate printer-friendly version") . "'\">[" . lang("Printer Friendly") . "]"; } - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); - - + $phpgw->common->phpgw_footer(); +?> diff --git a/doc/developers/phpGW_Developers-HOWTO-3.html b/doc/developers/phpGW_Developers-HOWTO-3.html index 1a947478fa..cf87710b42 100644 --- a/doc/developers/phpGW_Developers-HOWTO-3.html +++ b/doc/developers/phpGW_Developers-HOWTO-3.html @@ -24,8 +24,8 @@

To make things easy for developers we go ahead and load the following files.

3.3 Adding files, directories and icons.

diff --git a/doc/developers/phpGW_Developers-HOWTO-5.html b/doc/developers/phpGW_Developers-HOWTO-5.html index 5b46f63194..9f9e156215 100644 --- a/doc/developers/phpGW_Developers-HOWTO-5.html +++ b/doc/developers/phpGW_Developers-HOWTO-5.html @@ -45,6 +45,15 @@ Example:

+

$phpgw->common->phpgw_header

+ +

$phpgw->phpgw_header()
+Print out the start of the HTML page, including the navigation bar +and includes appname/inc/header.php +

$phpgw->common->phpgw_footer

+ +

$phpgw->phpgw_footer()
+Prints the system footer, and includes appname/inc/footer.php

$phpgw->common->appsession

$phpgw->common->appsession($data)
diff --git a/doc/developers/phpGW_Developers-HOWTO-6.html b/doc/developers/phpGW_Developers-HOWTO-6.html index 12e3103959..cd5633b4a6 100644 --- a/doc/developers/phpGW_Developers-HOWTO-6.html +++ b/doc/developers/phpGW_Developers-HOWTO-6.html @@ -66,13 +66,15 @@ Here are some examples:

$phpgw_info["server"]["server_root"] = Main installation directory
$phpgw_info["server"]["include_root"] = Location of the 'inc' directory.
$phpgw_info["server"]["temp_dir"] = Directory that can be used for temporarily storing files
+$phpgw_info["server"]["files_dir"] = Directory er and group files are stored
$phpgw_info["server"]["common_include_dir"] = Location of the core/shared include files.
$phpgw_info["server"]["template_dir"] = Active template files directory. This is defaulted by the server, and changeable by the user.
$phpgw_info["server"]["dir_separator"] = Allows compatibility with WindowsNT directory format,
-$phpgw_info["server"]["encrpytkey"] =
+$phpgw_info["server"]["encrpytkey"] = Key used for encryption functions
$phpgw_info["server"]["site_title"] = Site Title will show in the title bar of each webpage.
$phpgw_info["server"]["webserver_url"] = URL to phpGroupWare installation.
-$phpgw_info["server"]["charset"] = Unknown
+$phpgw_info["server"]["hostname"] = Name of the server phpGroupWare is installed upon.
+$phpgw_info["server"]["charset"] = default charset, default:iso-8859-1
$phpgw_info["server"]["version"] = phpGroupWare version.

6.5 Database information

diff --git a/doc/developers/phpGW_Developers-HOWTO.html b/doc/developers/phpGW_Developers-HOWTO.html index 8a01350bd1..af4d43050f 100644 --- a/doc/developers/phpGW_Developers-HOWTO.html +++ b/doc/developers/phpGW_Developers-HOWTO.html @@ -14,7 +14,7 @@ Contents

phpGroupWare Application Development

-

Dan Kuykendall <dan@kuykendall.org>

v0.5, 09 September 2000 +

Dan Kuykendall <dan@kuykendall.org>

v0.9 29 September 2000

This document explains phpGroupWare's infrastructure and API, along with what is required to integrate applications into it.
diff --git a/doc/developers/phpGW_Developers-HOWTO.sgml b/doc/developers/phpGW_Developers-HOWTO.sgml index c2e7f2146f..0bd2b55c65 100644 --- a/doc/developers/phpGW_Developers-HOWTO.sgml +++ b/doc/developers/phpGW_Developers-HOWTO.sgml @@ -3,10 +3,12 @@
@@ -17,7 +19,7 @@ Ran the whole thing through aspell to clean up typos. Dan Kuykendall <dan@kuykendall.org> - v0.5, 09 September 2000 + v0.9 29 September 2000 This document explains phpGroupWare's infrastructure and API, along with what is required to integrate applications into it. @@ -92,8 +94,8 @@ Ran the whole thing through aspell to clean up typos. To make things easy for developers we go ahead and load the following files. appname/inc/functions.inc.php - This file should include all your application specific functions. - appname/inc/header.inc.php - This file is loaded just after the system header/navbar, and allows developers to use it for whatever they need to load. - appname/inc/footer.inc.php - This file is loaded just before the system footer, allowing developers to close connections and whatever else they need. + appname/inc/header.inc.php - This file is loaded by $phpgw->common->header just after the system header/navbar, and allows developers to use it for whatever they need to load. + appname/inc/footer.inc.php - This file is loaded by $phpgw->common->footer just before the system footer, allowing developers to close connections and whatever else they need.

Adding files, directories and icons. @@ -299,6 +301,17 @@ Example:

Application Functions

+$phpgw->common->phpgw_header +

+$phpgw->phpgw_header() +Print out the start of the HTML page, including the navigation bar +and includes appname/inc/header.php +

+$phpgw->common->phpgw_footer +

+$phpgw->phpgw_footer() +Prints the system footer, and includes appname/inc/footer.php +

$phpgw->common->appsession

$phpgw->common->appsession($data) @@ -428,13 +441,15 @@ $errors = $phpgw->msg->send("email", $to, $subject, $body); $phpgw_info["server"]["server_root"] = Main installation directory $phpgw_info["server"]["include_root"] = Location of the 'inc' directory. $phpgw_info["server"]["temp_dir"] = Directory that can be used for temporarily storing files + $phpgw_info["server"]["files_dir"] = Directory er and group files are stored $phpgw_info["server"]["common_include_dir"] = Location of the core/shared include files. $phpgw_info["server"]["template_dir"] = Active template files directory. This is defaulted by the server, and changeable by the user. $phpgw_info["server"]["dir_separator"] = Allows compatibility with WindowsNT directory format, - $phpgw_info["server"]["encrpytkey"] = + $phpgw_info["server"]["encrpytkey"] = Key used for encryption functions $phpgw_info["server"]["site_title"] = Site Title will show in the title bar of each webpage. $phpgw_info["server"]["webserver_url"] = URL to phpGroupWare installation. - $phpgw_info["server"]["charset"] = Unknown + $phpgw_info["server"]["hostname"] = Name of the server phpGroupWare is installed upon. + $phpgw_info["server"]["charset"] = default charset, default:iso-8859-1 $phpgw_info["server"]["version"] = phpGroupWare version.

Database information diff --git a/doc/developers/phpGW_Developers-HOWTO.txt b/doc/developers/phpGW_Developers-HOWTO.txt index 12f9dfe0ba..8fc93467d3 100644 --- a/doc/developers/phpGW_Developers-HOWTO.txt +++ b/doc/developers/phpGW_Developers-HOWTO.txt @@ -1,6 +1,6 @@ phpGroupWare Application Development Dan Kuykendall - v0.5, 09 September 2000 + v0.9 29 September 2000 This document explains phpGroupWare's infrastructure and API, along with what is required to integrate applications into it. @@ -98,7 +98,9 @@ 5.2 Basic functions 5.2.1 $phpgw->link 5.3 Application Functions - 5.3.1 $phpgw->common->appsession + 5.3.1 $phpgw->common->phpgw_header + 5.3.2 $phpgw->common->phpgw_footer + 5.3.3 $phpgw->common->appsession 5.4 File functions 5.4.1 $phpgw->vfs->read_file 5.4.2 $phpgw->vfs->write_file @@ -128,8 +130,8 @@ 7.2.2.1 The lang table 7.2.2.2 lang.sql 7.3 Common return codes - 8. Using Templates + 8.1 Overview 8.2 How to use templates @@ -192,10 +194,10 @@ If you need help converting your application to templates and our lang support, we will try to connect you with someone to help. + + 22..22.. WWrriittiinngg//ppoorrttiinngg yyoouurr aapppplliiccaattiioonn - - 22..22..11.. IInncclluuddee ffiilleess Each PHP page you write will need to include the header.inc.php along @@ -249,13 +251,16 @@ +o appname/inc/functions.inc.php - This file should include all your application specific functions. - +o appname/inc/header.inc.php - This file is loaded just after the - system header/navbar, and allows developers to use it for whatever - they need to load. + +o appname/inc/header.inc.php - This file is loaded by + $phpgw->common->header just after the system header/navbar, and + allows developers to use it for whatever they need to load. + + +o appname/inc/footer.inc.php - This file is loaded by + $phpgw->common->footer just before the system footer, allowing + developers to close connections and whatever else they need. + + - +o appname/inc/footer.inc.php - This file is loaded just before the - system footer, allowing developers to close connections and - whatever else they need. 33..33.. AAddddiinngg ffiilleess,, ddiirreeccttoorriieess aanndd iiccoonnss.. @@ -326,8 +331,6 @@ There are 2 functions to coordinate the display of each application's links, section_start() and section_end() - - 33..55..11.. sseeccttiioonn__ssttaarrtt section_start($title,$icon_url) starts the section for your @@ -387,9 +390,6 @@ - - - @@ -538,7 +538,18 @@ 55..33.. AApppplliiccaattiioonn FFuunnccttiioonnss - 55..33..11.. $$pphhppggww-->>ccoommmmoonn-->>aappppsseessssiioonn + 55..33..11.. $$pphhppggww-->>ccoommmmoonn-->>pphhppggww__hheeaaddeerr + + $phpgw->phpgw_header() + Print out the start of the HTML page, including the navigation bar and + includes appname/inc/header.php + + 55..33..22.. $$pphhppggww-->>ccoommmmoonn-->>pphhppggww__ffooootteerr + + $phpgw->phpgw_footer() + Prints the system footer, and includes appname/inc/footer.php + + 55..33..33.. $$pphhppggww-->>ccoommmmoonn-->>aappppsseessssiioonn $phpgw->common->appsession($data) Store important information session information that your application @@ -580,6 +591,7 @@ You must send the complete path to the file. Example: + ______________________________________________________________________ $data = $phpgw->vfs->write_file("/some/dir/to/file.txt"); ______________________________________________________________________ @@ -592,6 +604,7 @@ $phpgw->vfs->read_userfile($file) Returns the data from $file, which resides in the users private dir. Example: + ______________________________________________________________________ $data = $phpgw->vfs->read_userfile("file.txt"); ______________________________________________________________________ @@ -644,6 +657,7 @@ + 66.. CCoonnffiigguurraattiioonn VVaarriiaabblleess 66..11.. IInnttrroodduuccttiioonn @@ -711,6 +725,8 @@ directory. $phpgw_info["server"]["temp_dir"] = Directory that can be used for temporarily storing files + $phpgw_info["server"]["files_dir"] = Directory er and group files are + stored $phpgw_info["server"]["common_include_dir"] = Location of the core/shared include files. $phpgw_info["server"]["template_dir"] = Active template files @@ -718,12 +734,16 @@ user. $phpgw_info["server"]["dir_separator"] = Allows compatibility with WindowsNT directory format, - $phpgw_info["server"]["encrpytkey"] = + $phpgw_info["server"]["encrpytkey"] = Key used for encryption + functions $phpgw_info["server"]["site_title"] = Site Title will show in the title bar of each webpage. $phpgw_info["server"]["webserver_url"] = URL to phpGroupWare installation. - $phpgw_info["server"]["charset"] = Unknown + $phpgw_info["server"]["hostname"] = Name of the server phpGroupWare is + installed upon. + $phpgw_info["server"]["charset"] = default charset, + default:iso-8859-1 $phpgw_info["server"]["version"] = phpGroupWare version. 66..55.. DDaattaabbaassee iinnffoorrmmaattiioonn @@ -835,6 +855,7 @@ 77..22..11.. TThhee llaanngg ffuunnccttiioonn + lang($key, $m1="", $m2="", $m3="", $m4="", $m5="", $m6="", $m7="", $m8="", $m9="", $m10="") @@ -898,6 +919,9 @@ application name in for app_name otherwise use the name common. The message_id should be in lower case for a small increase in speed. + + + 77..33.. CCoommmmoonn rreettuurrnn ccooddeess If you browse through the phpGroupWare sources, you may notice a @@ -921,7 +945,6 @@ Your message has been sent - translated into the current language. @@ -958,6 +981,9 @@ This document was written by Dan Kuykendall. + 2000-09-25 documentation on lang(), codes, administration and + preferences extension added by Steve Brown. + 99..44.. CCooppyyrriigghhttss aanndd TTrraaddeemmaarrkkss Copyright (c) Dan Kuykendall. Permission is granted to copy, @@ -988,3 +1014,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/preferences/changepassword.php b/preferences/changepassword.php index 3cb8dd3d61..85eed3a7d0 100755 --- a/preferences/changepassword.php +++ b/preferences/changepassword.php @@ -56,7 +56,7 @@ if (! $submit) { . "need to be done manually."); ?> common->phpgw_footer(); } else { if ($n_passwd != $n_passwd_2) $error = lang("the two passwords are not the same"); diff --git a/preferences/changetheme.php b/preferences/changetheme.php index e6f8a61b9f..c75a508407 100755 --- a/preferences/changetheme.php +++ b/preferences/changetheme.php @@ -49,6 +49,5 @@ . $installed_themes[$i]) . "\">" . $installed_themes[$i] . "\n"; } - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); - + $phpgw->common->phpgw_footer(); ?> diff --git a/preferences/index.php b/preferences/index.php index b7bfd435fe..11129f12a7 100755 --- a/preferences/index.php +++ b/preferences/index.php @@ -54,5 +54,5 @@ include($f); } } - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); -?> \ No newline at end of file + $phpgw->common->phpgw_footer(); +?> diff --git a/preferences/settings.php b/preferences/settings.php index 2ace18e66d..6aa432b616 100755 --- a/preferences/settings.php +++ b/preferences/settings.php @@ -313,6 +313,5 @@ Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/preferences/")); } - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); - + $phpgw->common->phpgw_footer(); ?> diff --git a/setup/index.php b/setup/index.php index 43608bee83..7060d77943 100644 --- a/setup/index.php +++ b/setup/index.php @@ -19,8 +19,6 @@ // Authorize the user to use setup app include("setup_auth.inc.php"); // Does not return unless user is authorized - echo "phpGroupWare Setup\n"; - echo "\n"; /* Database setup */ switch($phpgw_info["server"]["db_type"]){ @@ -55,6 +53,8 @@ /* Database setup */ switch($action){ case "askforupgrade": + echo "phpGroupWare Setup\n"; + echo "\n"; echo "\n"; echo " \n"; echo " \n"; @@ -100,6 +100,8 @@ phpGroupWare Setup\n"; + echo "\n"; echo "
 Analysis
\n"; echo " \n"; echo " \n"; @@ -121,6 +123,8 @@ echo "
 Information
\n"; break; case "Upgrade": + echo "phpGroupWare Setup\n"; + echo "\n"; echo "\n"; echo " \n"; echo " \n"; @@ -148,6 +152,8 @@ if ($db->num_rows() == 0){ $db->query("select * from accounts"); if ($db->num_rows() == 0){ + echo "phpGroupWare Setup\n"; + echo "\n"; echo "
 Information
\n"; echo " \n"; echo " \n"; @@ -170,6 +176,8 @@ Header("Location: $PHP_SELF?action=askforupgrade"); } }else{ + echo "phpGroupWare Setup\n"; + echo "\n"; echo "
 Analysis
\n"; echo " \n"; echo " \n";
 Analysis