← All changes | application/config/settings.php +21 -145 3.2.4 → 2.2.3 View file →

		@@ -1,8 +1,8 @@
1	1	<?php
2	2	$config['date_format'] = array(
3	3	'default' => 'j M Y',
4		- 'label' => HCM::__('Date Format'),
	4	+ 'label' => lang('conf_date_format'),
5	5	'type' => 'dropdown',
6	6	'options' => array(
7	7	'd/m/Y' => date('d/m/Y'),
8	8	'd-m-Y' => date('d-m-Y'),
		@@ -14,9 +14,9 @@
14	14	);
15	15
16	16	$config['time_format'] = array(
17	17	'default' => 'g:ia',
18		- 'label' => HCM::__('Time Format'),
	18	+ 'label' => lang('conf_time_format'),
19	19	'type' => 'dropdown',
20	20	'options' => array(
21	21	'g:ia' => date('g:ia'),
22	22	'g:i A' => date('g:i A'),
		@@ -25,57 +25,19 @@
25	25	);
26	26
27	27	$config['week_starts'] = array(
28	28	'default' => 0,
29		- 'label' => HCM::__('Week Starts On'),
	29	+ 'label' => lang('conf_week_starts'),
30	30	'type' => 'dropdown',
31	31	'options' => array(
32		- 0 => HCM::__('Sun'),
33		- 1 => HCM::__('Mon'),
34		- 2 => HCM::__('Tue'),
35		- 3 => HCM::__('Wed'),
36		- 4 => HCM::__('Thu'),
37		- 5 => HCM::__('Fri'),
38		- 6 => HCM::__('Sat'),
	32	+ 1 => lang('time_monday'),
	33	+ 0 => lang('time_sunday'),
39	34	),
40	35	);
41	36
42		-$config['disable_weekdays'] = array(
43		- 'default' => array(),
44		- 'label' => HCM::__('Days Of Week Disabled'),
45		- 'type' => 'checkbox_set',
46		- 'options' => array(
47		- 0 => HCM::__('Sun'),
48		- 1 => HCM::__('Mon'),
49		- 2 => HCM::__('Tue'),
50		- 3 => HCM::__('Wed'),
51		- 4 => HCM::__('Thu'),
52		- 5 => HCM::__('Fri'),
53		- 6 => HCM::__('Sat'),
54		- ),
55		- );
56		-
57		-$config['time_min'] = array(
58		- 'default' => 0,
59		- 'label' => HCM::__('Min Start Time'),
60		- 'type' => 'time',
61		- );
62		-
63		-$config['time_max'] = array(
64		- 'default' => 24 * 60 * 60,
65		- 'label' => HCM::__('Max End Time'),
66		- 'type' => 'time',
67		- );
68		-
69		-$config['show_end_time'] = array(
70		- 'default' => 1,
71		- 'label' => HCM::__('Show Shift End Time'),
72		- 'type' => 'checkbox',
73		- );
74		-
75	37	$config['email_from'] = array(
76	38	'default' => '',
77		- 'label' => HCM::__('Send Email Notifications From Address'),
	39	+ 'label' => lang('conf_email_from'),
78	40	'type' => 'text',
79	41	'rules' => 'trim|required|valid_email'
80	42	);
81	43
		@@ -80,30 +42,16 @@
80	42	);
81	43
82	44	$config['email_from_name'] = array(
83	45	'default' => '',
84		- 'label' => HCM::__('Send Email Notifications From Name'),
	46	+ 'label' => lang('conf_email_from_name'),
85	47	'type' => 'text',
86	48	'rules' => 'trim|required'
87	49	);
88	50
89		-$config['disable_email'] = array(
90		- 'default' => 0,
91		- 'label' => HCM::__('Disable Email'),
92		- 'type' => 'checkbox',
93		- );
94		-
95		-$config['bcc_email'] = array(
96		- 'default' => '',
97		- 'label' => HCM::__('Send a Copy Of All Email Notifications To'),
98		- 'help' => HCM::__('Separate by comma'),
99		- 'type' => 'text',
100		- 'rules' => 'trim',
101		- );
102		-
103	51	$config['csv_separator'] = array(
104	52	'default' => ',',
105		- 'label' => HCM::__('Separator in csv files'),
	53	+ 'label' => lang('conf_csv_separator'),
106	54	'type' => 'dropdown',
107	55	'options' => array(
108	56	',' => ',',
109	57	';' => ';',
		@@ -109,100 +57,28 @@
109	57	';' => ';',
110	58	),
111	59	);
112	60
113		-$config['login_with'] = array(
114		- 'default' => 'email',
115		- 'label' => HCM::__('Log In With'),
116		- 'type' => 'dropdown',
	61	+$config['working_levels'] = array(
	62	+ 'default' => array(USER_MODEL::LEVEL_STAFF, USER_MODEL::LEVEL_MANAGER, USER_MODEL::LEVEL_ADMIN),
	63	+ 'label' => lang('staff_who_can_work'),
	64	+ 'type' => 'checkbox_set',
117	65	'options' => array(
118		- 'email' => HCM::__('Email'),
119		- 'username' => HCM::__('Username'),
	66	+ USER_MODEL::LEVEL_STAFF => lang('user_level_staff'),
	67	+ USER_MODEL::LEVEL_MANAGER => lang('user_level_manager'),
	68	+ USER_MODEL::LEVEL_ADMIN => lang('user_level_admin'),
120	69	),
	70	+ 'rules' => 'required'
121	71	);
122	72
123		-/*
124		-$config['calendar_ajax'] = array(
	73	+
	74	+$config['staff_pick_shifts'] = array(
125	75	'default' => 1,
126		- 'label' => 'Ajax in admin calendar',
	76	+ 'label' => lang('staff_can_pick_up_shifts'),
127	77	'type' => 'checkbox',
128	78	);
129		-*/
130	79
131		-$config['timeoff:approval_required'] = array(
	80	+$config['approve_pick_shifts'] = array(
132	81	'default' => 1,
133		- 'label' => HCM::__('Admin Approval Required'),
	82	+ 'label' => lang('approve_shifts_pick_up'),
134	83	'type' => 'checkbox',
135		- );
136		-
137		-$ri = HC_Lib::ri();
138		-
139		-if( $ri ){
140		- $config['wall:schedule_display'] = array(
141		- 'default' => USER_HC_MODEL::LEVEL_STAFF,
142		- 'label' => HCM::__('Staff Can See Others Schedule'),
143		- 'type' => 'dropdown',
144		- 'options' => array(
145		- USER_HC_MODEL::LEVEL_STAFF => HCM::__('Yes'),
146		- USER_HC_MODEL::LEVEL_ADMIN => HCM::__('No'),
147		- ),
148		- );
149		-
150		- $config['wall:show_open'] = array(
151		- 'default' => 0,
152		- 'label' => HCM::__('Display Open Shifts'),
153		- 'type' => 'checkbox',
154		- );
155		-}
156		-else {
157		- $config['wall:schedule_display'] = array(
158		- 'default' => USER_HC_MODEL::LEVEL_STAFF,
159		- 'label' => HCM::__('Who Can See Full Schedule'),
160		- 'type' => 'dropdown',
161		- 'options' => array(
162		- 0 => HCM::__('Everyone'),
163		- USER_HC_MODEL::LEVEL_STAFF => HCM::__('Staff'),
164		- USER_HC_MODEL::LEVEL_ADMIN => HCM::__('Nobody'),
165		- ),
166		- );
167		-
168		- $config['wall:show_open'] = array(
169		- 'default' => 0,
170		- 'label' => HCM::__('Display Open Shifts'),
171		- 'type' => 'checkbox',
172		- );
173		-}
174		-
175		-$config['staff:working_levels'] = array(
176		- 'default' => array(USER_HC_MODEL::LEVEL_STAFF, USER_HC_MODEL::LEVEL_MANAGER, USER_HC_MODEL::LEVEL_ADMIN),
177		- 'label' => HCM::__('Who Can Work'),
178		- 'type' => 'checkbox_set',
179		- 'options' => array(
180		-/* translators: User level */
181		- USER_HC_MODEL::LEVEL_STAFF => HCM::__('Staff'),
182		-/* translators: User level */
183		- USER_HC_MODEL::LEVEL_MANAGER => HCM::__('Manager'),
184		-/* translators: User level */
185		- USER_HC_MODEL::LEVEL_ADMIN => HCM::__('Admin'),
186		- ),
187		- 'rules' => 'required'
188		- );
189		-
190		-$config['staff:shift_acl'] = array(
191		- 'default' => array('view_active'),
192		- 'label' => HCM::__('Employees Can'),
193		- 'type' => 'checkbox_set',
194		- 'inline' => 0,
195		- 'options' => array(
196		- 'view_active' => HCM::__('View Active Shifts'),
197		- 'view_draft' => HCM::__('View Draft Shifts'),
198		- 'create_draft' => HCM::__('Create Draft Shifts'),
199		- 'confirm_draft' => HCM::__('Confirm Draft Shifts'),
200		- 'create_active' => HCM::__('Create Active Shifts'),
201		- ),
202		- 'dependencies' => array(
203		- 'view_draft' => array('view_active'),
204		- 'create_draft' => array('view_draft'),
205		- 'confirm_draft' => array('view_active', 'view_draft'),
206		- 'create_active' => array('confirm_draft', 'view_active', 'create_draft'),
207		- ),
208	84	);