From 3510d65861a72af27b62c0936de340495dc055fd Mon Sep 17 00:00:00 2001
From: seek3r <seek3r@alumni.egroupware.org>
Date: Wed, 30 May 2001 08:26:24 +0000
Subject: [PATCH] changes to the way the header version is managed

---
 header.inc.php.template        |  6 ++++--
 phpgwapi/inc/functions.inc.php |  2 +-
 phpgwapi/setup/setup.inc.php   |  1 +
 phpgwapi/version.inc.php       | 19 -------------------
 version.inc.php                | 15 ---------------
 5 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 phpgwapi/version.inc.php
 delete mode 100644 version.inc.php

diff --git a/header.inc.php.template b/header.inc.php.template
index 5f3d35e868..7f3567c642 100644
--- a/header.inc.php.template
+++ b/header.inc.php.template
@@ -80,8 +80,10 @@
 	* Do not edit these lines                                                  *
 	\**************************************************************************/
 	define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc');
-	include(PHPGW_SERVER_ROOT.'/version.inc.php');
-	$phpgw_info['server']['versions']['header'] = '1.12';
+	include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php');
+	$phpgw_info['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header'];
+	unset($setup_info);
+	$phpgw_info['server']['versions']['header'] = '1.13';
 	// This is a fix for NT
 	if (!isset($phpgw_info['flags']['noapi']) || !$phpgw_info['flags']['noapi'] == True)
 	{
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 5d557cb189..c448a00229 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -149,7 +149,7 @@
 	\****************************************************************************/
 //	error_reporting(7);
 	/* Make sure the header.inc.php is current. */
-	if ($phpgw_info["server"]["versions"]["header"] < $phpgw_info["server"]["versions"]["current_header"]){
+	if ($phpgw_info['server']['versions']['header'] < $phpgw_info['server']['versions']['current_header']){
 		echo "<center><b>You need to port your settings to the new header.inc.php version.</b></center>";
 		exit;
 	}
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index 8fbfb92c06..3d05adbac0 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -3,6 +3,7 @@
 	$setup_info['phpgwapi']['name']    = 'phpgwapi';
 	$setup_info['phpgwapi']['title']   = 'phpgwapi';
 	$setup_info['phpgwapi']['version'] = '0.9.12.001';
+	$setup_info['phpgwapi']['versions']['current_header'] = '1.13';
 //	$setup_info['phpgwapi']['app_order'] = '6';
 
 	/* The tables this app creates */
diff --git a/phpgwapi/version.inc.php b/phpgwapi/version.inc.php
deleted file mode 100644
index ebee3e534a..0000000000
--- a/phpgwapi/version.inc.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-  /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-  /*
-    This is a completely redundant file, but Im keeping it here because
-    I have some irrational feeling that I should. Seek3r
-  */
-//  $phpgw_info['server']['versions']['phpgwapi'] = $phpgw_info['server']['versions']['phpgwapi'];
-?>
\ No newline at end of file
diff --git a/version.inc.php b/version.inc.php
deleted file mode 100644
index 1aaa4cab14..0000000000
--- a/version.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare                                                             *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-
-	/* $Id$ */
-
-	$phpgw_info['server']['versions']['phpgwapi']       = '0.9.13.001';
-	$phpgw_info['server']['versions']['current_header'] = '1.12';