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

Added in feature from frames. Admins can allow, disable or force them system wide. If they are allowed, there is a user preference

Browse Source 
for it.
This commit is contained in:
jengo 2000-12-11 09:18:09 +00:00
parent 7397c13e90
commit a052584cc7
4 changed files with 60 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/CHANGELOG
View File

@ -23,6 +23,8 @@
- Applied patch to fix md5 en/decryption.
Thanks milosch
- Fixed login message not showing up.
- Added in feature for frames. This can be a user preference, or a global option
for the admin to disable, allow, or force.
[0.9.7] - Fixed SQL error in tts
- Fixed table locking in admin -> edit account

23
index.php
View File

@ -24,14 +24,33 @@
include("header.inc.php");
// Note: I need to add checks to make sure these apps are installed.
if (($phpgw_info["user"]["preferences"]["common"]["useframes"] && $phpgw_info["server"]["useframes"] == "allowed")
|| ($phpgw_info["server"]["useframes"] == "always")) {
if (! $navbarframe && ! $framebody) {
$tpl = new Template($phpgw_info["server"]["template_dir"]);
$tpl->set_file(array("frames" => "frames.tpl"));
$tpl->set_var("navbar_link",$phpgw->link("index.php?navbarframe=True"));
$tpl->set_var("body_link",$phpgw->link("index.php?framebody=True"));
$tpl->pparse("out","frames");
}
if ($navbarframe) {
$phpgw->common->phpgw_header();
$phpgw->common->navbar();
}
} else {
$phpgw->common->phpgw_header();
$phpgw->common->navbar();
}
if ($cd=="yes" && $phpgw_info["user"]["preferences"]["common"]["default_app"]
&& $phpgw_info["user"]["apps"][$phpgw_info["user"]["preferences"]["common"]["default_app"]]) {
$phpgw->redirect($phpgw->link($phpgw_info["server"]["webserver_url"] . "/"
. $phpgw_info["user"]["preferences"]["common"]["default_app"] . "/"));
exit;
}
$phpgw->common->phpgw_header();
$phpgw->common->navbar();
$phpgw->common->read_preferences("addressbook");
$phpgw->common->read_preferences("email");

27
preferences/settings.php
View File

@ -20,9 +20,11 @@
include("../header.inc.php");
if (! $submit) {
if ($phpgw_info["server"]["useframes"] == "allowed") {
$target = ' target="_top"';
}
?>
<form method="POST" action="<?php echo $phpgw->link("settings.php"); ?>">
<form method="POST" action="<?php echo $phpgw->link("settings.php"); ?>"<?php echo $target; ?>>
<table border=0>
<tr>
<td><?php echo lang("max matchs per page"); ?>: </td>
@ -42,6 +44,20 @@
</select>
</td>
</tr>
<?php
if ($phpgw_info["server"]["useframes"] == "allowed") {
?>
<tr>
<td><?php echo lang("Show navigation bar in a frame"); ?>: </td>
<td>
<input type="checkbox" name="settings[useframes]" value="True"<?php echo ($phpgw_info["user"]["preferences"]["common"]["useframes"]?" checked":""); ?>>
</td>
</tr>
<?php
}
?>
<tr>
<td><?php echo lang("time zone offset"); ?>: </td>
<td>
@ -178,6 +194,7 @@
</form>
<?php
$phpgw->common->phpgw_footer();
} else {
$phpgw->preferences->preferences_delete("byappnotheme",$phpgw_info["user"]["account_id"],"common");
@ -196,7 +213,11 @@
$phpgw->db->unlock();
if ($settings["useframes"]) {
Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/index.php"));
exit;
}
Header("Location: " . $phpgw->link("index.php"));
}
$phpgw->common->phpgw_footer();
?>

13
setup/config.php
View File

@ -287,6 +287,19 @@
</tr>
<?php $selected = array(); ?>
<?php $selected[$current_config["useframes"]] = " selected"; ?>
<tr bgcolor="e6e6e6">
<td>Frame support:</td>
<td>
<select name="newsettings[useframes]">
<option value="allowed"<?php echo $selected["allowed"]; ?>>Allow frames</option>
<option value="always"<?php echo $selected["always"]; ?>>Force frames</option>
<option value="never"<?php echo $selected["never"]; ?>>Disable frames</option>
</select>
</td>
</tr>
<?php $selected = array(); ?>
<?php $selected[$current_config["htmlcompliant"]] = " selected"; ?>
<tr bgcolor="e6e6e6">
<td>Use pure HTML compliant code (not fully working yet):</td>