Skip to content

Commit d7f4c75

Browse files
ximexximex
committed
apply new fixers on code
1 parent 042fa32 commit d7f4c75

File tree

7 files changed

+25
-26
lines changed

7 files changed

+25
-26
lines changed

‎adm_program/modules/inventory/item.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ function showHideMembershipInformation(element) {
198198
$field = getFieldCode($field->getValue('inf_name_intern'), $getItemId);
199199
if($gDbType == 'mysql')
200200
{
201-
$sql = 'SELECT CONCAT(room_name, \' (\', room_capacity, \'+\', IFNULL(room_overhang, \'0\'), \')\') as name FROM '.TBL_ROOMS.' where room_id = ' . $field['value'] ;
201+
$sql = 'SELECT CONCAT(room_name, \' (\', room_capacity, \'+\', IFNULL(room_overhang, \'0\'), \')\') as name FROM '.TBL_ROOMS.' where room_id = ' . $field['value'];
202202
}
203203
else
204204
{

‎adm_program/modules/inventory/item_photo_edit.php

-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
exit();
147147
}
148148

149-
150149
/*****************************Foto hochladen*************************************/
151150
if($getMode == 'choose')
152151
{

‎adm_program/modules/photos/photo_download.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
$zipname = tempnam($tempfolder, 'zip');
8282
$nicename = $photo_album->getValue('pho_name').' - '.$photo_album->getValue('pho_photographers').'.zip';
8383

84-
$zip = new ZipArchive;
84+
$zip = new ZipArchive();
8585
$zip->open($zipname, ZipArchive::CREATE);
8686

8787
for ($i = 1; $i <= $quantity; $i++)

‎adm_program/modules/preferences/preferences.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,11 @@
313313
$text->readDataByColumns(array('txt_name' => 'SYSMAIL_REFUSE_REGISTRATION', 'txt_org_id' => $gCurrentOrganization->getValue('org_id')));
314314
$form->addMultilineTextInput('SYSMAIL_REFUSE_REGISTRATION', $gL10n->get('ORG_REFUSE_REGISTRATION'), $text->getValue('txt_text'), 7);
315315
$text->readDataByColumns(array('txt_name' => 'SYSMAIL_NEW_PASSWORD', 'txt_org_id' => $gCurrentOrganization->getValue('org_id')));
316-
$form->addMultilineTextInput('SYSMAIL_NEW_PASSWORD', $gL10n->get('ORG_SEND_NEW_PASSWORD'), $text->getValue('txt_text'), 7, array('helpTextIdInline' =>
317-
$gL10n->get('ORG_ADDITIONAL_VARIABLES').':<br /><strong>%variable1%</strong> - '.$gL10n->get('ORG_VARIABLE_NEW_PASSWORD')));
316+
$form->addMultilineTextInput('SYSMAIL_NEW_PASSWORD', $gL10n->get('ORG_SEND_NEW_PASSWORD'), $text->getValue('txt_text'), 7,
317+
array('helpTextIdInline' => $gL10n->get('ORG_ADDITIONAL_VARIABLES').':<br /><strong>%variable1%</strong> - '.$gL10n->get('ORG_VARIABLE_NEW_PASSWORD')));
318318
$text->readDataByColumns(array('txt_name' => 'SYSMAIL_ACTIVATION_LINK', 'txt_org_id' => $gCurrentOrganization->getValue('org_id')));
319-
$form->addMultilineTextInput('SYSMAIL_ACTIVATION_LINK', $gL10n->get('ORG_NEW_PASSWORD_ACTIVATION_LINK'), $text->getValue('txt_text'), 7, array('helpTextIdInline' =>
320-
$gL10n->get('ORG_ADDITIONAL_VARIABLES').':<br />
319+
$form->addMultilineTextInput('SYSMAIL_ACTIVATION_LINK', $gL10n->get('ORG_NEW_PASSWORD_ACTIVATION_LINK'), $text->getValue('txt_text'), 7,
320+
array('helpTextIdInline' => $gL10n->get('ORG_ADDITIONAL_VARIABLES').':<br />
321321
<strong>%variable1%</strong> - '.$gL10n->get('ORG_VARIABLE_NEW_PASSWORD').'<br />
322322
<strong>%variable2%</strong> - '.$gL10n->get('ORG_VARIABLE_ACTIVATION_LINK')));
323323

‎adm_program/system/classes/htmlpage.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -227,26 +227,26 @@ public function addDefaultMenu()
227227
$gL10n->get('LNK_WEBLINKS'), 'weblinks.png', 'right', 'menu_item_modules', 'admidio-default-menu-item');
228228
}
229229

230-
if($gCurrentUser ->isWebmaster() || $gCurrentUser ->manageRoles() || $gCurrentUser ->approveUsers() || $gCurrentUser ->editUsers())
230+
if($gCurrentUser->isWebmaster() || $gCurrentUser->manageRoles() || $gCurrentUser->approveUsers() || $gCurrentUser->editUsers())
231231
{
232232
$this->menu->addItem('menu_item_administration', null, $gL10n->get('SYS_ADMINISTRATION'), 'application_view_list.png', 'right', 'navbar', 'admidio-default-menu-item');
233233

234-
if($gCurrentUser ->approveUsers() && $gPreferences['registration_mode'] > 0)
234+
if($gCurrentUser->approveUsers() && $gPreferences['registration_mode'] > 0)
235235
{
236236
$this->menu->addItem('menu_item_registration', '/adm_program/modules/registration/registration.php',
237237
$gL10n->get('NWU_NEW_REGISTRATIONS'), 'new_registrations.png', 'right', 'menu_item_administration', 'admidio-default-menu-item');
238238
}
239-
if($gCurrentUser ->editUsers())
239+
if($gCurrentUser->editUsers())
240240
{
241241
$this->menu->addItem('menu_item_members', '/adm_program/modules/members/members.php',
242242
$gL10n->get('MEM_USER_MANAGEMENT'), 'user_administration.png', 'right', 'menu_item_administration', 'admidio-default-menu-item');
243243
}
244-
if($gCurrentUser ->manageRoles())
244+
if($gCurrentUser->manageRoles())
245245
{
246246
$this->menu->addItem('menu_item_roles', '/adm_program/modules/roles/roles.php',
247247
$gL10n->get('ROL_ROLE_ADMINISTRATION'), 'roles.png', 'right', 'menu_item_administration', 'admidio-default-menu-item');
248248
}
249-
if($gCurrentUser ->isWebmaster())
249+
if($gCurrentUser->isWebmaster())
250250
{
251251
$this->menu->addItem('menu_item_backup', '/adm_program/modules/backup/backup.php',
252252
$gL10n->get('BAC_DATABASE_BACKUP'), 'backup.png', 'right', 'menu_item_administration', 'admidio-default-menu-item');

‎adm_program/system/classes/htmltablebasic.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ class HtmlTableBasic extends HtmlElement {
133133
*/
134134
public function __construct($id = '', $class = '', $border = 0)
135135
{
136-
$this->border = (is_numeric($border))? $border : 0;
136+
$this->border = (is_numeric($border)) ? $border : 0;
137137
$this->lineChange = '';
138-
$this->columsWidth = array();
139-
$this->changeclass = '';
140-
$this->thead = -1;
141-
$this->tfoot = -1;
142-
$this->tbody = -1;
143-
$this->columnCount = 0;
144-
$this->rowCount = 0;
138+
$this->columsWidth = array();
139+
$this->changeclass = '';
140+
$this->thead = -1;
141+
$this->tfoot = -1;
142+
$this->tbody = -1;
143+
$this->columnCount = 0;
144+
$this->rowCount = 0;
145145

146146
parent::__construct('table', '', '', true);
147147

@@ -377,7 +377,7 @@ public function addTableBody($attribute = '', $value = '', $data = '', $col = 't
377377
}
378378

379379
$this->addParentElement('tbody');
380-
$this->tbody = 1 ;
380+
$this->tbody = 1;
381381
if($attribute != '' && $value != '')
382382
{
383383
$this->addAttribute($attribute, $value);
@@ -409,7 +409,7 @@ public function addTableFooter($attribute = '', $value = '', $data = '', $col =
409409
{
410410
$this->closeParentElement('thead');
411411
$this->addParentElement('tfoot');
412-
$this->tfoot = 1 ;
412+
$this->tfoot = 1;
413413

414414
if($attribute != '' && $value != '')
415415
{
@@ -440,7 +440,7 @@ public function addTableHeader($attribute = '', $value = '', $data = '', $col =
440440
if($this->thead != 1)
441441
{
442442
$this->addParentElement('thead');
443-
$this->thead = 1 ;
443+
$this->thead = 1;
444444

445445
if($attribute != '' && $value != '')
446446
{

‎adm_program/system/classes/listconfiguration.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -292,16 +292,16 @@ public function getSQL($roleIds, $memberStatus = 0)
292292
$type = '';
293293
}
294294

295-
$parser = new ConditionParser;
296-
295+
$parser = new ConditionParser();
296+
297297
// if profile field then add not exists condition
298298
if($listColumn->getValue('lsc_usf_id') > 0)
299299
{
300300
$parser->setNotExistsStatement('SELECT 1 FROM '.TBL_USER_DATA.' '.$tableAlias.'s
301301
WHERE '.$tableAlias.'s.usd_usr_id = usr_id
302302
AND '.$tableAlias.'s.usd_usf_id = '.$listColumn->getValue('lsc_usf_id'));
303303
}
304-
304+
305305
// now transform condition into SQL
306306
$condition = $parser->makeSqlStatement($value, $dbColumnName, $type, $gProfileFields->getPropertyById($listColumn->getValue('lsc_usf_id'), 'usf_name'));
307307
$sqlWhere = $sqlWhere. $condition;

0 commit comments

Comments
 (0)