git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update 0.5.0 changelog
[phorkie.git]
/
src
/
phorkie
/
File.php
diff --git
a/src/phorkie/File.php
b/src/phorkie/File.php
index 7f5b5b407df44747c9d67f6f34f6f1eff7b025e9..9eb7fa7002be4463442c1a4c81b596352b5ec895 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,26
+95,38
@@
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:
+ * - "display"
+ * - "raw"
+ * - "tool"
+ * @param string $option Additional option, e.g. tool name
+ * @param boolean $full Return full URL or normal relative
*
* @return string
*/
*
* @return string
*/
- public function getLink($type, $option = null)
+ public function getLink($type, $option = null
, $full = false
)
{
if ($type == 'raw') {
if ($this->repo->hash === null) {
{
if ($type == 'raw') {
if ($this->repo->hash === null) {
-
return '/' .
$this->repo->id . '/raw/' . $this->getFilename();
+
$link =
$this->repo->id . '/raw/' . $this->getFilename();
} else {
} else {
-
return '/' .
$this->repo->id . '/rev-raw/' . $this->repo->hash
+
$link =
$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();
+ $link = $this->repo->id
+ . '/tool/' . $option
+ . '/' . $this->getFilename();
+ } else if ($type == 'display') {
+ $link = $this->repo->id . '#' . $this->getFilename();
+ } else {
+ throw new Exception('Unknown type');
}
}
- throw new Exception('Unknown type');
+
+ if ($full) {
+ $link = Tools::fullUrl($link);
+ }
+ return $link;
}
/**
}
/**
@@
-164,7
+175,9
@@
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';
}
}
}
}