From 8abf9fa1a5b7fea98ca3ae7621173443b081cffa Mon Sep 17 00:00:00 2001 From: seek3r Date: Sat, 28 Sep 2002 15:20:20 +0000 Subject: [PATCH] Switched to using the register_exit_function() and added scrolling divs to a couple places for examples --- about.php | 1 - addressbook/csv_import.php | 1 - addressbook/help/EN/addressbook.php | 2 -- addressbook/help/FI/addressbook.php | 1 - addressbook/help/JA/addressbook.php | 2 -- addressbook/help/index.php | 1 - addressbook/inc/class.uiXport.inc.php | 5 ----- addressbook/inc/class.uivcard.inc.php | 7 ------- addressbook/index.php | 1 - admin/help/EN/account.php | 1 - admin/help/EN/admin.php | 1 - admin/help/EN/other.php | 1 - admin/help/EN/session.php | 1 - admin/help/FI/account.php | 1 - admin/help/FI/admin.php | 1 - admin/help/FI/other.php | 1 - admin/help/FI/session.php | 1 - admin/help/JA/account.php | 1 - admin/help/JA/admin.php | 1 - admin/help/JA/other.php | 1 - admin/help/JA/session.php | 1 - admin/help/index.php | 1 - admin/index.php | 2 -- admin/navbar-create.php | 2 -- admin/phpinfo.php | 2 -- admin/templates/default/index.tpl | 3 ++- admin/testbutton.php | 2 -- calendar/help/EN/add.php | 1 - calendar/help/EN/calendar.php | 1 - calendar/help/EN/edit_delete.php | 1 - calendar/help/EN/view.php | 1 - calendar/help/FI/add.php | 1 - calendar/help/FI/calendar.php | 1 - calendar/help/FI/edit_delete.php | 1 - calendar/help/FI/view.php | 1 - calendar/help/JA/add.php | 1 - calendar/help/JA/calendar.php | 1 - calendar/help/JA/edit_delete.php | 1 - calendar/help/JA/view.php | 1 - calendar/help/index.php | 1 - calendar/preferences.php | 1 - etemplate/process_exec.php | 2 -- home.php | 1 - index.php | 2 -- phpgwapi/inc/class.common.inc.php | 17 ----------------- phpgwapi/inc/class.xslttemplates.inc.php | 13 +++++++++++++ phpgwapi/inc/common_functions.inc.php | 20 +++++++++++++------- phpgwapi/inc/functions.inc.php | 20 +++++++++++++++----- preferences/changepassword.php | 2 -- preferences/changeprofile.php | 3 --- preferences/help/EN/other.php | 1 - preferences/help/EN/preferences.php | 1 - preferences/help/EN/settings.php | 1 - preferences/help/index.php | 1 - preferences/inc/class.uiaclprefs.inc.php | 1 - preferences/index.php | 1 - preferences/preferences.php | 2 -- preferences/templates/default/index.tpl | 2 ++ 58 files changed, 45 insertions(+), 104 deletions(-) diff --git a/about.php b/about.php index 212a86916f..748e212a66 100644 --- a/about.php +++ b/about.php @@ -53,5 +53,4 @@ } $tpl->pparse('out','phpgw_about'); - $GLOBALS['phpgw']->common->phpgw_footer(); ?> diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php index 4733bc5de9..62edc02e53 100644 --- a/addressbook/csv_import.php +++ b/addressbook/csv_import.php @@ -381,5 +381,4 @@ $GLOBALS['phpgw']->template->set_var('hiddenvars',$hiddenvars); $GLOBALS['phpgw']->template->fp('phpgw_body','import'); - $GLOBALS['phpgw']->common->phpgw_footer(); ?> diff --git a/addressbook/help/EN/addressbook.php b/addressbook/help/EN/addressbook.php index 46ae7bb9c5..68b00878b8 100755 --- a/addressbook/help/EN/addressbook.php +++ b/addressbook/help/EN/addressbook.php @@ -52,5 +52,3 @@ Simply fill in the fields, and click OK.

Access can be restricted to private, overriding acl preferences settings. From preferences, you can grant access to users to the be able to view, edit, and even delete your entries.

-common->phpgw_footer(); ?> - diff --git a/addressbook/help/FI/addressbook.php b/addressbook/help/FI/addressbook.php index 6d0ab187a8..aa2eacc966 100644 --- a/addressbook/help/FI/addressbook.php +++ b/addressbook/help/FI/addressbook.php @@ -51,4 +51,3 @@ T Tiedon käyttöoikeus voidaan rajoittaa yksityiseksi, mikä ohittaa ACL:n asetuksen. Osoitekirjan asetuksista voit antaa muille käyttäjille oikeuden selata, muokata tai jopa poistaa tallentamiasi tietoja.

-common->phpgw_footer(); ?> diff --git a/addressbook/help/JA/addressbook.php b/addressbook/help/JA/addressbook.php index 2a25a2208d..a2a911d173 100644 --- a/addressbook/help/JA/addressbook.php +++ b/addressbook/help/JA/addressbook.php @@ -51,5 +51,3 @@ FAX:
¥×¥é¥¤¥Ù¡¼¥È¥Ç¡¼¥¿¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢ÍøÍѵö²Ä¡Ê¥æ¡¼¥¶ÀßÄê¡Ë¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ¥æ¡¼¥¶ÀßÄê¤Ç¤Ï¤¢¤Ê¤¿¤¬ºîÀ®¤·¤¿¥¢¥É¥ì¥¹Ä¢¤ò¾¤Î¥æ¡¼¥¶¤¬¡¢É½¼¨¡¦ÄûÀµ¡¦ºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¥¢¥¯¥»¥¹¸¢¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

-common->phpgw_footer(); ?> - diff --git a/addressbook/help/index.php b/addressbook/help/index.php index 9d060b29b9..cb5177ad31 100755 --- a/addressbook/help/index.php +++ b/addressbook/help/index.php @@ -23,4 +23,3 @@ Version: -common->phpgw_footer(); ?> diff --git a/addressbook/inc/class.uiXport.inc.php b/addressbook/inc/class.uiXport.inc.php index 8c8ddc1850..579d09114d 100644 --- a/addressbook/inc/class.uiXport.inc.php +++ b/addressbook/inc/class.uiXport.inc.php @@ -100,7 +100,6 @@ $GLOBALS['phpgw']->common->phpgw_header(); echo "

$buffer
"; echo ''.lang('OK').''; - $GLOBALS['phpgw']->common->phpgw_footer(); } } else @@ -108,9 +107,7 @@ $GLOBALS['phpgw']->common->phpgw_header(); echo "
$buffer
"; echo ''.lang('OK').''; - $GLOBALS['phpgw']->common->phpgw_footer(); } - } else { @@ -183,7 +180,6 @@ $GLOBALS['phpgw']->common->phpgw_header(); echo lang('No conversion type <none> could be located. Please choose a conversion type from the list'); echo ' ' . lang('OK') . ''; - $GLOBALS['phpgw']->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_exit(); } @@ -203,7 +199,6 @@ echo $buffer; echo "\n\n"; echo '' . lang('OK') . ''; - $GLOBALS['phpgw']->common->phpgw_footer(); } } else diff --git a/addressbook/inc/class.uivcard.inc.php b/addressbook/inc/class.uivcard.inc.php index 484b62a76a..6fe648e82b 100644 --- a/addressbook/inc/class.uivcard.inc.php +++ b/addressbook/inc/class.uivcard.inc.php @@ -64,8 +64,6 @@ $this->template->set_var('group_option',$group_option); $this->template->pparse('out','vcardin'); - - $GLOBALS['phpgw']->common->phpgw_footer(); } function out() @@ -189,11 +187,6 @@ echo '' . lang('OK') . ''; echo ''; } - - if($nolname || $nofname) - { - $GLOBALS['phpgw']->common->phpgw_footer(); - } } } ?> diff --git a/addressbook/index.php b/addressbook/index.php index c170db021e..47c69e63e6 100755 --- a/addressbook/index.php +++ b/addressbook/index.php @@ -23,5 +23,4 @@ $obj = CreateObject('addressbook.uiaddressbook'); $obj->index(); - $GLOBALS['phpgw']->common->phpgw_footer(); ?> diff --git a/admin/help/EN/account.php b/admin/help/EN/account.php index c259892d75..bcb28134b7 100755 --- a/admin/help/EN/account.php +++ b/admin/help/EN/account.php @@ -30,4 +30,3 @@ Create, edit and delete users accounts. Set membership of groups, and access to User groups:
Create, edit and delete groups.

-common->phpgw_footer(); ?> diff --git a/admin/help/EN/admin.php b/admin/help/EN/admin.php index cafc5aff26..cb474dbaf8 100755 --- a/admin/help/EN/admin.php +++ b/admin/help/EN/admin.php @@ -46,4 +46,3 @@ Manual update for news groups.

  • Server information:
    At present phpinfo of the server that is running.

    • -common->phpgw_footer(); ?> diff --git a/admin/help/EN/other.php b/admin/help/EN/other.php index 236d78f639..a0524dbe63 100755 --- a/admin/help/EN/other.php +++ b/admin/help/EN/other.php @@ -29,4 +29,3 @@ Manual update for news groups.

  • Server information:
    At present phpinfo of the server that is running.

    • -common->phpgw_footer(); ?> diff --git a/admin/help/EN/session.php b/admin/help/EN/session.php index 31a68f2501..86e7853d00 100755 --- a/admin/help/EN/session.php +++ b/admin/help/EN/session.php @@ -32,4 +32,3 @@ Administration of all applications, user and group accounts, session logging and

    View Access Log:
    LoginId, IP, Login Time, Logout Time, Total time spent. -common->phpgw_footer(); ?> diff --git a/admin/help/FI/account.php b/admin/help/FI/account.php index 5c52f1d97d..52628033ea 100644 --- a/admin/help/FI/account.php +++ b/admin/help/FI/account.php @@ -32,4 +32,3 @@ ryhm Käyttäjäryhmät:
    Toiminnolla voit lisätä, muuttaa ja poistaa käyttäjäryhmiä.

    -common->phpgw_footer(); ?> diff --git a/admin/help/FI/admin.php b/admin/help/FI/admin.php index 50998b5cd4..bd893b8238 100644 --- a/admin/help/FI/admin.php +++ b/admin/help/FI/admin.php @@ -50,4 +50,3 @@ Uutisryhmien p

  • Palvelimen tiedot:
    Tällä hetkellä palvelimen phpinfo.

    • -common->phpgw_footer(); ?> diff --git a/admin/help/FI/other.php b/admin/help/FI/other.php index f2cc7269cd..0936a17b69 100644 --- a/admin/help/FI/other.php +++ b/admin/help/FI/other.php @@ -30,4 +30,3 @@ Uutisryhmien p

  • Palvelimen tiedot:
    Tällä hetkellä palvelimen phpinfo.

    • -common->phpgw_footer(); ?> diff --git a/admin/help/FI/session.php b/admin/help/FI/session.php index 10f78bac5b..5d6ead5d42 100644 --- a/admin/help/FI/session.php +++ b/admin/help/FI/session.php @@ -34,4 +34,3 @@ on ollut tekem

    Näytä käyttöloki:
    Tunnus, IP-osoite, Sisäänkirjautumisaika, Uloskirjautumisaika, Istunnon kesto. -common->phpgw_footer(); ?> diff --git a/admin/help/JA/account.php b/admin/help/JA/account.php index e97c8894ed..d37e04e78a 100644 --- a/admin/help/JA/account.php +++ b/admin/help/JA/account.php @@ -30,4 +30,3 @@ ¥æ¡¼¥¶¥°¥ë¡¼¥×:
    ¥æ¡¼¥¶¤¬½ê°¤¹¤ë¥°¥ë¡¼¥×¤òÄɲá¢ÄûÀµºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

    -common->phpgw_footer(); ?> diff --git a/admin/help/JA/admin.php b/admin/help/JA/admin.php index 4218bac9cc..edff4e6b98 100644 --- a/admin/help/JA/admin.php +++ b/admin/help/JA/admin.php @@ -51,4 +51,3 @@ you a checking page to be sure you do want to delete.

  • ¥µ¡¼¥Ð¾ðÊó:
    ¥µ¡¼¥Ð¤ÇÆ°ºî¤·¤Æ¤¤¤ë PHP ¤Î¾ðÊó¤ò¡¢phpinfo() ¤Çɽ¼¨¤·¤Þ¤¹¡£

    • -common->phpgw_footer(); ?> diff --git a/admin/help/JA/other.php b/admin/help/JA/other.php index af359ce4ba..606df88473 100644 --- a/admin/help/JA/other.php +++ b/admin/help/JA/other.php @@ -29,4 +29,3 @@

  • ¥µ¡¼¥Ð¾ðÊó:
    ¥µ¡¼¥Ð¤ÇÆ°ºî¤·¤Æ¤¤¤ë PHP ¤Î¾ðÊó¤ò¡¢phpinfo() ¤Çɽ¼¨¤·¤Þ¤¹¡£

    • -common->phpgw_footer(); ?> diff --git a/admin/help/JA/session.php b/admin/help/JA/session.php index 807bdc1260..f3bcedef4e 100644 --- a/admin/help/JA/session.php +++ b/admin/help/JA/session.php @@ -32,4 +32,3 @@

    ¥¢¥¯¥»¥¹¥í¥°»²¾È:
    phpGroupWare¤Ø¤Î¥¢¥¯¥»¥¹¥í¥°¤òɽ¼¨¤·¤Þ¤¹¡£¥í¥°¥¤¥óID,IP¥¢¥É¥ì¥¹,¥í¥°¥¤¥ó»þ´Ö,¥í¥°¥¢¥¦¥È»þ´Ö,ÍøÍÑ»þ´Ö¤òɽ¼¨¤·¤Þ¤¹¡£ -common->phpgw_footer(); ?> diff --git a/admin/help/index.php b/admin/help/index.php index cb180ca5dd..30d99b641b 100755 --- a/admin/help/index.php +++ b/admin/help/index.php @@ -24,4 +24,3 @@ Version: -common->phpgw_footer(); ?> diff --git a/admin/index.php b/admin/index.php index 1e4db6d98e..8983a2f04f 100755 --- a/admin/index.php +++ b/admin/index.php @@ -89,6 +89,4 @@ $GLOBALS['phpgw']->hooks->process('admin'); $GLOBALS['admin_tpl']->pparse('out','list'); - - $GLOBALS['phpgw']->common->phpgw_footer(); ?> diff --git a/admin/navbar-create.php b/admin/navbar-create.php index 13fc39cefb..5d3e116475 100644 --- a/admin/navbar-create.php +++ b/admin/navbar-create.php @@ -27,6 +27,4 @@ The instructions are as follows: echo "\nlink("/admin/navbar-sel.php","filename=".$phpgw_info["server"]["server_root"]."/".$key."/images/navbar.gif")."\">"; echo $phpgw_info["apps"][$key]["title"]."
    "; } - - $phpgw->common->phpgw_footer(); ?> diff --git a/admin/phpinfo.php b/admin/phpinfo.php index c2b5dced79..10e82ac070 100755 --- a/admin/phpinfo.php +++ b/admin/phpinfo.php @@ -26,6 +26,4 @@ } phpinfo(); - -// $phpgw->common->phpgw_footer(); ?> diff --git a/admin/templates/default/index.tpl b/admin/templates/default/index.tpl index 30918a3c49..f4e5b985ff 100755 --- a/admin/templates/default/index.tpl +++ b/admin/templates/default/index.tpl @@ -19,10 +19,11 @@ } } - +

    {rows}
    +
    diff --git a/admin/testbutton.php b/admin/testbutton.php index 78f3b4f624..7235918686 100755 --- a/admin/testbutton.php +++ b/admin/testbutton.php @@ -28,6 +28,4 @@ print "
    the same as ascii
    "; print $button->createInputButton("Lars is the best ;)",'submit','ascii'); print ""; - - $phpgw->common->phpgw_footer(); ?> diff --git a/calendar/help/EN/add.php b/calendar/help/EN/add.php index da379770f4..243f31e16b 100755 --- a/calendar/help/EN/add.php +++ b/calendar/help/EN/add.php @@ -43,4 +43,3 @@ Frequency: Simply fill in the fields, and click Submit.
    Note: Access can be set as with other applications in this suite, Private,Group Readable,Globally Readable.

    -common->phpgw_footer(); ?> diff --git a/calendar/help/EN/calendar.php b/calendar/help/EN/calendar.php index 7c59595553..2b8774a2e2 100755 --- a/calendar/help/EN/calendar.php +++ b/calendar/help/EN/calendar.php @@ -61,4 +61,3 @@ To edit an entry group click on the small icon as shown above. A form page will be presented, where you can edit the relevant fields. Chose edit or delete from the bottom of the page.
    Note:You can only make changes or delete those calendar entries created by you.

    -common->phpgw_footer(); ?> diff --git a/calendar/help/EN/edit_delete.php b/calendar/help/EN/edit_delete.php index 95bba0be81..cfc19e5d15 100755 --- a/calendar/help/EN/edit_delete.php +++ b/calendar/help/EN/edit_delete.php @@ -25,4 +25,3 @@ To edit an entry group click on the small icon as shown above. A form page will be presented, where you can edit the relevant fields. Chose edit or delete from the bottom of the page.

    Note:You can only make changes or delete those calendar entries created by you.

    -common->phpgw_footer(); ?> diff --git a/calendar/help/EN/view.php b/calendar/help/EN/view.php index 789fb27f95..63b018ed7d 100755 --- a/calendar/help/EN/view.php +++ b/calendar/help/EN/view.php @@ -31,4 +31,3 @@ Current week is displayed. Start day of week can be set in preferences.

    Month:
    Default entry is to the current month, viewed in monthly option, with both prior and future months easily accessible with one click.

    -common->phpgw_footer(); ?> diff --git a/calendar/help/FI/add.php b/calendar/help/FI/add.php index da27268488..8f611dfbc2 100644 --- a/calendar/help/FI/add.php +++ b/calendar/help/FI/add.php @@ -46,4 +46,3 @@ T Huomaa: Kuten muidenkin sovellusten kohdalla, voit antaa tiedon käyttöoikeudeksi Yksityinen, Oma ryhmä tai Kaikki.

    -common->phpgw_footer(); ?> diff --git a/calendar/help/FI/calendar.php b/calendar/help/FI/calendar.php index 4276a1ed03..e1e1b8797b 100644 --- a/calendar/help/FI/calendar.php +++ b/calendar/help/FI/calendar.php @@ -66,4 +66,3 @@ Muokataksesi tapahtumaa napsauta t Näytölle avautuu muokkauslomake. Valitse muokkaa tai poista sivun alareunasta.
    Huomaa:Voit muokata ja poistaa vain itse luomiasi tapahtumia.

    -common->phpgw_footer(); ?> diff --git a/calendar/help/FI/edit_delete.php b/calendar/help/FI/edit_delete.php index 38db9c1ab5..8713e0cc6a 100644 --- a/calendar/help/FI/edit_delete.php +++ b/calendar/help/FI/edit_delete.php @@ -26,4 +26,3 @@ Muokataksesi tapahtumaa napsauta t Näytölle avautuu muokkauslomake. Valitse muokkaa tai poista sivun alareunasta.

    Huomaa:Voit muokata ja poistaa vain itse luomiasi tapahtumia.

    -common->phpgw_footer(); ?> diff --git a/calendar/help/FI/view.php b/calendar/help/FI/view.php index 773500bea9..97adfeed4f 100644 --- a/calendar/help/FI/view.php +++ b/calendar/help/FI/view.php @@ -34,4 +34,3 @@ asetuksista.
    Kuukausi:
    Valittu kuukausi sekä edellinen ja seuraava kuukausi mini-kalentereina. Voit siirtyä päivänäkymään haluamaasi päivää napsauttamalla.

    -common->phpgw_footer(); ?> diff --git a/calendar/help/JA/add.php b/calendar/help/JA/add.php index 5b49394ee7..ac478574e9 100755 --- a/calendar/help/JA/add.php +++ b/calendar/help/JA/add.php @@ -42,4 +42,3 @@ ÉÑÅÙ: ¤Ê¤É¤Î¹àÌܤòÆþÎϤ·¡¢¼Â¹Ô¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£
    È÷¹Í: ¾¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÇÈ÷¤¨¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢¡Ê¥×¥é¥¤¥Ù¡¼¥È¡¢¥°¥ë¡¼¥×¡¢¥°¥í¡¼¥Ð¥ë¡Ë¤â¡¢¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÇÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£

    -common->phpgw_footer(); ?> diff --git a/calendar/help/JA/calendar.php b/calendar/help/JA/calendar.php index abef6ce078..311c7c966c 100755 --- a/calendar/help/JA/calendar.php +++ b/calendar/help/JA/calendar.php @@ -57,4 +57,3 @@ ͽÄê¤òÄûÀµ¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£ ÄûÀµ¤¹¤ëͽÄ꤬ɽ¼¨¤µ¤ì¡¢ÄûÀµ¤«ºï½ü¤òÁªÂò¤¹¤ë¥Ü¥¿¥ó¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
    È÷¹Í:ÄûÀµ¤äºï½ü¤Ï¡¢¼«Ê¬¤ÇºîÀ®¤·¤¿¤â¤Î¤Ë¸Â¤ê¤Þ¤¹¡£

    -common->phpgw_footer(); ?> diff --git a/calendar/help/JA/edit_delete.php b/calendar/help/JA/edit_delete.php index f9f4ae2dc3..bec069bf89 100755 --- a/calendar/help/JA/edit_delete.php +++ b/calendar/help/JA/edit_delete.php @@ -24,4 +24,3 @@ ͽÄê¤òÄûÀµ¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£ ÄûÀµ¤¹¤ëͽÄ꤬ɽ¼¨¤µ¤ì¡¢ÄûÀµ¤«ºï½ü¤òÁªÂò¤¹¤ë¥Ü¥¿¥ó¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
    È÷¹Í:ÄûÀµ¤äºï½ü¤Ï¡¢¼«Ê¬¤ÇºîÀ®¤·¤¿¤â¤Î¤Ë¸Â¤ê¤Þ¤¹¡£

    -common->phpgw_footer(); ?> diff --git a/calendar/help/JA/view.php b/calendar/help/JA/view.php index ab88a65bee..2e558d280b 100755 --- a/calendar/help/JA/view.php +++ b/calendar/help/JA/view.php @@ -30,4 +30,3 @@ ·îñ°Ì¤ÇͽÄê¤òɽ¼¨¤·¤Þ¤¹¡£·î¤Îɽ¼¨¤Ï¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Àè·î¤äÍâ·î¤Ë¥ï¥ó¥¯¥ê¥Ã¥¯¤Ç¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
    º£Ç¯:
    ǯñ°Ì¤ÇͽÄê¤òɽ¼¨¤·¤Þ¤¹¡£¾®¤µ¤¤·îñ°Ì¤Î¥«¥ì¥ó¥À¡¼¤ò°ìǯʬɽ¼¨¤·¤Þ¤¹¡£

    -common->phpgw_footer(); ?> diff --git a/calendar/help/index.php b/calendar/help/index.php index 295defa14d..f033efe69d 100755 --- a/calendar/help/index.php +++ b/calendar/help/index.php @@ -25,4 +25,3 @@ Version:

    This app was based on WebCalendar

    Transformed by Mark A Peters (Skeeter)
    -common->phpgw_footer(); ?> diff --git a/calendar/preferences.php b/calendar/preferences.php index c758e905c0..deccb7629f 100644 --- a/calendar/preferences.php +++ b/calendar/preferences.php @@ -234,5 +234,4 @@ display_item(lang('Print calendars in black & white'),$str); $p->pparse('out','pref'); - $phpgw->common->phpgw_footer(); ?> diff --git a/etemplate/process_exec.php b/etemplate/process_exec.php index 3820d3d533..2a6236d06b 100644 --- a/etemplate/process_exec.php +++ b/etemplate/process_exec.php @@ -20,5 +20,3 @@ include('../header.inc.php'); ExecMethod('etemplate.etemplate.process_exec'); - - $GLOBALS['phpgw']->common->phpgw_footer(); diff --git a/home.php b/home.php index 2b7a8bcc2f..96fba07f50 100755 --- a/home.php +++ b/home.php @@ -205,5 +205,4 @@ } $GLOBALS['phpgw']->preferences->save_repository(); } - $GLOBALS['phpgw']->common->phpgw_footer(); ?> diff --git a/index.php b/index.php index 80ebcae490..124345d36a 100755 --- a/index.php +++ b/index.php @@ -106,6 +106,4 @@ $_obj->get_list(); */ } - - $GLOBALS['phpgw']->common->phpgw_footer(); ?> diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index b76e980039..e676283478 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -1506,7 +1506,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' function phpgw_footer() { - global $HTMLCOMPLIANT; if(!defined('PHPGW_FOOTER_RAN')) { define('PHPGW_FOOTER_RAN',True); @@ -1522,22 +1521,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $GLOBALS['phpgw']->db->disconnect(); $this->phpgw_header(); $GLOBALS['phpgw']->template->pfp('out','phpgw_main_end'); -/* - - $GLOBALS['phpgw']->template->p('phpgw_head'); - $GLOBALS['phpgw']->template->p('phpgw_navbar_start'); - $this->msgbox('',False); - $GLOBALS['phpgw']->template->fp('phpgw_msgbox'); - $GLOBALS['phpgw']->template->p('phpgw_appspace'); - $GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR); - parse_navbar_end(); - $GLOBALS['phpgw']->template->reset_root(); - $GLOBALS['phpgw']->hooks->process('navbar_end'); - $GLOBALS['phpgw']->template->p('phpgw_navbar_end'); - $GLOBALS['phpgw']->template->p('phpgw_footer'); - $GLOBALS['phpgw']->template->parse('phpgw_main_body','login_form'); - $GLOBALS['phpgw']->template->pfp('out','phpgw_main'); -*/ } /* Clean up mcrypt */ diff --git a/phpgwapi/inc/class.xslttemplates.inc.php b/phpgwapi/inc/class.xslttemplates.inc.php index 6af47a4b48..28c204b40e 100644 --- a/phpgwapi/inc/class.xslttemplates.inc.php +++ b/phpgwapi/inc/class.xslttemplates.inc.php @@ -1,4 +1,17 @@ common; + register_shutdown_function(array(&$footer_common, 'phpgw_footer')); + /****************************************************************************\ * Stuff to use if logging in or logging out * \****************************************************************************/ @@ -476,7 +482,7 @@ } if(PHPGW_USE_FRAMES) { - $GLOBALS['phpgw']->common->phpgw_footer(); + exit; } } /*************************************************************************\ @@ -498,7 +504,7 @@ } if(PHPGW_USE_FRAMES) { - $GLOBALS['phpgw']->common->phpgw_footer(); + exit; } } /*************************************************************************\ @@ -520,7 +526,7 @@ } if(PHPGW_USE_FRAMES) { - $GLOBALS['phpgw']->common->phpgw_footer(); + exit; } } /*************************************************************************\ @@ -542,7 +548,7 @@ } if(PHPGW_USE_FRAMES) { - $GLOBALS['phpgw']->common->phpgw_footer(); + exit; } } @@ -571,7 +577,6 @@ $GLOBALS['phpgw_info']['flags']['msgbox_data']['Access not permitted']=False; $continue_app_data = False; $GLOBALS['phpgw']->template->set_var('phpgw_body',"user has no rights to this app!!!
    \n"); - //$GLOBALS['phpgw']->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_exit(True); } } @@ -582,6 +587,11 @@ { $GLOBALS['phpgw']->common->phpgw_header(); } + + if(!PHPGW_USE_FRAMES) + { +// echo '

    '; + } /* Make sure user is keeping his password in order */ /* Maybe we should create a common function in the phpgw_accounts_shared.inc.php file */ diff --git a/preferences/changepassword.php b/preferences/changepassword.php index cad1b9430b..4e192f971b 100755 --- a/preferences/changepassword.php +++ b/preferences/changepassword.php @@ -61,7 +61,6 @@ { $GLOBALS['phpgw']->common->phpgw_header(); $GLOBALS['phpgw']->template->pfp('out','form'); - $GLOBALS['phpgw']->common->phpgw_footer(); } else { @@ -88,6 +87,5 @@ { $GLOBALS['phpgw']->common->phpgw_header(); $GLOBALS['phpgw']->template->pfp('out','form'); - $GLOBALS['phpgw']->common->phpgw_footer(); } ?> diff --git a/preferences/changeprofile.php b/preferences/changeprofile.php index 3bae11b120..4c69d11e52 100644 --- a/preferences/changeprofile.php +++ b/preferences/changeprofile.php @@ -105,6 +105,3 @@ -common->phpgw_footer(); -?> diff --git a/preferences/help/EN/other.php b/preferences/help/EN/other.php index b1230078d0..8c52cf4ec9 100755 --- a/preferences/help/EN/other.php +++ b/preferences/help/EN/other.php @@ -35,4 +35,3 @@ Here you can set a few details about yourself, for public viewing by the rest of the users of the system. Title,Phone number, Comments, Picture upload.

  • Monitor Newsgroups:
    Easily choose which news groups you want to set for reading.
    • -common->phpgw_footer(); ?> diff --git a/preferences/help/EN/preferences.php b/preferences/help/EN/preferences.php index f45cd8f9d7..e7a2f2701d 100755 --- a/preferences/help/EN/preferences.php +++ b/preferences/help/EN/preferences.php @@ -67,4 +67,3 @@ of the system. Title,Phone number, Comments, Picture upload.

  • Monitor Newsgroups:
    Easily choose which news groups you want to set for reading.
    • -common->phpgw_footer(); ?> diff --git a/preferences/help/EN/settings.php b/preferences/help/EN/settings.php index 5f55a3c3cd..8c733cda32 100755 --- a/preferences/help/EN/settings.php +++ b/preferences/help/EN/settings.php @@ -55,4 +55,3 @@ Click on as many news headline news sites as you wish, these will be displayed f when using the headlines function.The systems admin set these as default, so be sure to let them know if you want some that are not there ;) -common->phpgw_footer(); ?> diff --git a/preferences/help/index.php b/preferences/help/index.php index 087c2339ad..93bba44e5b 100755 --- a/preferences/help/index.php +++ b/preferences/help/index.php @@ -23,4 +23,3 @@ Version:

    -common->phpgw_footer(); ?> diff --git a/preferences/inc/class.uiaclprefs.inc.php b/preferences/inc/class.uiaclprefs.inc.php index 713e96ad10..aa5e61932f 100644 --- a/preferences/inc/class.uiaclprefs.inc.php +++ b/preferences/inc/class.uiaclprefs.inc.php @@ -68,7 +68,6 @@ elseif(@isset($save_my_owner)) { echo '

    '.lang('You do not have permission to set ACL\'s in this mode!').'
    '; - $GLOBALS['phpgw']->common->phpgw_footer(); } */ diff --git a/preferences/index.php b/preferences/index.php index c0e0053f77..97cde94460 100755 --- a/preferences/index.php +++ b/preferences/index.php @@ -135,5 +135,4 @@ $GLOBALS['phpgw']->hooks->process('preferences',array('preferences')); $pref_tpl->pfp('out','list'); - $GLOBALS['phpgw']->common->phpgw_footer(); ?> diff --git a/preferences/preferences.php b/preferences/preferences.php index 01423c2e6c..014608f8b5 100755 --- a/preferences/preferences.php +++ b/preferences/preferences.php @@ -326,6 +326,4 @@ $t->pfp('out','list'); $t->pfp('out','footer'); } - - $GLOBALS['phpgw']->common->phpgw_footer(); ?> diff --git a/preferences/templates/default/index.tpl b/preferences/templates/default/index.tpl index da2634368b..eb65500025 100644 --- a/preferences/templates/default/index.tpl +++ b/preferences/templates/default/index.tpl @@ -1,4 +1,5 @@ +
    @@ -8,6 +9,7 @@
    {tabs}
    {rows}
    +