Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
Remove trailing spaces and cleanup some ini files
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed Jun 30, 2014
1 parent 2be8d79 commit cfdb680
Show file tree
Hide file tree
Showing 38 changed files with 197 additions and 198 deletions.
47 changes: 23 additions & 24 deletions core/configs/application.ini
Original file line number Diff line number Diff line change
@@ -1,60 +1,59 @@
[global]
;development or production
; development or production
environment = development
;name of the application
; name of the application
application.name = MIDAS - Digital Archiving System
;description of the application
; description of the application
application.description =
;keywords of the application
; keywords of the application
application.keywords = upload, manage, share
;language of the application (en or fr)
; language of the application (en or fr)
application.lang = en
;Optimize JS and CSS
; optimize JS and CSS
smartoptimizer = 0
;Session lifetime (minute)
; session lifetime (minute)
session.lifetime = 20
;Path to md5sum
; path to md5sum
md5sum.path =
;Default Assetstore
; default assetstore
defaultassetstore.id =
;DefaultTimezone
; default timezone
default.timezone = America/New_York
;Processing onthefly or cron
; processing onthefly or cron
processing = onthefly
;Default license
; default license
defaultlicense = 1
;Demo Mode (only works with MySQL)
; demo mode (only works with MySQL)
demomode = 0
;Enable Dynamic help
; enable dynamic help
dynamichelp = 1
;Enable logging of every Midas request
; enable logging of every request
logtrace = 0
;Entry for password prefix (dynamically generated at install time)
; entry for password prefix (dynamically generated at install time)
password.prefix =
;Outbound HTTP proxy to be used by PHP (empty for none)
; outbound HTTP proxy to be used by PHP (empty for none)
httpproxy =


[module]

[production]
;Activate error reporting using Zend
; Activate error reporting using Zend
mode.debug = 0
mode.test = 0
;Show native errors
; Show native errors
error.php = 0

[development]
;Activate error reporting using Zend
; Activate error reporting using Zend
mode.debug = 1
mode.test = 0
;Show native errors
; Show native errors
error.php = 1


[testing]
;Activate error reporting using Zend
; Activate error reporting using Zend
mode.debug = 1
mode.test = 1
;Show native errors
; Show native errors
error.php = 1
2 changes: 1 addition & 1 deletion core/configs/core.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bootstrap.class = "Bootstrap"
appnamespace = "Midas"
resources.frontController.controllerDirectory = "./core/controllers"
resources.frontController.moduleDirectory = "./modules"
resources.layout.layoutPath ="./core/layouts/"
resources.layout.layoutPath = "./core/layouts/"
resources.view.scriptPath = "./core/views/"
internationalization = "0"

Expand Down
2 changes: 1 addition & 1 deletion core/views/helpers/Dateago.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function dateago($timestamp)
$component=new DateComponent();
return $component->ago($timestamp);
}


/** Set view*/
public function setView(Zend_View_Interface $view)
Expand Down
62 changes: 31 additions & 31 deletions core/views/helpers/serversidefilepicker.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
}
$fp_uuid = Configure::read('filePickerId');


if( ! isset($script) ) $script = $this->webroot . 'admin/filePicker';
if( ! isset($width) ) $width = 400;
if( ! isset($height) ) $height = 400;
if( ! isset($fileFilter) ) $fileFilter = '';
if( ! isset($fileFilterErrorMsg) ) $fileFilterErrorMsg = 'Incorrect file type';
if( ! isset($destSelector) ) $destSelector = 'body>XX'; // default selector return 0 elements
if( ! isset($msg) ) $msg = '';

// Find root:
/*if( strpos( strtolower(PHP_OS), 'win') !== false )
{
Expand All @@ -63,43 +63,43 @@
$root = '/';
}*/
$root = '';

?>

<!-- FILE PICKER -->
<link rel="stylesheet" type="text/css" href="<?php echo $this->webroot?>css/jqueryFileTree.css" media="screen" />
<style>
.fp-container {
}

/* The fp-XXX-pannel is the div that gets lighted */
#fp-<?php echo $fp_uuid?>-panel {
display:none;
display:none;
position:fixed;
top:100px;
left:50%;
margin-left:-200px;
width:<?php echo $width?>px;
background:#FFFFFF;
padding:10px 15px 10px 15px;
border:2px solid #CCCCCC;
top:100px;
left:50%;
margin-left:-200px;
width:<?php echo $width?>px;
background:#FFFFFF;
padding:10px 15px 10px 15px;
border:2px solid #CCCCCC;
z-index:1001;
}

/* The fp-XXX-pannel is the div that covers the rest of the page */
#fp-<?php echo $fp_uuid?>-background {
display:none;
background:#000000;
opacity:0.5;
filter:alpha(opacity=90);
position:absolute;
top:0px;
left:0px;
min-width:100%;
min-height:100%;
z-index:1000;
#fp-<?php echo $fp_uuid?>-background {
display:none;
background:#000000;
opacity:0.5;
filter:alpha(opacity=90);
position:absolute;
top:0px;
left:0px;
min-width:100%;
min-height:100%;
z-index:1000;
}

.fp-fileTree {
width: <?php echo $width?>px;
height: 300px;
Expand All @@ -112,22 +112,22 @@
padding: 5px;
text-align: left;
}

.fp-inputFile {
position: relative;
width: <?php echo $width+5?>px;
}

.fp-inputButton {
position: relative;
float: left;
display: block;
width: 100px;
margin: 3px 40px;
}

.fp-open {
}
}
</style>

<?php if($fp_uuid == 1) {?>
Expand Down Expand Up @@ -179,15 +179,15 @@ $(document).ready( function() {
}
return false; // important to return false to prevent a form that include
// this element to be submitted when the user just want to
// select a file.
// select a file.
});

//$("#fp-<?php echo $fp_uuid?>-panel").draggable();
});
</script>
<input type="submit" id="fp-<?php echo $fp_uuid?>-open" class="fp-open" value="Choose"></input>
<div id="fp-<?php echo $fp_uuid?>-container" class="fp-container">

<div id="fp-<?php echo $fp_uuid?>-background"></div>
<div id="fp-<?php echo $fp_uuid?>-panel">
<b><?php echo $msg; ?></b>
Expand Down
14 changes: 7 additions & 7 deletions modules/api/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
; version of the module
version = 1.0.0
; full name
fullname= Web Api
fullname = Web Api
; description
description= "Allows external applications to communicate with MIDAS"
;Category
category= Core
description = "Allows external applications to communicate with MIDAS"
; category
category = Core

;Specify the prefix of the method exposed to the client API
;For example: By setting 'midas', the method signature will be 'midas.something.get'
methodprefix = midas
; specify the prefix of the method exposed to the client API
; for example: by setting 'midas', the method signature will be 'midas.something.get'
methodprefix = midas
8 changes: 4 additions & 4 deletions modules/archive/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
; version of the module
version = 1.0.0
; full name
fullname= Archive Extraction
fullname = Archive Extraction
; description
description= "Allows extraction of archive files into the hierarchy"
;Category
category= Core
description = "Allows extraction of archive files into the hierarchy"
; category
category = Core
10 changes: 5 additions & 5 deletions modules/batchmake/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
; version of the module
version = 0.1.0
; full name
fullname= Batchmake
fullname = Batchmake
; description
description= Will run a Batchmake pipeline, either locally or via Condor
;Category
category= SSP
dependencies= api
description = Will run a Batchmake pipeline, either locally or via Condor
; category
category = SSP
dependencies = api

batchmake.tmp_dir =
batchmake.bin_dir =
Expand Down
4 changes: 2 additions & 2 deletions modules/cleanup/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ version = 1.0.0
fullname = Cleanup Module
; description
description = "Schedules tasks to perform periodic cleanup operations on the database and filesystem"
; Category
; category
category = Core
; Dependencies
; dependencies
dependencies = scheduler

days = "1"
2 changes: 1 addition & 1 deletion modules/comments/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ version = 1.0.0
fullname = Comments
; description
description = Allows users to add comments to an item
; Category
; category
category = Core
8 changes: 4 additions & 4 deletions modules/communityagreement/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
; version of the module
version = 1.0.0
; full name
fullname= Community Agreement
fullname = Community Agreement
; description
description= "Enables community agreement"
;Category
category= Core
description = "Enables community agreement"
; category
category = Core
4 changes: 2 additions & 2 deletions modules/dicomanonymize/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = 1.0.0
fullname = "DICOM Anonymizer"
; description
description = "Anonymize DICOM files on the client side before upload"
;Category
; category
category = DICOM
;Dependencies
; dependencies
dependencies = dicomextractor
12 changes: 6 additions & 6 deletions modules/dicomextractor/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
; version of the module
version = 1.0.0
; full name
fullname= DICOM Extractor
fullname = DICOM Extractor
; description
description= Extract metadata from DICOM files
;Category
description = Extract metadata from DICOM files
; category
category = DICOM
;Dependencies
dependencies= scheduler,api,thumbnailcreator
; dependencies
dependencies = scheduler,api,thumbnailcreator

;hachoir-metadata command
; hachoir-metadata command
dcm2xml = "dcm2xml"
dcmj2pnm = "dcmj2pnm --write-jpeg --min-max-window"
dcmftest = "dcmftest"
Expand Down
26 changes: 13 additions & 13 deletions modules/dicomserver/configs/module.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
; version of the module
version = 1.0.0
; full name
fullname= DICOM Server
fullname = DICOM Server
; description
description= Receive and upload DICOM files, also provide DICOM Query/Retrieve services
;Category
description = Receive and upload DICOM files, also provide DICOM Query/Retrieve services
; category
category = DICOM
;Dependencies
dependencies= api,dicomextractor
; dependencies
dependencies = api,dicomextractor

;uploader DCMTK command
; uploader DCMTK command
dcm2xml = "dcm2xml"
storescp = "storescp"
dcmqrscp = "dcmqrscp"
dcmqridx = "dcmqridx"
;uploader reception directory
; uploader reception directory
receptiondir = ""
;storescp configuration
; storescp configuration
storescp_port = "55555"
;seconds
; seconds
storescp_study_timeout = "15"
;pydas destnation folder
; pydas destnation folder
pydas_dest_folder = "Public"
;dcmqrscp configuration
; dcmqrscp configuration
dcmqrscp_port = "9885"
;server AE title
; server AE title
server_ae_title = "MIDAS_PACS"
;remote AEs
; remote AEs
peer_aes = ""
Loading

0 comments on commit cfdb680

Please sign in to comment.