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

Commit ea562be

Browse files
author
Julien Jomier
committed
STYLE: Fixed style
1 parent a963038 commit ea562be

File tree

9 files changed

+167
-166
lines changed

9 files changed

+167
-166
lines changed

‎core/controllers/AdminController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class AdminController extends AppController
1818
public $_models = array('Errorlog', 'Assetstore');
1919
public $_daos = array();
2020
public $_components = array('Upgrade', 'Utility', 'MIDAS2Migration');
21-
public $_forms = array('Admin', 'Assetstore','Migrate');
21+
public $_forms = array('Admin', 'Assetstore', 'Migrate');
2222

2323
/** init the controller */
2424
function init()
@@ -477,10 +477,10 @@ function migratemidas2Action()
477477
}
478478

479479
// Remove the last slashe if any
480-
if($midas2_assetstore[strlen($midas2_assetstore)-1] == '\\'
481-
|| $midas2_assetstore[strlen($midas2_assetstore)-1] == '/')
480+
if($midas2_assetstore[strlen($midas2_assetstore) - 1] == '\\'
481+
|| $midas2_assetstore[strlen($midas2_assetstore) - 1] == '/')
482482
{
483-
$midas2_assetstore = substr($midas2_assetstore,0,strlen($midas2_assetstore)-1);
483+
$midas2_assetstore = substr($midas2_assetstore, 0, strlen($midas2_assetstore) - 1);
484484
}
485485

486486
$this->Component->MIDAS2Migration->midas2User = $midas2_user;

‎core/controllers/components/MIDAS2MigrationComponent.php‎

Lines changed: 129 additions & 128 deletions
Large diffs are not rendered by default.

‎core/controllers/forms/AssetstoreForm.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class AssetstoreForm extends AppForm
1515
{
1616
/** Create assetstore form*/
17-
public function createAssetstoreForm($action='assetstore/add')
17+
public function createAssetstoreForm($action = 'assetstore/add')
1818
{
1919
$form = new Zend_Form();
2020
$form->setAction($action);
@@ -23,7 +23,7 @@ public function createAssetstoreForm($action='assetstore/add')
2323
$form->setAttrib('class', 'assetstoreForm');
2424

2525
// Name of the assetstore
26-
$inputDirectory = new Zend_Form_Element_Text('name', array('label' => $this->t('Give a name'),
26+
$inputDirectory = new Zend_Form_Element_Text('name', array('label' => $this->t('Give a name'),
2727
'id' => 'assetstorename'));
2828
$inputDirectory->setRequired(true);
2929
$form->addElement($inputDirectory);

‎core/controllers/forms/MigrateForm.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ public function createMigrateForm($assetstores)
2424
$form->setAttrib('class', 'migrateForm');
2525

2626
// Input directory
27-
$midas2_hostname = new Zend_Form_Element_Text('midas2_hostname', array('label' => $this->t('MIDAS2 Hostname'),'size' => 60,'value'=>'localhost'));
27+
$midas2_hostname = new Zend_Form_Element_Text('midas2_hostname', array('label' => $this->t('MIDAS2 Hostname'), 'size' => 60,'value' => 'localhost'));
2828
$midas2_hostname->setRequired(true);
2929
$form->addElement($midas2_hostname);
3030

31-
$midas2_port = new Zend_Form_Element_Text('midas2_port', array('label' => $this->t('MIDAS2 Port'),'size' => 4,'value' => '5432'));
31+
$midas2_port = new Zend_Form_Element_Text('midas2_port', array('label' => $this->t('MIDAS2 Port'), 'size' => 4, 'value' => '5432'));
3232
$midas2_port->setRequired(true);
3333
$midas2_port->setValidators(array(new Zend_Validate_Digits()));
3434
$form->addElement($midas2_port);
3535

36-
$midas2_user = new Zend_Form_Element_Text('midas2_user', array('label' => $this->t('MIDAS2 User'),'size' => 60,'value' => 'midas'));
36+
$midas2_user = new Zend_Form_Element_Text('midas2_user', array('label' => $this->t('MIDAS2 User'), 'size' => 60, 'value' => 'midas'));
3737
$midas2_user->setRequired(true);
3838
$form->addElement($midas2_user);
3939

40-
$midas2_password = new Zend_Form_Element_Password('midas2_password', array('label' => $this->t('MIDAS2 Password'),'size' => 60,'value' => 'midas'));
40+
$midas2_password = new Zend_Form_Element_Password('midas2_password', array('label' => $this->t('MIDAS2 Password'), 'size' => 60, 'value' => 'midas'));
4141
$midas2_password->setRequired(true);
4242
$form->addElement($midas2_password);
4343

44-
$midas2_database = new Zend_Form_Element_Text('midas2_database', array('label' => $this->t('MIDAS2 Database'),'size' => 60,'value' => 'midas'));
44+
$midas2_database = new Zend_Form_Element_Text('midas2_database', array('label' => $this->t('MIDAS2 Database'),' size' => 60, 'value' => 'midas'));
4545
$midas2_database->setRequired(true);
4646
$form->addElement($midas2_database);
4747

48-
$midas2_assetstore = new Zend_Form_Element_Text('midas2_assetstore', array('label' => $this->t('MIDAS2 Assetstore Path'),'size' => 60,'value' => 'C:/xampp/midas/assetstore'));
48+
$midas2_assetstore = new Zend_Form_Element_Text('midas2_assetstore', array('label' => $this->t('MIDAS2 Assetstore Path'), 'size' => 60, 'value' => 'C:/xampp/midas/assetstore'));
4949
$midas2_assetstore->setRequired(true);
5050
$form->addElement($midas2_assetstore);
5151

‎core/database/upgrade/3.0.10.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ public function preUpgrade()
1010
public function mysql()
1111
{
1212
$this->db->query("DROP TABLE metadatatype");
13-
$this->RenameTableField('metadata','metadatatype_id','metadatatype','int(11)','integer','0');
13+
$this->renameTableField('metadata','metadatatype_id','metadatatype','int(11)','integer','0');
1414
}
1515

1616

1717
public function pgsql()
1818
{
1919
$this->db->query("DROP TABLE metadatatype");
20-
$this->RenameTableField('metadata','metadatatype_id','metadatatype','int(11)','integer','0');
20+
$this->renameTableField('metadata','metadatatype_id','metadatatype','int(11)','integer','0');
2121
}
2222

2323
public function postUpgrade()

‎core/database/upgrade/3.0.12.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public function pgsql()
2222

2323
public function postUpgrade()
2424
{
25-
$this->AddTableField('community', 'uuid', 'varchar(255)', ' character varying(512)', null);
26-
$this->AddTableField('user', 'uuid', 'varchar(255)', ' character varying(512)', null);
27-
$this->AddTableField('item', 'uuid', 'varchar(255)', ' character varying(512)', null);
28-
$this->AddTableField('folder', 'uuid', 'varchar(255)', ' character varying(512)', null);
29-
$this->AddTableField('itemrevision', 'uuid', 'varchar(255)', ' character varying(512)', null);
25+
$this->addTableField('community', 'uuid', 'varchar(255)', ' character varying(512)', null);
26+
$this->addTableField('user', 'uuid', 'varchar(255)', ' character varying(512)', null);
27+
$this->addTableField('item', 'uuid', 'varchar(255)', ' character varying(512)', null);
28+
$this->addTableField('folder', 'uuid', 'varchar(255)', ' character varying(512)', null);
29+
$this->addTableField('itemrevision', 'uuid', 'varchar(255)', ' character varying(512)', null);
3030

3131
}
3232
}

‎core/database/upgrade/3.0.13.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ class Upgrade_3_0_13 extends MIDASUpgrade
44
{
55
public function preUpgrade()
66
{
7-
$this->AddTableField('metadatadocumentvalue', 'metadatavalue_id', 'bigint(20)', 'serial',false);
8-
$this->AddTableField('metadatavalue', 'metadatavalue_id', 'bigint(20)', 'serial',false);
7+
$this->addTableField('metadatadocumentvalue', 'metadatavalue_id', 'bigint(20)', 'serial',false);
8+
$this->addTableField('metadatavalue', 'metadatavalue_id', 'bigint(20)', 'serial',false);
99
}
1010

1111
public function mysql()
1212
{
13-
$this->AddTablePrimaryKey('metadatadocumentvalue', 'metadatavalue_id');
14-
$this->AddTablePrimaryKey('metadatavalue', 'metadatavalue_id');
13+
$this->addTablePrimaryKey('metadatadocumentvalue', 'metadatavalue_id');
14+
$this->addTablePrimaryKey('metadatavalue', 'metadatavalue_id');
1515
$this->db->query("ALTER TABLE `metadatadocumentvalue` CHANGE `metadatavalue_id`
1616
`metadatavalue_id` BIGINT( 20 ) NOT NULL AUTO_INCREMENT");
1717
$this->db->query("ALTER TABLE `metadatavalue` CHANGE `metadatavalue_id`

‎core/models/base/MetadataModelBase.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ public function __construct()
3131
$this->initialize(); // required
3232
} // end __construct()
3333

34-
abstract function getMetadata($type,$element,$qualifier);
34+
abstract function getMetadata($type, $element, $qualifier);
3535
protected abstract function saveMetadataValue($metadataDao);
3636
abstract function getMetadataValueExists($metadataDao);
3737

3838
/** Add a metadata
3939
* @return MetadataDao */
40-
function addMetadata($type,$element,$qualifier,$description)
40+
function addMetadata($type, $element, $qualifier, $description)
4141
{
4242
// Gets the metadata
43-
$metadata = $this->getMetadata($type,$element,$qualifier);
43+
$metadata = $this->getMetadata($type, $element, $qualifier);
4444
if($metadata)
4545
{
4646
throw new Zend_Exception("Metadata already exists.");
@@ -62,15 +62,15 @@ function addMetadata($type,$element,$qualifier,$description)
6262

6363
/** Add a metadata to an itemRevision
6464
* @return MetadataDao */
65-
function addMetadataValue($itemRevisionDao,$type,$element,$qualifier,$value)
65+
function addMetadataValue($itemRevisionDao, $type, $element, $qualifier, $value)
6666
{
6767
if(!$itemRevisionDao instanceof $itemRevisionDao)
6868
{
6969
throw new Zend_Exception("Error parameters.");
7070
}
7171

7272
// Gets the metadata
73-
$metadataDao = $this->getMetadata($type,$element,$qualifier);
73+
$metadataDao = $this->getMetadata($type, $element, $qualifier);
7474

7575
if(!$metadataDao)
7676
{

‎library/MIDAS/models/MIDASUpgrade.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function loadElements()
165165
* @method public AddTableField()
166166
* Add a field to a table
167167
*/
168-
function AddTableField($table,$field,$mySQLType,$pgSqlType,$default)
168+
function addTableField($table, $field, $mySQLType, $pgSqlType, $default)
169169
{
170170
$sql = '';
171171
if($default !== false)
@@ -187,7 +187,7 @@ function AddTableField($table,$field,$mySQLType,$pgSqlType,$default)
187187
* @method public RemoveTableField()
188188
* Remove a field from a table
189189
*/
190-
function RemoveTableField($table,$field)
190+
function removeTableField($table, $field)
191191
{
192192
if($this->dbtype == "PDO_PGSQL")
193193
{
@@ -203,7 +203,7 @@ function RemoveTableField($table,$field)
203203
* @method public RenameTableField()
204204
* Rename a field from a table
205205
*/
206-
function RenameTableField($table,$field,$newfield,$mySQLType,$pgSqlType,$default)
206+
function renameTableField($table, $field, $newfield, $mySQLType, $pgSqlType, $default)
207207
{
208208
if($this->dbtype == "PDO_PGSQL")
209209
{
@@ -222,7 +222,7 @@ function RenameTableField($table,$field,$newfield,$mySQLType,$pgSqlType,$default
222222
* Check if the index exists.
223223
* Only works for MySQL
224224
*/
225-
function CheckIndexExists($table,$field)
225+
function checkIndexExists($table, $field)
226226
{
227227
if($this->dbtype == "PDO_MYSQL")
228228
{
@@ -242,9 +242,9 @@ function CheckIndexExists($table,$field)
242242
* @method public AddTableIndex()
243243
* Add an index to a table
244244
*/
245-
function AddTableIndex($table,$field)
245+
function addTableIndex($table, $field)
246246
{
247-
if(!$this->CheckIndexExists($table,$field))
247+
if(!$this->checkIndexExists($table, $field))
248248
{
249249
if($this->dbtype == "PDO_PGSQL")
250250
{
@@ -261,9 +261,9 @@ function AddTableIndex($table,$field)
261261
* @method public RemoveTableIndex()
262262
* Remove an index from a table
263263
*/
264-
function RemoveTableIndex($table,$field)
264+
function removeTableIndex($table, $field)
265265
{
266-
if($this->CheckIndexExists($table,$field))
266+
if($this->checkIndexExists($table, $field))
267267
{
268268
if($this->dbtype == "PDO_PGSQL")
269269
{
@@ -280,7 +280,7 @@ function RemoveTableIndex($table,$field)
280280
* @method public AddTablePrimaryKey()
281281
* Add a primary key to a table
282282
*/
283-
function AddTablePrimaryKey($table,$field)
283+
function addTablePrimaryKey($table, $field)
284284
{
285285
if($this->dbtype == "PDO_PGSQL")
286286
{
@@ -296,7 +296,7 @@ function AddTablePrimaryKey($table,$field)
296296
* @method public RemoveTablePrimaryKey()
297297
* Remove a primary key from a table
298298
*/
299-
function RemoveTablePrimaryKey($table)
299+
function removeTablePrimaryKey($table)
300300
{
301301
if($this->dbtype == "PDO_PGSQL")
302302
{

0 commit comments

Comments
 (0)