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

the api code is almost in working condition, I am commiting so that others can statr helping me

Browse Source
This commit is contained in:
seek3r 2000-12-18 20:22:02 +00:00
parent 94b13882e9
commit 9b591173d4
5 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
header.inc.php.template
View File

@ -29,7 +29,7 @@
\**************************************************************************/ \**************************************************************************/
$phpgw_info["server"]["server_root"] = "__SERVER_ROOT__"; $phpgw_info["server"]["server_root"] = "__SERVER_ROOT__";
$phpgw_info["server"]["include_root"] = "__INCLUDE_ROOT__"; $phpgw_info["server"]["api_dir"] = "__API_DIR__";
$phpgw_domain["default"] = array ( $phpgw_domain["default"] = array (
"db_host" => "__DB_HOST__", "db_host" => "__DB_HOST__",
@ -79,11 +79,11 @@
* Do not edit these lines * * Do not edit these lines *
\**************************************************************************/ \**************************************************************************/
include($phpgw_info["server"]["server_root"]."/version.inc.php"); include($phpgw_info["server"]["server_root"]."/version.inc.php");
$phpgw_info["server"]["header_version"] = "1.5"; $phpgw_info["server"]["header_version"] = "1.6";
// This is a fix for NT // This is a fix for NT
if (!isset($phpgw_info["flags"]["noapi"]) || if (!isset($phpgw_info["flags"]["noapi"]) ||
!$phpgw_info["flags"]["noapi"] == True){ !$phpgw_info["flags"]["noapi"] == True){
include($phpgw_info["server"]["include_root"] . "/phpgwapi/phpgw.inc.php"); include($phpgw_info["server"]["api_dir"] . "/phpgw.inc.php");
} }
// Leave off the final php closing tag, some editors will add // Leave off the final php closing tag, some editors will add

13
phpgwapi/phpgw.inc.php
View File

@ -12,13 +12,12 @@
/* $Id$ */ /* $Id$ */
$d1 = strtolower(substr($phpgw_info["server"]["include_root"],0,3)); $d1 = strtolower(substr($phpgw_info["server"]["api_dir"],0,3));
$d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3)); $d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
$d3 = strtolower(substr($phpgw_info["server"]["api_dir"],0,3)); if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp") {
if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp" || $d3 == "htt" || $d3 == "ftp") {
echo "Failed attempt to break in via an old Security Hole!<br>\n"; echo "Failed attempt to break in via an old Security Hole!<br>\n";
exit; exit;
} unset($d1);unset($d2);unset($d3); } unset($d1);unset($d2);
error_reporting(7); error_reporting(7);
@ -32,7 +31,7 @@
/**************************************************************************\ /**************************************************************************\
* Load up all the base files * * Load up all the base files *
\**************************************************************************/ \**************************************************************************/
include($phpgw_info["server"]["include_root"] . "/phpgwapi/phpgw_info.inc.php"); include($phpgw_info["server"]["api_dir"] . "/phpgw_info.inc.php");
/**************************************************************************\ /**************************************************************************\
* Required classes * * Required classes *
@ -364,13 +363,13 @@
/**************************************************************************\ /**************************************************************************\
* These lines load up the themes * * These lines load up the themes *
\**************************************************************************/ \**************************************************************************/
include($phpgw_info["server"]["server_root"] . "/themes/" . include($phpgw_info["server"]["api_dir"] . "/themes/" .
$phpgw_info["user"]["preferences"]["common"]["theme"] . ".theme"); $phpgw_info["user"]["preferences"]["common"]["theme"] . ".theme");
if ($phpgw_info["theme"]["bg_color"] == "") { if ($phpgw_info["theme"]["bg_color"] == "") {
/* Looks like there was a problem finding that theme. Try the default */ /* Looks like there was a problem finding that theme. Try the default */
echo "Warning: error locating selected theme"; echo "Warning: error locating selected theme";
include ($phpgw_info["server"]["server_root"] . "/themes/default.theme"); include ($phpgw_info["server"]["api_dir"] . "/themes/default.theme");
if ($phpgw_info["theme"]["bg_color"] == "") { if ($phpgw_info["theme"]["bg_color"] == "") {
// Hope we don't get to this point. Better then the user seeing a // Hope we don't get to this point. Better then the user seeing a
// complety back screen and not know whats going on // complety back screen and not know whats going on

2
phpgwapi/phpgw_common.inc.php
View File

@ -11,7 +11,7 @@
/* $Id$ */ /* $Id$ */
$d1 = strtolower(substr($phpgw_info["server"]["include_root"],0,3)); $d1 = strtolower(substr($phpgw_info["server"]["api_dir"],0,3));
$d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3)); $d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp") { if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp") {
echo "Failed attempt to break in via an old Security Hole!<br>\n"; echo "Failed attempt to break in via an old Security Hole!<br>\n";

14
phpgwapi/phpgw_info.inc.php
View File

@ -12,13 +12,12 @@
/* $Id$ */ /* $Id$ */
$d1 = strtolower(substr($phpgw_info["server"]["include_root"],0,3)); $d1 = strtolower(substr($phpgw_info["server"]["api_dir"],0,3));
$d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3)); $d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
$d3 = strtolower(substr($phpgw_info["server"]["api_dir"],0,3)); if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp") {
if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp" || $d3 == "htt" || $d3 == "ftp") {
echo "Failed attempt to break in via an old Security Hole!<br>\n"; echo "Failed attempt to break in via an old Security Hole!<br>\n";
exit; exit;
} unset($d1);unset($d2);unset($d3); } unset($d1);unset($d2);
magic_quotes_runtime(false); magic_quotes_runtime(false);
@ -28,15 +27,12 @@
echo "!!! PLEASE CORRECT THIS SITUATION !!!"; echo "!!! PLEASE CORRECT THIS SITUATION !!!";
} }
/* Additional dirs that are set from exsisting information. */
$phpgw_info["server"]["api_dir"] = $phpgw_info["server"]["include_root"] . "/phpgwapi";
if (empty($phpgw_info["server"]["default_tplset"])){ if (empty($phpgw_info["server"]["default_tplset"])){
$phpgw_info["server"]["default_tplset"] = "default"; $phpgw_info["server"]["default_tplset"] = "default";
} }
if (empty($phpgw_info["server"]["template_dir"])){ if (empty($phpgw_info["server"]["template_dir"])){
$phpgw_info["server"]["template_dir"] = $phpgw_info["server"]["include_root"]."/templates/".$phpgw_info["server"]["default_tplset"]; $phpgw_info["server"]["template_dir"] = $phpgw_info["server"]["api_dir"]."/templates/".$phpgw_info["server"]["default_tplset"];
} }
if (!isset($phpgw_domain)) { // make them fix their header if (!isset($phpgw_domain)) { // make them fix their header
@ -98,7 +94,7 @@
{ {
global $phpgw, $phpgw_info, $cd, $colspan; global $phpgw, $phpgw_info, $cd, $colspan;
$phpgw_info["server"]["images_dir"] = $phpgw_info["server"]["webserver_url"] . "/images"; $phpgw_info["server"]["images_dir"] = $phpgw_info["server"]["webserver_url"] . "/images";
$phpgw_info["server"]["template_dir"] = $phpgw_info["server"]["include_root"] . "/templates/" $phpgw_info["server"]["template_dir"] = $phpgw_info["server"]["api_dir"] . "/templates/"
. $phpgw_info["server"]["default_tplset"]; . $phpgw_info["server"]["default_tplset"];
$phpgw_info["server"]["app_root"] = $phpgw_info["server"]["server_root"]."/".$phpgw_info["flags"]["currentapp"]; $phpgw_info["server"]["app_root"] = $phpgw_info["server"]["server_root"]."/".$phpgw_info["flags"]["currentapp"];

2
version.inc.php
View File

@ -12,4 +12,4 @@
/* $Id$ */ /* $Id$ */
$phpgw_info["server"]["version"] = "0.9.8pre5"; $phpgw_info["server"]["version"] = "0.9.8pre5";
$phpgw_info["server"]["current_header_version"] = "1.5"; $phpgw_info["server"]["current_header_version"] = "1.6";