Switched to using the register_exit_function() and added scrolling divs to a couple places for examples

about.php

@@ -53,5 +53,4 @@
 	}
 
 	$tpl->pparse('out','phpgw_about');
-	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>

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

addressbook/help/EN/addressbook.php

@@ -52,5 +52,3 @@ Simply fill in the fields, and click OK.</li><p/></ul>
 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.<p/>
-<?php $phpgw->common->phpgw_footer(); ?>
-

addressbook/help/FI/addressbook.php

@@ -51,4 +51,3 @@ T
 Tiedon k<>ytt<74>oikeus voidaan rajoittaa yksityiseksi, mik<69> ohittaa ACL:n
 asetuksen. Osoitekirjan asetuksista voit antaa muille k<>ytt<74>jille
 oikeuden selata, muokata tai jopa poistaa tallentamiasi tietoja.<p/>
-<?php $phpgw->common->phpgw_footer(); ?>

addressbook/help/JA/addressbook.php

@@ -51,5 +51,3 @@ FAX:<br/>
 <EFBFBD>ץ饤<EFBFBD>١<EFBFBD><EFBFBD>ȥǡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>˥<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤϡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѵ<EFBFBD><EFBFBD>ġʥ桼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꤹ<EFBFBD><EFBFBD>ɬ<EFBFBD>פ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>
 <EFBFBD>桼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǤϤ<EFBFBD><EFBFBD>ʤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ쥹Ģ<EFBFBD><EFBFBD>¾<EFBFBD>Υ桼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤳<EFBFBD>Ȥ<EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD>륢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꤹ<EFBFBD>뤳<EFBFBD>Ȥ<EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>
 <p/>
-<?php $phpgw->common->phpgw_footer(); ?>
-

addressbook/help/index.php

@@ -23,4 +23,3 @@
 <font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
 Version: <b><?php echo $setup_info[$appname]['version']; ?></b>
 </font>
-<?php $phpgw->common->phpgw_footer(); ?>

addressbook/inc/class.uiXport.inc.php

@@ -100,7 +100,6 @@
 						$GLOBALS['phpgw']->common->phpgw_header();
 						echo "<pre>$buffer</pre>";
 						echo '<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index') . '">'.lang('OK').'</a>';
-						$GLOBALS['phpgw']->common->phpgw_footer();
 					}
 				}
 				else
@@ -108,9 +107,7 @@
 					$GLOBALS['phpgw']->common->phpgw_header();
 					echo "<pre>$buffer</pre>";
 					echo '<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'). '">'.lang('OK').'</a>';
-					$GLOBALS['phpgw']->common->phpgw_footer();
 				}
-
 			}
 			else
 			{
@@ -183,7 +180,6 @@
 					$GLOBALS['phpgw']->common->phpgw_header();
 					echo lang('<b>No conversion type &lt;none&gt; could be located.</b>  Please choose a conversion type from the list');
 					echo '&nbsp<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export') . '">' . lang('OK') . '</a>';
-					$GLOBALS['phpgw']->common->phpgw_footer();
 					$GLOBALS['phpgw']->common->phpgw_exit();
 				}
 
@@ -203,7 +199,6 @@
 					echo $buffer;
 					echo "\n</pre>\n";
 					echo '<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export') . '">' . lang('OK') . '</a>';
-					$GLOBALS['phpgw']->common->phpgw_footer();
 				}
 			}
 			else

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 '<a href="' . $GLOBALS['phpgw']->link('/addressbook/index.php') . '">' . lang('OK') . '</a>';
 				echo '</center>';
 			}
-
-			if($nolname || $nofname)
-			{
-				$GLOBALS['phpgw']->common->phpgw_footer();
-			}
 		}
 	}
 ?>

addressbook/index.php

@@ -23,5 +23,4 @@
 
 	$obj = CreateObject('addressbook.uiaddressbook');
 	$obj->index();
-	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>

admin/help/EN/account.php

@@ -30,4 +30,3 @@ Create, edit and delete users accounts. Set membership of groups, and access to
 <i>User groups:</i><br/>
 Create, edit and delete groups.<p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/EN/admin.php

@@ -46,4 +46,3 @@ Manual update for news groups.</li><p/>
 <li><b>Server information:</b><br/>
 At present phpinfo of the server that is running.</li><p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/EN/other.php

@@ -29,4 +29,3 @@ Manual update for news groups.</li><p/>
 <li><b>Server information:</b><br/>
 At present phpinfo of the server that is running.</li><p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/EN/session.php

@@ -32,4 +32,3 @@ Administration of all applications, user and group accounts, session logging and
 <p><i>View Access Log:</i>
 <br>LoginId, IP, Login Time, Logout Time, Total time spent.
 </ul>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/FI/account.php

@@ -32,4 +32,3 @@ ryhm
 <i>K<>ytt<74>j<EFBFBD>ryhm<68>t:</i><br/>
 Toiminnolla voit lis<69>t<EFBFBD>, muuttaa ja poistaa k<>ytt<74>j<EFBFBD>ryhmi<6D>.<p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/FI/admin.php

@@ -50,4 +50,3 @@ Uutisryhmien p
 <li><b>Palvelimen tiedot:</b><br/>
 T<EFBFBD>ll<EFBFBD> hetkell<6C> palvelimen phpinfo.</li><p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/FI/other.php

@@ -30,4 +30,3 @@ Uutisryhmien p
 <li><b>Palvelimen tiedot:</b><br/>
 T<EFBFBD>ll<EFBFBD> hetkell<6C> palvelimen phpinfo.</li><p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/FI/session.php

@@ -34,4 +34,3 @@ on ollut tekem
 <p><i>N<>yt<79> k<>ytt<74>loki:</i>
 <br>Tunnus, IP-osoite, Sis<69><73>nkirjautumisaika, Uloskirjautumisaika, Istunnon kesto.
 </ul>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/JA/account.php

@@ -30,4 +30,3 @@
 <i><3E>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD><EFBFBD>롼<EFBFBD><EBA1BC>:</i><br/>
 <EFBFBD>桼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>°<EFBFBD><EFBFBD><EFBFBD>륰<EFBFBD>롼<EFBFBD>פ<EFBFBD><EFBFBD>ɲá<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤳<EFBFBD>Ȥ<EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/JA/admin.php

@@ -51,4 +51,3 @@ you a checking page to be sure you do want to delete.<br/>
 <li><b><3E><><EFBFBD><EFBFBD><EFBFBD>о<EFBFBD><D0BE><EFBFBD>:</b><br/>
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ф<EFBFBD>ư<EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD><EFBFBD> PHP <20>ξ<EFBFBD><CEBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>phpinfo() <20><>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD></li><p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/JA/other.php

@@ -29,4 +29,3 @@
 <li><b><3E><><EFBFBD><EFBFBD><EFBFBD>о<EFBFBD><D0BE><EFBFBD>:</b><br/>
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ф<EFBFBD>ư<EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD><EFBFBD> PHP <20>ξ<EFBFBD><CEBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>phpinfo() <20><>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD></li><p/>
 </ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/JA/session.php

@@ -32,4 +32,3 @@
 <p><i><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:</i>
 <br>phpGroupWare<72>ؤΥ<D8A4><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ID,IP<49><50><EFBFBD>ɥ쥹,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD>,<2C><><EFBFBD>ѻ<EFBFBD><D1BB>֤<EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>
 </ul>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/help/index.php

@@ -24,4 +24,3 @@
 <font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
 Version: <b><?php echo $setup_info[$appname]['version']; ?></b>
 </font>
-<?php $phpgw->common->phpgw_footer(); ?>

admin/index.php

@@ -89,6 +89,4 @@
 
 	$GLOBALS['phpgw']->hooks->process('admin');
 	$GLOBALS['admin_tpl']->pparse('out','list');
-
-	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>

admin/navbar-create.php

@@ -27,6 +27,4 @@ The instructions are as follows:
     echo "\n<A HREF=\"".$phpgw->link("/admin/navbar-sel.php","filename=".$phpgw_info["server"]["server_root"]."/".$key."/images/navbar.gif")."\">";
     echo $phpgw_info["apps"][$key]["title"]."</A><BR>";
   }
-
-  $phpgw->common->phpgw_footer();
 ?>

admin/phpinfo.php

@@ -26,6 +26,4 @@
 	}
 
 	phpinfo();
-
-//	$phpgw->common->phpgw_footer();
 ?>

admin/templates/default/index.tpl

@@ -19,10 +19,11 @@
 		}
 	}
 </SCRIPT>
-
+<div style="width: 100%; height: 100%; overflow: auto;">
 <table width="75%" border="0" cellspacing="0" cellpadding="0">
  {rows}
 </table>
+</div>
 <!-- END list -->
 
 <!-- BEGIN app_row -->

admin/testbutton.php

@@ -28,6 +28,4 @@
 	print "<br>the same as ascii<br>";
 	print $button->createInputButton("Lars is the best ;)",'submit','ascii');
 	print "</form>";
-	
-	$phpgw->common->phpgw_footer();
 ?>

calendar/help/EN/add.php

@@ -43,4 +43,3 @@ Frequency:</td></table>
 Simply fill in the fields, and click Submit.</ul><br/>
 <b>Note:</b> Access can be set as with other applications in this suite, Private,Group Readable,Globally
 Readable.<p/></font>
-<?php $phpgw->common->phpgw_footer(); ?>

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.<br/>
 <b>Note:</b>You can only make changes or delete those calendar entries created by you.</li><p/></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

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.</li><p/>
 <b>Note:</b>You can only make changes or delete those calendar entries created by you.<p/></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/EN/view.php

@@ -31,4 +31,3 @@ Current week is displayed. Start day of week can be set in preferences.<p/>
 <i>Month:</i><br/>
 Default entry is to the current month, viewed in monthly option, with both prior and future
 months easily accessible with one click.<p/></li></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/FI/add.php

@@ -46,4 +46,3 @@ T
 <b>Huomaa:</b>
 Kuten muidenkin sovellusten kohdalla, voit antaa tiedon
 k<EFBFBD>ytt<EFBFBD>oikeudeksi Yksityinen, Oma ryhm<68> tai Kaikki.<p/></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/FI/calendar.php

@@ -66,4 +66,3 @@ Muokataksesi tapahtumaa napsauta t
 N<EFBFBD>yt<EFBFBD>lle avautuu muokkauslomake.
 Valitse muokkaa tai poista sivun alareunasta.<br/>
 <b>Huomaa:</b>Voit muokata ja poistaa vain itse luomiasi tapahtumia.</li><p/></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/FI/edit_delete.php

@@ -26,4 +26,3 @@ Muokataksesi tapahtumaa napsauta t
 N<EFBFBD>yt<EFBFBD>lle avautuu muokkauslomake.
 Valitse muokkaa tai poista sivun alareunasta.</li><p/>
 <b>Huomaa:</b>Voit muokata ja poistaa vain itse luomiasi tapahtumia.<p/></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/FI/view.php

@@ -34,4 +34,3 @@ asetuksista.<br/>
 <i>Kuukausi:</i><br/>
 Valittu kuukausi sek<65> edellinen ja seuraava kuukausi mini-kalentereina.
 Voit siirty<74> p<>iv<69>n<EFBFBD>kym<79><6D>n haluamaasi p<>iv<69><76> napsauttamalla.<p/></li></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/JA/add.php

@@ -42,4 +42,3 @@
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>:</td></table>
 <EFBFBD>ʤɤι<EFBFBD><EFBFBD>ܤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>¹ԥܥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>򥯥<EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><br/>
 <b><3E><><EFBFBD><EFBFBD>:</b> ¾<>Υ<EFBFBD><CEA5>ץꥱ<D7A5><EAA5B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>륢<EFBFBD><EBA5A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʥץ饤<D7A5>١<EFBFBD><D9A1>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>롼<EFBFBD>ס<EFBFBD><D7A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Х<EFBFBD><D0A5>ˤ⡢<CBA4><E2A1A2><EFBFBD>Υ<EFBFBD><CEA5>ץꥱ<D7A5><EAA5B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD></li></ul><p/></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/JA/calendar.php

@@ -57,4 +57,3 @@
 ͽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤿<EFBFBD><EFBFBD><EFBFBD>ˡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򥯥<EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͽ<EFBFBD>꤬ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>졢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򤹤<EFBFBD><EFBFBD>ܥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><br/>
 <b><3E><><EFBFBD><EFBFBD>:</b><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1><EFBFBD>ʬ<EFBFBD>Ǻ<EFBFBD><C7BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Τ˸¤<CBB8><C2A4>ޤ<EFBFBD><DEA4><EFBFBD></li><p/></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/JA/edit_delete.php

@@ -24,4 +24,3 @@
 ͽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤿<EFBFBD><EFBFBD><EFBFBD>ˡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򥯥<EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͽ<EFBFBD>꤬ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>졢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򤹤<EFBFBD><EFBFBD>ܥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><br/>
 <b><3E><><EFBFBD><EFBFBD>:</b><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1><EFBFBD>ʬ<EFBFBD>Ǻ<EFBFBD><C7BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Τ˸¤<CBB8><C2A4>ޤ<EFBFBD><DEA4><EFBFBD></li><p/></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/JA/view.php

@@ -30,4 +30,3 @@
 <EFBFBD><EFBFBD>ñ<EFBFBD>̤<EFBFBD>ͽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD>ϥǥե<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȤʤäƤ<EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˥<EFBFBD><EFBFBD>󥯥<EFBFBD><EFBFBD>å<EFBFBD><EFBFBD>ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤳<EFBFBD>Ȥ<EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><br/>
 <i><3E><>ǯ:</i><br/>
 ǯñ<EFBFBD>̤<EFBFBD>ͽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ñ<EFBFBD>̤Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǯʬɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD><p/></li></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/help/index.php

@@ -25,4 +25,3 @@ Version: <b><?php echo $setup_info[$appname]['version']; ?></b><p/>
 This app was based on <a href="http://webcalendar.sourceforge.net" target="_new">WebCalendar</a><br/><p/>
 Transformed by <a href="<?php echo $phpgw->link('/email/compose.php','to=skeeter@phpgroupware.org'); ?>" target="_new">Mark A Peters (Skeeter)</a><br/>
 </font>
-<?php $phpgw->common->phpgw_footer(); ?>

calendar/preferences.php

@@ -234,5 +234,4 @@
 	display_item(lang('Print calendars in black & white'),$str);
 
 	$p->pparse('out','pref');
-	$phpgw->common->phpgw_footer();
 ?>

etemplate/process_exec.php

@@ -20,5 +20,3 @@
 	include('../header.inc.php');
 
 	ExecMethod('etemplate.etemplate.process_exec');
-
-	$GLOBALS['phpgw']->common->phpgw_footer();

home.php

@@ -205,5 +205,4 @@
 		}
 		$GLOBALS['phpgw']->preferences->save_repository();
 	}
-	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>

index.php

@@ -106,6 +106,4 @@
 		$_obj->get_list();
 		*/
 	}
-
-	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>

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 */

phpgwapi/inc/class.xslttemplates.inc.php

@@ -1,4 +1,17 @@
 <?php
+
+	if (!extension_loaded('xslt'))
+	{
+		if (PHP_OS == 'Windows' || PHP_OS == 'OS/2')
+		{
+			dl('php_xslt.dll');	
+		}
+		else
+		{
+			dl('xslt.so');
+		}
+	}
+
 	require_once('class.xmltool.inc.php');
 
 	class xslttemplates

phpgwapi/inc/common_functions.inc.php

@@ -528,21 +528,27 @@
 
 		/* error_reporting(0); */
 		list($appname,$classname) = explode('.', $class);
+		$filename = PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php';
+		$included_files = get_included_files();
 
-		if (!isset($GLOBALS['phpgw_info']['flags']['included_classes'][$classname]) ||
+		if (!isset($included_files[$filename]))
-			!$GLOBALS['phpgw_info']['flags']['included_classes'][$classname])
 		{
-			if(@file_exists(PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
+			if(@file_exists($filename))
 			{
-				include(PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
+				include_once($filename);
-				$GLOBALS['phpgw_info']['flags']['included_classes'][$classname] = True;
+				$is_included = True;
 			}
 			else
 			{
-				$GLOBALS['phpgw_info']['flags']['included_classes'][$classname] = False;
+				$is_included = False;
 			}
 		}
-		if($GLOBALS['phpgw_info']['flags']['included_classes'][$classname])
+		else
+		{
+			$is_included = True;
+		}
+		
+		if($is_included)
 		{
 			if ($p1 == '_UNDEF_' && $p1 != 1)
 			{

phpgwapi/inc/functions.inc.php

@@ -268,6 +268,12 @@
 	define('PHPGW_ACL_PRIVATE',16);
 	define('PHPGW_ACL_GROUP_MANAGERS',32);
 
+	/****************************************************************************\
+	* Forcing the footer to run when the rest of the script is done.             *
+	\****************************************************************************/
+	$footer_common = &$GLOBALS['phpgw']->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!!!<br>\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 '<div style="width: 100%; height: 100%; overflow: auto;">';
+				}
 
 				/* Make sure user is keeping his password in order */
 				/* Maybe we should create a common function in the phpgw_accounts_shared.inc.php file */

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

preferences/changeprofile.php

@@ -105,6 +105,3 @@
    </table>
 
   </form>
-<?php
-	$GLOBALS['phpgw']->common->phpgw_footer();
-?>

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.</li><p/>
 <li><b>Monitor Newsgroups:</b><br/>
 Easily choose which news groups you want to set for reading.</li>
-<?php $phpgw->common->phpgw_footer(); ?>

preferences/help/EN/preferences.php

@@ -67,4 +67,3 @@ of the system. Title,Phone number, Comments, Picture upload.</li><p/>
 <li><b>Monitor Newsgroups:</b><br/>
 Easily choose which news groups you want to set for reading.</li></ul>
 </font>
-<?php $phpgw->common->phpgw_footer(); ?>

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 ;)
 </li></ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>

preferences/help/index.php

@@ -23,4 +23,3 @@
 <font face="<?php echo $GLOBALS['phpgw_info']['theme']['font']; ?>" size="2">
 Version: <b><?php echo $setup_info[$appname]['version']; ?></b><p/>
 </font>
-<?php $GLOBALS['phpgw']->common->phpgw_footer(); ?>

preferences/inc/class.uiaclprefs.inc.php

@@ -68,7 +68,6 @@
 			elseif(@isset($save_my_owner))
 			{
 				echo '<center>'.lang('You do not have permission to set ACL\'s in this mode!').'</center>';
-				$GLOBALS['phpgw']->common->phpgw_footer();
 			}
 			*/
 

preferences/index.php

@@ -135,5 +135,4 @@
 
 	$GLOBALS['phpgw']->hooks->process('preferences',array('preferences'));
 	$pref_tpl->pfp('out','list');
-	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>

preferences/preferences.php

@@ -326,6 +326,4 @@
 		$t->pfp('out','list');
 		$t->pfp('out','footer');
 	}
-
-	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>

preferences/templates/default/index.tpl

@@ -1,4 +1,5 @@
 <!-- BEGIN list -->
+<div style="width: 100%; height: 100%; overflow: auto;">
 <table border="0" width="100%" cellspacing="0" cellpadding="0">
  <tr>
   <td align="left">{tabs}</td>
@@ -8,6 +9,7 @@
 <table width="75%" border="0" cellspacing="0" cellpadding="0">
  {rows}
 </table>
+</div>
 <!-- END list -->
 
 <!-- BEGIN app_row -->