Merging develop back to master. Develop has been installed locally for UAT (passed) (#527)

RussH · web-flow · commit 2764566bcb37 · 2021-03-18T10:08:40.000Z
@RussH updated version to 0.9.6 @pribeiro42 Update index.php (#498) … a0b3324 @KPull Fix a syntax error in the Mailer.php file (#511) … fb73517 @RussH Update composer.json (#525) …
diff --git a/ajax.php b/ajax.php
@@ -3,7 +3,7 @@
  * CATS
  * AJAX Delegation Module
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/careers/index.php b/careers/index.php
@@ -3,7 +3,7 @@
  * CATS
  * Careers Page Display Module
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
@@ -34,6 +34,7 @@
 $careerPage = true;
 
 chdir('..');
+include_once('config.php') ;
 include_once(LEGACY_ROOT . '/lib/CATSUtility.php');
 include_once(CATSUtility::getIndexName());
 
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "OpenCATS/OpenCATS",
+    "name": "opencats/opencats",
     "require-dev": {
         "behat/behat": "~3.0.4",
         "phpunit/phpunit": "^7",
diff --git a/constants.php b/constants.php
@@ -41,7 +41,9 @@
 );
 
 /* CATS Version */
-define('CATS_VERSION', '0.9.5.2');
+
+define('CATS_VERSION', '0.9.6');
+
 
 /* Copyright information at bottom of pages. */
 define('COPYRIGHT_HTML', '&copy; 2007-2020 OpenCATS.');
diff --git a/index.php b/index.php
@@ -3,7 +3,7 @@
  * CATS
  * Index (Delegation Module)
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/modules/activity/dataGrids.php b/modules/activity/dataGrids.php
@@ -3,7 +3,7 @@
  * CATS
  * Contacts Datagrid
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/modules/companies/dataGrids.php b/modules/companies/dataGrids.php
@@ -3,7 +3,7 @@
  * CATS
  * Companies Datagrid
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/modules/contacts/dataGrids.php b/modules/contacts/dataGrids.php
@@ -3,7 +3,7 @@
  * CATS
  * Contacts Datagrid
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/modules/home/dataGrids.php b/modules/home/dataGrids.php
@@ -3,7 +3,7 @@
  * CATS
  * Home Datagrid
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/modules/joborders/dataGrids.php b/modules/joborders/dataGrids.php
@@ -3,7 +3,7 @@
  * CATS
  * Joborder Datagrid
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/modules/lists/dataGrids.php b/modules/lists/dataGrids.php
@@ -3,7 +3,7 @@
  * CATS
  * Companies Datagrid
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/rss/index.php b/rss/index.php
@@ -3,7 +3,7 @@
  * CATS
  * RSS Display Module
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *
diff --git a/xml/index.php b/xml/index.php
@@ -3,7 +3,7 @@
  * CATS
  * RSS Display Module
  *
- * CATS Version: 0.9.4 Countach
+ * CATS Version: 0.9.6
  *
  * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
  *

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* CATS`
`4`	`4`	`* AJAX Delegation Module`
`5`	`5`	`*`
`6`		`- * CATS Version: 0.9.4 Countach`
	`6`	`+ * CATS Version: 0.9.6`
`7`	`7`	`*`
`8`	`8`	`* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.`
`9`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* CATS`
`4`	`4`	`* Careers Page Display Module`
`5`	`5`	`*`
`6`		`- * CATS Version: 0.9.4 Countach`
	`6`	`+ * CATS Version: 0.9.6`
`7`	`7`	`*`
`8`	`8`	`* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.`
`9`	`9`	`*`
`@@ -34,6 +34,7 @@`
`34`	`34`	`$careerPage = true;`
`35`	`35`
`36`	`36`	`chdir('..');`
	`37`	`+include_once('config.php') ;`
`37`	`38`	`include_once(LEGACY_ROOT . '/lib/CATSUtility.php');`
`38`	`39`	`include_once(CATSUtility::getIndexName());`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "OpenCATS/OpenCATS",`
	`2`	`+ "name": "opencats/opencats",`
`3`	`3`	`"require-dev": {`
`4`	`4`	`"behat/behat": "~3.0.4",`
`5`	`5`	`"phpunit/phpunit": "^7",`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* CATS`
`4`	`4`	`* Index (Delegation Module)`
`5`	`5`	`*`
`6`		`- * CATS Version: 0.9.4 Countach`
	`6`	`+ * CATS Version: 0.9.6`
`7`	`7`	`*`
`8`	`8`	`* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.`
`9`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* CATS`
`4`	`4`	`* Contacts Datagrid`
`5`	`5`	`*`
`6`		`- * CATS Version: 0.9.4 Countach`
	`6`	`+ * CATS Version: 0.9.6`
`7`	`7`	`*`
`8`	`8`	`* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.`
`9`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* CATS`
`4`	`4`	`* Companies Datagrid`
`5`	`5`	`*`
`6`		`- * CATS Version: 0.9.4 Countach`
	`6`	`+ * CATS Version: 0.9.6`
`7`	`7`	`*`
`8`	`8`	`* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.`
`9`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* CATS`
`4`	`4`	`* Home Datagrid`
`5`	`5`	`*`
`6`		`- * CATS Version: 0.9.4 Countach`
	`6`	`+ * CATS Version: 0.9.6`
`7`	`7`	`*`
`8`	`8`	`* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.`
`9`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* CATS`
`4`	`4`	`* Joborder Datagrid`
`5`	`5`	`*`
`6`		`- * CATS Version: 0.9.4 Countach`
	`6`	`+ * CATS Version: 0.9.6`
`7`	`7`	`*`
`8`	`8`	`* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.`
`9`	`9`	`*`