hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some wrong uses of

Browse Source
This commit is contained in:
hyung-hwan 2021-02-12 17:35:03 +00:00
parent bae3f6aec0
commit 945fb1ca9a
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codepot/src/codepot/models/coderepomodel.php
View File

@ -45,7 +45,7 @@ class CodeRepoModel extends Model
if (self::_deleteDirectory($dir . "/" . $item) === FALSE) if (self::_deleteDirectory($dir . "/" . $item) === FALSE)
{ {
chmod($dir . "/" . $item, 0777); chmod($dir . "/" . $item, 0777);
if (self::deleteDirectory($dir . "/" . $item) === FALSE) return FALSE; if (self::_deleteDirectory($dir . "/" . $item) === FALSE) return FALSE;
}; };
} }

14
codepot/src/codepot/models/gitmodel.php
View File

@ -3,7 +3,7 @@
$CI = &get_instance(); $CI = &get_instance();
$CI->load->model('CodeRepoModel'); $CI->load->model('CodeRepoModel');
class GitModel extends CodeRepoModel class SubversionModel extends CodeRepoModel
{ {
function __construct () function __construct ()
{ {
@ -156,12 +156,20 @@ class GitModel extends CodeRepoModel
static function createRepo ($projectid, $repodir, $cfgdir, $api) static function createRepo ($projectid, $repodir, $cfgdir, $api)
{ {
$projdir = "{$repodir}/{$projectid}"; $projdir = "{$repodir}/{$projectid}";
if (@git_repository_init($projdir, TRUE) === FALSE) return FALSE; try
{
@Git2\Repository::init($projdir, FALSE);
return TRUE;
}
catch (Exception $x)
{
return FALSE;
}
} }
static function deleteRepo ($projectid, $repodir) static function deleteRepo ($projectid, $repodir)
{ {
return $this->deleteDirectory("{$repodir}/{$projectid}"); return self::_deleteDirectory("{$repodir}/{$projectid}");
} }
} }

6
codepot/src/codepot/models/subversionmodel.php
View File

@ -2223,13 +2223,13 @@ class SubversionModel extends CodeRepoModel
$contents = @file_get_contents("{$cfgdir}/${hook}"); $contents = @file_get_contents("{$cfgdir}/${hook}");
if ($contents === FALSE) if ($contents === FALSE)
{ {
$this->deleteDirectory ($projdir); self::_deleteDirectory ($projdir);
return FALSE; return FALSE;
} }
if (@file_put_contents("{$repodir}/${hook}", str_replace('%API%', $api, $contents)) === FALSE) if (@file_put_contents("{$repodir}/${hook}", str_replace('%API%', $api, $contents)) === FALSE)
{ {
$this->deleteDirectory ($projdir); self::_deleteDirectory ($projdir);
return FALSE; return FALSE;
} }
@ -2237,7 +2237,7 @@ class SubversionModel extends CodeRepoModel
if (@chmod("{$repodir}/{$hook}", 0755) === FALSE || if (@chmod("{$repodir}/{$hook}", 0755) === FALSE ||
@symlink("../../{$hook}", "{$repodir}/{$projectid}/hooks/${hook}") === FALSE) @symlink("../../{$hook}", "{$repodir}/{$projectid}/hooks/${hook}") === FALSE)
{ {
$this->deleteDirectory ($projdir); self::_deleteDirectory ($projdir);
return FALSE; return FALSE;
} }
} }