Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
90ce82a
Add symfony git ignore
mlespiau Dec 5, 2016
c52d9cb
initial symfony commit
mlespiau Dec 5, 2016
608f193
Initial setup + LegacyContoller
mlespiau Dec 6, 2016
a2e1706
Initial commit for making OpenCATS requests work wrapped on symphony
mlespiau Dec 7, 2016
0929119
Include and enable opcache
mlespiau Dec 7, 2016
1369407
Some fixes to make the legacy code run wrapped by Symfony
mlespiau Dec 7, 2016
6873a29
Make legacy session usage compatible with Symfony
mlespiau Dec 7, 2016
a490098
Move ckeditor to public web folder
mlespiau Dec 7, 2016
447fb42
Fix reference to candidate validator
mlespiau Dec 7, 2016
f09952f
Fix includes
mlespiau Dec 7, 2016
3e1b0a7
Manage ajax requests in LegacyController
mlespiau Dec 7, 2016
691e51c
Remove / route from DefaultController
mlespiau Dec 7, 2016
f7df1c1
Add Toolbar UI to support OpenCATS chrome extension
mlespiau Dec 13, 2016
7163f21
Merge pull request #7 from mlespiau/anonymous-enhacements
mlespiau Dec 13, 2016
25c48dd
get, add, delete, update email templates lib changes
Kixy25 Jan 3, 2017
eeb1ae9
Add/Delete template in template manager
Kixy25 Jan 3, 2017
9959fb7
Add/Delete/Update template in SettingsUI
Kixy25 Jan 3, 2017
bc3a48f
Add CandidateController.php
mlespiau Jan 6, 2017
29c64b1
Initial codeception setup + first unit test migration
mlespiau Jan 6, 2017
c87483b
Apply Symphony + Codeception standards to AJAXInterface unit test
mlespiau Jan 6, 2017
34d4a95
Apply Symphony + Codeception standards to ArrayUtility unit test
mlespiau Jan 6, 2017
f149275
Update AJAXInterfaceTest to work in PSR-4 standard
mlespiau Jan 6, 2017
2e4b1bd
Apply Symphony + Codeception standards to BrowserDetection unit test
mlespiau Jan 6, 2017
0a4b944
Update path to run unit tests with codeception
mlespiau Jan 6, 2017
2ef7fc7
Rename test folder and update phpunit version
mlespiau Jan 6, 2017
57c5bfb
Apply Symphony + Codeception standards to Company unit test
mlespiau Jan 6, 2017
140a13c
Apply Symphony + Codeception standards to DateUtils unit test
mlespiau Jan 6, 2017
9f873a9
Apply Symphony + Codeception standards to FileUtility, JobOrder, Resu…
mlespiau Jan 6, 2017
7873474
Move integration test folder to codeception unit test folder
mlespiau Jan 9, 2017
f071b8f
Expose unit test mariadb port on 3306
mlespiau Jan 9, 2017
1c2e8c0
Change travis mariadb port for unit test to 3307
mlespiau Jan 9, 2017
7f87457
new ajax functions to choose an email template and to preview how it'…
Kixy25 Jan 9, 2017
ceb46f1
new ajax calls for emails
Kixy25 Jan 9, 2017
4d90f9f
send emails in bulk when not using template, send by one when using it
Kixy25 Jan 9, 2017
25c30fa
getting neccesary info from db
Kixy25 Jan 9, 2017
d8564f0
added js lib
Kixy25 Jan 9, 2017
a32e8ff
added fields to email form
Kixy25 Jan 9, 2017
320c52d
disabled checking of empty email body, ckeditor had problems with it
Kixy25 Jan 9, 2017
8456919
Make first gherkin acceptance tests to pass in codeception
mlespiau Jan 9, 2017
273b76e
Update location of runAllTests call in travis
mlespiau Jan 9, 2017
d8ff052
Fix error in waitForDB.php
mlespiau Jan 9, 2017
c52fad6
Fix selenium hostname during acceptance testing phase
mlespiau Jan 9, 2017
b5e413c
Increase wait timeout
mlespiau Jan 9, 2017
2ed0b51
Move candidate-filters acceptance tests to codeception standards
mlespiau Jan 9, 2017
90f0346
Push test artifacts to s3
mlespiau Jan 10, 2017
80b14ba
Update s3 bucket configuration
mlespiau Jan 10, 2017
2f62803
Move tinymce to the public folder
mlespiau Jan 10, 2017
20690c2
Move bdd features files to codeception standards
mlespiau Jan 10, 2017
24ba928
Add debug information
mlespiau Jan 10, 2017
5bb3899
Add more debug information
mlespiau Jan 10, 2017
765d3d2
Add debug information in Travis
mlespiau Jan 10, 2017
1957bd9
Add more debugging information
mlespiau Jan 11, 2017
51877dd
Fix debugging info
mlespiau Jan 11, 2017
23f2dc3
Merge remote-tracking branch 'origin/master' into opencats-symfony
mlespiau Jan 11, 2017
3a297de
Add symfony files to git ignore
mlespiau Jan 11, 2017
151c859
Merge branch 'master' of https://github.com/mlespiau/OpenCATS
mlespiau Jan 11, 2017
28f3b37
Merge remote-tracking branch 'origin/master' into opencats-symfony
mlespiau Jan 11, 2017
0b2a6b6
Fix issues after merge.
mlespiau Jan 12, 2017
8f3dee5
Depend on the php docker image crafted for OpenCATS + Symfony
mlespiau Jan 12, 2017
a604705
Handle legacy ajax.php indecently from other requested php files
mlespiau Jan 13, 2017
f2f0610
Refactor getCompanyNames.php so it does not call die (bad practice th…
mlespiau Jan 13, 2017
d21d4d5
Remove duplicated call to add iframe for popups.
mlespiau Jan 13, 2017
0e16ccc
Move acceptance tests to AppBundle
mlespiau Jan 16, 2017
9c7974b
Update .gitignore to ignore codeception files
mlespiau Jan 16, 2017
98ac97d
Build codeception test classes during CI
mlespiau Jan 16, 2017
e031726
Update facebook/webdriver version to the latest stable release
mlespiau Jan 16, 2017
1bcfe23
Replace text from Job Order Save button
mlespiau Jan 16, 2017
197c1f4
Use firefox selenium node as it’s handling a bad case with js alters …
mlespiau Jan 16, 2017
0297283
Add .idea to .gitignore
mlespiau Jan 16, 2017
3e330ed
Remove log from test code
mlespiau Jan 16, 2017
1b7ab9f
Fix problem displaying error.
mlespiau Jan 16, 2017
4e8b35c
Fix wrong path for autoloader
mlespiau Jan 16, 2017
0dcab0b
Make configurations for symfony dev and prod versions
mlespiau Jan 17, 2017
8bf0091
Use selenium chrome
mlespiau Jan 17, 2017
e3b413c
preview css changes
Kixy25 Jan 18, 2017
bac1683
add comment to unused code
Kixy25 Jan 18, 2017
588d0a4
Fix public js paths
mlespiau Jan 22, 2017
61eee27
Fix path for History.php
mlespiau Jan 22, 2017
94f9640
Simplify tests
mlespiau Jan 22, 2017
93fecf6
Add missing default value for contact select in joborders Add
mlespiau Jan 22, 2017
2dc2b06
Move login.feature to codeception test folder
mlespiau Jan 28, 2017
a30b69f
Fix job orders acceptance tests in codeception
mlespiau Jan 28, 2017
a8a48d8
Move tests from behat to codeception
mlespiau Jan 28, 2017
6e85eec
Fixes to login.feature test
mlespiau Jan 28, 2017
e6ae1d9
Fixed security tests in codeception
mlespiau Jan 28, 2017
5661ceb
Remove unused behat and php units in legacy root code folder
mlespiau Jan 28, 2017
b6c4278
Update Security Steps
mlespiau Jan 28, 2017
90b3637
Update composer.lock with current composer.json code
mlespiau Jan 28, 2017
b98b0a1
Updated composer.json, lock file and config.php (done by Symfony comp…
mlespiau Jan 28, 2017
2c92454
Fix command to execute tests in travisCI
mlespiau Jan 28, 2017
06b0f3b
Reduce verbosity
mlespiau Jan 28, 2017
a7709b0
Fix db issues when running unit tests
mlespiau Jan 28, 2017
6eeac3e
Do not include cache, session and logs folders in package distribution
mlespiau Jan 30, 2017
abec3fa
Fix Gherking tests in codeception
mlespiau Feb 6, 2017
826223e
Fix zip package generation
mlespiau Feb 6, 2017
360398d
Add use Codeception\Exception\Fail
mlespiau Feb 6, 2017
f230338
Remove unused import
mlespiau Feb 6, 2017
7c7b254
Style change
mlespiau Feb 6, 2017
6a562d6
Add comment for roleData class variable
mlespiau Feb 6, 2017
1a308fa
Add PHPDoc block
mlespiau Feb 6, 2017
dcf4062
Use Fail exception using short name
mlespiau Feb 6, 2017
f0b7473
AcceptanceTester: Add comment for iAmAuthenticatedAs function
mlespiau Feb 6, 2017
9a76a76
Style change
mlespiau Feb 6, 2017
5df0b4d
AcceptanceTester: Add missing import
mlespiau Feb 6, 2017
1e7bf20
Change package code commands to exclude directories that should be ig…
mlespiau Feb 6, 2017
dac1386
Add verbosity to zip command for debugging
mlespiau Feb 11, 2017
c836e67
Remove debugging information
mlespiau Feb 11, 2017
eeba751
AcceptanceTest: Remove try catch using for debbuing
mlespiau Feb 11, 2017
b3fab0d
Fix issue in package code command
mlespiau Feb 11, 2017
339fd2b
Fix test
mlespiau Feb 11, 2017
773ca38
Fixed logic in security tests
mlespiau Feb 11, 2017
30fba62
Fix POST security tests
mlespiau Feb 12, 2017
7d67cee
Add missing parameters to CommonErrors:fatal validations in SettingUI…
mlespiau Feb 12, 2017
3aedb6f
Merge branch 'master' into email_templates_support
Feb 17, 2017
f9d468d
Improve test step error message
mlespiau Mar 1, 2017
e28cf75
Improve error reporting for testing steps
mlespiau Mar 1, 2017
dab754e
Partially fix moduleSubPagesSecurity tests
mlespiau Mar 1, 2017
a3e2cbb
Partially fix moduleSubPagesSecurity.feature tests
mlespiau Mar 1, 2017
73870b2
moduleSubPagesSecurity tests: fix Job Order Show page and Candidate S…
mlespiau Mar 1, 2017
57294ef
moduleSubPagesSecurity: Fix Company Show page visibility
mlespiau Mar 1, 2017
5620f5b
Fix moduleSubPagesSecurity tests
mlespiau Mar 1, 2017
65e4bb9
Fix moduleMainPagesSecurity tests
mlespiau Mar 29, 2017
b67c2b7
Fix moduleMainPageSecurity tests
mlespiau Mar 30, 2017
87dcc5a
Fix wrong CSS selector for tests
mlespiau Mar 30, 2017
a6ffae7
Fix problem with clickOnOnTheRowContaining test function
mlespiau Mar 31, 2017
0bec370
Troubleshoot zip errors in TravisCI
mlespiau Mar 31, 2017
51235d4
Update composer son and composer.lock files
mlespiau Mar 31, 2017
73ce176
Disable problematic tests
mlespiau Mar 31, 2017
1fb4e4d
Update test code due to changes in Codeception API (getVisibleText ma…
mlespiau Apr 1, 2017
393e5a6
Fix test function issues in AcceptanceTester.php
mlespiau Apr 2, 2017
225244b
Ignore exception in “see” function while checking for multiple tests
mlespiau Apr 2, 2017
3036807
Update stamp
mlespiau Apr 2, 2017
63edb19
Comment failing test
mlespiau Apr 5, 2017
af6d892
Add log to build job
mlespiau Apr 6, 2017
967971e
Remove dead License code as it will be never executed (since validate…
mlespiau Apr 12, 2017
95e6693
Update configuration to use environment variables (passed by docker i…
mlespiau Apr 22, 2017
361de0b
Fix issue with travis generating release packages for each commit id
mlespiau Apr 22, 2017
99e9227
Remove test/config.php as it’s now handled with environment variables
mlespiau Apr 22, 2017
a6a95cf
Update travis to reflect changes in docker files
mlespiau Apr 22, 2017
86208c6
Update docker compose version
mlespiau Apr 22, 2017
e056631
Merge pull request #249 from opencats/master
mlespiau Apr 26, 2017
f93276b
Generate docker image with php + nginx + application code
mlespiau Apr 28, 2017
00d02d8
Declare environment variable
mlespiau Apr 28, 2017
5d504bc
Run build on ubuntu trusty image and also check output for uname comm…
mlespiau Apr 28, 2017
ddaca14
Capture OS version output
mlespiau Apr 28, 2017
19e3276
Remove docker installation
mlespiau Apr 28, 2017
0811f56
Add docker compose installation back
mlespiau Apr 28, 2017
9254b25
Upgrade docker compose version
mlespiau Apr 28, 2017
e121b4b
Another test to fix travis build
mlespiau Apr 28, 2017
9d25513
Keep one env section
mlespiau Apr 28, 2017
b5d480b
Revert "Keep one env section"
mlespiau Apr 28, 2017
1eb5685
Revert "Another test to fix travis build"
mlespiau Apr 28, 2017
210ed10
Revert "Upgrade docker compose version"
mlespiau Apr 28, 2017
fbdd6d2
Revert "Add docker compose installation back"
mlespiau Apr 28, 2017
0e9f789
Revert "Remove docker installation"
mlespiau Apr 28, 2017
3b1f9f0
Revert "Capture OS version output"
mlespiau Apr 28, 2017
c330fd2
Revert "Run build on ubuntu trusty image and also check output for un…
mlespiau Apr 28, 2017
45c4acb
Revert "Declare environment variable"
mlespiau Apr 28, 2017
783141d
Revert "Generate docker image with php + nginx + application code"
mlespiau Apr 28, 2017
cfc507a
Add simple docker build command to travis build
mlespiau Apr 28, 2017
e173fcf
Execute dummy build command before running functional tests
mlespiau Apr 28, 2017
8c1419a
Push image to opencats repo
mlespiau Apr 28, 2017
dfd501a
Move compose variable to global scope and add debugging info
mlespiau Apr 28, 2017
f70aab3
Fix docker push command
mlespiau Apr 28, 2017
786e96e
Update docker login command
mlespiau Apr 28, 2017
d0dadac
Add quotes
mlespiau Apr 29, 2017
9502465
Update docker login command
mlespiau Apr 29, 2017
68deea2
Re-encrypt user and pass
mlespiau Apr 29, 2017
a7ebbd9
Remove hardcoded tag
mlespiau Apr 29, 2017
7b808d5
Remove hardcoded configuration for tests
mlespiau Apr 29, 2017
15534c0
Fix default values for default configuration
mlespiau Apr 29, 2017
4324f6a
Fix test configuration
mlespiau Apr 29, 2017
f0a7a8a
Fix include paths
mlespiau Apr 29, 2017
f601e61
Add supervisord files to .gitignore
mlespiau Apr 30, 2017
45bfd3c
Simplify docker compose file by using new base image (php-fpm + nginx)
mlespiau Apr 30, 2017
d1e0162
Merge upstream develop
mlespiau Apr 30, 2017
f54a36c
Merge remote-tracking branch 'upstream/release/0.9.4' into develop
mlespiau Apr 30, 2017
79feb77
Merge branch 'opencats-symfony' into develop
mlespiau Apr 30, 2017
376a61d
Update container name in travis script (it was renamed when switchin…
mlespiau Apr 30, 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
a42b852
Add attachments folders to .gitignore
mlespiau May 2, 2017
30e80ad
Merge remote-tracking branch 'upstream/develop' into develop
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
97227a1
Merge remote-tracking branch 'upstream/develop' into develop
mlespiau May 11, 2017
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
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,13 @@ docker/data/*
docker/persist/*
vendor/*
attachments/*
code/tests/_output/*
code/var/*
code/vendor/*
code/src/AppBundle/tests/_output/*
code/src/AppBundle/tests/_support/_generated/*
.idea/*
supervisord.log
supervisord.pid
code/web/attachments/*
code/web/js/ckeditor/*
39 changes: 34 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ services:
- docker

env:
COMPOSE_VERSION: 1.7.1
global:
- COMPOSE_VERSION: 1.12.0
- secure: W83x4IKY3XSPsxhIP6fqTZvggqPvBeZXfbC+DWQRlerir0e/7pLwaICgPrXH6fOLAmdHtOCgore0NIq8gMHO0ktyuYsqBiunIWunlDlEsHNtnZwKdDz6g8XId85/FFqv54aVHHxW310gvFfw6B2Lpu4CsWuWuWLpr/TMp+kRVktVPes57MRl6gVWm2VwJt961GmAt3snFSNK5adrYi+JElpQq1Ow1+JuB/evd1zPCfEhYY/xXDuViMo2yDmNwUtDM/MX4QT+a4mc5EIlOFsMNZLJgwLmcKa8M9wjNDwi9hePNB0Mas77aeHxvUTbGPayF0rFDdyD+g0ZMFS16OcfvtAik65CswV1TC/9jQ9LDciaIsPqpH+0ur9EWRc2NybfYVVhRocdtZ5VxWql9BzNDv991IAqIuvVNuJO6LDQ6UCI+zz/I9m7BC4Ean94Jz2HP/tqI8wftXK35bjrgMWgEOXuF8MYnfAnFeP+1Hp2aFYKs0qTfsrZDz5rCQTGksd0tmdRz1UrrGjuHQhauHvZX+Tiz0nbgRaCjFRJicIXkI/ZH/srGZsBvSJy3rsp00PsdksZ2HkZPr9hwpah5tWxA3yEsES0p+6DWUay94SvJL4XJYKcfrlav+TTlo9SgiK47pLx1V59WBB1WIY+1irVV5wh3gWQPNgHuultah/n6h0=
- secure: KEcrIpXfepTir1baq96qF/44sBhyE6l6YNKCvGVQNamMwPgodwFD28eNbOnI2PAUqH6U8dUekUhTCMs0fUyGTSNUtFVGtDGwbvoKCgMnG8UlpcmyaVgo7xyN4UKsBdKOWQAT44VDbBY4/9/16KQoJ4t8Jod5VOt6LENhjF804YmjtCS7MW46VhuK1mD1L0voe2lPWPtc1tlBgOTQ62zgZulLmD0JilWw5PckI9zu8ZeNpNqOjAs2mYRgU6Ed5LPWSyjkBVWH11EtQsvXQKwQUynDFH3wnoeDpP3Nigi4pWOqAWr7r+A/F5pBlklANLpT49nBEMtUu9SPuqGKkdBlaCIVbd/ov3PowRg4BfDBN/o8ZAGaUcS3lBtXMYJun4e0Zq9irmtFt6rI/HYxPscInPlsafZ3ROf577F0qGtec8aRcpGzi+QAEGpTCM9uYm4PEX88ajQbRCTdD+p7FLsQCahqrFkZD2xPSR4Pt3sRCKHX5AW6/XYMcKomz4xw1bs2okWOmZWzFbGo26cMeAzpEuxwRp8o/WB7Xn9ulhUWxpBy1KBEgPBRUcK9EihTo89nabcwFDJuZTbxmRyz8HokAaW1TOZ+qIb9vtzKMP81fUr/YN59Ty926U1rdOBW21rKIDuT+jo700CRCthgQ2vTIZs5DtMW6+JautKL3wwLQuk=

before_install:
- sudo apt-get update -qq
Expand All @@ -17,11 +20,23 @@ php:
- 5.6

script:
- echo $COMPOSE_VERSION
- uname -s
- uname -m
- composer install
- ./vendor/bin/phpunit src/OpenCATS/Tests/UnitTests
- cd docker/; docker-compose -f docker-compose-test.yml up -d
- docker-compose -f docker-compose-test.yml exec php /var/www/public/test/runAllTests.sh
- cd ..; ./ci/package-code.sh
- docker ps
- cd code; composer install; cd ..
- cd code; ./vendor/bin/codecept build; cd ..
- cd docker/; docker-compose -f docker-compose-unittest.yml up -d; cd ..
- docker exec -ti docker_unittestphp_1 /var/www/test/runUnitTests.sh
- cd docker/; docker-compose -f docker-compose-unittest.yml down; cd ..
- export TAG=`if [ "$TRAVIS_TAG" != "" ]; then echo $TRAVIS_TAG; elif [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH; fi`
- docker build -t opencats/opencats:$TAG .
- cd docker/env-test; docker-compose up -d
- docker --version
- docker info
- docker-compose exec opencats /var/www/test/runAllTests.sh
- cd ..; cd ..; ./ci/package-code.sh

deploy:
provider: releases
Expand All @@ -34,3 +49,17 @@ deploy:
on:
tags: true

addons:
artifacts:
debug: true
paths:
- ./code/tests/_output
target_paths: $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_NUMBER
working_dir: WORKING_DIR
bucket: opencats
s3_region: us-east-1

after_success:
- export TAG=`if [ "$TRAVIS_TAG" != "" ]; then echo $TRAVIS_TAG; elif [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH; fi`
- docker login --username $DOCKER_USER --password $DOCKER_PASS
- docker push opencats/opencats:$TAG
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM opencats/base:0.1.0
ADD . /var/www
28 changes: 14 additions & 14 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 Down
136 changes: 0 additions & 136 deletions ajax.php

This file was deleted.

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
55 changes: 27 additions & 28 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 Expand Up @@ -56,36 +56,35 @@
if (empty($companiesArray))
{
$interface->outputXMLErrorPage(-2, 'No companies data.');
die();
}

$output =
"<data>\n" .
" <errorcode>0</errorcode>\n" .
" <errormessage></errormessage>\n" .
" <totalelements>" . count($companiesArray) . "</totalelements>\n";

$arrayCounter = 0;
foreach ($companiesArray as $rowIndex => $row)
} else
{
$arrayCounter++;

if ($arrayCounter > $maxResults)
$output =
"<data>\n" .
" <errorcode>0</errorcode>\n" .
" <errormessage></errormessage>\n" .
" <totalelements>" . count($companiesArray) . "</totalelements>\n";

$arrayCounter = 0;
foreach ($companiesArray as $rowIndex => $row)
{
break;
$arrayCounter++;

if ($arrayCounter > $maxResults)
{
break;
}

$output .=
" <result>\n" .
" <id>" . $companiesArray[$rowIndex]['companyID'] . "</id>\n" .
" <name>" . rawurlencode($companiesArray[$rowIndex]['name']) . "</name>\n" .
" </result>\n";
}

$output .=
" <result>\n" .
" <id>" . $companiesArray[$rowIndex]['companyID'] . "</id>\n" .
" <name>" . rawurlencode($companiesArray[$rowIndex]['name']) . "</name>\n" .
" </result>\n";
}

$output .=
"</data>\n";

/* Send back the XML data. */
$interface->outputXMLPage($output);
"</data>\n";

/* Send back the XML data. */
$interface->outputXMLPage($output);
}
?>
Loading
Loading