extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added $phpgw->common->phpgw_footer() function, and changed all

Browse Source 
places that were including the footer.inc.php to use the function.

Re-arrange phpgw.inc.php to include optional classes after reading the DB config
misc bugfixes.
This commit is contained in:
sjb4891 2000-09-29 05:24:18 +00:00
parent 313c7aba0f
commit 263fdedd2a
44 changed files with 184 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/add.php
View File

@ -88,5 +88,5 @@
</HTML>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();

2
addressbook/edit.php
View File

@ -111,5 +111,5 @@
</HTML>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
addressbook/index.php
View File

@ -228,5 +228,5 @@
</center>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

4
addressbook/view.php
View File

@ -78,4 +78,6 @@
</TBODY>
</TABLE>
</DIV>
<?php include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); ?>
<?php
$phpgw->common->phpgw_footer();
?>

3
admin/accesslog.php
View File

@ -95,5 +95,4 @@
$t->pparse("out","footer");
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();

2
admin/accounts.php
View File

@ -104,5 +104,5 @@
$t->pparse("out","footer");
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/applications.php
View File

@ -62,4 +62,4 @@
. "<table border=0 width=45% align=center><tr><td align=left><input type=\"submit\" "
. "value=\"" . lang("Add") . "\"></td></tr></table></form>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();

2
admin/currentusers.php
View File

@ -84,5 +84,5 @@
}
$t->pparse("out","footer");
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/deleteaccount.php
View File

@ -51,7 +51,7 @@
</table>
</center>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
}
if ($confirm) {

2
admin/deleteapplication.php
View File

@ -49,5 +49,5 @@
</table>
</center>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/deletegroup.php
View File

@ -106,5 +106,5 @@
</table>
</center>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/deleteheadline.php
View File

@ -49,7 +49,7 @@
</table>
</center>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
}
else {
$table_locks = array('news_site','news_headlines','users_headlines');

4
admin/editaccount.php
View File

@ -213,4 +213,6 @@
</table>
</center>
</form>
<?php include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); ?>
<?php
$phpgw->common->phpgw_footer();
?>

2
admin/editapplication.php
View File

@ -64,5 +64,5 @@
$t->pparse("out","form");
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/editgroup.php
View File

@ -163,5 +163,5 @@
$t->pparse("out","form");
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/editheadline.php
View File

@ -72,7 +72,7 @@
</center>
</form>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
} else {
$phpgw->db->lock("news_site");

2
admin/groups.php
View File

@ -71,5 +71,5 @@
. "<td align=right>" . lang("search") . "&nbsp;"
. "<input name=\"query\"></td></tr></form></table>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/headlines.php
View File

@ -42,5 +42,5 @@
. "<tr><td colspan=\"5\"><input type=\"submit\" value=\"".lang("Add")
. "\"></td></tr></form></table></center>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/index.php
View File

@ -67,5 +67,5 @@ else {
}
?>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/newaccount.php
View File

@ -192,5 +192,5 @@
</center>
</form>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/newapplication.php
View File

@ -62,5 +62,5 @@
$t->pparse("out","form");
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/newgroup.php
View File

@ -121,5 +121,5 @@
$t->pparse("out","form");
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
admin/newheadline.php
View File

@ -62,7 +62,7 @@
</center>
</form>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
} else {
if (! $n_display)

2
admin/nntp.php
View File

@ -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");

4
admin/viewaccount.php
View File

@ -99,5 +99,5 @@
</center>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
calendar/day.php
View File

@ -178,6 +178,6 @@ for ($i = $wkstart; date("Ymd", $i) <= date("Ymd", $monthend); $i += (24 * 3600
. "status = '" . lang("Generate printer-friendly version"). "'";
echo "<a href=\"".$phpgw->link($PHP_SELF,$param)."\">";
echo "[". lang("Printer Friendly") . "]</A>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
}
?>

2
calendar/edit_entry.php
View File

@ -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();
?>

2
calendar/edit_entry_handler.php
View File

@ -239,5 +239,5 @@ $phpgw->common->phpgw_header();
}
$phpgw->db->unlock();
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
calendar/index.php
View File

@ -166,6 +166,6 @@
. "status = '" . lang("Generate printer-friendly version"). "'";
echo "<a href=\"".$phpgw->link($PHP_SELF,$param)."\">";
echo "[". lang("Printer Friendly") . "]</A>";
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
}
?>

4
calendar/search.php
View File

@ -89,5 +89,5 @@
<P>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
calendar/view.php
View File

@ -202,6 +202,6 @@
?>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

7
calendar/week.php
View File

@ -96,8 +96,8 @@
</B></FONT>
<FONT SIZE="+1" COLOR="<?php echo $H2COLOR;?>">
<?php
$phpgw->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 "<BR>\n";
if ($phpgw->db->next_record()) {
if (strlen($phpgw->db->f(0)) || strlen($phpgw->db->f(1))) {
@ -170,4 +170,5 @@
onMouseOver="window.status = '<?php echo lang("Generate printer-friendly version"); ?>'">[<?php echo lang("Printer Friendly"); ?>]</A>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

5
calendar/year.php
View File

@ -68,6 +68,5 @@
. "status = '" . lang("Generate printer-friendly version") . "'\">["
. lang("Printer Friendly") . "]</A>";
}
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

4
doc/developers/phpGW_Developers-HOWTO-3.html
View File

@ -24,8 +24,8 @@
<P>To make things easy for developers we go ahead and load the following files.
<UL>
<LI> appname/inc/functions.inc.php - This file should include all your application specific functions.</LI>
<LI> 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.</LI>
<LI> appname/inc/footer.inc.php - This file is loaded just before the system footer, allowing developers to close connections and whatever else they need.</LI>
<LI> appname/inc/header.inc.php - This file is loaded by <CODE>$phpgw->common->header</CODE> just after the system header/navbar, and allows developers to use it for whatever they need to load.</LI>
<LI> appname/inc/footer.inc.php - This file is loaded by <CODE>$phpgw->common->footer</CODE> just before the system footer, allowing developers to close connections and whatever else they need.</LI>
</UL>
<H2><A NAME="ss3.3">3.3 Adding files, directories and icons.</A>
</H2>

9
doc/developers/phpGW_Developers-HOWTO-5.html
View File

@ -45,6 +45,15 @@ Example:
</H2>
<P>
<H3>$phpgw->common->phpgw_header</H3>
<P><CODE>$phpgw->phpgw_header()</CODE><BR>
Print out the start of the HTML page, including the navigation bar
and includes <CODE>appname/inc/header.php</CODE>
<H3>$phpgw->common->phpgw_footer</H3>
<P><CODE>$phpgw->phpgw_footer()</CODE><BR>
Prints the system footer, and includes <CODE>appname/inc/footer.php</CODE>
<H3>$phpgw->common->appsession</H3>
<P><CODE>$phpgw->common->appsession($data)</CODE><BR>

6
doc/developers/phpGW_Developers-HOWTO-6.html
View File

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

2
doc/developers/phpGW_Developers-HOWTO.html
View File

@ -14,7 +14,7 @@ Contents
<HR>
<H1> phpGroupWare Application Development</H1>
<H2>Dan Kuykendall &lt;dan@kuykendall.org&gt;</H2> v0.5, 09 September 2000
<H2>Dan Kuykendall &lt;dan@kuykendall.org&gt;</H2> v0.9 29 September 2000
<P><HR>
<EM> This document explains phpGroupWare's infrastructure and API, along with what is required to integrate applications into it.</EM>
<HR>

33
doc/developers/phpGW_Developers-HOWTO.sgml
View File

@ -3,10 +3,12 @@
<!-- LinuxDoc file was created by hand by <Dan Kuykendall> 7 July 2000 -->
<!--
$Log$
Revision 1.5 2000/09/26 15:56:24 sjb4891
Added documentation on hook facility for preferences and admin pages.
Added docs on the DB based lang() function, and the standard return codes.
Ran the whole thing through aspell to clean up typos.
Revision 1.6 2000/09/29 05:24:17 sjb4891
Added $phpgw->common->phpgw_footer() function, and changed all
places that were including the footer.inc.php to use the function.
Re-arrange phpgw.inc.php to include optional classes after reading the DB config
misc bugfixes.
-->
<article>
@ -17,7 +19,7 @@ Ran the whole thing through aspell to clean up typos.
Dan Kuykendall &lt;dan@kuykendall.org&gt;
</author>
<date>
v0.5, 09 September 2000
v0.9 29 September 2000
</date>
<abstract>
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.
<itemize>
<item> appname/inc/functions.inc.php - This file should include all your application specific functions.
<item> 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.
<item> appname/inc/footer.inc.php - This file is loaded just before the system footer, allowing developers to close connections and whatever else they need.
<item> appname/inc/header.inc.php - This file is loaded by <tt>$phpgw->common->header</tt> just after the system header/navbar, and allows developers to use it for whatever they need to load.
<item> appname/inc/footer.inc.php - This file is loaded by <tt>$phpgw->common->footer</tt> just before the system footer, allowing developers to close connections and whatever else they need.
</itemize>
</p>
<sect1>Adding files, directories and icons.
@ -299,6 +301,17 @@ Example:
</p>
<sect1>Application Functions
<p>
<sect2>$phpgw->common->phpgw_header
<p>
<tt>$phpgw->phpgw_header()</tt><newline>
Print out the start of the HTML page, including the navigation bar
and includes <tt>appname/inc/header.php</tt>
</p>
<sect2>$phpgw->common->phpgw_footer
<p>
<tt>$phpgw->phpgw_footer()</tt><newline>
Prints the system footer, and includes <tt>appname/inc/footer.php</tt>
</p>
<sect2>$phpgw->common->appsession
<p>
<tt>$phpgw->common->appsession($data)</tt><newline>
@ -428,13 +441,15 @@ $errors = $phpgw->msg->send("email", $to, $subject, $body);
<tt>$phpgw_info["server"]["server_root"] = </tt>Main installation directory<newline>
<tt>$phpgw_info["server"]["include_root"] = </tt>Location of the '<tt>inc</tt>' directory.<newline>
<tt>$phpgw_info["server"]["temp_dir"] = </tt>Directory that can be used for temporarily storing files<newline>
<tt>$phpgw_info["server"]["files_dir"] = </tt>Directory er and group files are stored<newline>
<tt>$phpgw_info["server"]["common_include_dir"] = </tt>Location of the core/shared include files.<newline>
<tt>$phpgw_info["server"]["template_dir"] = </tt>Active template files directory. This is defaulted by the server, and changeable by the user.<newline>
<tt>$phpgw_info["server"]["dir_separator"] = </tt>Allows compatibility with WindowsNT directory format,<newline>
<tt>$phpgw_info["server"]["encrpytkey"] = </tt><newline>
<tt>$phpgw_info["server"]["encrpytkey"] = </tt>Key used for encryption functions<newline>
<tt>$phpgw_info["server"]["site_title"] = </tt>Site Title will show in the title bar of each webpage.<newline>
<tt>$phpgw_info["server"]["webserver_url"] = </tt>URL to phpGroupWare installation.<newline>
<tt>$phpgw_info["server"]["charset"] = </tt>Unknown<newline>
<tt>$phpgw_info["server"]["hostname"] = </tt>Name of the server phpGroupWare is installed upon.<newline>
<tt>$phpgw_info["server"]["charset"] = </tt>default charset, default:<tt>iso-8859-1</tt><newline>
<tt>$phpgw_info["server"]["version"] = </tt>phpGroupWare version.<newline>
</p>
<sect1>Database information

106
doc/developers/phpGW_Developers-HOWTO.txt
View File

@ -1,6 +1,6 @@
phpGroupWare Application Development
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.
@ -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 @@

2
preferences/changepassword.php
View File

@ -56,7 +56,7 @@ if (! $submit) {
. "need to be done manually."); ?>
</pre>
<?php
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
} else {
if ($n_passwd != $n_passwd_2)
$error = lang("the two passwords are not the same");

3
preferences/changetheme.php
View File

@ -49,6 +49,5 @@
. $installed_themes[$i]) . "\">" . $installed_themes[$i] . "</a>\n";
}
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

2
preferences/index.php
View File

@ -54,5 +54,5 @@
include($f);
}
}
include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
$phpgw->common->phpgw_footer();
?>

3
preferences/settings.php
View File

@ -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();
?>

12
setup/index.php
View File

@ -19,8 +19,6 @@
// Authorize the user to use setup app
include("setup_auth.inc.php");
// Does not return unless user is authorized
echo "<html><head><title>phpGroupWare Setup</title></head>\n";
echo "<body bgcolor='#ffffff'>\n";
/* Database setup */
switch($phpgw_info["server"]["db_type"]){
@ -55,6 +53,8 @@
/* Database setup */
switch($action){
case "askforupgrade":
echo "<html><head><title>phpGroupWare Setup</title></head>\n";
echo "<body bgcolor='#ffffff'>\n";
echo "<table border=\"0\" align=\"center\">\n";
echo " <tr bgcolor=\"486591\">\n";
echo " <td colspan=\"2\"><font color=\"fefefe\">&nbsp;<b>Analysis</b></font></td>\n";
@ -100,6 +100,8 @@
<?php
break;
case "Dump my old tables":
echo "<html><head><title>phpGroupWare Setup</title></head>\n";
echo "<body bgcolor='#ffffff'>\n";
echo "<table border=\"0\" align=\"center\">\n";
echo " <tr bgcolor=\"486591\">\n";
echo " <td colspan=\"2\"><font color=\"fefefe\">&nbsp;<b>Information</b></font></td>\n";
@ -121,6 +123,8 @@
echo "</table>\n";
break;
case "Upgrade":
echo "<html><head><title>phpGroupWare Setup</title></head>\n";
echo "<body bgcolor='#ffffff'>\n";
echo "<table border=\"0\" align=\"center\">\n";
echo " <tr bgcolor=\"486591\">\n";
echo " <td colspan=\"2\"><font color=\"fefefe\">&nbsp;<b>Information</b></font></td>\n";
@ -148,6 +152,8 @@
if ($db->num_rows() == 0){
$db->query("select * from accounts");
if ($db->num_rows() == 0){
echo "<html><head><title>phpGroupWare Setup</title></head>\n";
echo "<body bgcolor='#ffffff'>\n";
echo "<table border=\"0\" align=\"center\">\n";
echo " <tr bgcolor=\"486591\">\n";
echo " <td colspan=\"2\"><font color=\"fefefe\">&nbsp;<b>Analysis</b></font></td>\n";
@ -170,6 +176,8 @@
Header("Location: $PHP_SELF?action=askforupgrade");
}
}else{
echo "<html><head><title>phpGroupWare Setup</title></head>\n";
echo "<body bgcolor='#ffffff'>\n";
echo "<table border=\"0\" align=\"center\">\n";
echo " <tr bgcolor=\"486591\">\n";
echo " <td colspan=\"2\"><font color=\"fefefe\">&nbsp;<b>Analysis</b></font></td>\n";