holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed frames

Browse Source
This commit is contained in:
jengo 2000-12-18 21:22:02 +00:00
parent 9ca521458c
commit 96791d2cad
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@ -34,8 +34,8 @@
"frame_navbar" => "frames_navbar.tpl" "frame_navbar" => "frames_navbar.tpl"
)); ));
$tpl->set_var("navbar_link",$phpgw->link("index.php?navbarframe=True")); $tpl->set_var("navbar_link",$phpgw->link("index.php","navbarframe=True"));
$tpl->set_var("body_link",$phpgw->link("index.php?framebody=True")); $tpl->set_var("body_link",$phpgw->link("index.php","framebody=True"));
if ($phpgw_info["user"]["preferences"]["common"]["frame_navbar_location"] == "bottom") { if ($phpgw_info["user"]["preferences"]["common"]["frame_navbar_location"] == "bottom") {
$tpl->set_var("frame_size","*,60"); $tpl->set_var("frame_size","*,60");

6
phpgwapi/phpgw_accounts_shared.inc.php
View File

@ -222,7 +222,13 @@
{ {
global $phpgw_info; global $phpgw_info;
unset($phpgw_info["user"]["preferences"][$app_name][$var]); unset($phpgw_info["user"]["preferences"][$app_name][$var]);
}
// This will kill all preferences within a certain app
function reset($app_name)
{
global $phpgw_info;
$phpgw_info["user"]["preferences"][$app_name] = array();
} }
} //end of preferences class } //end of preferences class

5
preferences/settings.php
View File

@ -20,7 +20,7 @@
include("../header.inc.php"); include("../header.inc.php");
if (! $submit) { if (! $submit) {
if ($phpgw_info["server"]["useframes"] == "allowed") { if ($phpgw_info["server"]["useframes"] != "never") {
$target = ' target="_top"'; $target = ' target="_top"';
} }
?> ?>
@ -56,7 +56,7 @@
</tr> </tr>
<?php <?php
} }
if ($phpgw_info["server"]["useframes"] == "always") { if ($phpgw_info["server"]["useframes"] != "never") {
?> ?>
<tr> <tr>
<td><?php echo lang("Navigation bar frame location"); ?>: </td> <td><?php echo lang("Navigation bar frame location"); ?>: </td>
@ -202,6 +202,7 @@
$phpgw->common->phpgw_footer(); $phpgw->common->phpgw_footer();
} else { } else {
$phpgw->preferences->reset("common");
while ($setting = each($settings)) { while ($setting = each($settings)) {
$phpgw->preferences->change("common",$setting[0],$setting[1]); $phpgw->preferences->change("common",$setting[0],$setting[1]);
} }