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

two updates for php7 behavioral change

Browse Source
This commit is contained in:
hyung-hwan 2022-08-30 14:44:24 +00:00
parent fb226c5bfe
commit f6114a9384
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codepot/docker/Dockerfile.alpine
View File

@ -56,8 +56,8 @@ COPY --from=installer /root/packages/x86_64/apache2-mod-perl-2.0.12-r1.apk /tmp
RUN \ RUN \
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \ apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
subversion apache2 libldap \ subversion apache2 libldap \
php7-apache2 php7-gd php7-sqlite3 php7-ldap \ php7-apache2 php7-gd php7-sqlite3 php7-ldap php7-ctype \
php7-pdo php7-pdo_sqlite php7-pdo_mysql \ php7-pdo php7-pdo_sqlite php7-pdo_mysql php7-zip \
apache2-webdav mod_dav_svn \ apache2-webdav mod_dav_svn \
perl-switch perl-config-simple perl-digest-sha1 \ perl-switch perl-config-simple perl-digest-sha1 \
perl-dbd-sqlite perl-ldap perl-subversion perl-mail-sendmail sqlite bash && \ perl-dbd-sqlite perl-ldap perl-subversion perl-mail-sendmail sqlite bash && \

6
codepot/src/codepot/helpers/codepot_helper.php
View File

@ -221,19 +221,19 @@ if ( !function_exists ('codepot_zip_dir'))
if (!is_dir($path)) return FALSE; if (!is_dir($path)) return FALSE;
if (!class_exists('ZipArchive')) return FALSE; if (!class_exists('ZipArchive')) return FALSE;
$stack = array (); $stack = array();
array_push ($stack, $path); array_push ($stack, $path);
$prefix = strlen($path); $prefix = strlen($path);
$zip = new ZipArchive(); $zip = new ZipArchive();
if (@$zip->open ($output_file, ZipArchive::OVERWRITE) === FALSE) return FALSE; if (@$zip->open($output_file, ZipArchive::OVERWRITE | ZipArchive::CREATE) === FALSE) return FALSE;
while (!empty($stack)) while (!empty($stack))
{ {
$dir = array_pop($stack); $dir = array_pop($stack);
$d = @opendir ($dir); $d = @opendir($dir);
if ($d === FALSE) continue; if ($d === FALSE) continue;
$new_path = empty($local_path)? $dir: substr_replace($dir, $local_path, 0, $prefix); $new_path = empty($local_path)? $dir: substr_replace($dir, $local_path, 0, $prefix);

3
codepot/src/codepot/models/codemodel.php
View File

@ -97,8 +97,7 @@ class CodeModel extends CI_Model
} }
$result = $query->result(); $result = $query->result();
$num = empty($result)? 0: $num = empty($result)? 0: (isset($result[0]->COUNT)? $result[0]->COUNT: $result[0]->count);
isset($result[0]->COUNT)? $result[0]->COUNT: $result[0]->count;
$this->db->trans_commit(); $this->db->trans_commit();
return $num; return $num;