Skip to content

Legacy root added to includes #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlespiau merged 3 commits into from
May 2, 2017
Merged

Legacy root added to includes #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9e52b9
added legacy_root into includes, defined in config.php
May 1, 2017
5fc6803
added legacy root into tests
May 1, 2017
394f7d9
missing legacy_root added
May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions QueueCLI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@
chdir($CATSHome);

include_once('./config.php');
include_once('./constants.php');
include_once('./lib/CATSUtility.php');
include_once('./lib/DatabaseConnection.php');
include_once('./lib/DateUtility.php');
include_once('./lib/Template.php');
include_once('./lib/Users.php');
include_once('./lib/MRU.php');
include_once('./lib/Hooks.php');
include_once('./lib/Session.php'); /* Depends: MRU, Users, DatabaseConnection. */
include_once('./lib/UserInterface.php'); /* Depends: Template, Session. */
include_once('./lib/ModuleUtility.php'); /* Depends: UserInterface */
include_once('./lib/TemplateUtility.php'); /* Depends: ModuleUtility, Hooks */
include_once('./lib/QueueProcessor.php');
include_once('./modules/queue/constants.php');
include_once(LEGACY_ROOT . '/constants.php');
include_once(LEGACY_ROOT . '/lib/CATSUtility.php');
include_once(LEGACY_ROOT . '/lib/DatabaseConnection.php');
include_once(LEGACY_ROOT . '/lib/DateUtility.php');
include_once(LEGACY_ROOT . '/lib/Template.php');
include_once(LEGACY_ROOT . '/lib/Users.php');
include_once(LEGACY_ROOT . '/lib/MRU.php');
include_once(LEGACY_ROOT . '/lib/Hooks.php');
include_once(LEGACY_ROOT . '/lib/Session.php'); /* Depends: MRU, Users, DatabaseConnection. */
include_once(LEGACY_ROOT . '/lib/UserInterface.php'); /* Depends: Template, Session. */
include_once(LEGACY_ROOT . '/lib/ModuleUtility.php'); /* Depends: UserInterface */
include_once(LEGACY_ROOT . '/lib/TemplateUtility.php'); /* Depends: ModuleUtility, Hooks */
include_once(LEGACY_ROOT . '/lib/QueueProcessor.php');
include_once(LEGACY_ROOT . '/modules/queue/constants.php');

/* Give the session a unique name to avoid conflicts and start the session. */
@session_name(CATS_SESSION_NAME);
Expand Down
12 changes: 6 additions & 6 deletions ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@


include_once('./config.php');
include_once('./constants.php');
include_once('./lib/DatabaseConnection.php');
include_once('./lib/Session.php'); /* Depends: MRU, Users, DatabaseConnection. */
include_once('./lib/AJAXInterface.php');
include_once('./lib/CATSUtility.php');
include_once(LEGACY_ROOT . '/constants.php');
include_once(LEGACY_ROOT . '/lib/DatabaseConnection.php');
include_once(LEGACY_ROOT . '/lib/Session.php'); /* Depends: MRU, Users, DatabaseConnection. */
include_once(LEGACY_ROOT . '/lib/AJAXInterface.php');
include_once(LEGACY_ROOT . '/lib/CATSUtility.php');


header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
Expand Down Expand Up @@ -107,7 +107,7 @@

if (!isset($_REQUEST['nobuffer']))
{
include_once('./lib/Hooks.php');
include_once(LEGACY_ROOT . '/lib/Hooks.php');

ob_start();
include($filename);
Expand Down
2 changes: 1 addition & 1 deletion ajax/deleteActivity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* $Id: deleteActivity.php 1479 2007-01-17 00:22:21Z will $
*/

include_once('./lib/ActivityEntries.php');
include_once(LEGACY_ROOT . '/lib/ActivityEntries.php');


$interface = new SecureAJAXInterface();
Expand Down
6 changes: 3 additions & 3 deletions ajax/editActivity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
*/


include_once('./lib/StringUtility.php');
include_once('./lib/ActivityEntries.php');
include_once('./lib/Pipelines.php');
include_once(LEGACY_ROOT . '/lib/StringUtility.php');
include_once(LEGACY_ROOT . '/lib/ActivityEntries.php');
include_once(LEGACY_ROOT . '/lib/Pipelines.php');


$interface = new SecureAJAXInterface();
Expand Down
4 changes: 2 additions & 2 deletions ajax/getAttachmentLocal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

$interface = new SecureAJAXInterface();

include_once('./lib/CommonErrors.php');
include_once('./lib/Attachments.php');
include_once(LEGACY_ROOT . '/lib/CommonErrors.php');
include_once(LEGACY_ROOT . '/lib/Attachments.php');

@ini_set('memory_limit', '256M');

Expand Down
2 changes: 1 addition & 1 deletion ajax/getCandidateIdByEmail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

$interface = new SecureAJAXInterface();

include ('lib/Candidates.php');
include (LEGACY_ROOT .'/lib/Candidates.php');

if (!isset($_REQUEST['email']))
{
Expand Down
2 changes: 1 addition & 1 deletion ajax/getCandidateIdByPhone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

$interface = new SecureAJAXInterface();

include ('lib/Candidates.php');
include (LEGACY_ROOT . '/lib/Candidates.php');

if (!isset($_REQUEST['phone']))
{
Expand Down
2 changes: 1 addition & 1 deletion ajax/getCompanyContacts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* $Id: getCompanyContacts.php 1892 2007-02-20 06:44:04Z will $
*/

include_once('./lib/Companies.php');
include_once(LEGACY_ROOT . '/lib/Companies.php');


$interface = new SecureAJAXInterface();
Expand Down
2 changes: 1 addition & 1 deletion ajax/getCompanyLocation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* $Id: getCompanyLocation.php 2359 2007-04-21 22:49:17Z will $
*/

include_once('./lib/Companies.php');
include_once(LEGACY_ROOT . '/lib/Companies.php');


$interface = new SecureAJAXInterface();
Expand Down
2 changes: 1 addition & 1 deletion ajax/getCompanyLocationAndDepartments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* $Id: getCompanyLocationAndDepartments.php 2359 2007-04-21 22:49:17Z will $
*/

include_once('./lib/Companies.php');
include_once(LEGACY_ROOT . '/lib/Companies.php');


$interface = new SecureAJAXInterface();
Expand Down
4 changes: 2 additions & 2 deletions ajax/getCompanyNames.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
* $Id: getCompanyNames.php 2367 2007-04-23 23:24:05Z will $
*/

include_once('./lib/Companies.php');
include_once('./lib/Search.php');
include_once(LEGACY_ROOT . '/lib/Companies.php');
include_once(LEGACY_ROOT . '/lib/Search.php');


$interface = new SecureAJAXInterface();
Expand Down
6 changes: 3 additions & 3 deletions ajax/getDataGridPager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
* $Id: getDataGridPager.php 3078 2007-09-21 20:25:28Z will $
*/

include_once('./lib/CATSUtility.php');
include_once('./lib/TemplateUtility.php');
include_once('./lib/DataGrid.php');
include_once(LEGACY_ROOT . '/lib/CATSUtility.php');
include_once(LEGACY_ROOT . '/lib/TemplateUtility.php');
include_once(LEGACY_ROOT . '/lib/DataGrid.php');

$interface = new SecureAJAXInterface();

Expand Down
6 changes: 3 additions & 3 deletions ajax/getDataItemJobOrders.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@
switch ($dataItemType)
{
case DATA_ITEM_CANDIDATE:
include_once('./lib/Candidates.php');
include_once(LEGACY_ROOT . '/lib/Candidates.php');
$dataItem = new Candidates($siteID);
break;

case DATA_ITEM_COMPANY:
include_once('./lib/Companies.php');
include_once(LEGACY_ROOT . '/lib/Companies.php');
$dataItem = new Companies($siteID);
break;

case DATA_ITEM_CONTACT:
include_once('./lib/Contacts.php');
include_once(LEGACY_ROOT . '/lib/Contacts.php');
$dataItem = new Contacts($siteID);
break;

Expand Down
6 changes: 3 additions & 3 deletions ajax/getParsedAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
* $Id: getParsedAddress.php 2492 2007-05-25 21:12:47Z will $
*/

include_once('./lib/StringUtility.php');
include_once('./lib/AddressParser.php');
include_once('./lib/ResultSetUtility.php');
include_once(LEGACY_ROOT . '/lib/StringUtility.php');
include_once(LEGACY_ROOT . '/lib/AddressParser.php');
include_once(LEGACY_ROOT . '/lib/ResultSetUtility.php');


$interface = new AJAXInterface();
Expand Down
2 changes: 1 addition & 1 deletion ajax/getPipelineDetails.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* $Id: getPipelineDetails.php 2976 2007-08-30 18:18:48Z andrew $
*/

include_once('./lib/Pipelines.php');
include_once(LEGACY_ROOT . '/lib/Pipelines.php');


$interface = new SecureAJAXInterface();
Expand Down
12 changes: 6 additions & 6 deletions ajax/getPipelineJobOrder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
* $Id: getPipelineJobOrder.php 3814 2007-12-06 17:54:28Z brian $
*/

include_once('./lib/Pipelines.php');
include_once('./lib/TemplateUtility.php');
include_once('./lib/StringUtility.php');
include_once('./lib/CATSUtility.php');
include_once('./lib/Hooks.php');
include_once('./lib/JobOrders.php');
include_once(LEGACY_ROOT . '/lib/Pipelines.php');
include_once(LEGACY_ROOT . '/lib/TemplateUtility.php');
include_once(LEGACY_ROOT . '/lib/StringUtility.php');
include_once(LEGACY_ROOT . '/lib/CATSUtility.php');
include_once(LEGACY_ROOT . '/lib/Hooks.php');
include_once(LEGACY_ROOT . '/lib/JobOrders.php');

$interface = new SecureAJAXInterface();

Expand Down
2 changes: 1 addition & 1 deletion ajax/setCandidateJobOrderRating.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* $Id: setCandidateJobOrderRating.php 1479 2007-01-17 00:22:21Z will $
*/

include_once('./lib/Pipelines.php');
include_once(LEGACY_ROOT . '/lib/Pipelines.php');


$interface = new SecureAJAXInterface();
Expand Down
2 changes: 1 addition & 1 deletion ajax/testEmailSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* $Id: testEmailSettings.php 2101 2007-03-06 00:20:17Z brian $
*/

include_once('./lib/Mailer.php');
include_once(LEGACY_ROOT . '/lib/Mailer.php');


$interface = new SecureAJAXInterface();
Expand Down
4 changes: 2 additions & 2 deletions ajax/zipLookup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* OpenCATS
* AJAX Street/City/State lookup via Zip Interface
*/
include_once('./lib/ZipLookup.php');
include_once('./lib/StringUtility.php');
include_once(LEGACY_ROOT . '/lib/ZipLookup.php');
include_once(LEGACY_ROOT . '/lib/StringUtility.php');

$interface = new AJAXInterface();

Expand Down
2 changes: 1 addition & 1 deletion careers/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
$careerPage = true;

chdir('..');
include_once('./lib/CATSUtility.php');
include_once(LEGACY_ROOT . '/lib/CATSUtility.php');
include_once(CATSUtility::getIndexName());

?>
8 changes: 7 additions & 1 deletion config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
/* License key. */
define('LICENSE_KEY','3163GQ-54ISGW-14E4SHD-ES9ICL-X02DTG-GYRSQ6');

/* legacy root. */
if( !defined('LEGACY_ROOT') )
{
define('LEGACY_ROOT', '.');
}

/* Database configuration. */
define('DATABASE_USER', 'cats');
define('DATABASE_PASS', 'password');
Expand Down Expand Up @@ -289,7 +295,7 @@


/*
require_once('.\constants.php');
require_once(LEGACY_ROOT . '/constants.php');
// defining user roles
const USER_ROLES = array(
'candidate' => array('Candidate', 'candidate', 'This is a candidate.', ACCESS_LEVEL_SA, ACCESS_LEVEL_READ),
Expand Down
30 changes: 15 additions & 15 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/* Do we need to run the installer? */
if (!file_exists('INSTALL_BLOCK') && !isset($_POST['performMaintenence']))
{
include('modules/install/notinstalled.php');
include(LEGACY_ROOT .'/modules/install/notinstalled.php');
die();
}

Expand All @@ -66,18 +66,18 @@
}

include_once('./config.php');
include_once('./constants.php');
include_once('./lib/CommonErrors.php');
include_once('./lib/CATSUtility.php');
include_once('./lib/DatabaseConnection.php');
include_once('./lib/Template.php');
include_once('./lib/Users.php');
include_once('./lib/MRU.php');
include_once('./lib/Hooks.php');
include_once('./lib/Session.php'); /* Depends: MRU, Users, DatabaseConnection. */
include_once('./lib/UserInterface.php'); /* Depends: Template, Session. */
include_once('./lib/ModuleUtility.php'); /* Depends: UserInterface */
include_once('./lib/TemplateUtility.php'); /* Depends: ModuleUtility, Hooks */
include_once(LEGACY_ROOT . '/constants.php');
include_once(LEGACY_ROOT . '/lib/CommonErrors.php');
include_once(LEGACY_ROOT . '/lib/CATSUtility.php');
include_once(LEGACY_ROOT . '/lib/DatabaseConnection.php');
include_once(LEGACY_ROOT . '/lib/Template.php');
include_once(LEGACY_ROOT . '/lib/Users.php');
include_once(LEGACY_ROOT . '/lib/MRU.php');
include_once(LEGACY_ROOT . '/lib/Hooks.php');
include_once(LEGACY_ROOT . '/lib/Session.php'); /* Depends: MRU, Users, DatabaseConnection. */
include_once(LEGACY_ROOT . '/lib/UserInterface.php'); /* Depends: Template, Session. */
include_once(LEGACY_ROOT . '/lib/ModuleUtility.php'); /* Depends: UserInterface */
include_once(LEGACY_ROOT . '/lib/TemplateUtility.php'); /* Depends: ModuleUtility, Hooks */


/* Give the session a unique name to avoid conflicts and start the session. */
Expand Down Expand Up @@ -106,7 +106,7 @@ function stripslashes_deep($value)
}
if (get_magic_quotes_gpc())
{
include_once('./lib/ArrayUtility.php');
include_once(LEGACY_ROOT . '/lib/ArrayUtility.php');

$_GET = array_map('stripslashes_deep', $_GET);
$_POST = array_map('stripslashes_deep', $_POST);
Expand Down Expand Up @@ -151,7 +151,7 @@ function stripslashes_deep($value)
if (ModuleUtility::moduleExists("asp") && ModuleUtility::moduleExists("website"))
{
// FIXME: Can we optimize this a bit...?
include_once('modules/asp/lib/General.php');
include_once(LEGACY_ROOT .'/modules/asp/lib/General.php');

if (!(isset($careerPage) && $careerPage) &&
!(isset($rssPage) && $rssPage) &&
Expand Down
4 changes: 2 additions & 2 deletions installtest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
// FIXME: Test config readable.

include_once('./config.php');
include_once('./constants.php');
include_once('./lib/InstallationTests.php');
include_once(LEGACY_ROOT . '/constants.php');
include_once(LEGACY_ROOT . '/lib/InstallationTests.php');


define('REQUIRED_SCHEMA_VERSION', '1200');
Expand Down
2 changes: 1 addition & 1 deletion installwizard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
$phpVersionParts = explode('.', $phpVersion);
if ($phpVersionParts[0] >= 5)
{
include_once('lib/TemplateUtility.php');
include_once(LEGACY_ROOT . '/lib/TemplateUtility.php');
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions lib/ActivityEntries.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
/**
* Candidates library.
*/
include_once('./lib/Candidates.php');
include_once(LEGACY_ROOT . '/lib/Candidates.php');

/**
* Contacts library.
*/
include_once('./lib/Contacts.php');
include_once(LEGACY_ROOT . '/lib/Contacts.php');

/**
* Job Orders library.
*/
include_once('./lib/JobOrders.php');
include_once(LEGACY_ROOT . '/lib/JobOrders.php');


/**
Expand Down
4 changes: 2 additions & 2 deletions lib/AddressParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
/**
* Aray Utility library.
*/
include_once('./lib/ArrayUtility.php');
include_once(LEGACY_ROOT . '/lib/ArrayUtility.php');

/**
* Result Set Utility library.
*/
include_once('./lib/ResultSetUtility.php');
include_once(LEGACY_ROOT . '/lib/ResultSetUtility.php');


/**
Expand Down
Loading