diff --git a/header.inc.php.template b/header.inc.php.template index d1f96d3936..d24a5168e4 100644 --- a/header.inc.php.template +++ b/header.inc.php.template @@ -30,8 +30,6 @@ $phpgw_info["server"]["server_root"] = "__SERVER_ROOT__"; $phpgw_info["server"]["include_root"] = "__INCLUDE_ROOT__"; - /* This is the basic include needed on each page for phpGroupWare application compliance */ - $phpgw_info["flags"]["htmlcompliant"] = __HTMLCOMPLIANT__; $phpgw_domain["default"] = array ( "db_host" => "__DB_HOST__", diff --git a/setup/config.php b/setup/config.php index 5bea214216..2655b0ed0f 100644 --- a/setup/config.php +++ b/setup/config.php @@ -286,6 +286,18 @@ </tr> <?php $selected = array(); ?> + <?php $selected[$current_config["htmlcompliant"]] = " selected"; ?> + <tr bgcolor="e6e6e6"> + <td>Use pure HTML compliant code (not fully working yet):</td> + <td> + <select name="newsettings[htmlcompliant]"> + <option value="bottom"<?php echo $selected["True"]; ?>>True</option> + <option value="top"<?php echo $selected["False"]; ?>>False</option> + </select> + </td> + </tr> + <?php $selected = array(); ?> + <tr bgcolor="e6e6e6"> <td>Would like like phpGroupWare to check for new version<br>when admins login ?:</td> <td><input type="checkbox" name="newsettings[checkfornewversion]" value="True"<?php echo ($current_config["checkfornewversion"]?" checked":""); ?>></td> diff --git a/setup/createheader.php b/setup/createheader.php index 28a78648a7..0483a95117 100644 --- a/setup/createheader.php +++ b/setup/createheader.php @@ -131,23 +131,6 @@ <input type=hidden name=write_config value=true> <tr><td colspan=2><b>Server Root</b><br><input type=text name=server_root size=80 value="<? echo $phpgw_info["server"]["server_root"] ?>"></td></tr> <tr><td colspan=2><b>Include Root</b><br><input type=text name=include_root size=80 value="<? echo $phpgw_info["server"]["include_root"] ?>"></td></tr> - <tr><td colspan=2><b>htmlcompliant<br> - <select name=htmlcompliant > - <? - if($phpgw_info["flags"]["htmlcompliant"] == True) { - ?> - <option value=True selected>True - <option value=False>False - <? - } else { - ?> - <option value=True>True - <option value=False selected>False - <? - } - ?> - </select> - </td></tr> <tr><td><b>DB Host</b><br><input type=text name=db_host value="<? echo $phpgw_info["server"]["db_host"] ?>"></td><td>Hostname/IP of Databaseserver</td></tr> <tr><td><b>DB Name</b><br><input type=text name=db_name value="<? echo $phpgw_info["server"]["db_name"] ?>"></td><td>Name of Database</td></tr> <tr><td><b>DB User</b><br><input type=text name=db_user value="<? echo $phpgw_info["server"]["db_user"] ?>"></td><td>Name of DB User as phpgroupware has to connect as</td></tr> diff --git a/setup/sql/common_default_records.inc.php b/setup/sql/common_default_records.inc.php index d334458d1a..295f141808 100644 --- a/setup/sql/common_default_records.inc.php +++ b/setup/sql/common_default_records.inc.php @@ -46,6 +46,7 @@ $db->query("insert into config (config_name, config_value) values ('httpproxy_server', '')"); $db->query("insert into config (config_name, config_value) values ('httpproxy_port', '')"); $db->query("insert into config (config_name, config_value) values ('showpoweredbyon', 'bottom')"); + $db->query("insert into config (config_name, config_value) values ('htmlcompliant', 'False')"); $db->query("insert into config (config_name, config_value) values ('checkfornewversion', 'False')"); $db->query("insert into config (config_name, config_value) values ('freshinstall', 'True')"); }