@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | { |
176 | 176 | $App = $this->App(); |
177 | 177 | |
178 | - $customFieldSet= $App->CustomFieldSet(); |
|
178 | + $customFieldSet = $App->CustomFieldSet(); |
|
179 | 179 | $object = mb_substr(get_class($this), mb_strlen($App->classPrefix), -mb_strlen('Set')); |
180 | 180 | |
181 | 181 | $customFields = $customFieldSet->select($customFieldSet->object->is($object)); |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | throw new app_Exception('Trying to get the reference string of a record without an id.'); |
391 | 391 | } |
392 | 392 | $classname = $this->getClassName(); |
393 | - return $classname . ':' . $this->id; |
|
393 | + return $classname.':'.$this->id; |
|
394 | 394 | } |
395 | 395 | |
396 | 396 | |
@@ -650,13 +650,13 @@ discard block |
||
650 | 650 | */ |
651 | 651 | protected function importDate($name, $value) |
652 | 652 | { |
653 | - if (preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}/',$value)) { |
|
653 | + if (preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}/', $value)) { |
|
654 | 654 | return $this->importProperty($name, $value); |
655 | 655 | } |
656 | 656 | |
657 | 657 | // try in DD/MM/YYYY format |
658 | 658 | |
659 | - if (preg_match('/(?P<day>[0-9]+)\/(?P<month>[0-9]+)\/(?P<year>[0-9]{2,4})/',$value, $matches)) { |
|
659 | + if (preg_match('/(?P<day>[0-9]+)\/(?P<month>[0-9]+)\/(?P<year>[0-9]{2,4})/', $value, $matches)) { |
|
660 | 660 | |
661 | 661 | $value = sprintf('%04d-%02d-%02d', (int) $matches['year'], (int) $matches['month'], (int) $matches['day']); |
662 | 662 |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | if (null === $url) { |
113 | 113 | $script = '<script type="text/javascript">'; |
114 | 114 | if (isset($message)) { |
115 | - $script .= 'alert("' . bab_toHtml($message, BAB_HTML_JS) . '");'; |
|
115 | + $script .= 'alert("'.bab_toHtml($message, BAB_HTML_JS).'");'; |
|
116 | 116 | } |
117 | 117 | $script .= 'history.back();'; |
118 | 118 | $script .= '</script>'; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | $url = $url->url(); |
125 | 125 | } |
126 | 126 | if (!empty($babBody->msgerror)) { |
127 | - $url .= '&msgerror=' . urlencode($babBody->msgerror); |
|
127 | + $url .= '&msgerror='.urlencode($babBody->msgerror); |
|
128 | 128 | } |
129 | 129 | if (isset($message)) { |
130 | 130 | $lines = explode("\n", $message); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | } |
135 | 135 | |
136 | - header('Location: ' . $url); |
|
136 | + header('Location: '.$url); |
|
137 | 137 | die; |
138 | 138 | } |
139 | 139 | |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | */ |
166 | 166 | function app_fileUploadError($error) |
167 | 167 | { |
168 | - switch($error) { |
|
168 | + switch ($error) { |
|
169 | 169 | case UPLOAD_ERR_OK: |
170 | 170 | return null; |
171 | 171 |
@@ -318,9 +318,9 @@ discard block |
||
318 | 318 | if (is_array($parameters)) { |
319 | 319 | $params = array(); |
320 | 320 | foreach ($parameters as $key => $value) { |
321 | - $params[] = $key . '=' . $value; |
|
321 | + $params[] = $key.'='.$value; |
|
322 | 322 | } |
323 | - $rawField .= ':' . implode(';', $params); |
|
323 | + $rawField .= ':'.implode(';', $params); |
|
324 | 324 | } |
325 | 325 | array_push($rawFields, $rawField); |
326 | 326 | $this->fields = implode(',', $rawFields); |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | if (empty($rawField)) { |
340 | 340 | continue; |
341 | 341 | } |
342 | - list($fieldName, ) = explode(':', $rawField); |
|
342 | + list($fieldName,) = explode(':', $rawField); |
|
343 | 343 | |
344 | 344 | if ($removedFieldName == $fieldName) { |
345 | 345 | continue; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | bab_Widgets()->includePhpClass('widget_InputWidget'); |
27 | 27 | bab_Widgets()->includePhpClass('widget_TableModelView'); |
28 | 28 | |
29 | -require_once dirname(__FILE__) . '/ui.helpers.php'; |
|
29 | +require_once dirname(__FILE__).'/ui.helpers.php'; |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * @return Widget_Form |
@@ -680,7 +680,7 @@ discard block |
||
680 | 680 | continue; |
681 | 681 | } |
682 | 682 | |
683 | - list(, , $nbCol) = explode('-', $customSection->sizePolicy); |
|
683 | + list(,, $nbCol) = explode('-', $customSection->sizePolicy); |
|
684 | 684 | |
685 | 685 | if ($currentColumn + $nbCol > 12) { |
686 | 686 | $this->addItem($row); |
@@ -708,7 +708,7 @@ discard block |
||
708 | 708 | $parameters = $displayField['parameters']; |
709 | 709 | $classname = isset($parameters['classname']) ? $parameters['classname'] : ''; |
710 | 710 | $label = isset($parameters['label']) && $parameters['label'] !== '__' ? $parameters['label'] : ''; |
711 | - $displayFieldMethod = '_' . $displayFieldName; |
|
711 | + $displayFieldMethod = '_'.$displayFieldName; |
|
712 | 712 | |
713 | 713 | if (method_exists($this, $displayFieldMethod)) { |
714 | 714 | $widget = $this->$displayFieldMethod($customSection); |
@@ -766,7 +766,7 @@ discard block |
||
766 | 766 | $parameters = $displayField['parameters']; |
767 | 767 | $classname = isset($parameters['classname']) ? $parameters['classname'] : ''; |
768 | 768 | $label = isset($parameters['label']) && $parameters['label'] !== '__' ? $parameters['label'] : ''; |
769 | - $displayFieldMethod = '_' . $displayFieldName; |
|
769 | + $displayFieldMethod = '_'.$displayFieldName; |
|
770 | 770 | |
771 | 771 | if (method_exists($this, $displayFieldMethod)) { |
772 | 772 | $widget = $this->$displayFieldMethod($customSection); |
@@ -1036,7 +1036,7 @@ discard block |
||
1036 | 1036 | $row = $W->Items()->setSizePolicy('row'); |
1037 | 1037 | foreach ($customSections as $customSection) { |
1038 | 1038 | |
1039 | - list(, , $nbCol) = explode('-', $customSection->sizePolicy); |
|
1039 | + list(,, $nbCol) = explode('-', $customSection->sizePolicy); |
|
1040 | 1040 | |
1041 | 1041 | if ($currentColumn + $nbCol > 12) { |
1042 | 1042 | $this->addItem($row); |
@@ -1063,7 +1063,7 @@ discard block |
||
1063 | 1063 | $parameters = $displayField['parameters']; |
1064 | 1064 | $classname = isset($parameters['classname']) ? $parameters['classname'] : ''; |
1065 | 1065 | $label = isset($parameters['label']) ? $parameters['label'] : ''; |
1066 | - $displayFieldMethod = '_' . $displayFieldName; |
|
1066 | + $displayFieldMethod = '_'.$displayFieldName; |
|
1067 | 1067 | |
1068 | 1068 | if (method_exists($this, $displayFieldMethod)) { |
1069 | 1069 | $value = $this->$displayFieldMethod($customSection); |
@@ -1154,7 +1154,7 @@ discard block |
||
1154 | 1154 | // we try to select one according to the classname prefix. |
1155 | 1155 | list($prefix) = explode('_', get_class($this)); |
1156 | 1156 | $functionalityName = ucwords($prefix); |
1157 | - $this->app = @bab_functionality::get('App/' . $functionalityName); |
|
1157 | + $this->app = @bab_functionality::get('App/'.$functionalityName); |
|
1158 | 1158 | if (!$this->app) { |
1159 | 1159 | $this->app = @bab_functionality::get('App'); |
1160 | 1160 | } |
@@ -1215,7 +1215,7 @@ discard block |
||
1215 | 1215 | $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber); |
1216 | 1216 | |
1217 | 1217 | if (isset($name)) { |
1218 | - $this->sortParameterName = $name . '[filter][sort]'; |
|
1218 | + $this->sortParameterName = $name.'[filter][sort]'; |
|
1219 | 1219 | } else { |
1220 | 1220 | $this->sortParameterName = 'filter[sort]'; |
1221 | 1221 | } |
@@ -1366,11 +1366,11 @@ discard block |
||
1366 | 1366 | |
1367 | 1367 | foreach ($columns as $fieldName => $column) { |
1368 | 1368 | $field = $column->getField(); |
1369 | - if (! $column->isSearchable()) { |
|
1369 | + if (!$column->isSearchable()) { |
|
1370 | 1370 | continue; |
1371 | 1371 | } |
1372 | 1372 | |
1373 | - if (! ($field instanceof ORM_Field)) { |
|
1373 | + if (!($field instanceof ORM_Field)) { |
|
1374 | 1374 | $field = null; |
1375 | 1375 | } |
1376 | 1376 | |
@@ -1387,7 +1387,7 @@ discard block |
||
1387 | 1387 | |
1388 | 1388 | $formItem = $this->handleFilterLabel($label, $input); |
1389 | 1389 | $formItem->setSizePolicy('col-lg-2 col-md-3 col-sm-6 col-xs-12'); |
1390 | - $formItem->addClass('field_' . $fieldName); |
|
1390 | + $formItem->addClass('field_'.$fieldName); |
|
1391 | 1391 | |
1392 | 1392 | $mainSearch = (method_exists($column, 'isMainSearch') && $column->isMainSearch()); |
1393 | 1393 | |
@@ -1400,7 +1400,7 @@ discard block |
||
1400 | 1400 | } |
1401 | 1401 | |
1402 | 1402 | |
1403 | - if (! $this->submit) { |
|
1403 | + if (!$this->submit) { |
|
1404 | 1404 | $this->submit = $W->SubmitButton(); |
1405 | 1405 | $this->submit->setLabel(widget_translate('Filter')); |
1406 | 1406 | } |
@@ -1473,7 +1473,7 @@ discard block |
||
1473 | 1473 | // $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber); |
1474 | 1474 | |
1475 | 1475 | if (isset($name)) { |
1476 | - $this->sortParameterName = $name . '[filter][sort]'; |
|
1476 | + $this->sortParameterName = $name.'[filter][sort]'; |
|
1477 | 1477 | } else { |
1478 | 1478 | $this->sortParameterName = 'filter[sort]'; |
1479 | 1479 | } |
@@ -1538,7 +1538,7 @@ discard block |
||
1538 | 1538 | |
1539 | 1539 | $tableview->setCurrentPage(isset($filterValues['pageNumber']) ? $filterValues['pageNumber'] : 0); |
1540 | 1540 | |
1541 | - $tableview->sortParameterName = $name . '[filter][sort]'; |
|
1541 | + $tableview->sortParameterName = $name.'[filter][sort]'; |
|
1542 | 1542 | |
1543 | 1543 | if (isset($filterValues['sort'])) { |
1544 | 1544 | $tableview->setSortField($filterValues['sort']); |
@@ -1837,7 +1837,7 @@ discard block |
||
1837 | 1837 | continue; |
1838 | 1838 | } |
1839 | 1839 | |
1840 | - list(, , $nbCol) = explode('-', $customSection->sizePolicy); |
|
1840 | + list(,, $nbCol) = explode('-', $customSection->sizePolicy); |
|
1841 | 1841 | |
1842 | 1842 | if ($currentColumn + $nbCol > 12) { |
1843 | 1843 | $this->addItem($row); |
@@ -1879,7 +1879,7 @@ discard block |
||
1879 | 1879 | $classname = isset($parameters['classname']) ? $parameters['classname'] : ''; |
1880 | 1880 | $label = isset($parameters['label']) ? $parameters['label'] : null; |
1881 | 1881 | |
1882 | - $displayFieldMethod = '_' . $displayFieldName; |
|
1882 | + $displayFieldMethod = '_'.$displayFieldName; |
|
1883 | 1883 | if (method_exists($this, $displayFieldMethod)) { |
1884 | 1884 | $item = $this->$displayFieldMethod($customSection, $label); |
1885 | 1885 | } else { |
@@ -1908,7 +1908,7 @@ discard block |
||
1908 | 1908 | } |
1909 | 1909 | } |
1910 | 1910 | |
1911 | - if ($currentColumn + $nbCol> 0) { |
|
1911 | + if ($currentColumn + $nbCol > 0) { |
|
1912 | 1912 | $this->addItem($row); |
1913 | 1913 | } |
1914 | 1914 | } |
@@ -2022,7 +2022,7 @@ discard block |
||
2022 | 2022 | |
2023 | 2023 | $displayable = $field->output($value); |
2024 | 2024 | |
2025 | - switch(true) { |
|
2025 | + switch (true) { |
|
2026 | 2026 | case ($field instanceof ORM_TextField): |
2027 | 2027 | $displayable = $W->RichText($displayable)->setRenderingOptions(BAB_HTML_ALL ^ BAB_HTML_P); |
2028 | 2028 | break; |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | public function __construct(Func_App $app, $id = null, Widget_Layout $layout = null) |
116 | 116 | { |
117 | 117 | parent::__construct($app); |
118 | - // We simulate inheritance from Widget_VBoxLayout. |
|
118 | + // We simulate inheritance from Widget_VBoxLayout. |
|
119 | 119 | $W = $this->widgets = bab_Widgets(); |
120 | 120 | |
121 | 121 | $this->buttonsLayout = $this->buttonsLayout(); |
@@ -322,9 +322,9 @@ discard block |
||
322 | 322 | $cancelLabel = isset($this->cancelLabel) ? $this->cancelLabel : $App->translate('Cancel'); |
323 | 323 | $this->addButton( |
324 | 324 | $W->SubmitButton(/*'cancel'*/) |
325 | - ->addClass('widget-close-dialog') |
|
325 | + ->addClass('widget-close-dialog') |
|
326 | 326 | ->setAction($this->cancelAction) |
327 | - ->setLabel($cancelLabel) |
|
327 | + ->setLabel($cancelLabel) |
|
328 | 328 | ); |
329 | 329 | } |
330 | 330 | } |
@@ -1170,21 +1170,21 @@ discard block |
||
1170 | 1170 | |
1171 | 1171 | |
1172 | 1172 | |
1173 | - protected function addCustomFields(app_RecordSet $recordSet) |
|
1174 | - { |
|
1175 | - $customFields = $recordSet->getCustomFields(); |
|
1173 | + protected function addCustomFields(app_RecordSet $recordSet) |
|
1174 | + { |
|
1175 | + $customFields = $recordSet->getCustomFields(); |
|
1176 | 1176 | |
1177 | 1177 | foreach ($customFields as $customField) { |
1178 | 1178 | $fieldname = $customField->fieldname; |
1179 | 1179 | $this->addColumn( |
1180 | 1180 | widget_TableModelViewColumn($recordSet->$fieldname, $customField->name) |
1181 | - ->setSortable(true) |
|
1182 | - ->setExportable(true) |
|
1183 | - ->setSearchable($customField->searchable) |
|
1184 | - ->setVisible($customField->visible) |
|
1181 | + ->setSortable(true) |
|
1182 | + ->setExportable(true) |
|
1183 | + ->setSearchable($customField->searchable) |
|
1184 | + ->setVisible($customField->visible) |
|
1185 | 1185 | ); |
1186 | 1186 | } |
1187 | - } |
|
1187 | + } |
|
1188 | 1188 | |
1189 | 1189 | |
1190 | 1190 | /** |
@@ -46,72 +46,72 @@ discard block |
||
46 | 46 | /** |
47 | 47 | * @param Func_App $App |
48 | 48 | */ |
49 | - public function __construct(Func_App $App) |
|
50 | - { |
|
51 | - parent::__construct($App); |
|
52 | - |
|
53 | - $this->setDescription('Custom field'); |
|
54 | - |
|
55 | - $this->setPrimaryKey('id'); |
|
56 | - |
|
57 | - $this->addFields( |
|
58 | - ORM_StringField('name') |
|
59 | - ->setDescription('Name of field used for display'), |
|
60 | - ORM_StringField('fieldname') |
|
61 | - ->setDescription('Name of field used in table, not modifiable'), |
|
62 | - ORM_TextField('description') |
|
63 | - ->setDescription('Optional description'), |
|
64 | - ORM_EnumField('object', $this->getObjects()) |
|
65 | - ->setDescription('Name of object in App ex : Article, Contact, Organization...'), |
|
66 | - ORM_EnumField('fieldtype', $this->getFieldTypes()) |
|
67 | - ->setDescription('Name of ORM field ex : Enum, String, Text, Bool...'), |
|
68 | - ORM_TextField('enumvalues') |
|
69 | - ->setDescription('serialized array of values for enum fields'), |
|
70 | - ORM_BoolField('mandatory') |
|
71 | - ->setDescription('Mandatory') |
|
72 | - ); |
|
73 | - } |
|
74 | - |
|
75 | - |
|
76 | - |
|
77 | - /** |
|
78 | - * List of objects where custom fields are applicable. |
|
79 | - * |
|
80 | - * @return string[] |
|
81 | - */ |
|
82 | - public function getObjects() |
|
83 | - { |
|
84 | - $App = $this->App(); |
|
85 | - |
|
86 | - $arr = array(); |
|
87 | - |
|
88 | - if (isset($App->Article)) { |
|
89 | - $arr['Article'] = $App->translate('Products database'); |
|
90 | - } |
|
91 | - |
|
92 | - return $arr; |
|
93 | - } |
|
94 | - |
|
95 | - /** |
|
96 | - * list of ORM fields to use for a custom field |
|
97 | - */ |
|
98 | - public function getFieldTypes() |
|
99 | - { |
|
100 | - $App = $this->App(); |
|
101 | - |
|
102 | - return array( |
|
103 | - 'String' => $App->translate('Line edit'), |
|
104 | - 'Text' => $App->translate('Text edit'), |
|
105 | - 'Bool' => $App->translate('Checkbox'), |
|
106 | - 'Int' => $App->translate('Integer number'), |
|
107 | - 'Decimal' => $App->translate('Decimal number'), |
|
108 | - 'Date' => $App->translate('Date'), |
|
109 | - 'DateTime' => $App->translate('Date and time'), |
|
110 | - 'Enum' => $App->translate('Selection list'), |
|
111 | - 'Url' => $App->translate('Url'), |
|
112 | - 'Email' => $App->translate('Email address'), |
|
113 | - ); |
|
114 | - } |
|
49 | + public function __construct(Func_App $App) |
|
50 | + { |
|
51 | + parent::__construct($App); |
|
52 | + |
|
53 | + $this->setDescription('Custom field'); |
|
54 | + |
|
55 | + $this->setPrimaryKey('id'); |
|
56 | + |
|
57 | + $this->addFields( |
|
58 | + ORM_StringField('name') |
|
59 | + ->setDescription('Name of field used for display'), |
|
60 | + ORM_StringField('fieldname') |
|
61 | + ->setDescription('Name of field used in table, not modifiable'), |
|
62 | + ORM_TextField('description') |
|
63 | + ->setDescription('Optional description'), |
|
64 | + ORM_EnumField('object', $this->getObjects()) |
|
65 | + ->setDescription('Name of object in App ex : Article, Contact, Organization...'), |
|
66 | + ORM_EnumField('fieldtype', $this->getFieldTypes()) |
|
67 | + ->setDescription('Name of ORM field ex : Enum, String, Text, Bool...'), |
|
68 | + ORM_TextField('enumvalues') |
|
69 | + ->setDescription('serialized array of values for enum fields'), |
|
70 | + ORM_BoolField('mandatory') |
|
71 | + ->setDescription('Mandatory') |
|
72 | + ); |
|
73 | + } |
|
74 | + |
|
75 | + |
|
76 | + |
|
77 | + /** |
|
78 | + * List of objects where custom fields are applicable. |
|
79 | + * |
|
80 | + * @return string[] |
|
81 | + */ |
|
82 | + public function getObjects() |
|
83 | + { |
|
84 | + $App = $this->App(); |
|
85 | + |
|
86 | + $arr = array(); |
|
87 | + |
|
88 | + if (isset($App->Article)) { |
|
89 | + $arr['Article'] = $App->translate('Products database'); |
|
90 | + } |
|
91 | + |
|
92 | + return $arr; |
|
93 | + } |
|
94 | + |
|
95 | + /** |
|
96 | + * list of ORM fields to use for a custom field |
|
97 | + */ |
|
98 | + public function getFieldTypes() |
|
99 | + { |
|
100 | + $App = $this->App(); |
|
101 | + |
|
102 | + return array( |
|
103 | + 'String' => $App->translate('Line edit'), |
|
104 | + 'Text' => $App->translate('Text edit'), |
|
105 | + 'Bool' => $App->translate('Checkbox'), |
|
106 | + 'Int' => $App->translate('Integer number'), |
|
107 | + 'Decimal' => $App->translate('Decimal number'), |
|
108 | + 'Date' => $App->translate('Date'), |
|
109 | + 'DateTime' => $App->translate('Date and time'), |
|
110 | + 'Enum' => $App->translate('Selection list'), |
|
111 | + 'Url' => $App->translate('Url'), |
|
112 | + 'Email' => $App->translate('Email address'), |
|
113 | + ); |
|
114 | + } |
|
115 | 115 | |
116 | 116 | /** |
117 | 117 | * @return ORM_Criteria |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | case 'Bool': |
176 | 176 | $field = ORM_BoolField($this->fieldname); |
177 | 177 | $field->setOutputOptions( |
178 | - $this->App()->translate('No'), |
|
178 | + $this->App()->translate('No'), |
|
179 | 179 | $this->App()->translate('Yes') |
180 | 180 | ); |
181 | 181 | break; |
@@ -192,80 +192,80 @@ discard block |
||
192 | 192 | } |
193 | 193 | |
194 | 194 | |
195 | - /** |
|
196 | - * @return string[] |
|
197 | - */ |
|
198 | - public function getEnumValues() |
|
199 | - { |
|
200 | - return unserialize($this->enumvalues); |
|
201 | - } |
|
202 | - |
|
203 | - |
|
204 | - /** |
|
205 | - * @return Widget_LabelledWidget |
|
206 | - */ |
|
207 | - public function getWidget() |
|
208 | - { |
|
209 | - $W = bab_Widgets(); |
|
210 | - $App = $this->App(); |
|
211 | - |
|
212 | - switch ($this->fieldtype) { |
|
213 | - case 'Text': |
|
214 | - $widget = $W->TextEdit()->setLines(3)->setColumns(70); |
|
215 | - break; |
|
216 | - |
|
217 | - case 'Bool': |
|
218 | - $widget = $W->Checkbox(); |
|
219 | - break; |
|
220 | - |
|
221 | - case 'Enum': |
|
222 | - $options = array('' => '') + $this->getEnumValues(); |
|
223 | - $widget = $W->Select()->setOptions($options); |
|
224 | - break; |
|
225 | - |
|
226 | - case 'Date': |
|
227 | - $widget = $W->DatePicker(); |
|
228 | - break; |
|
229 | - |
|
230 | - case 'DateTime': |
|
231 | - $widget = $W->DateTimePicker(); |
|
232 | - break; |
|
233 | - |
|
234 | - case 'Int': |
|
235 | - $widget = $W->RegExpLineEdit(); |
|
236 | - $widget->setRegExp(Widget_RegExpLineEdit::INT_FORMAT) |
|
237 | - ->setSubmitMessage(sprintf($App->translate('The field %s should be a integer number'), $this->name)) |
|
238 | - ->setSize(10); |
|
239 | - break; |
|
240 | - |
|
241 | - case 'Decimal': |
|
242 | - $widget = $W->RegExpLineEdit(); |
|
243 | - $widget->setRegExp(Widget_RegExpLineEdit::FLOAT_FORMAT) |
|
244 | - ->setSubmitMessage(sprintf($App->translate('The field %s should be a decimal number'), $this->name)) |
|
245 | - ->setSize(10); |
|
246 | - break; |
|
247 | - |
|
248 | - case 'Url': |
|
249 | - $widget = $W->UrlLineEdit(); |
|
250 | - break; |
|
251 | - |
|
252 | - case 'Email': |
|
253 | - $widget = $W->EmailLineEdit(); |
|
254 | - break; |
|
255 | - |
|
256 | - default: |
|
257 | - case 'String': |
|
258 | - $widget = $W->LineEdit()->setSize(70)->setMaxSize(255); |
|
259 | - break; |
|
260 | - } |
|
261 | - |
|
262 | - $labelledItem = $W->LabelledWidget($this->name, $widget, null); |
|
263 | - $labelledItem->setName($this->fieldname); |
|
264 | - |
|
265 | - if (!empty($this->description)) { |
|
266 | - $labelledItem->setDescription($this->description); |
|
267 | - } |
|
268 | - |
|
269 | - return $labelledItem; |
|
270 | - } |
|
195 | + /** |
|
196 | + * @return string[] |
|
197 | + */ |
|
198 | + public function getEnumValues() |
|
199 | + { |
|
200 | + return unserialize($this->enumvalues); |
|
201 | + } |
|
202 | + |
|
203 | + |
|
204 | + /** |
|
205 | + * @return Widget_LabelledWidget |
|
206 | + */ |
|
207 | + public function getWidget() |
|
208 | + { |
|
209 | + $W = bab_Widgets(); |
|
210 | + $App = $this->App(); |
|
211 | + |
|
212 | + switch ($this->fieldtype) { |
|
213 | + case 'Text': |
|
214 | + $widget = $W->TextEdit()->setLines(3)->setColumns(70); |
|
215 | + break; |
|
216 | + |
|
217 | + case 'Bool': |
|
218 | + $widget = $W->Checkbox(); |
|
219 | + break; |
|
220 | + |
|
221 | + case 'Enum': |
|
222 | + $options = array('' => '') + $this->getEnumValues(); |
|
223 | + $widget = $W->Select()->setOptions($options); |
|
224 | + break; |
|
225 | + |
|
226 | + case 'Date': |
|
227 | + $widget = $W->DatePicker(); |
|
228 | + break; |
|
229 | + |
|
230 | + case 'DateTime': |
|
231 | + $widget = $W->DateTimePicker(); |
|
232 | + break; |
|
233 | + |
|
234 | + case 'Int': |
|
235 | + $widget = $W->RegExpLineEdit(); |
|
236 | + $widget->setRegExp(Widget_RegExpLineEdit::INT_FORMAT) |
|
237 | + ->setSubmitMessage(sprintf($App->translate('The field %s should be a integer number'), $this->name)) |
|
238 | + ->setSize(10); |
|
239 | + break; |
|
240 | + |
|
241 | + case 'Decimal': |
|
242 | + $widget = $W->RegExpLineEdit(); |
|
243 | + $widget->setRegExp(Widget_RegExpLineEdit::FLOAT_FORMAT) |
|
244 | + ->setSubmitMessage(sprintf($App->translate('The field %s should be a decimal number'), $this->name)) |
|
245 | + ->setSize(10); |
|
246 | + break; |
|
247 | + |
|
248 | + case 'Url': |
|
249 | + $widget = $W->UrlLineEdit(); |
|
250 | + break; |
|
251 | + |
|
252 | + case 'Email': |
|
253 | + $widget = $W->EmailLineEdit(); |
|
254 | + break; |
|
255 | + |
|
256 | + default: |
|
257 | + case 'String': |
|
258 | + $widget = $W->LineEdit()->setSize(70)->setMaxSize(255); |
|
259 | + break; |
|
260 | + } |
|
261 | + |
|
262 | + $labelledItem = $W->LabelledWidget($this->name, $widget, null); |
|
263 | + $labelledItem->setName($this->fieldname); |
|
264 | + |
|
265 | + if (!empty($this->description)) { |
|
266 | + $labelledItem->setDescription($this->description); |
|
267 | + } |
|
268 | + |
|
269 | + return $labelledItem; |
|
270 | + } |
|
271 | 271 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | |
24 | 24 | |
25 | -require_once APP_CTRL_PATH . '/record.ctrl.php'; |
|
25 | +require_once APP_CTRL_PATH.'/record.ctrl.php'; |
|
26 | 26 | |
27 | 27 | |
28 | 28 | /** |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | foreach ($allViewSections as $viewSection) { |
59 | 59 | $fields = $viewSection->getFields(); |
60 | 60 | foreach ($fields as $field) { |
61 | - $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id; |
|
61 | + $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id; |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | bab_Sort::asort($availableFields, 'description', bab_Sort::CASE_INSENSITIVE); |
82 | 82 | |
83 | 83 | foreach ($availableFields as $field) { |
84 | - $fieldName = $field['name']; |
|
84 | + $fieldName = $field['name']; |
|
85 | 85 | $fieldDescription = $field['description']; |
86 | 86 | |
87 | 87 | $used = isset($allViewFieldNames[$fieldName]); |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | $recordSet = $this->getRecordSet(); |
391 | 391 | $record = $recordSet->request($id); |
392 | 392 | |
393 | - $object = $record->object . 'Set'; |
|
393 | + $object = $record->object.'Set'; |
|
394 | 394 | |
395 | 395 | $objectRecordSet = $App->$object(); |
396 | 396 | |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | $recordSet = $this->getRecordSet(); |
465 | 465 | $record = $recordSet->request($data['id']); |
466 | 466 | |
467 | - $object = $record->object . 'Set'; |
|
467 | + $object = $record->object.'Set'; |
|
468 | 468 | |
469 | 469 | $objectRecordSet = $App->$object(); |
470 | 470 | |
@@ -536,17 +536,17 @@ discard block |
||
536 | 536 | $nbCol = 0; |
537 | 537 | foreach ($customSections as $customSection) { |
538 | 538 | |
539 | - list(, , $nbCol) = explode('-', $customSection->sizePolicy); |
|
539 | + list(,, $nbCol) = explode('-', $customSection->sizePolicy); |
|
540 | 540 | |
541 | 541 | $currentColumn += $nbCol; |
542 | 542 | |
543 | 543 | $sectionSection = $W->Section( |
544 | - $customSection->name . ' (' . $customSection->rank . ')', |
|
545 | - $sectionBox = $W->VBoxItems($W->Hidden()->setName('#' . $customSection->id)) |
|
544 | + $customSection->name.' ('.$customSection->rank.')', |
|
545 | + $sectionBox = $W->VBoxItems($W->Hidden()->setName('#'.$customSection->id)) |
|
546 | 546 | ); |
547 | 547 | $sectionSection->addClass('app-custom-section'); |
548 | 548 | $sectionSection->addClass($customSection->classname); |
549 | - $sectionSection->setSizePolicy($customSection->sizePolicy . ' widget-sameheight'); |
|
549 | + $sectionSection->setSizePolicy($customSection->sizePolicy.' widget-sameheight'); |
|
550 | 550 | |
551 | 551 | $row->addItem($sectionSection); |
552 | 552 | |
@@ -588,7 +588,7 @@ discard block |
||
588 | 588 | $fieldItem = $W->HBoxItems( |
589 | 589 | $W->Label($fieldDescription)->setSizePolicy('maximum')->addClass('icon', Func_Icons::ACTIONS_ZOOM_FIT_HEIGHT), |
590 | 590 | $W->HBoxItems( |
591 | - $W->Hidden()->setName($customSection->id . '.' . $fieldId)->setValue($field['name']), |
|
591 | + $W->Hidden()->setName($customSection->id.'.'.$fieldId)->setValue($field['name']), |
|
592 | 592 | $W->Link('', $customSectionCtrl->editDisplayField($customSection->id, $field['name'])) |
593 | 593 | ->addClass('icon', Func_Icons::ACTIONS_DOCUMENT_EDIT) |
594 | 594 | ->setOpenMode(Widget_Link::OPEN_DIALOG), |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | } |
666 | 666 | |
667 | 667 | header('Content-type: application/json'); |
668 | - header('Content-Disposition: attachment; filename="' . $object . '.' . ($view === '' ? 'default' : $view) . '.json"'."\n"); |
|
668 | + header('Content-Disposition: attachment; filename="'.$object.'.'.($view === '' ? 'default' : $view).'.json"'."\n"); |
|
669 | 669 | |
670 | 670 | $json = bab_json_encode($sectionsValues); |
671 | 671 | $json = bab_convertStringFromDatabase($json, bab_charset::UTF_8); |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | * @copyright Copyright (c) 2018 by CANTICO ({@link http://www.cantico.fr}) |
22 | 22 | */ |
23 | 23 | |
24 | -require_once dirname(__FILE__) . '/define.php'; |
|
25 | -require_once dirname(__FILE__) . '/functions.php'; |
|
24 | +require_once dirname(__FILE__).'/define.php'; |
|
25 | +require_once dirname(__FILE__).'/functions.php'; |
|
26 | 26 | |
27 | 27 | |
28 | 28 | |
@@ -55,14 +55,14 @@ discard block |
||
55 | 55 | $this->addonName = 'libapp'; |
56 | 56 | $this->addonPrefix = 'app'; |
57 | 57 | |
58 | - $this->classPrefix = $this->addonPrefix . '_'; |
|
59 | - $this->controllerTg = 'addon/' . $this->addonName . '/main'; |
|
58 | + $this->classPrefix = $this->addonPrefix.'_'; |
|
59 | + $this->controllerTg = 'addon/'.$this->addonName.'/main'; |
|
60 | 60 | |
61 | 61 | $addon = bab_getAddonInfosInstance($this->addonName); |
62 | 62 | $this->phpPath = $addon->getPhpPath(); |
63 | 63 | $this->recordSetPath = $this->phpPath; |
64 | 64 | $this->ctrlPath = $this->phpPath; |
65 | - $this->uiPath = $this->phpPath . 'ui/'; |
|
65 | + $this->uiPath = $this->phpPath.'ui/'; |
|
66 | 66 | |
67 | 67 | $babDB = bab_getDB(); |
68 | 68 | |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | public function getRecordSetPathname($class) |
110 | 110 | { |
111 | 111 | // $App->MyRecordSet() -> myrecord.class.php |
112 | - $file = strtolower(substr($class, strlen($this->classPrefix), -3)) . '.class.php'; |
|
113 | - return $this->recordSetPath . $file; |
|
112 | + $file = strtolower(substr($class, strlen($this->classPrefix), -3)).'.class.php'; |
|
113 | + return $this->recordSetPath.$file; |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | public function getRecordPathname($class) |
123 | 123 | { |
124 | 124 | // $App->MyRecord() -> myrecord.class.php |
125 | - $file = strtolower(substr($class, strlen($this->classPrefix))) . '.class.php'; |
|
126 | - return $this->recordSetPath . $file; |
|
125 | + $file = strtolower(substr($class, strlen($this->classPrefix))).'.class.php'; |
|
126 | + return $this->recordSetPath.$file; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | |
228 | 228 | if (substr($method, 0, 7) === 'include' && substr($method, -3) === 'Set') { |
229 | 229 | $incl = $method; |
230 | - $classNameMethod = substr($method, strlen('include')) . 'ClassName'; |
|
230 | + $classNameMethod = substr($method, strlen('include')).'ClassName'; |
|
231 | 231 | |
232 | 232 | |
233 | 233 | $classname = $this->$classNameMethod(); |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | // We need to revert to multilang fields before synchronizing. |
250 | 250 | $set->useLang(false); |
251 | 251 | } |
252 | - $sql .= $mysqlbackend->setToSql($set) . "\n"; |
|
252 | + $sql .= $mysqlbackend->setToSql($set)."\n"; |
|
253 | 253 | } |
254 | 254 | } |
255 | 255 | } |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | |
281 | 281 | if (substr($method, 0, strlen('include')) === 'include' && substr($method, -strlen('Set')) === 'Set') { |
282 | 282 | $incl = $method; |
283 | - $classNameMethod = substr($method, strlen('include')) . 'ClassName'; |
|
283 | + $classNameMethod = substr($method, strlen('include')).'ClassName'; |
|
284 | 284 | |
285 | 285 | $classname = $this->$classNameMethod(); |
286 | 286 | |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | |
295 | 295 | if (class_exists($classname) && method_exists($this, $call)) { |
296 | 296 | $set = $this->$call(); |
297 | - $sql .= $mysqlbackend->setToSql($set) . "\n"; |
|
297 | + $sql .= $mysqlbackend->setToSql($set)."\n"; |
|
298 | 298 | } |
299 | 299 | } |
300 | 300 | } |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | |
309 | 309 | public function includeBase() |
310 | 310 | { |
311 | - require_once APP_PHP_PATH . 'base.class.php'; |
|
311 | + require_once APP_PHP_PATH.'base.class.php'; |
|
312 | 312 | } |
313 | 313 | |
314 | 314 | /** |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | */ |
317 | 317 | public function includeRecordSet() |
318 | 318 | { |
319 | - require_once APP_SET_PATH . 'record.class.php'; |
|
319 | + require_once APP_SET_PATH.'record.class.php'; |
|
320 | 320 | } |
321 | 321 | |
322 | 322 | |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | */ |
326 | 326 | public function includeTraceableRecordSet() |
327 | 327 | { |
328 | - require_once APP_SET_PATH . 'traceablerecord.class.php'; |
|
328 | + require_once APP_SET_PATH.'traceablerecord.class.php'; |
|
329 | 329 | } |
330 | 330 | |
331 | 331 | |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | */ |
342 | 342 | public function includeLogSet() |
343 | 343 | { |
344 | - require_once APP_SET_PATH . 'log.class.php'; |
|
344 | + require_once APP_SET_PATH.'log.class.php'; |
|
345 | 345 | } |
346 | 346 | |
347 | 347 | /** |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | */ |
358 | 358 | public function LogSetClassName() |
359 | 359 | { |
360 | - return $this->LogClassName() . 'Set'; |
|
360 | + return $this->LogClassName().'Set'; |
|
361 | 361 | } |
362 | 362 | |
363 | 363 | /** |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | */ |
380 | 380 | public function includeLinkSet() |
381 | 381 | { |
382 | - require_once APP_SET_PATH . 'link.class.php'; |
|
382 | + require_once APP_SET_PATH.'link.class.php'; |
|
383 | 383 | } |
384 | 384 | |
385 | 385 | /** |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | */ |
396 | 396 | public function LinkSetClassName() |
397 | 397 | { |
398 | - return $this->LinkClassName() . 'Set'; |
|
398 | + return $this->LinkClassName().'Set'; |
|
399 | 399 | } |
400 | 400 | |
401 | 401 | /** |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | return null; |
430 | 430 | } |
431 | 431 | list($classname, $id) = $refParts; |
432 | - $classSet = $classname . 'Set'; |
|
432 | + $classSet = $classname.'Set'; |
|
433 | 433 | $set = $this->$classSet(); |
434 | 434 | if (isset($set)) { |
435 | 435 | return $set->get($id); |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | { |
449 | 449 | $fullClassName = get_class($record); |
450 | 450 | list(, $className) = explode('_', $fullClassName); |
451 | - return $className . ':' . $record->id; |
|
451 | + return $className.':'.$record->id; |
|
452 | 452 | } |
453 | 453 | |
454 | 454 | |
@@ -539,16 +539,16 @@ discard block |
||
539 | 539 | */ |
540 | 540 | public function mailTo($addr, $subject = null, $body = null) |
541 | 541 | { |
542 | - $mailTo = 'mailto:' . $addr; |
|
542 | + $mailTo = 'mailto:'.$addr; |
|
543 | 543 | $parameters = array(); |
544 | 544 | if (isset($subject)) { |
545 | - $parameters[] = 'subject=' . $subject; |
|
545 | + $parameters[] = 'subject='.$subject; |
|
546 | 546 | } |
547 | 547 | if (isset($body)) { |
548 | - $parameters[] = 'body=' . $body; |
|
548 | + $parameters[] = 'body='.$body; |
|
549 | 549 | } |
550 | 550 | if (!empty($parameters)) { |
551 | - $mailTo .= '?' . implode('&', $parameters); |
|
551 | + $mailTo .= '?'.implode('&', $parameters); |
|
552 | 552 | } |
553 | 553 | |
554 | 554 | return $mailTo; |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | } |
600 | 600 | |
601 | 601 | $number = number_format($number, $decimals, ',', ' '); |
602 | - return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol); |
|
602 | + return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol); |
|
603 | 603 | } |
604 | 604 | |
605 | 605 | |
@@ -619,7 +619,7 @@ discard block |
||
619 | 619 | } |
620 | 620 | |
621 | 621 | if (!isset($format)) { |
622 | - $format = bab_registry::get('/' . $this->addonName . '/numberFormat', $PhoneNumber->getDefaultFormat()); |
|
622 | + $format = bab_registry::get('/'.$this->addonName.'/numberFormat', $PhoneNumber->getDefaultFormat()); |
|
623 | 623 | } |
624 | 624 | $phoneNumberUtil = $PhoneNumber->PhoneNumberUtil(); |
625 | 625 | |
@@ -640,7 +640,7 @@ discard block |
||
640 | 640 | */ |
641 | 641 | public function includeController() |
642 | 642 | { |
643 | - require_once APP_PHP_PATH . '/controller.class.php'; |
|
643 | + require_once APP_PHP_PATH.'/controller.class.php'; |
|
644 | 644 | } |
645 | 645 | |
646 | 646 | |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | */ |
650 | 650 | public function includeRecordController() |
651 | 651 | { |
652 | - require_once APP_CTRL_PATH . '/record.ctrl.php'; |
|
652 | + require_once APP_CTRL_PATH.'/record.ctrl.php'; |
|
653 | 653 | } |
654 | 654 | |
655 | 655 | |
@@ -689,7 +689,7 @@ discard block |
||
689 | 689 | */ |
690 | 690 | public function includeUi() |
691 | 691 | { |
692 | - require_once APP_UI_PATH . 'ui.class.php'; |
|
692 | + require_once APP_UI_PATH.'ui.class.php'; |
|
693 | 693 | } |
694 | 694 | |
695 | 695 | |
@@ -701,7 +701,7 @@ discard block |
||
701 | 701 | public function Ui() |
702 | 702 | { |
703 | 703 | $this->includeUi(); |
704 | - return bab_getInstance($this->classPrefix . 'Ui');//->setApp($this); |
|
704 | + return bab_getInstance($this->classPrefix.'Ui'); //->setApp($this); |
|
705 | 705 | } |
706 | 706 | |
707 | 707 | /** |
@@ -729,29 +729,29 @@ discard block |
||
729 | 729 | |
730 | 730 | case substr($name, -strlen('SetClassName')) === 'SetClassName': |
731 | 731 | $setName = substr($name, 0, strlen($name) - strlen('ClassName')); |
732 | - return $this->classPrefix . $setName; |
|
732 | + return $this->classPrefix.$setName; |
|
733 | 733 | |
734 | 734 | case substr($name, -strlen('ClassName')) === 'ClassName': |
735 | 735 | $recordName = substr($name, 0, strlen($name) - strlen('ClassName')); |
736 | - return $this->classPrefix . $recordName; |
|
736 | + return $this->classPrefix.$recordName; |
|
737 | 737 | |
738 | 738 | case substr($name, 0, strlen('include')) === 'include' && substr($name, -strlen('Set')) === 'Set': |
739 | 739 | $fileNameBase = strtolower(substr(substr($name, 0, strlen($name) - strlen('Set')), strlen('include'))); |
740 | - require_once PHP_SET_PATH . $fileNameBase . '.class.php'; |
|
740 | + require_once PHP_SET_PATH.$fileNameBase.'.class.php'; |
|
741 | 741 | return; |
742 | 742 | |
743 | 743 | case substr($name, -strlen('Set')) === 'Set': |
744 | - $includeMethod = 'include' . $name; |
|
744 | + $includeMethod = 'include'.$name; |
|
745 | 745 | $this->$includeMethod(); |
746 | - $setClassNameMethod = $name . 'ClassName'; |
|
746 | + $setClassNameMethod = $name.'ClassName'; |
|
747 | 747 | $className = $this->$setClassNameMethod(); |
748 | 748 | $set = new $className($this); |
749 | 749 | return $set; |
750 | 750 | |
751 | 751 | //case method_exists($this, $name . 'Set'): |
752 | 752 | default: |
753 | - $setName = $name . 'Set'; |
|
754 | - $recordClassNameMethod = $name . 'ClassName'; |
|
753 | + $setName = $name.'Set'; |
|
754 | + $recordClassNameMethod = $name.'ClassName'; |
|
755 | 755 | $recordClassName = $this->$recordClassNameMethod(); |
756 | 756 | if (isset($arguments[0])) { |
757 | 757 | if ($arguments[0] instanceof $recordClassName) { |