CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch all array init calles to no space before bracket

Browse Source 
Also bug fix in Form General for load int PK calls with non int types
This commit is contained in:
Clemens Schwaighofer
2019-09-20 11:10:13 +09:00
parent 8ade113070
commit ef1df6f171
26 changed files with 398 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/includes/Date.Vars.php
View File

@@ -7,7 +7,7 @@
* HISTORY:
*********************************************************************/
$day_short = array (
$day_short = array(
1 => 'Mon',
2 => 'Tue',
3 => 'Wed',
@@ -17,7 +17,7 @@ $day_short = array (
7 => 'Sun'
);
$day_long = array (
$day_long = array(
1 => 'Monday',
2 => 'Tuesday',
3 => 'Wednesday',
@@ -28,7 +28,7 @@ $day_long = array (
);
// months
$month_long = array (
$month_long = array(
1 => 'January',
2 => 'February',
3 => 'March',
@@ -43,7 +43,7 @@ $month_long = array (
12 => 'December'
);
$month_short = array (
$month_short = array(
1 => 'Jan',
2 => 'Feb',
3 => 'Mar',

4
www/includes/admin_header.php
View File

@@ -14,7 +14,7 @@ if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
}
// predefine vars
$lang = '';
$messages = array ();
$messages = array();
// import all POST vars
extract($_POST, EXTR_SKIP);
//------------------------------ variable init end
@@ -70,7 +70,7 @@ ob_end_flush();
//------------------------------ logging start
// log backend data
// data part creation
$data = array (
$data = array(
'_SESSION' => $_SESSION,
'_GET' => $_GET,
'_POST' => $_POST,

32
www/includes/edit_base.php
View File

@@ -94,13 +94,13 @@ if ($form->my_page_name == 'edit_order') {
// order name is _always_ order_number for the edit interface
// follwing arrays do exist here:
// $position ... has the positions of the array (0..max), cause in a <select>
// $position ... has the positions of the array(0..max), cause in a <select>
// I can't put an number into the array field, in this array,
// there are the POSITION stored, that should CHANGE there order (up/down)
// $row_data_id ... has ALL ids from the sorting part
// $row_data_order ... has ALL order positions from the soirting part
if (!isset($position)) {
$position = array ();
$position = array();
}
$row_data_id = $_POST['row_data_id'];
$original_id = $row_data_id;
@@ -154,7 +154,7 @@ if ($form->my_page_name == 'edit_order') {
$q .= "ORDER BY order_number";
while ($res = $form->dbReturn($q)) {
$row_data[] = array (
$row_data[] = array(
"id" => $res[$table_name."_id"],
"name" => $res["name"],
"order" => $res["order_number"]
@@ -164,22 +164,22 @@ if ($form->my_page_name == 'edit_order') {
// html title
$HEADER['HTML_TITLE'] = $form->l->__('Edit Order');
$messages = array ();
$messages = array();
// error msg
if (isset($error)) {
if (!isset($msg)) {
$msg = array ();
$msg = array();
}
$messages[] = array ('msg' => $msg, 'class' => 'error', 'width' => '100%');
$messages[] = array('msg' => $msg, 'class' => 'error', 'width' => '100%');
}
$DATA['form_error_msg'] = $messages;
// all the row data
$options_id = array ();
$options_name = array ();
$options_selected = array ();
$options_id = array();
$options_name = array();
$options_selected = array();
if (!isset($row_data) || !is_array($row_data)) {
$row_data = array ();
$row_data = array();
}
for ($i = 0; $i < count($row_data); $i ++) {
$options_id[] = $i;
@@ -197,8 +197,8 @@ if ($form->my_page_name == 'edit_order') {
$DATA['options_selected'] = $options_selected;
// hidden list for the data (id, order number)
$row_data_id = array ();
$row_data_order = array ();
$row_data_id = array();
$row_data_order = array();
for ($i = 0; $i < count($row_data); $i++) {
$row_data_id[] = $row_data[$i]['id'];
$row_data_order[] = $row_data[$i]['order'];
@@ -247,9 +247,9 @@ if ($form->my_page_name == 'edit_order') {
// build nav from $PAGES ...
if (!isset($PAGES) || !is_array($PAGES)) {
$PAGES = array ();
$PAGES = array();
}
$menuarray = array ();
$menuarray = array();
foreach ($PAGES as $PAGE_CUID => $PAGE_DATA) {
if ($PAGE_DATA['menu'] && $PAGE_DATA['online']) {
$menuarray[] = $PAGE_DATA;
@@ -268,7 +268,7 @@ if ($form->my_page_name == 'edit_order') {
}
$position = 0;
$menu_data = array ();
$menu_data = array();
for ($i = 1; $i <= count($menuarray); $i ++) {
// do that for new array
$j = $i - 1;
@@ -319,7 +319,7 @@ if ($form->my_page_name == 'edit_order') {
$DATA['form_my_page_name'] = $form->my_page_name;
$DATA['filename_exist'] = 0;
$DATA['drop_down_input'] = 0;
$elements = array ();
$elements = array();
// depending on the "getPageName()" I show different stuff
switch ($form->my_page_name) {
case 'edit_users':

42
www/includes/table_arrays/array_edit_access.php
View File

@@ -1,25 +1,25 @@
<?php declare(strict_types=1);
$edit_access = array (
'table_array' => array (
'edit_access_id' => array (
$edit_access = array(
'table_array' => array(
'edit_access_id' => array(
'value' => isset($GLOBALS['edit_access_id']) ? $GLOBALS['edit_access_id'] : '',
'type' => 'hidden',
'pk' => 1
),
'name' => array (
'name' => array(
'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
'output_name' => 'Access Group Name',
'mandatory' => 1,
'type' => 'text',
'error_check' => 'alphanumericspace|unique'
),
'description' => array (
'description' => array(
'value' => isset($GLOBALS['description']) ? $GLOBALS['description'] : '',
'output_name' => 'Description',
'type' => 'textarea'
),
'color' => array (
'color' => array(
'value' => isset($GLOBALS['color']) ? $GLOBALS['color'] : '',
'output_name' => 'Color',
'mandatory' => 0,
@@ -30,27 +30,27 @@ $edit_access = array (
'error_regex' => "/[\dA-Fa-f]{6}/",
'error_example' => 'F6A544'
),
'enabled' => array (
'enabled' => array(
'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : 0,
'output_name' => 'Enabled',
'type' => 'binary',
'int' => 1, // OR 'bool' => 1
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'protected' => array (
'protected' => array(
'value' => isset($GLOBALS['protected']) ? $GLOBALS['protected'] : 0,
'output_name' => 'Protected',
'type' => 'binary',
'int' => 1,
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'additional_acl' => array (
'additional_acl' => array(
'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['additional_acl'] : '',
'output_name' => 'Additional ACL (as JSON)',
'type' => 'textarea',
@@ -61,41 +61,41 @@ $edit_access = array (
),
'table_name' => 'edit_access',
"load_query" => "SELECT edit_access_id, name FROM edit_access ORDER BY name",
'show_fields' => array (
array (
'show_fields' => array(
array(
'name' => 'name'
)
),
'element_list' => array (
'edit_access_data' => array (
'element_list' => array(
'edit_access_data' => array(
'output_name' => 'Edit Access Data',
'delete_name' => 'remove_edit_access_data',
// 'type' => 'reference_data', # is not a sub table read and connect, but only a sub table with data
'max_empty' => 5, # maxium visible if no data is set, if filled add this number to visible
'prefix' => 'ead',
'elements' => array (
'name' => array (
'elements' => array(
'name' => array(
'type' => 'text',
'error_check' => 'alphanumeric|unique',
'output_name' => 'Name',
'mandatory' => 1
),
'value' => array (
'value' => array(
'type' => 'text',
'output_name' => 'Value'
),
'enabled' => array (
'enabled' => array(
'type' => 'checkbox',
'output_name' => 'Activate',
'int' => 1,
'element_list' => array(1)
),
/*'edit_access_id' => array (
/*'edit_access_id' => array(
'int' => 1,
'type' => 'hidden',
'fk_id' => 1 # reference main key from master table above
),*/
'edit_access_data_id' => array (
'edit_access_data_id' => array(
'type' => 'hidden',
'int' => 1,
'pk_id' => 1

44
www/includes/table_arrays/array_edit_groups.php
View File

@@ -1,29 +1,29 @@
<?php declare(strict_types=1);
$edit_groups = array (
'table_array' => array (
'edit_group_id' => array (
$edit_groups = array(
'table_array' => array(
'edit_group_id' => array(
'value' => isset($GLOBALS['edit_group_id']) ? $GLOBALS['edit_group_id'] : '',
'pk' => 1,
'type' => 'hidden'
),
'enabled' => array (
'enabled' => array(
'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
'output_name' => 'Enabled',
'int' => 1,
'type' => 'binary',
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'name' => array (
'name' => array(
'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
'output_name' => 'Group Name',
'type' => 'text',
'mandatory' => 1
),
'edit_access_right_id' => array (
'edit_access_right_id' => array(
'value' => isset($GLOBALS['edit_access_right_id']) ? $GLOBALS['edit_access_right_id'] : '',
'output_name' => 'Group Level',
'mandatory' => 1,
@@ -31,14 +31,14 @@ $edit_groups = array (
'type' => 'drop_down_db',
'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
),
'edit_scheme_id' => array (
'edit_scheme_id' => array(
'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
'output_name' => 'Group Scheme',
'int_null' => 1,
'type' => 'drop_down_db',
'query' => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
),
'additional_acl' => array (
'additional_acl' => array(
'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['additional_acl'] : '',
'output_name' => 'Additional ACL (as JSON)',
'type' => 'textarea',
@@ -49,54 +49,54 @@ $edit_groups = array (
),
'load_query' => "SELECT edit_group_id, name, enabled FROM edit_group ORDER BY name",
'table_name' => 'edit_group',
'show_fields' => array (
array (
'show_fields' => array(
array(
'name' => 'name'
),
array (
array(
'name' => 'enabled',
'binary' => array ('Yes', 'No'),
'binary' => array('Yes', 'No'),
'before_value' => 'Enabled: '
)
),
'element_list' => array (
'edit_page_access' => array (
'element_list' => array(
'edit_page_access' => array(
'output_name' => 'Pages',
'mandatory' => 1,
'delete' => 0, // set then reference entries are deleted, else the 'enable' flag is only set
'enable_name' => 'enable_page_access',
'prefix' => 'epa',
'read_data' => array (
'read_data' => array(
'table_name' => 'edit_page',
'pk_id' => 'edit_page_id',
'name' => 'name',
'order' => 'order_number'
),
'elements' => array (
'edit_page_access_id' => array (
'elements' => array(
'edit_page_access_id' => array(
'type' => 'hidden',
'int' => 1,
'pk_id' => 1
),
'enabled' => array (
'enabled' => array(
'type' => 'checkbox',
'output_name' => 'Activate',
'int' => 1,
'element_list' => array(1)
),
'edit_access_right_id' => array (
'edit_access_right_id' => array(
'type' => 'drop_down_db',
'output_name' => 'Access Level',
'int' => 1,
'preset' => 1, // first of the select
'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
),
'edit_page_id' => array (
'edit_page_id' => array(
'int' => 1,
'type' => 'hidden'
)
/*,
'edit_default' => array (
'edit_default' => array(
'output_name' => 'Default',
'type' => 'radio',
'mandatory' => 1

32
www/includes/table_arrays/array_edit_languages.php
View File

@@ -1,13 +1,13 @@
<?php declare(strict_types=1);
$edit_languages=array (
'table_array' => array (
'edit_language_id' => array (
$edit_languages=array(
'table_array' => array(
'edit_language_id' => array(
'value' => isset($GLOBALS['edit_language_id']) ? $GLOBALS['edit_language_id'] : '',
'type' => 'hidden',
'pk' => 1
),
'short_name' => array (
'short_name' => array(
'value' => isset($GLOBALS['short_name']) ? $GLOBALS['short_name'] : '',
'output_name' => 'Language (short)',
'mandatory' => 1,
@@ -15,58 +15,58 @@ $edit_languages=array (
'size' => 2,
'length' => 2
),
'long_name' => array (
'long_name' => array(
'value' => isset($GLOBALS['long_name']) ? $GLOBALS['long_name'] : '',
'output_name' => 'Language (long)',
'mandatory' => 1,
'type' => 'text',
'size' => 40
),
'iso_name' => array (
'iso_name' => array(
'value' => isset($GLOBALS['iso_name']) ? $GLOBALS['iso_name'] : '',
'output_name' => 'ISO Code',
'mandatory' => 1,
'type' => 'text'
),
'order_number' => array (
'order_number' => array(
'value' => isset($GLOBALS['order_number']) ? $GLOBALS['order_number'] : '',
'int' => 1,
'order' => 1
),
'enabled' => array (
'enabled' => array(
'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
'output_name' => 'Enabled',
'int' => 1,
'type' => 'binary',
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'lang_default' => array (
'lang_default' => array(
'value' => isset($GLOBALS['lang_default']) ? $GLOBALS['lang_default'] : '',
'output_name' => 'Default Language',
'int' => 1,
'type' => 'binary',
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
)
),
'load_query' => "SELECT edit_language_id, long_name, iso_name, enabled FROM edit_language ORDER BY long_name",
'show_fields' => array (
array (
'show_fields' => array(
array(
'name' => 'long_name'
),
array (
array(
'name' => 'iso_name',
'before_value' => 'ISO: '
),
array (
array(
'name' => 'enabled',
'before_value' => 'Enabled: ',
'binary' => array ('Yes','No')
'binary' => array('Yes','No')
)
),
'table_name' => 'edit_language'

16
www/includes/table_arrays/array_edit_menu_group.php
View File

@@ -1,26 +1,26 @@
<?php declare(strict_types=1);
$edit_menu_group = array (
'table_array' => array (
'edit_menu_group_id' => array (
$edit_menu_group = array(
'table_array' => array(
'edit_menu_group_id' => array(
'value' => isset($GLOBALS['edit_menu_group_id']) ? $GLOBALS['edit_menu_group_id'] : '',
'type' => 'hidden',
'pk' => 1
),
'name' => array (
'name' => array(
'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
'output_name' => 'Group name',
'mandatory' => 1,
'type' => 'text'
),
'flag' => array (
'flag' => array(
'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
'output_name' => 'Flag',
'mandatory' => 1,
'type' => 'text',
'error_check' => 'alphanumeric|unique'
),
'order_number' => array (
'order_number' => array(
'value' => isset($GLOBALS['order_number']) ? $GLOBALS['order_number'] : '',
'output_name' => 'Group order',
'type' => 'order',
@@ -30,8 +30,8 @@ $edit_menu_group = array (
),
'table_name' => 'edit_menu_group',
'load_query' => "SELECT edit_menu_group_id, name FROM edit_menu_group ORDER BY name",
'show_fields' => array (
array (
'show_fields' => array(
array(
'name' => 'name'
)
)

96
www/includes/table_arrays/array_edit_pages.php
View File

@@ -1,13 +1,13 @@
<?php declare(strict_types=1);
$edit_pages = array (
'table_array' => array (
'edit_page_id' => array (
$edit_pages = array(
'table_array' => array(
'edit_page_id' => array(
'value' => isset($GLOBALS['edit_page_id']) ? $GLOBALS['edit_page_id'] : '',
'type' => 'hidden',
'pk' => 1
),
'filename' => array (
'filename' => array(
'value' => isset($GLOBALS['filename']) ? $GLOBALS['filename'] : '',
'output_name' => 'Add File ...',
'mandatory' => 1,
@@ -17,24 +17,24 @@ $edit_pages = array (
"LEFT JOIN edit_page ep ON temp_files.filename = ep.filename ".
"WHERE ep.filename IS NULL"
),
'name' => array (
'name' => array(
'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
'output_name' => 'Page name',
'mandatory' => 1,
'type' => 'text'
),
'order_number' => array (
'order_number' => array(
'value' => isset($GLOBALS['order_number']) ? $GLOBALS['order_number'] : '',
'output_name' => 'Page order',
'type' => 'order',
'int' => 1,
'order' => 1
),
/* 'flag' => array (
/* 'flag' => array(
'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
'output_name' => 'Page Flag',
'type' => 'drop_down_array',
'query' => array (
'query' => array(
'0' => '0',
'1' => '1',
'2' => '2',
@@ -43,37 +43,37 @@ $edit_pages = array (
'5' => '5'
)
),*/
'online' => array (
'online' => array(
'value' => isset($GLOBALS['online']) ? $GLOBALS['online'] : '',
'output_name' => 'Online',
'int' => 1,
'type' => 'binary',
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'menu' => array (
'menu' => array(
'value' => isset($GLOBALS['menu']) ? $GLOBALS['menu'] : '',
'output_name' => 'Menu',
'int' => 1,
'type' => 'binary',
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'popup' => array (
'popup' => array(
'value' => isset($GLOBALS['popup']) ? $GLOBALS['popup'] : '',
'output_name' => 'Popup',
'int' => 1,
'type' => 'binary',
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'popup_x' => array (
'popup_x' => array(
'value' => isset($GLOBALS['popup_x']) ? $GLOBALS['popup_x'] : '',
'output_name' => 'Popup Width',
'int_null' => 1,
@@ -81,7 +81,7 @@ $edit_pages = array (
'size' => 4,
'length' => 4
),
'popup_y' => array (
'popup_y' => array(
'value' => isset($GLOBALS['popup_y']) ? $GLOBALS['popup_y'] : '',
'output_name' => 'Popup Height',
'int_null' => 1,
@@ -89,7 +89,7 @@ $edit_pages = array (
'size' => 4,
'length' => 4
),
'content_alias_edit_page_id' => array (
'content_alias_edit_page_id' => array(
'value' => isset($GLOBALS['content_alias_edit_page_id']) ? $GLOBALS['content_alias_edit_page_id'] : '',
'output_name' => 'Content Alias Source',
'int_null' => 1,
@@ -109,32 +109,32 @@ $edit_pages = array (
),
'load_query' => "SELECT edit_page_id, filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
'table_name' => 'edit_page',
'show_fields' => array (
array (
'show_fields' => array(
array(
'name' => 'name'
),
array (
array(
'name' => 'filename',
'before_value' => 'Filename: '
),
array (
array(
'name' => 'online',
'binary' => array ('Yes','No'),
'binary' => array('Yes','No'),
'before_value' => 'Online: '
),
array (
array(
'name' => 'menu',
'binary' => array ('Yes','No'),
'binary' => array('Yes','No'),
'before_value' => 'Menu: '
),
array (
array(
'name' => 'popup',
'binary' => array ('Yes','No'),
'binary' => array('Yes','No'),
'before_value' => 'Popup: '
)
),
'reference_arrays' => array (
'edit_visible_group' => array (
'reference_arrays' => array(
'edit_visible_group' => array(
'table_name' => 'edit_page_visible_group',
'other_table_pk' => 'edit_visible_group_id',
'output_name' => 'Visible Groups (access)',
@@ -143,7 +143,7 @@ $edit_pages = array (
'selected' => isset($GLOBALS['edit_visible_group_id']) ? $GLOBALS['edit_visible_group_id'] : '',
'query' => "SELECT edit_visible_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag FROM edit_visible_group ORDER BY name"
),
'edit_menu_group' => array (
'edit_menu_group' => array(
'table_name' => 'edit_page_menu_group',
'other_table_pk' => 'edit_menu_group_id',
'output_name' => 'Menu Groups (grouping)',
@@ -154,77 +154,77 @@ $edit_pages = array (
)
),
'element_list' => array (
'edit_query_string' => array (
'element_list' => array(
'edit_query_string' => array(
'output_name' => 'Query Strings',
'delete_name' => 'remove_query_string',
'prefix' => 'eqs',
'elements' => array (
'name' => array (
'elements' => array(
'name' => array(
'output_name' => 'Name',
'type' => 'text',
'error_check' => 'unique|alphanumeric',
'mandatory' => 1
),
'value' => array (
'value' => array(
'output_name' => 'Value',
'type' => 'text'
),
'enabled' => array (
'enabled' => array(
'output_name' => 'Enabled',
'int' => 1,
'type' => 'checkbox',
'element_list' => array (1)
'element_list' => array(1)
),
'dynamic' => array (
'dynamic' => array(
'output_name' => 'Dynamic',
'int' => 1,
'type' => 'checkbox',
'element_list' => array (1)
'element_list' => array(1)
),
'edit_query_string_id' => array (
'edit_query_string_id' => array(
'type' => 'hidden',
'pk_id' => 1
)
) // elements
), // query_string element list
'edit_page_content' => array (
'edit_page_content' => array(
'output_name' => 'Page Content',
'delete_name' => 'remove_page_content',
'prefix' => 'epc',
'elements' => array (
'name' => array (
'elements' => array(
'name' => array(
'output_name' => 'Content',
'type' => 'text',
'error_check' => 'alphanumeric',
'mandatory' => 1
),
'uid' => array (
'uid' => array(
'output_name' => 'UID',
'type' => 'text',
'error_check' => 'unique|alphanumeric',
'mandatory' => 1
),
'order_number' => array (
'order_number' => array(
'output_name' => 'Order',
'type' => 'text',
'error_check' => 'int',
'mandatory' => 1
),
'online' => array (
'online' => array(
'output_name' => 'Online',
'int' => 1,
'type' => 'checkbox',
'element_list' => array (1)
'element_list' => array(1)
),
'edit_access_right_id' => array (
'edit_access_right_id' => array(
'type' => 'drop_down_db',
'output_name' => 'Access Level',
'int' => 1,
'preset' => 1, // first of the select
'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
),
'edit_page_content_id' => array (
'edit_page_content_id' => array(
'type' => 'hidden',
'pk_id' => 1
)

24
www/includes/table_arrays/array_edit_schemes.php
View File

@@ -1,19 +1,19 @@
<?php declare(strict_types=1);
$edit_schemes = array (
'table_array' => array (
'edit_scheme_id' => array (
$edit_schemes = array(
'table_array' => array(
'edit_scheme_id' => array(
'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
'type' => 'hidden',
'pk' => 1
),
'name' => array (
'name' => array(
'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
'output_name' => 'Scheme Name',
'mandatory' => 1,
'type' => 'text'
),
'header_color' => array (
'header_color' => array(
'value' => isset($GLOBALS['header_color']) ? $GLOBALS['header_color'] : '',
'output_name' => 'Header Color',
'mandatory' => 1,
@@ -24,17 +24,17 @@ $edit_schemes = array (
'error_regex' => '/[\dA-Fa-f]{6}/',
'error_example' => 'F6A544'
),
'enabled' => array (
'enabled' => array(
'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
'output_name' => 'Enabled',
'int' => 1,
'type' => 'binary',
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'template' => array (
'template' => array(
'value' => isset($GLOBALS['template']) ? $GLOBALS['template'] : '',
'output_name' => 'Template',
'type' => 'text'
@@ -42,13 +42,13 @@ $edit_schemes = array (
),
'table_name' => 'edit_scheme',
'load_query' => "SELECT edit_scheme_id, name, enabled FROM edit_scheme ORDER BY name",
'show_fields' => array (
array (
'show_fields' => array(
array(
'name' => 'name'
),
array (
array(
'name' => 'enabled',
'binary' => array ('Yes', 'No'),
'binary' => array('Yes', 'No'),
'before_value' => 'Enabled: '
)
)

112
www/includes/table_arrays/array_edit_users.php
View File

@@ -1,29 +1,29 @@
<?php declare(strict_types=1);
$edit_users = array (
'table_array' => array (
'edit_user_id' => array (
$edit_users = array(
'table_array' => array(
'edit_user_id' => array(
'value' => isset($GLOBALS['edit_user_id']) ? $GLOBALS['edit_user_id'] : '',
'type' => 'hidden',
'pk' => 1,
'int' => 1
),
'username' => array (
'username' => array(
'value' => isset($GLOBALS['username']) ? $GLOBALS['username'] : '',
'output_name' => 'Username',
'mandatory' => 1,
'error_check' => 'unique|alphanumericextended',
'type' => 'text'
),
'password' => array (
'password' => array(
'value' => isset($GLOBALS['password']) ? $GLOBALS['password'] : '',
'HIDDEN_value' => isset($GLOBALS['HIDDEN_password']) ? $GLOBALS['HIDDEN_password'] : '',
'CONFIRM_value' => isset($GLOBALS['CONFIRM_password']) ? $GLOBALS['CONFIRM_password'] : '',
'output_name' => 'Password',
'mandatory' => 1,
'type' => 'password', // later has to be password for encryption in database
'update' => array ( // connected field updates, and update data
'password_change_date' => array ( // db row to update
'update' => array( // connected field updates, and update data
'password_change_date' => array( // db row to update
'type' => 'date', // type of field (int/text/date/etc)
'value' => 'NOW()' // value [todo: complex reference
)
@@ -31,7 +31,7 @@ $edit_users = array (
),
// password date when first insert and password is set, needs special field with connection to password
// password reset force interval, if set, user needs to reset password after X time period
'password_change_interval' => array (
'password_change_interval' => array(
'value' => isset($GLOBALS['password_change_interval']) ? $GLOBALS['password_change_interval'] : '',
'output_name' => 'Password change interval',
'error_check' => 'intervalshort', // can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
@@ -40,83 +40,83 @@ $edit_users = array (
'size' => 5, // make it 5 chars long
'length' => 5
),
'enabled' => array (
'enabled' => array(
'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
'output_name' => 'Enabled',
'type' => 'binary',
'int' => 1,
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'strict' => array (
'strict' => array(
'value' => isset($GLOBALS['strict']) ? $GLOBALS['strict'] : '',
'output_name' => 'Strict (Lock after errors)',
'type' => 'binary',
'int' => 1,
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'locked' => array (
'locked' => array(
'value' => isset($GLOBALS['locked']) ? $GLOBALS['locked'] : '',
'output_name' => 'Locked (auto set if strict with errors)',
'type' => 'binary',
'int' => 1,
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'admin' => array (
'admin' => array(
'value' => isset($GLOBALS['admin']) ? $GLOBALS['admin'] : '',
'output_name' => 'Admin',
'type' => 'binary',
'int' => 1,
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'debug' => array (
'debug' => array(
'value' => isset($GLOBALS['debug']) ? $GLOBALS['debug'] : '',
'output_name' => 'Debug',
'type' => 'binary',
'int' => 1,
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'db_debug' => array (
'db_debug' => array(
'value' => isset($GLOBALS['db_debug']) ? $GLOBALS['db_debug'] : '',
'output_name' => 'DB Debug',
'type' => 'binary',
'int' => 1,
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'email' => array (
'email' => array(
'value' => isset($GLOBALS['email']) ? $GLOBALS['email'] : '',
'output_name' => 'E-Mail',
'type' => 'text',
'error_check' => 'email'
),
'last_name' => array (
'last_name' => array(
'value' => isset($GLOBALS['last_name']) ? $GLOBALS['last_name'] : '',
'output_name' => 'Last Name',
'type' => 'text'
),
'first_name' => array (
'first_name' => array(
'value' => isset($GLOBALS['first_name']) ? $GLOBALS['first_name'] : '',
'output_name' => 'First Name',
'type' => 'text'
),
'edit_language_id' => array (
'edit_language_id' => array(
'value' => isset($GLOBALS['edit_language_id']) ? $GLOBALS['edit_language_id'] : '',
'output_name' => 'Language',
'mandatory' => 1,
@@ -124,14 +124,14 @@ $edit_users = array (
'type' => 'drop_down_db',
'query' => "SELECT edit_language_id, long_name FROM edit_language WHERE enabled = 1 ORDER BY order_number"
),
'edit_scheme_id' => array (
'edit_scheme_id' => array(
'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
'output_name' => 'Scheme',
'int_null' => 1,
'type' => 'drop_down_db',
'query' => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
),
'edit_group_id' => array (
'edit_group_id' => array(
'value' => isset($GLOBALS['edit_group_id']) ? $GLOBALS['edit_group_id'] : '',
'output_name' => 'Group',
'int' => 1,
@@ -139,7 +139,7 @@ $edit_users = array (
'query' => "SELECT edit_group_id, name FROM edit_group WHERE enabled = 1 ORDER BY name",
'mandatory' => 1
),
'edit_access_right_id' => array (
'edit_access_right_id' => array(
'value' => isset($GLOBALS['edit_access_right_id']) ? $GLOBALS['edit_access_right_id'] : '',
'output_name' => 'User Level',
'mandatory' => 1,
@@ -147,35 +147,35 @@ $edit_users = array (
'type' => 'drop_down_db',
'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
),
'login_error_count' => array (
'login_error_count' => array(
'output_name' => 'Login error count',
'value' => isset($GLOBALS['login_error_count']) ? $GLOBALS['login_error_count'] : '',
'type' => 'view',
'empty' => '0'
),
'login_error_date_last' => array (
'login_error_date_last' => array(
'output_name' => 'Last login error',
'value' => isset($GLOBALS['login_error_date_liast']) ? $GLOBALS['login_error_date_liast'] : '',
'type' => 'view',
'empty' => '-'
),
'login_error_date_first' => array (
'login_error_date_first' => array(
'output_name' => 'First login error',
'value' => isset($GLOBALS['login_error_date_first']) ? $GLOBALS['login_error_date_first'] : '',
'type' => 'view',
'empty' => '-'
),
'protected' => array (
'protected' => array(
'value' => isset($GLOBALS['protected']) ? $GLOBALS['protected'] : '',
'output_name' => 'Protected',
'type' => 'binary',
'int' => 1,
'element_list' => array (
'element_list' => array(
'1' => 'Yes',
'0' => 'No'
)
),
'additional_acl' => array (
'additional_acl' => array(
'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['additional_acl'] : '',
'output_name' => 'Additional ACL (as JSON)',
'type' => 'textarea',
@@ -186,79 +186,79 @@ $edit_users = array (
),
'load_query' => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count FROM edit_user ORDER BY username",
'table_name' => 'edit_user',
'show_fields' => array (
array (
'show_fields' => array(
array(
'name' => 'username'
),
array (
array(
'name' => 'enabled',
'binary' => array ('Yes', 'No'),
'binary' => array('Yes', 'No'),
'before_value' => 'Enabled: '
),
array (
array(
'name' => 'debug',
'binary' => array ('Yes', 'No'),
'binary' => array('Yes', 'No'),
'before_value' => 'Debug: '
),
array (
array(
'name' => 'db_debug',
'binary' => array ('Yes', 'No'),
'binary' => array('Yes', 'No'),
'before_value' => 'DB Debug: '
),
array (
array(
'name' => 'strict',
'binary' => array ('Yes', 'No'),
'binary' => array('Yes', 'No'),
'before_value' => 'Strict: '
),
array (
array(
'name' => 'locked',
'binary' => array ('Yes', 'No'),
'binary' => array('Yes', 'No'),
'before_value' => 'Locked: '
),
array (
array(
'name' => 'login_error_count',
'before_value' => 'Errors: '
)
),
'element_list' => array (
'edit_access_user' => array (
'element_list' => array(
'edit_access_user' => array(
'output_name' => 'Accounts',
'mandatory' => 1,
'delete' => 0, // set then reference entries are deleted, else the 'enable' flag is only set
'prefix' => 'ecu',
'read_data' => array (
'read_data' => array(
'table_name' => 'edit_access',
'pk_id' => 'edit_access_id',
'name' => 'name',
'order' => 'name'
),
'elements' => array (
'edit_access_user_id' => array (
'elements' => array(
'edit_access_user_id' => array(
'output_name' => 'Activate',
'type' => 'hidden',
'int' => 1,
'pk_id' => 1
),
'enabled' => array (
'enabled' => array(
'type' => 'checkbox',
'output_name' => 'Activate',
'int' => 1,
'element_list' => array (1)
'element_list' => array(1)
),
'edit_access_right_id' => array (
'edit_access_right_id' => array(
'type' => 'drop_down_db',
'output_name' => 'Access Level',
'preset' => 1, // first of the select
'int' => 1,
'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
),
'edit_default' => array (
'edit_default' => array(
'type' => 'radio_group',
'output_name' => 'Default',
'int' => 1,
'element_list' => 'radio_group'
),
'edit_access_id' => array (
'edit_access_id' => array(
'type' => 'hidden',
'int' => 1
)

14
www/includes/table_arrays/array_edit_visible_group.php
View File

@@ -1,19 +1,19 @@
<?php declare(strict_types=1);
$edit_visible_group = array (
'table_array' => array (
'edit_visible_group_id' => array (
$edit_visible_group = array(
'table_array' => array(
'edit_visible_group_id' => array(
'value' => isset($GLOBALS['edit_visible_group_id']) ? $GLOBALS['edit_visible_group_id'] : '',
'type' => 'hidden',
'pk' => 1
),
'name' => array (
'name' => array(
'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
'output_name' => 'Group name',
'mandatory' => 1,
'type' => 'text'
),
'flag' => array (
'flag' => array(
'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
'output_name' => 'Flag',
'mandatory' => 1,
@@ -23,8 +23,8 @@ $edit_visible_group = array (
),
'table_name' => 'edit_visible_group',
'load_query' => "SELECT edit_visible_group_id, name FROM edit_visible_group ORDER BY name",
'show_fields' => array (
array (
'show_fields' => array(
array(
'name' => 'name'
)
)