From b97fe4a0016ae591c0b7eec5e9c0f4311e7fea3c Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 31 Aug 2016 13:53:29 +0100 Subject: [PATCH 1/5] Fix double slash in URI --- app/Config/constants.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Config/constants.php b/app/Config/constants.php index c2e744d5..e4ce615d 100644 --- a/app/Config/constants.php +++ b/app/Config/constants.php @@ -61,14 +61,14 @@ if(php_sapi_name() === "cli") { define('PROTOCOL', "http://"); - define('DOMAIN', "www.my-orangescrum.com/"); // Please set your application domain (REQUIRED) + define('DOMAIN', "www.my-orangescrum.com"); // Please set your application domain (REQUIRED) }else{ $ht = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on')?"https://":"http://"; define('PROTOCOL', $ht); if($_SERVER['SERVER_PORT'] != 80) - define('DOMAIN', $_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/"); + define('DOMAIN', $_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']); else - define('DOMAIN', $_SERVER['SERVER_NAME']."/"); + define('DOMAIN', $_SERVER['SERVER_NAME']); } define('HTTP_SERVER',PROTOCOL.DOMAIN); define('HTTP_ROOT', HTTP_SERVER.SUB_FOLDER); @@ -176,4 +176,4 @@ //define("NODEJS_HOST",'http://www.your-application.com:3002'); //enable this, if you have Node.js setup in the server // If you are enabling NODEJS_HOST, make sure you have PHP version >5.3.0 // Also, remove comment on "use ElephantIO\Client as ElephantIOClient" from the following files -// app/Controller/EasycasesController.php, app/Controller/Component/PostcaseComponent.php, app/webroot/EmailReply.php \ No newline at end of file +// app/Controller/EasycasesController.php, app/Controller/Component/PostcaseComponent.php, app/webroot/EmailReply.php From 0bae5ca997a53d988cc6c76aaf5504573ef71425 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 21 Sep 2016 13:22:41 +0100 Subject: [PATCH 2/5] Enable custom task types in CSV import --- app/Controller/ProjectsController.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Controller/ProjectsController.php b/app/Controller/ProjectsController.php index 5039b968..84918656 100644 --- a/app/Controller/ProjectsController.php +++ b/app/Controller/ProjectsController.php @@ -1537,7 +1537,14 @@ function importexport($proj_id='') { function csv_dataimport() { $project_id = $this->data['proj_id']; $project_uid = $this->data['proj_uid']; - $task_type_arr = array('enhancement','enh','bug','research n do','rnd','quality assurance','qa','unit testing','unt','maintenance','mnt','others','oth','release','rel','update','upd','development','dev'); + + $task_type_arr = array(); + $this->LoadModel('Type'); + $allTasks = $this->Type->getAllTypes(); + foreach($allTasks as $taskType){ + array_push($task_type_arr, $taskType['Type']['short_name'], $taskType['Type']['name']); + } + $task_status_arr = array('new','close','wip','resolve','resolved','closed'); $this->loadModel('User'); $this->loadModel('ProjectUser'); @@ -2207,4 +2214,4 @@ function validateTaskType(){ echo json_encode($jsonArr);exit; } } -?> \ No newline at end of file +?> From 019b282d7312dafc13033715265f3e7e037ec336 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 21 Sep 2016 14:19:56 +0100 Subject: [PATCH 3/5] Revert "Fix double slash in URI" This reverts commit b97fe4a0016ae591c0b7eec5e9c0f4311e7fea3c. --- app/Config/constants.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Config/constants.php b/app/Config/constants.php index e4ce615d..c2e744d5 100644 --- a/app/Config/constants.php +++ b/app/Config/constants.php @@ -61,14 +61,14 @@ if(php_sapi_name() === "cli") { define('PROTOCOL', "http://"); - define('DOMAIN', "www.my-orangescrum.com"); // Please set your application domain (REQUIRED) + define('DOMAIN', "www.my-orangescrum.com/"); // Please set your application domain (REQUIRED) }else{ $ht = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on')?"https://":"http://"; define('PROTOCOL', $ht); if($_SERVER['SERVER_PORT'] != 80) - define('DOMAIN', $_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']); + define('DOMAIN', $_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/"); else - define('DOMAIN', $_SERVER['SERVER_NAME']); + define('DOMAIN', $_SERVER['SERVER_NAME']."/"); } define('HTTP_SERVER',PROTOCOL.DOMAIN); define('HTTP_ROOT', HTTP_SERVER.SUB_FOLDER); @@ -176,4 +176,4 @@ //define("NODEJS_HOST",'http://www.your-application.com:3002'); //enable this, if you have Node.js setup in the server // If you are enabling NODEJS_HOST, make sure you have PHP version >5.3.0 // Also, remove comment on "use ElephantIO\Client as ElephantIOClient" from the following files -// app/Controller/EasycasesController.php, app/Controller/Component/PostcaseComponent.php, app/webroot/EmailReply.php +// app/Controller/EasycasesController.php, app/Controller/Component/PostcaseComponent.php, app/webroot/EmailReply.php \ No newline at end of file From 2bef17e021e8a09229efa7efb23ff9e752a4152d Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 21 Sep 2016 14:24:43 +0100 Subject: [PATCH 4/5] Revert "Revert "Fix double slash in URI"" This reverts commit 019b282d7312dafc13033715265f3e7e037ec336. --- app/Config/constants.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Config/constants.php b/app/Config/constants.php index c2e744d5..e4ce615d 100644 --- a/app/Config/constants.php +++ b/app/Config/constants.php @@ -61,14 +61,14 @@ if(php_sapi_name() === "cli") { define('PROTOCOL', "http://"); - define('DOMAIN', "www.my-orangescrum.com/"); // Please set your application domain (REQUIRED) + define('DOMAIN', "www.my-orangescrum.com"); // Please set your application domain (REQUIRED) }else{ $ht = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on')?"https://":"http://"; define('PROTOCOL', $ht); if($_SERVER['SERVER_PORT'] != 80) - define('DOMAIN', $_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/"); + define('DOMAIN', $_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']); else - define('DOMAIN', $_SERVER['SERVER_NAME']."/"); + define('DOMAIN', $_SERVER['SERVER_NAME']); } define('HTTP_SERVER',PROTOCOL.DOMAIN); define('HTTP_ROOT', HTTP_SERVER.SUB_FOLDER); @@ -176,4 +176,4 @@ //define("NODEJS_HOST",'http://www.your-application.com:3002'); //enable this, if you have Node.js setup in the server // If you are enabling NODEJS_HOST, make sure you have PHP version >5.3.0 // Also, remove comment on "use ElephantIO\Client as ElephantIOClient" from the following files -// app/Controller/EasycasesController.php, app/Controller/Component/PostcaseComponent.php, app/webroot/EmailReply.php \ No newline at end of file +// app/Controller/EasycasesController.php, app/Controller/Component/PostcaseComponent.php, app/webroot/EmailReply.php From 880b6b8fd55803fa9a693fe26fc5b360bf59171d Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 21 Sep 2016 14:24:46 +0100 Subject: [PATCH 5/5] Revert "Enable custom task types in CSV import" This reverts commit 0bae5ca997a53d988cc6c76aaf5504573ef71425. --- app/Controller/ProjectsController.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/Controller/ProjectsController.php b/app/Controller/ProjectsController.php index 84918656..5039b968 100644 --- a/app/Controller/ProjectsController.php +++ b/app/Controller/ProjectsController.php @@ -1537,14 +1537,7 @@ function importexport($proj_id='') { function csv_dataimport() { $project_id = $this->data['proj_id']; $project_uid = $this->data['proj_uid']; - - $task_type_arr = array(); - $this->LoadModel('Type'); - $allTasks = $this->Type->getAllTypes(); - foreach($allTasks as $taskType){ - array_push($task_type_arr, $taskType['Type']['short_name'], $taskType['Type']['name']); - } - + $task_type_arr = array('enhancement','enh','bug','research n do','rnd','quality assurance','qa','unit testing','unt','maintenance','mnt','others','oth','release','rel','update','upd','development','dev'); $task_status_arr = array('new','close','wip','resolve','resolved','closed'); $this->loadModel('User'); $this->loadModel('ProjectUser'); @@ -2214,4 +2207,4 @@ function validateTaskType(){ echo json_encode($jsonArr);exit; } } -?> +?> \ No newline at end of file