Skip to content
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.

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

Merge develop back to Master for a new release. #493

Merged
merged 120 commits into from
Oct 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
34b20ca
toggle quickactionmenu visibility by clicking it
Kixy25 Nov 29, 2016
c7ae52c
Candidate duplicates module added and integrated with other modules
Kixy25 Nov 29, 2016
6b37f0a
corrected header of file to follow license
Nov 29, 2016
3d1e11c
Merge branch 'master' into candidate_duplicates
Nov 30, 2016
6678c5e
Merge branch 'master' into candidate_duplicates
Dec 5, 2016
0f33c1b
duplicates module integrated into candidates module and added access …
Kixy25 Dec 5, 2016
a8562d3
Merge branch 'master' into candidate_duplicates
Dec 6, 2016
5fa6458
Merge branch 'master' into candidate_duplicates
Dec 10, 2016
ffce535
Merge branch 'master' into candidate_duplicates
Dec 10, 2016
cc38c5d
added duplicates quick action menu
Dec 10, 2016
035cbbd
quickaction for duplicates added
Dec 10, 2016
4dff27a
rename of DuplicateCandidate to CandidateDuplicate
Dec 10, 2016
b1a14d7
tag fix
Kixy25 Dec 12, 2016
519d90b
quickaction fixes
Kixy25 Dec 12, 2016
b0306f7
Merge branch 'master' into candidate_duplicates
Dec 21, 2016
6410f56
Merge branch 'master' into candidate_duplicates
Dec 23, 2016
5c7d3e3
acl related refactoring ifor duplicates
Dec 23, 2016
1e8e571
fixed typo error
Dec 24, 2016
faf3f1a
fixed typo error
Dec 24, 2016
1fa02de
Merge branch 'master' into candidate_duplicates
Jan 6, 2017
c9b3cba
Merge branch 'master' into candidate_duplicates
Jan 8, 2017
60d7ebc
Merge branch 'master' into candidate_duplicates
Jan 9, 2017
8a2bbc3
fixed duplicate quick action menu - added permissions and access level
Kixy25 Jan 10, 2017
9ab60c2
fixed duplicate quick action menu - added permissions and access level
Kixy25 Jan 10, 2017
bdcd8db
Merge branch 'master' into candidate_duplicates
Jan 16, 2017
5679196
Merge branch 'quickactionmenu_fix' into candidate_duplicates
Kixy25 Feb 6, 2017
5531084
removing duplicate info from function parameters
Kixy25 Feb 6, 2017
03ab64e
adjusting candidate datagrid
Kixy25 Feb 6, 2017
ddebc29
removing unnecessary duplicate code
Kixy25 Feb 6, 2017
631d5e0
adding includes
Kixy25 Feb 6, 2017
4d4104a
added duplicate info into candidate show page
Kixy25 Feb 6, 2017
d35de07
config update
Kixy25 Feb 6, 2017
cf3f5e6
changed duplicate secure object names
Kixy25 Feb 6, 2017
afe4669
removed unused template
Kixy25 Feb 6, 2017
058d5bb
Merge branch 'master' into candidate_duplicates
Feb 17, 2017
fa06f1d
Merge branch 'master' into candidate_duplicates
Mar 30, 2017
3dc81e3
Merge branch 'candidate_duplicates' into candidate_duplicates
Mar 30, 2017
5d317e3
Merge branch 'master' into candidate_duplicates
Mar 30, 2017
bac70c1
db upgrade, not tested
Kixy25 Feb 6, 2017
5a90cbb
updated migration from 0.9.4 to 0.9.5
Mar 30, 2017
5378b0d
added duplicate db table to test db
Kixy25 Mar 28, 2017
0db9988
correction in javascript based on codacy review
Mar 30, 2017
03bb9d8
js code fixes based on codacy review
Mar 30, 2017
d9181dd
removed forgotten or badly merged parameter from a function
Kixy25 Apr 3, 2017
f0405ac
Merge branch 'master' into candidate_duplicates
Apr 20, 2017
b9f833a
duplicate initialization
Kixy25 Apr 20, 2017
e056631
Merge pull request #249 from opencats/master
mlespiau Apr 26, 2017
d61aff1
fixed (hopefully well) duplicate primary key errors during update by …
Kixy25 Apr 27, 2017
6bd26ee
add ckeditor to composer
May 1, 2017
a2d175c
updated reference to ckeditor in tpl files
May 1, 2017
00f2d34
removed embedded ckeditor files
May 1, 2017
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
d7f8942
Merge pull request #260 from AnritsuSolutionsSK/legacyroot
mlespiau May 2, 2017
bf38b06
small typo fixes in Legacy root usage
May 2, 2017
590cf9f
Merge pull request #261 from AnritsuSolutionsSK/legacyroot
mlespiau May 2, 2017
3ead167
Merge pull request #257 from AnritsuSolutionsSK/ckeditor_in_composer
mlespiau May 2, 2017
2a068f4
Merge branch 'release/0.9.4' into develop
mlespiau May 2, 2017
66a1fe1
Merge branch 'master' into candidate_duplicates
May 2, 2017
c59eb1a
added duplicate candidate icon to pipeline grids
Kixy25 May 3, 2017
56380ee
fixed duplicate rows after merge of candidate pipeline details and hi…
Kixy25 May 15, 2017
2f55928
fixed some logical errors and added input trim and whitespace removal…
Kixy25 May 16, 2017
59c73c6
removed unused function
Kixy25 May 16, 2017
ccf6c19
removed old todo
Kixy25 May 16, 2017
e85f1e9
fixed list entry duplicates in duplicate merge and moved it into sepa…
Kixy25 May 16, 2017
10455a1
fixed missing access level
Kixy25 May 16, 2017
20dd7eb
Merge branch 'candidate_duplicates' of into candidate_duplicates
May 16, 2017
3339214
added URI encoding to AJAX call so "&" can be a part of a list name, …
skrchnavy May 16, 2017
b4e2300
Added a Public/Private column into job order datagrid (#239)
skrchnavy May 17, 2017
632f8f9
updated import
May 23, 2017
03705d1
Ckeditor font plugin only where needed (#229)
skrchnavy May 24, 2017
a15b9f9
Merge branch 'master' into develop
May 27, 2017
036c527
travis build fix
Jun 23, 2017
d57e7cb
Merge branch 'develop' into candidate_duplicates
Jun 27, 2017
5180ef8
added indexes to duplicates table
Jun 27, 2017
df471e5
Merge branch 'master' into develop
Jul 6, 2017
c5112a7
Merge branch 'master' into develop
Aug 1, 2017
ef1b824
Merge branch 'master' into develop
Sep 18, 2017
4672e42
Merge branch 'master' into develop
Oct 19, 2017
79901a9
Merge branch 'master' into develop
Dec 9, 2017
69ec439
Merge branch 'master' into develop
Feb 21, 2018
d1a229a
Merge pull request #168 from AnritsuSolutionsSK/candidate_duplicates
RussH Jul 16, 2018
01f5ab7
Job order import (#230)
skrchnavy Jul 18, 2018
1e31bbd
Email templates support (#231)
skrchnavy Oct 15, 2018
7f4b669
Update db/cats_testdata.bak (#398)
RussH Oct 30, 2018
2d7b8a4
Revert "Update db/cats_testdata.bak (#398)" (#399)
RussH Oct 30, 2018
d0dc7fb
Update db/cats_testdata.bak (#400)
RussH Oct 30, 2018
a676aba
Job order statuses configurable (#236)
skrchnavy Oct 31, 2018
66cca88
Import of files in different encoding (#238)
skrchnavy Nov 6, 2018
3929a55
Pipeline in GUI changed to Job Order or Candidates based on context …
skrchnavy Jan 7, 2019
17c559c
Fix state location mapping (#245)
smackjack3 Jan 7, 2019
33bf591
updated travis.yml to add in php 7.3 testing
RussH Jan 7, 2019
1ee1839
updated travis.yml to remove php 7.3 testing
RussH Jan 8, 2019
43018f2
Spelling Vetran -> Veteran
RussH Mar 26, 2019
6f41ac7
Spelling Vetran -> Veteran
RussH Mar 26, 2019
88b2929
Resolved issue #444 - rss is not valid (#447)
Sep 27, 2019
76c3041
Closing out the 'test-php-7' feature branch and merging back to devel…
RussH Sep 29, 2019
a924d08
Fixed #451 there was an issue with the installer, this was an issue w…
Oct 2, 2019
de76379
Revert "Fixed #451 there was an issue with the installer, this was an…
Oct 3, 2019
5a65a59
Fixed #451 there was an issue with the installer, this was an issue w…
Oct 3, 2019
a348984
Merge pull request #453 from amaisonneuve/develop
amaisonneuve Oct 3, 2019
1554577
Two (2) Fixes - Resolved issue #444 + A missing class reference (#456)
Oct 14, 2019
ecb89c4
Update ActivityEntries.php (#450)
RussH Oct 14, 2019
1ca09ee
Update mailer.php to support umlauts (enforce UTF-8) (#449)
RussH Oct 14, 2019
790565a
added job reference number to pipeline datagrid on candidate show pag…
skrchnavy Oct 14, 2019
b0682a7
Show 'lists' on candidates page (#269)
skrchnavy Oct 14, 2019
de40396
fix LDAP module (#366)
wumb0 Oct 14, 2019
efbfd5e
added activity logging after adding new candidate (#270)
skrchnavy Oct 14, 2019
0cd2295
added the option to email a candidate from the candidate show page (i…
RussH Oct 14, 2019
b005f83
Revert "added the option to email a candidate from the candidate show…
RussH Nov 12, 2019
1640653
PHP7 Test build and tag (#461)
RussH Jan 15, 2020
ec98ef3
fix package generation
RussH Jan 15, 2020
6cd5a53
updated secure api_key value for travis-ci
RussH Jan 16, 2020
74abe85
Update .travis.yml
RussH Jan 16, 2020
9c55fa4
adding php version currently under active support tot the test matrix…
attachmentgenie Feb 13, 2020
e232aab
Update the encrypted secure api_key for Travis CI to generate releases.
RussH Apr 15, 2020
77c1f2b
Develop (#473)
Apr 15, 2020
0064085
Travis.yml validation (#492)
RussH Sep 11, 2020
8838f08
removed ckeditor/ckeditor_php4.php
RussH Oct 15, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/no-response.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 16

# Label requiring a response
responseRequiredLabel: more-information-required
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ docker/data/*
docker/persist/*
vendor/*
attachments/*
temp/*
temp/*
# Ignore Mac DS_Store files
.DS_Store
/vendor/
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
- docker

env:
COMPOSE_VERSION: 1.7.1
COMPOSE_VERSION: 1.25.3

before_install:
- sudo apt-get update -qq
Expand All @@ -14,8 +14,9 @@ before_install:

language: php
php:
- 5.6

- 7.2
- 7.3
- 7.4
script:
- composer install
- ./vendor/bin/phpunit src/OpenCATS/Tests/UnitTests
Expand All @@ -26,11 +27,10 @@ script:
deploy:
provider: releases
api_key:
secure: Srgq/VW4yoYg0yWq/llOix47MAe2EKccqxfdukxrm6fePKRRv6bVBQXH/0hhrTTn4Q6xrmVycqC36SD9/JVL684xNYBESlT4V3DpZ6vxPYeNzU2GjtoMBqGCOgjZvxpq5AGIf7gXZ9GdM4+xikBPthspCcUorg8hkLgaOQ5PPlI0dC7cdFPjQweoxAqDe6VwQ31J1MiO+DPI+69GHb/KukHkS/sjhZTMZoO0shfw5dhv0TSuaeaPzWYw1+g6sNdgNurNbi4bPEEpofUdfA+WaWw7oapsO7ZW4qTqKxsrsrCf1ZgTnynm2Kow5D7oFVqRkt/kpoQ/UzwZUalzm8JrVeYPbQ2j7mYxOh3TcTYn24NSm8xuDgF8ZaG3BxoWCLQSA8pdJZRI7QbWrDdFA93ZD1EWRW0amL3rOGLED61K0ZFhulUBy1bKyjAnT2T6FPsKk4hOwFDo1nojzemQnl6PfPT6Lsuvk5FotevsemBUQl+xx7UQsxhDM3kw3/IheE/abOYmIK+qRKdcH5J04m+dadXKZBa+h/Jsd5AdC7Yp3Si74IhJFceyvQIx7GkkG4fo/0Y34mCAXuwEN7acB7RbNU8DVyzfUtpWSPwkw2iDTJshDsV1RN94Xzt+k/GvLAvAOttozkhruYV563+MEYizBRN+96jaF/35dZYd+X3UwBA=
secure: ke80rN2W+MZWizqUbd9ENVOYLYiQy29oAdyqD61Q2rLunnFXm0LgDv/6Bddav6/Lherv+sFmN6LIa9IF3iD/oO7nUuzuRhsL4E9Pib5Al3TEIDZoOeeXyVinO/v2QaWjs+ufAswUESch0/+8p6bowiwGwaCJw0S4EA+jA/PacKHYxYG2cIbk9Rl7/HlSmirAQpkw2n+xUx4pQZj0bQRd5mILFxyLuFa5ct8y3Ya+Bo4gCBgJnXEITufbeuQmcEeK/4Zec8G5xZOIfoiTV7gT4nEBWl1wUK8FxFoEytG6NrHP8fRSkpgmecuZwzQI1zX5ORZaVTzLpC5Mw10/AZmBWYxkZN9ALYpQ9xKvFhxL4kurRZQOdfpepc3gvC6rCNE0Q+OYHD38Y3Nb6rdnOcqdkROdNkPPL+OierOgatgG4grlYLZq4tu9fnqRXYgT4UNrDiV6hAG8OPIIkHRWItPIr5HIjGkAPIos/fs20rBan/uqms9vZjzijfUjOwbold5t1fMTuO1zx/UytANunIWMbajP8puuO+GeEAB8vkE9CBC7ZR+pXDqap3qewCmg4FeclPc24wPcYUM0RRUSOFrBarlM/pQBHIidkgrh3hu48qyXGTw/HzxrgzEatKBgR+Nht2dKml7uEFTJVZnq91VVjlnYOlNv4u+jgNt8z0VxG7Q=
file:
- $TRAVIS_BUILD_DIR/opencats-$TRAVIS_TAG-full.tar.gz
- $TRAVIS_BUILD_DIR/opencats-$TRAVIS_TAG-full.zip
skip_cleanup: true
on:
tags: true

32 changes: 17 additions & 15 deletions QueueCLI.php
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 All @@ -58,7 +58,9 @@
/* Make sure we aren't getting screwed over by magic quotes. */
if (get_magic_quotes_runtime())
{
set_magic_quotes_runtime(0);
if (function_exists('set_magic_quotes_runtime')) {
set_magic_quotes_runtime(0);
}
}
if (get_magic_quotes_gpc())
{
Expand Down
16 changes: 9 additions & 7 deletions ajax.php
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 All @@ -49,7 +49,9 @@
/* Make sure we aren't getting screwed over by magic quotes. */
if (get_magic_quotes_runtime())
{
set_magic_quotes_runtime(0);
if (function_exists('set_magic_quotes_runtime')) {
set_magic_quotes_runtime(0);
}
}
if (get_magic_quotes_gpc())
{
Expand Down Expand Up @@ -107,7 +109,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
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
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
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
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
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
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
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
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
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
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
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
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
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
28 changes: 19 additions & 9 deletions ajax/getPipelineJobOrder.php
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 Expand Up @@ -93,7 +93,17 @@
}
else
{
$pipelinesRS[$rowIndex]['iconTag'] = ' ';
$pipelinesRS[$rowIndex]['iconTag'] = '<img src="images/mru/blank.gif" alt="" width="16" height="16" />';
}

if ($row['isDuplicateCandidate'] == 1)
{
$pipelinesRS[$rowIndex]['iconTag'] .= '<img src="images/wf_error.gif" alt="" width="16" height="16" title="Duplicate Candidate"/>';
}

if($pipelinesRS[$rowIndex]['iconTag'] == '')
{
$pipelinesRS[$rowIndex]['iconTag'] .= '&nbsp;';
}

$pipelinesRS[$rowIndex]['ratingLine'] = TemplateUtility::getRatingObject(
Expand Down Expand Up @@ -193,7 +203,7 @@ function printSortLink($field, $delimiter = "'", $changeDirection = true)
<tr>
<th></th>
<th></th>
<th align="left" width="10" nowrap="nowrap"></th>
<th align="left" width="32" nowrap="nowrap"></th>
<th align="left" width="62" nowrap="nowrap">
<a href="javascript:void(0);" onclick="PipelineJobOrder_populate(<?php echo($jobOrderID); ?>, <?php echo($page); ?>, <?php echo($entriesPerPage); ?>, <?php printSortLink('ratingValue'); ?>, <?php if ($isPopup) echo(1); else echo(0); ?>, 'ajaxPipelineTable', '<?php echo($_SESSION['CATS']->getCookie()); ?>', 'ajaxPipelineTableIndicator', '<?php echo($indexFile); ?>');">
Match
Expand Down Expand Up @@ -297,7 +307,7 @@ function printSortLink($field, $delimiter = "'", $changeDirection = true)
<?php endif; ?>
<?php if ($_SESSION['CATS']->getAccessLevel('pipelines.removeFromPipeline') >= ACCESS_LEVEL_DELETE): ?>
<a href="<?php echo($indexFile); ?>?m=joborders&amp;a=removeFromPipeline&amp;jobOrderID=<?php echo($jobOrderID); ?>&amp;candidateID=<?php echo($pipelinesData['candidateID']); ?>" onclick="javascript:return confirm('Remove <?php echo(str_replace('\'', '\\\'', htmlspecialchars($pipelinesData['firstName']))); ?> <?php echo(str_replace('\'', '\\\'', htmlspecialchars($pipelinesData['lastName']))); ?> from the pipeline?')">
<img src="images/actions/delete.gif" width="16" height="16" class="absmiddle" alt="remove" style="border: none;" title="Remove from Pipeline" />
<img src="images/actions/delete.gif" width="16" height="16" class="absmiddle" alt="remove" style="border: none;" title="Remove from Job Order" />
</a>
<?php endif; ?>
<?php endif; ?>
Expand Down
56 changes: 56 additions & 0 deletions ajax/replaceTemplateTags.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?php
include_once('./lib/EmailTemplates.php');
include_once('./lib/DateUtility.php');
include_once('./lib/Candidates.php');

$interface = new SecureAJAXInterface();

if (!$interface->isRequiredIDValid('candidateID', false))
{
$interface->outputXMLErrorPage(-1, 'Invalid candidate ID.');
die();
}

$siteID = $interface->getSiteID();

$candidateID = $_REQUEST['candidateID'];
$templateText = $_REQUEST['templateText'];

/* Get an array of the company's location data. */
$candidates = new Candidates($siteID);
$candidateData = $candidates->get($candidateID);
$emailTemplates = new EmailTemplates($siteID);
$emailTemplateText = $emailTemplates->replaceVariables($templateText);

if (empty($candidateData))
{
$interface->outputXMLErrorPage(-2, 'No candidate data.');
die();
}

$stringsToFind = array(
'%CANDOWNER%',
'%CANDFIRSTNAME%',
'%CANDFULLNAME%'
);
$replacementStrings = array(
$candidateData['ownerFullName'],
$candidateData['firstName'],
$candidateData['candidateFullName'],
);
$emailTemplateText = str_replace(
$stringsToFind,
$replacementStrings,
$emailTemplateText
);

/* Send back the XML data. */
$interface->outputXMLPage(
"<data>\n" .
" <errorcode>0</errorcode>\n" .
" <errormessage></errormessage>\n" .
" <text>" . htmlspecialchars($emailTemplateText) . "</text>\n" .
"</data>\n"
);

?>
Loading