projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New Company Setup 'Barcodes On Stock' implemented. Rep303 shows barcodes if set.
[fa-stable.git]
/
includes
/
packages.inc
diff --git
a/includes/packages.inc
b/includes/packages.inc
index 2dc7bd3e46a87ac931ee5eede02ba604b7c45b58..c3aa518cd3de40f0d305c77eb1a3a5248f74751e 100644
(file)
--- a/
includes/packages.inc
+++ b/
includes/packages.inc
@@
-19,7
+19,8
@@
define('PUBKEY_PATH', $path_to_root);
// FrontAccounting package class
//
class package extends gzip_file {
// FrontAccounting package class
//
class package extends gzip_file {
- function package($filename, $basedir=null)
+
+ function __construct($filename, $basedir=null)
{
global $path_to_root;
{
global $path_to_root;
@@
-30,7
+31,7
@@
class package extends gzip_file {
} else
mkdir($basedir);
}
} else
mkdir($basedir);
}
-
$this->archive
($filename);
+
parent::__construct
($filename);
$this->set_options(array('basedir'=> $basedir));
$this->options['type'] = "pkg";
}
$this->set_options(array('basedir'=> $basedir));
$this->options['type'] = "pkg";
}
@@
-299,6
+300,10
@@
function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey
$sig = url_get_contents($repo.'/Release.sig');
$data = file_get_contents($loclist);
$cert = file_get_contents(PUBKEY_PATH.'/FA.pem');
$sig = url_get_contents($repo.'/Release.sig');
$data = file_get_contents($loclist);
$cert = file_get_contents(PUBKEY_PATH.'/FA.pem');
+ if (!function_exists('openssl_verify')) {
+ display_error(_("OpenSSL have to be available on your server to use extension repository system."));
+ return null;
+ }
if (openssl_verify($data, $sig, $cert) <= 0) {
if ($refresh) {
if (!@unlink($loclist))
if (openssl_verify($data, $sig, $cert) <= 0) {
if ($refresh) {
if (!@unlink($loclist))
@@
-671,12
+676,6
@@
function install_extension($pkg_name)
'active' => @$pkg['DefaultStatus'] == 'active' ? true : false,
'path' => $pkg['InstallPath'],
);
'active' => @$pkg['DefaultStatus'] == 'active' ? true : false,
'path' => $pkg['InstallPath'],
);
-// if (isset($pkg['MenuTabs']))
-// $ext['tabs'] = $pkg['MenuTabs'];
-// if (isset($pkg['MenuEntries']))
-// $ext['entries'] = $pkg['MenuEntries'];
-// if (isset($pkg['AccessExtensions']))
-// $ext['acc_file'] = $pkg['AccessExtensions'];
if (isset($pkg['SqlScript']))
$ext['sql'] = $pkg['SqlScript'];
if (isset($pkg['SqlScript']))
$ext['sql'] = $pkg['SqlScript'];
@@
-736,8
+735,8
@@
function check_src_ext_version($ext_v)
global $src_version;
$compat_levels = 2; // current policy is keeping compatibility on major version level.
global $src_version;
$compat_levels = 2; // current policy is keeping compatibility on major version level.
- $app = explode('.', s
trspn($src_version, "0123456789."
));
- $pkg = explode('.', s
trspn($ext_v, "0123456789."
));
+ $app = explode('.', s
ubstr($src_version, 0, strspn($src_version, "0123456789.")
));
+ $pkg = explode('.', s
ubstr($ext_v, 0, strspn($ext_v, "0123456789.")
));
for ($i=0; $i < min($compat_levels, count($app)); $i++)
if ($pkg[$i] < $app[$i])
for ($i=0; $i < min($compat_levels, count($app)); $i++)
if ($pkg[$i] < $app[$i])