git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Single file editing
[phorkie.git]
/
src
/
phorkie
/
File.php
diff --git
a/src/phorkie/File.php
b/src/phorkie/File.php
index 331f2e546be5b72b96c9d96960ca8b7c4f6526e6..2aa1d194c48d2c3e87ccbf7876ff1aa1988446c6 100644
(file)
--- a/
src/phorkie/File.php
+++ b/
src/phorkie/File.php
@@
-55,7
+55,7
@@
class File
*/
public function getExt()
{
*/
public function getExt()
{
- return s
ubstr($this->path, strrpos($this->path, '.') + 1
);
+ return s
trtolower(substr($this->path, strrpos($this->path, '.') + 1)
);
}
public function getContent()
}
public function getContent()
@@
-64,8
+64,7
@@
class File
//quick hack until https://pear.php.net/bugs/bug.php?id=19385 is fixed
$cmd = new GitCommandBinary($this->repo->getVc());
$cmd->setSubCommand('show');
//quick hack until https://pear.php.net/bugs/bug.php?id=19385 is fixed
$cmd = new GitCommandBinary($this->repo->getVc());
$cmd->setSubCommand('show');
- return //$this->repo->getVc()->getCommand('show')
- $cmd
+ return $cmd
->addArgument($this->repo->hash . ':' . $this->path)
->execute();
}
->addArgument($this->repo->hash . ':' . $this->path)
->execute();
}
@@
-96,10
+95,10
@@
class File
/**
* Get a link to the file
*
/**
* Get a link to the file
*
- * @param string $type Link type. Supported are:
- * - "raw"
- * - "tool"
- * @param string $option
+ * @param string $type
Link type. Supported are:
+ *
- "raw"
+ *
- "tool"
+ * @param string $option
Additional option, e.g. tool name
*
* @return string
*/
*
* @return string
*/
@@
-107,17
+106,22
@@
class File
{
if ($type == 'raw') {
if ($this->repo->hash === null) {
{
if ($type == 'raw') {
if ($this->repo->hash === null) {
- return
'/' .
$this->repo->id . '/raw/' . $this->getFilename();
+ return $this->repo->id . '/raw/' . $this->getFilename();
} else {
} else {
- return
'/' .
$this->repo->id . '/rev-raw/' . $this->repo->hash
+ return $this->repo->id . '/rev-raw/' . $this->repo->hash
. '/' . $this->getFilename();
}
} else if ($type == 'tool') {
. '/' . $this->getFilename();
}
} else if ($type == 'tool') {
- return '/' . $this->repo->id . '/tool/' . $option . '/' . $this->getFilename();
+ return $this->repo->id
+ . '/tool/' . $option
+ . '/' . $this->getFilename();
}
throw new Exception('Unknown type');
}
}
throw new Exception('Unknown type');
}
+ /**
+ * @return string Mime type of file
+ */
public function getMimeType()
{
$ext = $this->getExt();
public function getMimeType()
{
$ext = $this->getExt();
@@
-161,8
+165,10
@@
class File
$type = $GLOBALS['phorkie']['languages'][$ext]['mime'];
return substr($type, 0, 5) === 'text/'
$type = $GLOBALS['phorkie']['languages'][$ext]['mime'];
return substr($type, 0, 5) === 'text/'
- || $type == 'application/javascript';
+ || $type == 'application/javascript'
+ || substr($type, -4) == '+xml'
+ || substr($type, -5) == '+json';
}
}
}
}
-?>
\ No newline at end of file
+?>