@@ -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); |
@@ -94,7 +94,7 @@ |
||
94 | 94 | public function hasNoAccess(app_RecordSet $recordSet, $accessType, $user = null) |
95 | 95 | { |
96 | 96 | $criterion = $this->getAccessCriterion($recordSet, $accessType, $user); |
97 | - if (! $criterion instanceof ORM_FalseCriterion) { |
|
97 | + if (!$criterion instanceof ORM_FalseCriterion) { |
|
98 | 98 | return false; |
99 | 99 | } |
100 | 100 | return true; |
@@ -24,7 +24,7 @@ |
||
24 | 24 | |
25 | 25 | |
26 | 26 | |
27 | -require_once dirname(__FILE__). '/functions.php'; |
|
27 | +require_once dirname(__FILE__).'/functions.php'; |
|
28 | 28 | |
29 | 29 | |
30 | 30 | function LibApp_upgrade($sVersionBase, $sVersionIni) |
@@ -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 | /** |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | |
225 | 225 | if (substr($method, 0, 7) === 'include' && substr($method, -3) === 'Set') { |
226 | 226 | $incl = $method; |
227 | - $classNameMethod = substr($method, strlen('include')) . 'ClassName'; |
|
227 | + $classNameMethod = substr($method, strlen('include')).'ClassName'; |
|
228 | 228 | |
229 | 229 | |
230 | 230 | $classname = $this->$classNameMethod(); |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | // We need to revert to multilang fields before synchronizing. |
247 | 247 | $set->useLang(false); |
248 | 248 | } |
249 | - $sql .= $mysqlbackend->setToSql($set) . "\n"; |
|
249 | + $sql .= $mysqlbackend->setToSql($set)."\n"; |
|
250 | 250 | } |
251 | 251 | } |
252 | 252 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | |
278 | 278 | if (substr($method, 0, strlen('include')) === 'include' && substr($method, -strlen('Set')) === 'Set') { |
279 | 279 | $incl = $method; |
280 | - $classNameMethod = substr($method, strlen('include')) . 'ClassName'; |
|
280 | + $classNameMethod = substr($method, strlen('include')).'ClassName'; |
|
281 | 281 | |
282 | 282 | $classname = $this->$classNameMethod(); |
283 | 283 | |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | |
292 | 292 | if (class_exists($classname) && method_exists($this, $call)) { |
293 | 293 | $set = $this->$call(); |
294 | - $sql .= $mysqlbackend->setToSql($set) . "\n"; |
|
294 | + $sql .= $mysqlbackend->setToSql($set)."\n"; |
|
295 | 295 | } |
296 | 296 | } |
297 | 297 | } |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | |
306 | 306 | public function includeBase() |
307 | 307 | { |
308 | - require_once APP_PHP_PATH . 'base.class.php'; |
|
308 | + require_once APP_PHP_PATH.'base.class.php'; |
|
309 | 309 | } |
310 | 310 | |
311 | 311 | /** |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | */ |
314 | 314 | public function includeRecordSet() |
315 | 315 | { |
316 | - require_once APP_SET_PATH . 'record.class.php'; |
|
316 | + require_once APP_SET_PATH.'record.class.php'; |
|
317 | 317 | } |
318 | 318 | |
319 | 319 | |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | */ |
323 | 323 | public function includeTraceableRecordSet() |
324 | 324 | { |
325 | - require_once APP_SET_PATH . 'traceablerecord.class.php'; |
|
325 | + require_once APP_SET_PATH.'traceablerecord.class.php'; |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | { |
335 | 335 | static $accessManager = null; |
336 | 336 | if (!isset($accessManager)) { |
337 | - require_once APP_SET_PATH . 'accessmanager.class.php'; |
|
337 | + require_once APP_SET_PATH.'accessmanager.class.php'; |
|
338 | 338 | $accessManager = new app_AccessManager($this); |
339 | 339 | } |
340 | 340 | |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | */ |
353 | 353 | public function includeLogSet() |
354 | 354 | { |
355 | - require_once APP_SET_PATH . 'log.class.php'; |
|
355 | + require_once APP_SET_PATH.'log.class.php'; |
|
356 | 356 | } |
357 | 357 | |
358 | 358 | /** |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | */ |
369 | 369 | public function LogSetClassName() |
370 | 370 | { |
371 | - return $this->LogClassName() . 'Set'; |
|
371 | + return $this->LogClassName().'Set'; |
|
372 | 372 | } |
373 | 373 | |
374 | 374 | /** |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | */ |
391 | 391 | public function includeLinkSet() |
392 | 392 | { |
393 | - require_once APP_SET_PATH . 'link.class.php'; |
|
393 | + require_once APP_SET_PATH.'link.class.php'; |
|
394 | 394 | } |
395 | 395 | |
396 | 396 | /** |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | */ |
407 | 407 | public function LinkSetClassName() |
408 | 408 | { |
409 | - return $this->LinkClassName() . 'Set'; |
|
409 | + return $this->LinkClassName().'Set'; |
|
410 | 410 | } |
411 | 411 | |
412 | 412 | /** |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | */ |
430 | 430 | public function getRecordSetByRef($recordClassname) |
431 | 431 | { |
432 | - $classSet = $recordClassname . 'Set'; |
|
432 | + $classSet = $recordClassname.'Set'; |
|
433 | 433 | $set = $this->$classSet(); |
434 | 434 | return $set; |
435 | 435 | } |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | { |
467 | 467 | $fullClassName = get_class($record); |
468 | 468 | list(, $className) = explode('_', $fullClassName); |
469 | - return $className . ':' . $record->id; |
|
469 | + return $className.':'.$record->id; |
|
470 | 470 | } |
471 | 471 | |
472 | 472 | |
@@ -557,16 +557,16 @@ discard block |
||
557 | 557 | */ |
558 | 558 | public function mailTo($addr, $subject = null, $body = null) |
559 | 559 | { |
560 | - $mailTo = 'mailto:' . $addr; |
|
560 | + $mailTo = 'mailto:'.$addr; |
|
561 | 561 | $parameters = array(); |
562 | 562 | if (isset($subject)) { |
563 | - $parameters[] = 'subject=' . $subject; |
|
563 | + $parameters[] = 'subject='.$subject; |
|
564 | 564 | } |
565 | 565 | if (isset($body)) { |
566 | - $parameters[] = 'body=' . $body; |
|
566 | + $parameters[] = 'body='.$body; |
|
567 | 567 | } |
568 | 568 | if (!empty($parameters)) { |
569 | - $mailTo .= '?' . implode('&', $parameters); |
|
569 | + $mailTo .= '?'.implode('&', $parameters); |
|
570 | 570 | } |
571 | 571 | |
572 | 572 | return $mailTo; |
@@ -617,7 +617,7 @@ discard block |
||
617 | 617 | } |
618 | 618 | |
619 | 619 | $number = number_format($number, $decimals, ',', ' '); |
620 | - return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol); |
|
620 | + return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol); |
|
621 | 621 | } |
622 | 622 | |
623 | 623 | |
@@ -637,7 +637,7 @@ discard block |
||
637 | 637 | } |
638 | 638 | |
639 | 639 | if (!isset($format)) { |
640 | - $format = bab_registry::get('/' . $this->addonName . '/numberFormat', $PhoneNumber->getDefaultFormat()); |
|
640 | + $format = bab_registry::get('/'.$this->addonName.'/numberFormat', $PhoneNumber->getDefaultFormat()); |
|
641 | 641 | } |
642 | 642 | $phoneNumberUtil = $PhoneNumber->PhoneNumberUtil(); |
643 | 643 | |
@@ -658,7 +658,7 @@ discard block |
||
658 | 658 | */ |
659 | 659 | public function includeController() |
660 | 660 | { |
661 | - require_once APP_PHP_PATH . '/controller.class.php'; |
|
661 | + require_once APP_PHP_PATH.'/controller.class.php'; |
|
662 | 662 | } |
663 | 663 | |
664 | 664 | |
@@ -667,7 +667,7 @@ discard block |
||
667 | 667 | */ |
668 | 668 | public function includeRecordController() |
669 | 669 | { |
670 | - require_once APP_CTRL_PATH . '/record.ctrl.php'; |
|
670 | + require_once APP_CTRL_PATH.'/record.ctrl.php'; |
|
671 | 671 | } |
672 | 672 | |
673 | 673 | |
@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | */ |
708 | 708 | public function includeUi() |
709 | 709 | { |
710 | - require_once APP_UI_PATH . 'ui.class.php'; |
|
710 | + require_once APP_UI_PATH.'ui.class.php'; |
|
711 | 711 | } |
712 | 712 | |
713 | 713 | |
@@ -719,7 +719,7 @@ discard block |
||
719 | 719 | public function Ui() |
720 | 720 | { |
721 | 721 | $this->includeUi(); |
722 | - return bab_getInstance($this->classPrefix . 'Ui');//->setApp($this); |
|
722 | + return bab_getInstance($this->classPrefix.'Ui'); //->setApp($this); |
|
723 | 723 | } |
724 | 724 | |
725 | 725 | /** |
@@ -747,29 +747,29 @@ discard block |
||
747 | 747 | |
748 | 748 | case substr($name, -strlen('SetClassName')) === 'SetClassName': |
749 | 749 | $setName = substr($name, 0, strlen($name) - strlen('ClassName')); |
750 | - return $this->classPrefix . $setName; |
|
750 | + return $this->classPrefix.$setName; |
|
751 | 751 | |
752 | 752 | case substr($name, -strlen('ClassName')) === 'ClassName': |
753 | 753 | $recordName = substr($name, 0, strlen($name) - strlen('ClassName')); |
754 | - return $this->classPrefix . $recordName; |
|
754 | + return $this->classPrefix.$recordName; |
|
755 | 755 | |
756 | 756 | case substr($name, 0, strlen('include')) === 'include' && substr($name, -strlen('Set')) === 'Set': |
757 | 757 | $fileNameBase = strtolower(substr(substr($name, 0, strlen($name) - strlen('Set')), strlen('include'))); |
758 | - require_once APP_SET_PATH . $fileNameBase . '.class.php'; |
|
758 | + require_once APP_SET_PATH.$fileNameBase.'.class.php'; |
|
759 | 759 | return; |
760 | 760 | |
761 | 761 | case substr($name, -strlen('Set')) === 'Set': |
762 | - $includeMethod = 'include' . $name; |
|
762 | + $includeMethod = 'include'.$name; |
|
763 | 763 | $this->$includeMethod(); |
764 | - $setClassNameMethod = $name . 'ClassName'; |
|
764 | + $setClassNameMethod = $name.'ClassName'; |
|
765 | 765 | $className = $this->$setClassNameMethod(); |
766 | 766 | $set = new $className($this); |
767 | 767 | return $set; |
768 | 768 | |
769 | 769 | //case method_exists($this, $name . 'Set'): |
770 | 770 | default: |
771 | - $setName = $name . 'Set'; |
|
772 | - $recordClassNameMethod = $name . 'ClassName'; |
|
771 | + $setName = $name.'Set'; |
|
772 | + $recordClassNameMethod = $name.'ClassName'; |
|
773 | 773 | $recordClassName = $this->$recordClassNameMethod(); |
774 | 774 | if (isset($arguments[0])) { |
775 | 775 | if ($arguments[0] instanceof $recordClassName) { |