Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2026-07-09 12:43:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

put escapeshelltag out of the string

Browse Source
This commit is contained in:
Marcos Coelho
2012-12-20 12:56:17 -02:00
parent 9091aa2292
commit 0951527bfc
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/GitList/Git/Repository.php
View File

@@ -70,7 +70,8 @@ class Repository extends BaseRepository
public function searchCommitLog($query)
{
$command = "log --grep=".escapeshellarg($query)." --pretty=format:\"<item><hash>%H</hash><short_hash>%h</short_hash><tree>%T</tree><parent>%P</parent><author>%an</author><author_email>%ae</author_email><date>%at</date><commiter>%cn</commiter><commiter_email>%ce</commiter_email><commiter_date>%ct</commiter_date><message><![CDATA[%s]]></message></item>\"";
$query = escapeshellarg($query);
$command = "log --grep={$query} --pretty=format:\"<item><hash>%H</hash><short_hash>%h</short_hash><tree>%T</tree><parent>%P</parent><author>%an</author><author_email>%ae</author_email><date>%at</date><commiter>%cn</commiter><commiter_email>%ce</commiter_email><commiter_date>%ct</commiter_date><message><![CDATA[%s]]></message></item>\"";
try {
$logs = $this->getPrettyFormat($command);
@@ -89,8 +90,10 @@ class Repository extends BaseRepository
public function searchTree($query, $branch)
{
$query = escapeshellarg($query);
try {
$results = $this->getClient()->run($this, "grep -I --line-number ".escapeshellarg($query)." $branch");
$results = $this->getClient()->run($this, "grep -I --line-number {$query} $branch");
} catch (\RuntimeException $e) {
return false;
}