aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/inc/File
diff options
context:
space:
mode:
Diffstat (limited to 'inc/File')
-rw-r--r--inc/File/MediaFile.php8
-rw-r--r--inc/File/MediaResolver.php4
-rw-r--r--inc/File/PageFile.php38
-rw-r--r--inc/File/PageResolver.php4
-rw-r--r--inc/File/Resolver.php6
5 files changed, 26 insertions, 34 deletions
diff --git a/inc/File/MediaFile.php b/inc/File/MediaFile.php
index d45822ad7..fcb10c250 100644
--- a/inc/File/MediaFile.php
+++ b/inc/File/MediaFile.php
@@ -27,7 +27,7 @@ class MediaFile
$this->id = $id; //FIXME should it be cleaned?
$this->path = mediaFN($id, $rev);
- list($this->ext, $this->mime, $this->downloadable) = mimetype($this->path, false);
+ [$this->ext, $this->mime, $this->downloadable] = mimetype($this->path, false);
}
/** @return string */
@@ -121,7 +121,7 @@ class MediaFile
if (!$this->isImage()) return;
$info = getimagesize($this->path);
if ($info === false) return;
- list($this->width, $this->height) = $info;
+ [$this->width, $this->height] = $info;
}
/**
@@ -154,13 +154,13 @@ class MediaFile
*/
public function userPermission()
{
- return auth_quickaclcheck(getNS($this->id).':*');
+ return auth_quickaclcheck(getNS($this->id) . ':*');
}
/** @return JpegMeta */
public function getMeta()
{
- if($this->meta === null) $this->meta = new JpegMeta($this->path);
+ if ($this->meta === null) $this->meta = new JpegMeta($this->path);
return $this->meta;
}
}
diff --git a/inc/File/MediaResolver.php b/inc/File/MediaResolver.php
index 098584e72..cc65978d0 100644
--- a/inc/File/MediaResolver.php
+++ b/inc/File/MediaResolver.php
@@ -5,8 +5,8 @@ namespace dokuwiki\File;
/**
* Creates an absolute media ID from a relative one
*/
-class MediaResolver extends Resolver {
-
+class MediaResolver extends Resolver
+{
/** @inheritDoc */
public function resolveId($id, $rev = '', $isDateAt = false)
{
diff --git a/inc/File/PageFile.php b/inc/File/PageFile.php
index 965426185..f561c4e12 100644
--- a/inc/File/PageFile.php
+++ b/inc/File/PageFile.php
@@ -99,20 +99,20 @@ class PageFile
$currentSize = file_exists($pagefile) ? filesize($pagefile) : 0;
// prepare data for event COMMON_WIKIPAGE_SAVE
- $data = array(
- 'id' => $this->id, // should not be altered by any handlers
- 'file' => $pagefile, // same above
- 'changeType' => null, // set prior to event, and confirm later
+ $data = [
+ 'id' => $this->id,// should not be altered by any handlers
+ 'file' => $pagefile,// same above
+ 'changeType' => null,// set prior to event, and confirm later
'revertFrom' => $REV,
'oldRevision' => $currentRevision,
'oldContent' => $currentContent,
- 'newRevision' => 0, // only available in the after hook
+ 'newRevision' => 0,// only available in the after hook
'newContent' => $text,
'summary' => $summary,
- 'contentChanged' => ($text != $currentContent), // confirm later
- 'changeInfo' => '', // automatically determined by revertFrom
- 'sizechange' => strlen($text) - strlen($currentContent), // TBD
- );
+ 'contentChanged' => ($text != $currentContent),// confirm later
+ 'changeInfo' => '',// automatically determined by revertFrom
+ 'sizechange' => strlen($text) - strlen($currentContent),
+ ];
// determine tentatively change type and relevant elements of event data
if ($data['revertFrom']) {
@@ -166,7 +166,7 @@ class PageFile
$data['summary'] = $lang['deleted'];
}
// send "update" event with empty data, so plugins can react to page deletion
- $ioData = array([$pagefile, '', false], getNS($this->id), noNS($this->id), false);
+ $ioData = [[$pagefile, '', false], getNS($this->id), noNS($this->id), false];
Event::createAndTrigger('IO_WIKIPAGE_WRITE', $ioData);
// pre-save deleted revision
@touch($pagefile);
@@ -210,7 +210,7 @@ class PageFile
$this->updateMetadata($logEntry);
// update the purgefile (timestamp of the last time anything within the wiki was changed)
- io_saveFile($conf['cachedir'].'/purgefile', time());
+ io_saveFile($conf['cachedir'] . '/purgefile', time());
return $data;
}
@@ -238,12 +238,12 @@ class PageFile
if (touch($fileLastMod, $revInfo['date'])) {
clearstatcache();
$msg = "PageFile($this->id)::detectExternalEdit(): timestamp successfully modified";
- $details = '('.$wrong_timestamp.' -> '.$revInfo['date'].')';
+ $details = '(' . $wrong_timestamp . ' -> ' . $revInfo['date'] . ')';
Logger::error($msg, $details, $fileLastMod);
} else {
// runtime error
$msg = "PageFile($this->id)::detectExternalEdit(): page file should be newer than last revision "
- .'('.filemtime($fileLastMod).' < '. $this->changelog->lastRevision() .')';
+ . '(' . filemtime($fileLastMod) . ' < ' . $this->changelog->lastRevision() . ')';
throw new RuntimeException($msg);
}
}
@@ -286,11 +286,7 @@ class PageFile
{
global $INFO;
- list(
- 'date' => $date,
- 'type' => $changeType,
- 'user' => $user,
- ) = $logEntry;
+ ['date' => $date, 'type' => $changeType, 'user' => $user, ] = $logEntry;
$wasRemoved = ($changeType === DOKU_CHANGE_TYPE_DELETE);
$wasCreated = ($changeType === DOKU_CHANGE_TYPE_CREATE);
@@ -302,9 +298,10 @@ class PageFile
if ($wasRemoved) return;
$oldmeta = p_read_metadata($this->id)['persistent'];
- $meta = array();
+ $meta = [];
- if ($wasCreated &&
+ if (
+ $wasCreated &&
(empty($oldmeta['date']['created']) || $oldmeta['date']['created'] === $createdDate)
) {
// newly created
@@ -330,5 +327,4 @@ class PageFile
$meta['last_change'] = $logEntry;
p_set_metadata($this->id, $meta);
}
-
}
diff --git a/inc/File/PageResolver.php b/inc/File/PageResolver.php
index 1c10ea674..03edd612a 100644
--- a/inc/File/PageResolver.php
+++ b/inc/File/PageResolver.php
@@ -7,7 +7,6 @@ namespace dokuwiki\File;
*/
class PageResolver extends Resolver
{
-
/**
* Resolves a given ID to be absolute
*
@@ -21,7 +20,7 @@ class PageResolver extends Resolver
// pages may have a hash attached, we separate it on resolving
if (strpos($id, '#') !== false) {
- list($id, $hash) = sexplode('#', $id, 2);
+ [$id, $hash] = sexplode('#', $id, 2);
$hash = cleanID($hash);
} else {
$hash = '';
@@ -95,5 +94,4 @@ class PageResolver extends Resolver
}
return $id;
}
-
}
diff --git a/inc/File/Resolver.php b/inc/File/Resolver.php
index e3734cf69..4fe849b63 100644
--- a/inc/File/Resolver.php
+++ b/inc/File/Resolver.php
@@ -7,7 +7,6 @@ namespace dokuwiki\File;
*/
abstract class Resolver
{
-
/** @var string context page ID */
protected $contextID;
/** @var string namespace of context page ID */
@@ -51,7 +50,7 @@ abstract class Resolver
*/
protected function resolvePrefix($id)
{
- if($id === '') return $id;
+ if ($id === '') return $id;
// relative to current page (makes the current page a start page)
if ($id[0] === '~') {
@@ -94,7 +93,7 @@ abstract class Resolver
array_pop($result);
continue;
}
- array_push($result, $dir);
+ $result[] = $dir;
}
$id = implode(':', $result);
@@ -102,5 +101,4 @@ abstract class Resolver
return $id;
}
-
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-05 22:10:41 +0000