Skip to content

Commit

Permalink
Merge pull request #1 from loannis/Rename_table_columns
Browse files Browse the repository at this point in the history 
Rename table columns from camelCase to snake_case
  • Loading branch information
@axel
axel authored Nov 9, 2022
2 parents 5f06f11 + c5e6380 commit 369b450
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 82 deletions.
16 changes: 8 additions & 8 deletions Config/Schema/schema.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
<field name="co_dashboard_widget_id" type="I">
<constraint>REFERENCES cm_co_dashboard_widgets(id)</constraint>
</field>
<field name="connUrl" type="C" size="256" />
<field name="connVer" type="C" size="256" />
<field name="grouperUrl" type="C" size="256" />
<field name="connUser" type="C" size="64" />
<field name="connPass" type="C" size="64" />
<field name="adHocHeading" type="C" size="64" />
<field name="wgHeading" type="C" size="64" />
<field name="defaultCollapse" type="C" size="64" />
<field name="conn_url" type="C" size="256" />
<field name="conn_ver" type="C" size="256" />
<field name="grouper_url" type="C" size="256" />
<field name="conn_user" type="C" size="64" />
<field name="conn_pass" type="C" size="64" />
<field name="adhoc_heading" type="C" size="64" />
<field name="wg_heading" type="C" size="64" />
<field name="default_collapse" type="C" size="64" />
<field name="created" type="T" />
<field name="modified" type="T" />

Expand Down
18 changes: 9 additions & 9 deletions Controller/GrouperGroupsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ private function setConnection()
//Now get the setup Dasboard instance from db for connection info.
$getConnInfo = new CoGrouperLite();
$connectionInfo = $getConnInfo->findById($this->passedArgs['glid']);
$this->Session->write('Plugin.Grouper.Api.url', $connectionInfo['CoGrouperLite']['connUrl']);
$this->Session->write('Plugin.Grouper.Api.version', $connectionInfo['CoGrouperLite']['connVer']);
$this->Session->write('Plugin.Grouper.Api.user', $connectionInfo['CoGrouperLite']['connUser']);
$this->Session->write('Plugin.Grouper.Api.pass', $connectionInfo['CoGrouperLite']['connPass']);
$this->Session->write('Plugin.Grouper.Api.grouperUrl', $connectionInfo['CoGrouperLite']['grouperUrl']);

$this->Session->write('Plugin.Grouper.Api.adHocHeading', $connectionInfo['CoGrouperLite']['adHocHeading']);
$this->Session->write('Plugin.Grouper.Api.wgHeading', $connectionInfo['CoGrouperLite']['wgHeading']);
$this->Session->write('Plugin.Grouper.Api.defaultCollapse', $connectionInfo['CoGrouperLite']['defaultCollapse']);
$this->Session->write('Plugin.Grouper.Api.url', $connectionInfo['CoGrouperLite']['conn_url']);
$this->Session->write('Plugin.Grouper.Api.version', $connectionInfo['CoGrouperLite']['conn_ver']);
$this->Session->write('Plugin.Grouper.Api.user', $connectionInfo['CoGrouperLite']['conn_user']);
$this->Session->write('Plugin.Grouper.Api.pass', $connectionInfo['CoGrouperLite']['conn_pass']);
$this->Session->write('Plugin.Grouper.Api.grouperUrl', $connectionInfo['CoGrouperLite']['grouper_url']);

$this->Session->write('Plugin.Grouper.Api.adHocHeading', $connectionInfo['CoGrouperLite']['adhoc_heading']);
$this->Session->write('Plugin.Grouper.Api.wgHeading', $connectionInfo['CoGrouperLite']['wg_heading']);
$this->Session->write('Plugin.Grouper.Api.defaultCollapse', $connectionInfo['CoGrouperLite']['default_collapse']);
}

/**
Expand Down
16 changes: 8 additions & 8 deletions Model/CoGrouperLite.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,37 +58,37 @@ class CoGrouperLite extends CoDashboardWidgetBackend {
'rule' => 'alphaNumeric',
'required' => true
),
'connUrl' => array(
'conn_url' => array(
'rule' => array('custom', '/^https?:\/\/.*/'),
'required' => true
),
'connVer' => array(
'conn_ver' => array(
'rule' => array('minLength', 4),
'required' => true
),
'grouperUrl' => array(
'grouper_url' => array(
'rule' => array('custom', '/^https?:\/\/.*/'),
'required' => true
),
'connUser' => array(
'conn_user' => array(
'rule' => array('minLength', 1),
'required' => true
),
'connPass' => array(
'conn_pass' => array(
'rule' => array('minLength', 1),
'required' => true
),
'adHocHeading' => array(
'adhoc_heading' => array(
'rule' => array('minLength', 1),
'required' => false,
'default' => 'Ad-hoc groups'
),
'wgHeading' => array(
'wg_heading' => array(
'rule' => array('minLength', 1),
'required' => false,
'default' => 'Working groups'
),
'defaultCollapse' => array(
'default_collapse' => array(
'rule' => array('minLength', 1),
'required' => false,
'default' => 'collapsed'
Expand Down
114 changes: 57 additions & 57 deletions View/CoGrouperLites/fields.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,29 +72,29 @@ print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)
<li>
<div class="field-name">
<div class="field-title">
<?php print($e ? $this->Form->label('grouperUrl', _txt('pl.grouperlite.config.grouper-url')) : _txt('pl.grouperlite.config.grouper-url')); ?>
<?php print($e ? $this->Form->label('grouper_url', _txt('pl.grouperlite.config.grouper-url')) : _txt('pl.grouperlite.config.grouper-url')); ?>
<span class="required">*</span>
<br /><sub>
<?php print($e ? $this->Form->label('grouperUrl', _txt('pl.grouperlite.config.grouper-url-subscript')) : _txt('pl.grouperlite.config.grouper-url-subscript')); ?>
<?php print($e ? $this->Form->label('grouper_url', _txt('pl.grouperlite.config.grouper-url-subscript')) : _txt('pl.grouperlite.config.grouper-url-subscript')); ?>
</sub>
</div>
</div>
<div class="field-info">
<?php
$attrs = array();
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['grouperUrl'] ?? '');
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['grouper_url'] ?? '');
$attrs['empty'] = true;
$attrs['required'] = true;

if ($e) {
print $this->Form->input('grouperUrl', $attrs);
print $this->Form->input('grouper_url', $attrs);

if ($this->Form->isFieldError('grouperUrl')) {
print $this->Form->error('grouperUrl');
if ($this->Form->isFieldError('grouper_url')) {
print $this->Form->error('grouper_url');
}
} else {
if (!empty($co_grouper_lites[0]['CoGrouperLite']['grouperUrl'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['grouperUrl'], FILTER_SANITIZE_SPECIAL_CHARS);
if (!empty($co_grouper_lites[0]['CoGrouperLite']['grouper_url'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['grouper_url'], FILTER_SANITIZE_SPECIAL_CHARS);
}
}
?>
Expand All @@ -103,26 +103,26 @@ print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)
<li>
<div class="field-name">
<div class="field-title">
<?php print($e ? $this->Form->label('connUrl', _txt('pl.grouperlite.config.grouper-ws-url')) : _txt('pl.grouperlite.config.grouper-url')); ?>
<?php print($e ? $this->Form->label('conn_url', _txt('pl.grouperlite.config.grouper-ws-url')) : _txt('pl.grouperlite.config.grouper-url')); ?>
<span class="required">*</span>
</div>
</div>
<div class="field-info">
<?php
$attrs = array();
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['connUrl'] ?? '');
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['conn_url'] ?? '');
$attrs['empty'] = true;
$attrs['required'] = true;

if ($e) {
print $this->Form->input('connUrl', $attrs);
print $this->Form->input('conn_url', $attrs);

if ($this->Form->isFieldError('connUrl')) {
print $this->Form->error('connUrl');
if ($this->Form->isFieldError('conn_url')) {
print $this->Form->error('conn_url');
}
} else {
if (!empty($co_grouper_lites[0]['CoGrouperLite']['connUrl'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['connUrl'], FILTER_SANITIZE_SPECIAL_CHARS);
if (!empty($co_grouper_lites[0]['CoGrouperLite']['conn_url'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['conn_url'], FILTER_SANITIZE_SPECIAL_CHARS);
}
}
?>
Expand All @@ -131,26 +131,26 @@ print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)
<li>
<div class="field-name">
<div class="field-title">
<?php print($e ? $this->Form->label('connVer', _txt('pl.grouperlite.config.grouper-ws-version')) : _txt('pl.grouperlite.config.grouper-version')); ?>
<?php print($e ? $this->Form->label('conn_ver', _txt('pl.grouperlite.config.grouper-ws-version')) : _txt('pl.grouperlite.config.grouper-version')); ?>
<span class="required">*</span>
</div>
</div>
<div class="field-info">
<?php
$attrs = array();
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['connVer'] ?? '');
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['conn_ver'] ?? '');
$attrs['empty'] = true;
$attrs['required'] = true;

if ($e) {
print $this->Form->input('connVer', $attrs);
print $this->Form->input('conn_ver', $attrs);

if ($this->Form->isFieldError('connVer')) {
print $this->Form->error('connVer');
if ($this->Form->isFieldError('conn_ver')) {
print $this->Form->error('conn_ver');
}
} else {
if (!empty($co_grouper_lites[0]['CoGrouperLite']['connVer'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['connVer'], FILTER_SANITIZE_SPECIAL_CHARS);
if (!empty($co_grouper_lites[0]['CoGrouperLite']['conn_ver'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['conn_ver'], FILTER_SANITIZE_SPECIAL_CHARS);
}
}
?>
Expand All @@ -159,26 +159,26 @@ print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)
<li>
<div class="field-name">
<div class="field-title">
<?php print($e ? $this->Form->label('connUser', _txt('pl.grouperlite.config.grouper-ws-un')) : _txt('pl.grouperlite.config.grouper-un')); ?>
<?php print($e ? $this->Form->label('conn_user', _txt('pl.grouperlite.config.grouper-ws-un')) : _txt('pl.grouperlite.config.grouper-un')); ?>
<span class="required">*</span>
</div>
</div>
<div class="field-info">
<?php
$attrs = array();
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['connUser'] ?? '');
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['conn_user'] ?? '');
$attrs['empty'] = true;
$attrs['required'] = true;

if ($e) {
print $this->Form->input('connUser', $attrs);
print $this->Form->input('conn_user', $attrs);

if ($this->Form->isFieldError('connUser')) {
print $this->Form->error('connUser');
if ($this->Form->isFieldError('conn_user')) {
print $this->Form->error('conn_user');
}
} else {
if (!empty($co_grouper_lites[0]['CoGrouperLite']['connUser'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['connUser'], FILTER_SANITIZE_SPECIAL_CHARS);
if (!empty($co_grouper_lites[0]['CoGrouperLite']['conn_user'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['conn_user'], FILTER_SANITIZE_SPECIAL_CHARS);
}
}
?>
Expand All @@ -187,26 +187,26 @@ print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)
<li>
<div class="field-name">
<div class="field-title">
<?php print($e ? $this->Form->label('connPass', _txt('pl.grouperlite.config.grouper-ws-pw')) : _txt('pl.grouperlite.config.grouper-pw')); ?>
<?php print($e ? $this->Form->label('conn_pass', _txt('pl.grouperlite.config.grouper-ws-pw')) : _txt('pl.grouperlite.config.grouper-pw')); ?>
<span class="required">*</span>
</div>
</div>
<div class="field-info">
<?php
$attrs = array();
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['connPass'] ?? '');
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['conn_pass'] ?? '');
$attrs['empty'] = true;
$attrs['required'] = true;

if ($e) {
print $this->Form->password('connPass', $attrs);
print $this->Form->password('conn_pass', $attrs);

if ($this->Form->isFieldError('connPass')) {
print $this->Form->error('connPass');
if ($this->Form->isFieldError('conn_pass')) {
print $this->Form->error('conn_pass');
}
} else {
if (!empty($co_grouper_lites[0]['CoGrouperLite']['connPass'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['connPass'], FILTER_SANITIZE_SPECIAL_CHARS);
if (!empty($co_grouper_lites[0]['CoGrouperLite']['conn_pass'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['conn_pass'], FILTER_SANITIZE_SPECIAL_CHARS);
}
}
?>
Expand All @@ -216,25 +216,25 @@ print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)
<li>
<div class="field-name">
<div class="field-title">
<?php print($e ? $this->Form->label('adHocHeading', _txt('pl.grouperlite.config.ad-hoc-heading')) : _txt('pl.grouperlite.config.ad-hoc-heading')); ?>
<?php print($e ? $this->Form->label('adhoc_heading', _txt('pl.grouperlite.config.ad-hoc-heading')) : _txt('pl.grouperlite.config.ad-hoc-heading')); ?>
</div>
</div>
<div class="field-info">
<?php
$attrs = array();
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['adHocHeading'] ?? '');
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['adhoc_heading'] ?? '');
$attrs['empty'] = true;
$attrs['required'] = false;

if ($e) {
print $this->Form->input('adHocHeading', $attrs);
print $this->Form->input('adhoc_heading', $attrs);

if ($this->Form->isFieldError('adHocHeading')) {
print $this->Form->error('adHocHeading');
if ($this->Form->isFieldError('adhoc_heading')) {
print $this->Form->error('adhoc_heading');
}
} else {
if (!empty($co_grouper_lites[0]['CoGrouperLite']['adHocHeading'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['adHocHeading'], FILTER_SANITIZE_SPECIAL_CHARS);
if (!empty($co_grouper_lites[0]['CoGrouperLite']['adhoc_heading'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['adhoc_heading'], FILTER_SANITIZE_SPECIAL_CHARS);
}
}
?>
Expand All @@ -244,25 +244,25 @@ print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)
<li>
<div class="field-name">
<div class="field-title">
<?php print($e ? $this->Form->label('wgHeading', _txt('pl.grouperlite.config.wg-heading')) : _txt('pl.grouperlite.config.wg-heading')); ?>
<?php print($e ? $this->Form->label('wg_heading', _txt('pl.grouperlite.config.wg-heading')) : _txt('pl.grouperlite.config.wg-heading')); ?>
</div>
</div>
<div class="field-info">
<?php
$attrs = array();
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['wgHeading'] ?? '');
$attrs['value'] = ($co_grouper_lites[0]['CoGrouperLite']['wg_heading'] ?? '');
$attrs['empty'] = true;
$attrs['required'] = false;

if ($e) {
print $this->Form->input('wgHeading', $attrs);
print $this->Form->input('wg_heading', $attrs);

if ($this->Form->isFieldError('wgHeading')) {
print $this->Form->error('wgHeading');
if ($this->Form->isFieldError('wg_heading')) {
print $this->Form->error('wg_heading');
}
} else {
if (!empty($co_grouper_lites[0]['CoGrouperLite']['wgHeading'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['wgHeading'], FILTER_SANITIZE_SPECIAL_CHARS);
if (!empty($co_grouper_lites[0]['CoGrouperLite']['wg_heading'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['wg_heading'], FILTER_SANITIZE_SPECIAL_CHARS);
}
}
?>
Expand All @@ -273,28 +273,28 @@ print $this->Form->hidden('co_dashboard_widget_id', array('default' => $vv_dwid)

<div class="field-name">
<div class="field-title">
<?php print($e ? $this->Form->label('defaultCollapse', _txt('pl.grouperlite.config.default-collapse')) : _txt('pl.grouperlite.config.default-collapse')); ?>
<?php print($e ? $this->Form->label('default_collapse', _txt('pl.grouperlite.config.default-collapse')) : _txt('pl.grouperlite.config.default-collapse')); ?>
</div>
</div>
<div class="field-info">
<?php

if ($e) {
print $this->Form->radio('defaultCollapse', array(
print $this->Form->radio('default_collapse', array(
'collapsed' => 'True',
'expanded' => 'False'
), array(
'value' => $co_grouper_lites[0]['CoGrouperLite']['defaultCollapse'],
'value' => $co_grouper_lites[0]['CoGrouperLite']['default_collapse'],
'legend' => false,
'separator' => '&nbsp;&nbsp;'
));

if ($this->Form->isFieldError('defaultCollapse')) {
print $this->Form->error('defaultCollapse');
if ($this->Form->isFieldError('default_collapse')) {
print $this->Form->error('default_collapse');
}
} else {
if (!empty($co_grouper_lites[0]['CoGrouperLite']['defaultCollapse'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['defaultCollapse'], FILTER_SANITIZE_SPECIAL_CHARS);
if (!empty($co_grouper_lites[0]['CoGrouperLite']['default_collapse'])) {
print filter_var($co_grouper_lites[0]['CoGrouperLite']['default_collapse'], FILTER_SANITIZE_SPECIAL_CHARS);
}
}
?>
Expand Down

0 comments on commit 369b450

Please sign in to comment.