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

Commit cfdb680

Browse files
author
Jamie Snape
committed
Remove trailing spaces and cleanup some ini files
1 parent 2be8d79 commit cfdb680

File tree

38 files changed

+197
-198
lines changed

38 files changed

+197
-198
lines changed

core/configs/application.ini

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,59 @@
11
[global]
2-
;development or production
2+
; development or production
33
environment = development
4-
;name of the application
4+
; name of the application
55
application.name = MIDAS - Digital Archiving System
6-
;description of the application
6+
; description of the application
77
application.description =
8-
;keywords of the application
8+
; keywords of the application
99
application.keywords = upload, manage, share
10-
;language of the application (en or fr)
10+
; language of the application (en or fr)
1111
application.lang = en
12-
;Optimize JS and CSS
12+
; optimize JS and CSS
1313
smartoptimizer = 0
14-
;Session lifetime (minute)
14+
; session lifetime (minute)
1515
session.lifetime = 20
16-
;Path to md5sum
16+
; path to md5sum
1717
md5sum.path =
18-
;Default Assetstore
18+
; default assetstore
1919
defaultassetstore.id =
20-
;DefaultTimezone
20+
; default timezone
2121
default.timezone = America/New_York
22-
;Processing onthefly or cron
22+
; processing onthefly or cron
2323
processing = onthefly
24-
;Default license
24+
; default license
2525
defaultlicense = 1
26-
;Demo Mode (only works with MySQL)
26+
; demo mode (only works with MySQL)
2727
demomode = 0
28-
;Enable Dynamic help
28+
; enable dynamic help
2929
dynamichelp = 1
30-
;Enable logging of every Midas request
30+
; enable logging of every request
3131
logtrace = 0
32-
;Entry for password prefix (dynamically generated at install time)
32+
; entry for password prefix (dynamically generated at install time)
3333
password.prefix =
34-
;Outbound HTTP proxy to be used by PHP (empty for none)
34+
; outbound HTTP proxy to be used by PHP (empty for none)
3535
httpproxy =
3636

37-
3837
[module]
3938

4039
[production]
41-
;Activate error reporting using Zend
40+
; Activate error reporting using Zend
4241
mode.debug = 0
4342
mode.test = 0
44-
;Show native errors
43+
; Show native errors
4544
error.php = 0
4645

4746
[development]
48-
;Activate error reporting using Zend
47+
; Activate error reporting using Zend
4948
mode.debug = 1
5049
mode.test = 0
51-
;Show native errors
50+
; Show native errors
5251
error.php = 1
5352

5453

5554
[testing]
56-
;Activate error reporting using Zend
55+
; Activate error reporting using Zend
5756
mode.debug = 1
5857
mode.test = 1
59-
;Show native errors
58+
; Show native errors
6059
error.php = 1

core/configs/core.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ bootstrap.class = "Bootstrap"
55
appnamespace = "Midas"
66
resources.frontController.controllerDirectory = "./core/controllers"
77
resources.frontController.moduleDirectory = "./modules"
8-
resources.layout.layoutPath ="./core/layouts/"
8+
resources.layout.layoutPath = "./core/layouts/"
99
resources.view.scriptPath = "./core/views/"
1010
internationalization = "0"
1111

core/views/helpers/Dateago.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function dateago($timestamp)
2727
$component=new DateComponent();
2828
return $component->ago($timestamp);
2929
}
30-
30+
3131

3232
/** Set view*/
3333
public function setView(Zend_View_Interface $view)

core/views/helpers/serversidefilepicker.phtml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
}
4545
$fp_uuid = Configure::read('filePickerId');
4646

47-
47+
4848
if( ! isset($script) ) $script = $this->webroot . 'admin/filePicker';
4949
if( ! isset($width) ) $width = 400;
5050
if( ! isset($height) ) $height = 400;
5151
if( ! isset($fileFilter) ) $fileFilter = '';
5252
if( ! isset($fileFilterErrorMsg) ) $fileFilterErrorMsg = 'Incorrect file type';
5353
if( ! isset($destSelector) ) $destSelector = 'body>XX'; // default selector return 0 elements
5454
if( ! isset($msg) ) $msg = '';
55-
55+
5656
// Find root:
5757
/*if( strpos( strtolower(PHP_OS), 'win') !== false )
5858
{
@@ -63,43 +63,43 @@
6363
$root = '/';
6464
}*/
6565
$root = '';
66-
66+
6767
?>
6868

6969
<!-- FILE PICKER -->
7070
<link rel="stylesheet" type="text/css" href="<?php echo $this->webroot?>css/jqueryFileTree.css" media="screen" />
7171
<style>
7272
.fp-container {
7373
}
74-
74+
7575
/* The fp-XXX-pannel is the div that gets lighted */
7676
#fp-<?php echo $fp_uuid?>-panel {
77-
display:none;
77+
display:none;
7878
position:fixed;
79-
top:100px;
80-
left:50%;
81-
margin-left:-200px;
82-
width:<?php echo $width?>px;
83-
background:#FFFFFF;
84-
padding:10px 15px 10px 15px;
85-
border:2px solid #CCCCCC;
79+
top:100px;
80+
left:50%;
81+
margin-left:-200px;
82+
width:<?php echo $width?>px;
83+
background:#FFFFFF;
84+
padding:10px 15px 10px 15px;
85+
border:2px solid #CCCCCC;
8686
z-index:1001;
8787
}
88-
88+
8989
/* The fp-XXX-pannel is the div that covers the rest of the page */
90-
#fp-<?php echo $fp_uuid?>-background {
91-
display:none;
92-
background:#000000;
93-
opacity:0.5;
94-
filter:alpha(opacity=90);
95-
position:absolute;
96-
top:0px;
97-
left:0px;
98-
min-width:100%;
99-
min-height:100%;
100-
z-index:1000;
90+
#fp-<?php echo $fp_uuid?>-background {
91+
display:none;
92+
background:#000000;
93+
opacity:0.5;
94+
filter:alpha(opacity=90);
95+
position:absolute;
96+
top:0px;
97+
left:0px;
98+
min-width:100%;
99+
min-height:100%;
100+
z-index:1000;
101101
}
102-
102+
103103
.fp-fileTree {
104104
width: <?php echo $width?>px;
105105
height: 300px;
@@ -112,22 +112,22 @@
112112
padding: 5px;
113113
text-align: left;
114114
}
115-
115+
116116
.fp-inputFile {
117117
position: relative;
118118
width: <?php echo $width+5?>px;
119119
}
120-
120+
121121
.fp-inputButton {
122122
position: relative;
123123
float: left;
124124
display: block;
125125
width: 100px;
126126
margin: 3px 40px;
127127
}
128-
128+
129129
.fp-open {
130-
}
130+
}
131131
</style>
132132

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

185185
//$("#fp-<?php echo $fp_uuid?>-panel").draggable();
186186
});
187187
</script>
188188
<input type="submit" id="fp-<?php echo $fp_uuid?>-open" class="fp-open" value="Choose"></input>
189189
<div id="fp-<?php echo $fp_uuid?>-container" class="fp-container">
190-
190+
191191
<div id="fp-<?php echo $fp_uuid?>-background"></div>
192192
<div id="fp-<?php echo $fp_uuid?>-panel">
193193
<b><?php echo $msg; ?></b>

modules/api/configs/module.ini

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
; version of the module
33
version = 1.0.0
44
; full name
5-
fullname= Web Api
5+
fullname = Web Api
66
; description
7-
description= "Allows external applications to communicate with MIDAS"
8-
;Category
9-
category= Core
7+
description = "Allows external applications to communicate with MIDAS"
8+
; category
9+
category = Core
1010

11-
;Specify the prefix of the method exposed to the client API
12-
;For example: By setting 'midas', the method signature will be 'midas.something.get'
13-
methodprefix = midas
11+
; specify the prefix of the method exposed to the client API
12+
; for example: by setting 'midas', the method signature will be 'midas.something.get'
13+
methodprefix = midas

modules/archive/configs/module.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
; version of the module
33
version = 1.0.0
44
; full name
5-
fullname= Archive Extraction
5+
fullname = Archive Extraction
66
; description
7-
description= "Allows extraction of archive files into the hierarchy"
8-
;Category
9-
category= Core
7+
description = "Allows extraction of archive files into the hierarchy"
8+
; category
9+
category = Core

modules/batchmake/configs/module.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
; version of the module
33
version = 0.1.0
44
; full name
5-
fullname= Batchmake
5+
fullname = Batchmake
66
; description
7-
description= Will run a Batchmake pipeline, either locally or via Condor
8-
;Category
9-
category= SSP
10-
dependencies= api
7+
description = Will run a Batchmake pipeline, either locally or via Condor
8+
; category
9+
category = SSP
10+
dependencies = api
1111

1212
batchmake.tmp_dir =
1313
batchmake.bin_dir =

modules/cleanup/configs/module.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ version = 1.0.0
55
fullname = Cleanup Module
66
; description
77
description = "Schedules tasks to perform periodic cleanup operations on the database and filesystem"
8-
; Category
8+
; category
99
category = Core
10-
; Dependencies
10+
; dependencies
1111
dependencies = scheduler
1212

1313
days = "1"

modules/comments/configs/module.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ version = 1.0.0
55
fullname = Comments
66
; description
77
description = Allows users to add comments to an item
8-
; Category
8+
; category
99
category = Core

modules/communityagreement/configs/module.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
; version of the module
33
version = 1.0.0
44
; full name
5-
fullname= Community Agreement
5+
fullname = Community Agreement
66
; description
7-
description= "Enables community agreement"
8-
;Category
9-
category= Core
7+
description = "Enables community agreement"
8+
; category
9+
category = Core

0 commit comments

Comments
 (0)