Skip to content

Commit 32f6ff6

Browse files
JoshuaLuckersJoshuaLuckers
committed
Remove unnecessary uses of deprecated strftime()
1 parent 38ab332 commit 32f6ff6

File tree

22 files changed

+77
-77
lines changed

22 files changed

+77
-77
lines changed

‎_build/test/properties.sample.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use xPDO\xPDO;
2020

2121
/* define some properties */
22-
$properties['runtime'] = strftime("%Y%m%dT%H%M%S");
22+
$properties['runtime'] = date('YmdHis');
2323
$properties['config_key'] = 'test';
2424

2525
/* driver-specific connection properties */

‎_build/transport.core.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
'name' => 'modx.com',
168168
'description' => 'The official MODX transport provider for 3rd party components.',
169169
'service_url' => 'https://rest.modx.com/extras/',
170-
'created' => strftime('%Y-%m-%d %H:%M:%S'),
170+
'created' => date('Y-m-d H:i:s'),
171171
], '', true, true);
172172
$attributes = [
173173
xPDOTransport::PRESERVE_KEYS => false,

‎core/src/Revolution/Processors/Element/TemplateVar/Renders/mgr/input/date.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class modTemplateVarInputRenderDate extends modTemplateVarInputRender {
1818
public function process($value,array $params = []) {
1919
$v = $value;
2020
if ($v != '' && $v != '0' && $v != '0000-00-00 00:00:00') {
21-
$v = strftime('%Y-%m-%d %H:%M:%S',strtotime($v));
21+
$v = date('Y-m-d H:i:s',strtotime($v));
2222
}
2323
$this->tv->set('value',$v);
2424

‎core/src/Revolution/Processors/Resource/Create.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public function setFieldDefaults()
262262
$scriptProperties['uri_override'] = empty($scriptProperties['uri_override']) ? 0 : 1;
263263

264264
if (empty($scriptProperties['createdon'])) {
265-
$scriptProperties['createdon'] = strftime('%Y-%m-%d %H:%M:%S');
265+
$scriptProperties['createdon'] = date('Y-m-d H:i:s');
266266
}
267267

268268
if (empty($scriptProperties['createdby'])) {
@@ -507,7 +507,7 @@ public function addTemplateVariables()
507507
$value = implode(',', $newTags);
508508
break;
509509
case 'date':
510-
$value = empty($value) ? '' : strftime('%Y-%m-%d %H:%M:%S', strtotime($value));
510+
$value = empty($value) ? '' : date('Y-m-d H:i:s', strtotime($value));
511511
break;
512512
case 'url':
513513
if ($this->getProperty($tvKey . '_prefix', '--') != '--') {

‎core/src/Revolution/Processors/Resource/Event/UpdateFromGrid.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ public function validate()
6565
{
6666
$publishDate = $this->getProperty('pub_date');
6767
if (!empty($publishDate)) {
68-
$this->setProperty('pub_date', strftime('%Y-%m-%d %H:%M', strtotime($publishDate)));
68+
$this->setProperty('pub_date', date('Y-m-d H:i', strtotime($publishDate)));
6969
}
7070

7171
$unPublishDate = $this->getProperty('unpub_date');
7272
if (!empty($unPublishDate)) {
73-
$this->setProperty('unpub_date', strftime('%Y-%m-%d %H:%M', strtotime($unPublishDate)));
73+
$this->setProperty('unpub_date', date('Y-m-d H:i', strtotime($unPublishDate)));
7474
}
7575
return true;
7676
}

‎core/src/Revolution/Processors/Resource/Reload.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function process()
7171
}
7272
break;
7373
case 'date':
74-
$value = empty($value) ? '' : strftime('%Y-%m-%d %H:%M:%S', strtotime($value));
74+
$value = empty($value) ? '' : date('Y-m-d H:i:s', strtotime($value));
7575
break;
7676
/* ensure tag types trim whitespace from tags */
7777
case 'tag':

‎core/src/Revolution/Processors/Resource/Update.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ public function saveTemplateVariables()
738738
}
739739
break;
740740
case 'date':
741-
$value = empty($value) ? '' : strftime('%Y-%m-%d %H:%M:%S', strtotime($value));
741+
$value = empty($value) ? '' : date('Y-m-d H:i:s', strtotime($value));
742742
break;
743743
/* ensure tag types trim whitespace from tags */
744744
case 'tag':

‎core/src/Revolution/Processors/Security/Profile/Get.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ public function process()
7171
$userArray = array_merge($profile->toArray(), $userArray);
7272
}
7373

74-
$userArray['dob'] = !empty($userArray['dob']) ? strftime('%m/%d/%Y', $userArray['dob']) : '';
75-
$userArray['blockeduntil'] = !empty($userArray['blockeduntil']) ? strftime('%m/%d/%Y %I:%M %p',
74+
$userArray['dob'] = !empty($userArray['dob']) ? date('m/d/Y', $userArray['dob']) : '';
75+
$userArray['blockeduntil'] = !empty($userArray['blockeduntil']) ? date('m/d/Y h:i A',
7676
$userArray['blockeduntil']) : '';
77-
$userArray['blockedafter'] = !empty($userArray['blockedafter']) ? strftime('%m/%d/%Y %I:%M %p',
77+
$userArray['blockedafter'] = !empty($userArray['blockedafter']) ? date('m/d/Y h:i A',
7878
$userArray['blockedafter']) : '';
79-
$userArray['lastlogin'] = !empty($userArray['lastlogin']) ? strftime('%m/%d/%Y', $userArray['lastlogin']) : '';
79+
$userArray['lastlogin'] = !empty($userArray['lastlogin']) ? date('m/d/Y', $userArray['lastlogin']) : '';
8080

8181
return $this->success('', $userArray);
8282
}

‎core/src/Revolution/Processors/Security/User/Get.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ public function cleanup()
9191
$userArray = array_merge($profile->toArray(), $userArray);
9292
}
9393

94-
$userArray['dob'] = !empty($userArray['dob']) ? strftime('%m/%d/%Y', $userArray['dob']) : '';
95-
$userArray['blockeduntil'] = !empty($userArray['blockeduntil']) ? strftime('%Y-%m-%d %H:%M:%S',
94+
$userArray['dob'] = !empty($userArray['dob']) ? date('m/d/Y', $userArray['dob']) : '';
95+
$userArray['blockeduntil'] = !empty($userArray['blockeduntil']) ? date('Y-m-d H:i:s',
9696
$userArray['blockeduntil']) : '';
97-
$userArray['blockedafter'] = !empty($userArray['blockedafter']) ? strftime('%Y-%m-%d %H:%M:%S',
97+
$userArray['blockedafter'] = !empty($userArray['blockedafter']) ? date('Y-m-d H:i:s',
9898
$userArray['blockedafter']) : '';
9999
$userArray['lastlogin'] = !empty($userArray['lastlogin']) ? date($this->modx->getOption('manager_date_format') . ', ' . $this->modx->getOption('manager_time_format'),
100100
$userArray['lastlogin']) : '';

‎core/src/Revolution/Processors/System/Info.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public function process()
4040
/* general */
4141
$data['modx_version'] = $this->modx->version['full_appname'];
4242
$data['code_name'] = $this->modx->version['code_name'];
43-
$data['servertime'] = strftime('%I:%M:%S %p', time());
44-
$data['localtime'] = strftime('%I:%M:%S %p', time() + $serverOffset);
43+
$data['servertime'] = date('h:i:s A', time());
44+
$data['localtime'] = date('h:i:s A', time() + $serverOffset);
4545
$data['serveroffset'] = $serverOffset / (60 * 60);
4646

4747
/* database info */
@@ -58,7 +58,7 @@ public function process()
5858
$data['database_name'] = trim($this->modx->getOption('dbname'),
5959
$this->modx->_escapeCharOpen . $this->modx->_escapeCharClose);
6060
$data['database_server'] = $this->modx->getOption('host');
61-
$data['now'] = strftime('%b %d, %Y %I:%M %p', time());
61+
$data['now'] = date('M d, Y h:i A', time());
6262
$data['table_prefix'] = $this->modx->getOption('table_prefix');
6363

6464
return $this->success('', $data);

‎core/src/Revolution/Processors/System/Log/GetList.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ public function getData()
121121
$wa['user'] = $user;
122122
}
123123
if (!empty($dateStart)) {
124-
$dateStart = strftime('%Y-%m-%d', strtotime($dateStart . ' 00:00:00'));
124+
$dateStart = date('Y-m-d', strtotime($dateStart . ' 00:00:00'));
125125
$wa['occurred:>='] = $dateStart;
126126
}
127127
if (!empty($dateEnd)) {
128-
$dateEnd = strftime('%Y-%m-%d', strtotime($dateEnd . ' 23:59:59'));
128+
$dateEnd = date('Y-m-d', strtotime($dateEnd . ' 23:59:59'));
129129
$wa['occurred:<='] = $dateEnd;
130130
}
131131

‎core/src/Revolution/Processors/Workspace/Packages/ScanLocal.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function createPackage($signature)
123123
$package = $this->modx->newObject(modTransportPackage::class);
124124
$package->set('signature', $signature);
125125
$package->set('state', 1);
126-
$package->set('created', strftime('%Y-%m-%d %H:%M:%S'));
126+
$package->set('created', date('Y-m-d H:i:s'));
127127
$package->set('workspace', $this->workspace->get('id'));
128128

129129
/* set package version data */

‎core/src/Revolution/Registry/Db/mysql/modDbRegisterMessage.php

+35-35
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
1313
'version' => '3.0',
1414
'table' => 'register_messages',
1515
'extends' => 'xPDO\\Om\\xPDOObject',
16-
'tableMeta' =>
16+
'tableMeta' =>
1717
array (
1818
'engine' => 'InnoDB',
1919
),
20-
'fields' =>
20+
'fields' =>
2121
array (
2222
'topic' => NULL,
2323
'id' => NULL,
@@ -29,9 +29,9 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
2929
'payload' => NULL,
3030
'kill' => 0,
3131
),
32-
'fieldMeta' =>
32+
'fieldMeta' =>
3333
array (
34-
'topic' =>
34+
'topic' =>
3535
array (
3636
'dbtype' => 'integer',
3737
'precision' => '10',
@@ -40,36 +40,36 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
4040
'null' => false,
4141
'index' => 'pk',
4242
),
43-
'id' =>
43+
'id' =>
4444
array (
4545
'dbtype' => 'varchar',
4646
'precision' => '191',
4747
'phptype' => 'string',
4848
'null' => false,
4949
'index' => 'pk',
5050
),
51-
'created' =>
51+
'created' =>
5252
array (
5353
'dbtype' => 'datetime',
5454
'phptype' => 'datetime',
5555
'null' => false,
5656
'index' => 'index',
5757
),
58-
'valid' =>
58+
'valid' =>
5959
array (
6060
'dbtype' => 'datetime',
6161
'phptype' => 'datetime',
6262
'null' => false,
6363
'index' => 'index',
6464
),
65-
'accessed' =>
65+
'accessed' =>
6666
array (
6767
'dbtype' => 'timestamp',
6868
'phptype' => 'timestamp',
6969
'attributes' => 'ON UPDATE CURRENT_TIMESTAMP',
7070
'index' => 'index',
7171
),
72-
'accesses' =>
72+
'accesses' =>
7373
array (
7474
'dbtype' => 'integer',
7575
'precision' => '10',
@@ -79,7 +79,7 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
7979
'default' => 0,
8080
'index' => 'index',
8181
),
82-
'expires' =>
82+
'expires' =>
8383
array (
8484
'dbtype' => 'integer',
8585
'precision' => '20',
@@ -88,13 +88,13 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
8888
'default' => 0,
8989
'index' => 'index',
9090
),
91-
'payload' =>
91+
'payload' =>
9292
array (
9393
'dbtype' => 'mediumtext',
9494
'phptype' => 'string',
9595
'null' => false,
9696
),
97-
'kill' =>
97+
'kill' =>
9898
array (
9999
'dbtype' => 'tinyint',
100100
'precision' => '1',
@@ -104,103 +104,103 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
104104
'default' => 0,
105105
),
106106
),
107-
'indexes' =>
107+
'indexes' =>
108108
array (
109-
'PRIMARY' =>
109+
'PRIMARY' =>
110110
array (
111111
'alias' => 'PRIMARY',
112112
'primary' => true,
113113
'unique' => true,
114114
'type' => 'BTREE',
115-
'columns' =>
115+
'columns' =>
116116
array (
117-
'topic' =>
117+
'topic' =>
118118
array (
119119
'length' => '',
120120
'collation' => 'A',
121121
'null' => false,
122122
),
123-
'id' =>
123+
'id' =>
124124
array (
125125
'length' => '',
126126
'collation' => 'A',
127127
'null' => false,
128128
),
129129
),
130130
),
131-
'created' =>
131+
'created' =>
132132
array (
133133
'alias' => 'created',
134134
'primary' => false,
135135
'unique' => false,
136136
'type' => 'BTREE',
137-
'columns' =>
137+
'columns' =>
138138
array (
139-
'created' =>
139+
'created' =>
140140
array (
141141
'length' => '',
142142
'collation' => 'A',
143143
'null' => false,
144144
),
145145
),
146146
),
147-
'valid' =>
147+
'valid' =>
148148
array (
149149
'alias' => 'valid',
150150
'primary' => false,
151151
'unique' => false,
152152
'type' => 'BTREE',
153-
'columns' =>
153+
'columns' =>
154154
array (
155-
'valid' =>
155+
'valid' =>
156156
array (
157157
'length' => '',
158158
'collation' => 'A',
159159
'null' => false,
160160
),
161161
),
162162
),
163-
'accessed' =>
163+
'accessed' =>
164164
array (
165165
'alias' => 'accessed',
166166
'primary' => false,
167167
'unique' => false,
168168
'type' => 'BTREE',
169-
'columns' =>
169+
'columns' =>
170170
array (
171-
'accessed' =>
171+
'accessed' =>
172172
array (
173173
'length' => '',
174174
'collation' => 'A',
175175
'null' => false,
176176
),
177177
),
178178
),
179-
'accesses' =>
179+
'accesses' =>
180180
array (
181181
'alias' => 'accesses',
182182
'primary' => false,
183183
'unique' => false,
184184
'type' => 'BTREE',
185-
'columns' =>
185+
'columns' =>
186186
array (
187-
'accesses' =>
187+
'accesses' =>
188188
array (
189189
'length' => '',
190190
'collation' => 'A',
191191
'null' => false,
192192
),
193193
),
194194
),
195-
'expires' =>
195+
'expires' =>
196196
array (
197197
'alias' => 'expires',
198198
'primary' => false,
199199
'unique' => false,
200200
'type' => 'BTREE',
201-
'columns' =>
201+
'columns' =>
202202
array (
203-
'expires' =>
203+
'expires' =>
204204
array (
205205
'length' => '',
206206
'collation' => 'A',
@@ -209,9 +209,9 @@ class modDbRegisterMessage extends \MODX\Revolution\Registry\Db\modDbRegisterMes
209209
),
210210
),
211211
),
212-
'aggregates' =>
212+
'aggregates' =>
213213
array (
214-
'Topic' =>
214+
'Topic' =>
215215
array (
216216
'class' => 'MODX\\Revolution\\Registry\\Db\\modDbRegisterTopic',
217217
'local' => 'topic',
@@ -239,7 +239,7 @@ public static function getValidMessages(
239239
$register->modx,
240240
"SELECT msg.* FROM {$msgTable} msg JOIN {$topicTable} topic ON msg.valid <= :now AND (topic.name = :topic OR (topic.name = :topicbase AND msg.id = :topicmsg)) AND topic.id = msg.topic ORDER BY msg.created ASC {$limitClause}",
241241
[
242-
':now' => strftime('%Y-%m-%d %H:%M:%S'),
242+
':now' => date('Y-m-d H:i:s'),
243243
':topic' => $topic,
244244
':topicbase' => $topicBase,
245245
':topicmsg' => $topicMsg,

0 commit comments

Comments
 (0)