From 83a0af34247756a14e27dd2108c86dda775c28cc Mon Sep 17 00:00:00 2001 From: seek3r Date: Wed, 20 Jun 2001 08:36:55 +0000 Subject: [PATCH] trying to get windows support working --- header.inc.php.template | 16 +++++++--------- phpgwapi/inc/class.db.inc.php | 2 +- phpgwapi/inc/class.db_mysql.inc.php | 19 ++++++++++--------- phpgwapi/inc/class.translation.inc.php | 2 +- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/header.inc.php.template b/header.inc.php.template index 2df4cf6fa9..7e12bd72c9 100644 --- a/header.inc.php.template +++ b/header.inc.php.template @@ -73,27 +73,25 @@ /* If you do not want phpGroupWare to be cached by proxy servers, uncomment the following */ /* This is recommended, but not required. */ - //header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 - //header('Pragma: no-cache'); // HTTP/1.0 + /* header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 */ + /* header('Pragma: no-cache'); // HTTP/1.0 */ /**************************************************************************\ * Do not edit these lines * \**************************************************************************/ - // This is required becuase some applications (outside of phpGW) set a cookie named lang - // Which messes up phpGWs $lang array, people will pull there hair out tring to find it. - // This should make there life a little simpler. - unset($lang); define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc'); include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php'); $phpgw_info["server"]["versions"]["phpgwapi"] = $setup_info['phpgwapi']['version']; $phpgw_info['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header']; unset($setup_info); $phpgw_info['server']['versions']['header'] = '1.16'; - // This is a fix for NT + /* This is a fix for NT */ if (!isset($phpgw_info['flags']['noapi']) || !$phpgw_info['flags']['noapi'] == True) { include(PHPGW_API_INC . '/functions.inc.php'); } - // Leave off the final php closing tag, some editors will add - // a \n or space after which will mess up cookies later on + /* + Leave off the final php closing tag, some editors will add + a \n or space after which will mess up cookies later on + */ diff --git a/phpgwapi/inc/class.db.inc.php b/phpgwapi/inc/class.db.inc.php index 0baf1d89a4..a1f4e9d3e6 100644 --- a/phpgwapi/inc/class.db.inc.php +++ b/phpgwapi/inc/class.db.inc.php @@ -1,4 +1,4 @@ +?> \ No newline at end of file diff --git a/phpgwapi/inc/class.db_mysql.inc.php b/phpgwapi/inc/class.db_mysql.inc.php index d50c53254f..d3a150eee5 100644 --- a/phpgwapi/inc/class.db_mysql.inc.php +++ b/phpgwapi/inc/class.db_mysql.inc.php @@ -90,7 +90,7 @@ class db { return $this->Link_ID; } - // This only affects systems not using persistant connections + /* This only affects systems not using persistant connections */ function disconnect() { if($this->Link_ID <> 0) @@ -124,7 +124,7 @@ class db { } /* public: perform a query */ - // I added the line and file section so we can have better error reporting. (jengo) + /* I added the line and file section so we can have better error reporting. (jengo) */ function query($Query_String, $line = "", $file = "") { /* No empty queries, please, since PHP4 chokes on them. */ if ($Query_String == "") @@ -354,8 +354,8 @@ class db { * Test: if (isset($result['meta']['myfield'])) { ... */ - // if no $table specified, assume that we are working with a query - // result + /* if no $table specified, assume that we are working with a query */ + /* result */ if ($table) { $this->connect(); $id = @mysql_list_fields($this->Database, $table); @@ -369,7 +369,7 @@ class db { $count = @mysql_num_fields($id); - // made this IF due to performance (one if is faster than $count if's) + /* made this IF due to performance (one if is faster than $count if's) */ if (!$full) { for ($i=0; $i<$count; $i++) { $res[$i]["table"] = @mysql_field_table ($id, $i); @@ -378,7 +378,7 @@ class db { $res[$i]["len"] = @mysql_field_len ($id, $i); $res[$i]["flags"] = @mysql_field_flags ($id, $i); } - } else { // full + } else { /* full */ $res["num_fields"]= $count; for ($i=0; $i<$count; $i++) { @@ -391,7 +391,7 @@ class db { } } - // free the result only if we were called on a table + /* free the result only if we were called on a table */ if ($table) @mysql_free_result($id); return $res; } @@ -400,7 +400,7 @@ class db { function halt($msg, $line = "", $file = "") { global $phpgw; - $this->unlock(); // Just in case there is a table currently locked + $this->unlock(); /* Just in case there is a table currently locked */ $this->Error = @mysql_error($this->Link_ID); $this->Errno = @mysql_errno($this->Link_ID); @@ -463,6 +463,7 @@ class db { $this->Password = $currentPassword; $this->Database = $currentDatabase; $this->connect(); - //return $return; + /*return $return; */ } } +?> \ No newline at end of file diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php index 06f8945351..15a8c51f13 100644 --- a/phpgwapi/inc/class.translation.inc.php +++ b/phpgwapi/inc/class.translation.inc.php @@ -1,4 +1,4 @@ +?> \ No newline at end of file