X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpackages.inc;h=feab3d78dd502a754ec7ed6b04047169e3b2fa3c;hb=6ae59a0b8741ce89f30b64c2d0f376835eb0a778;hp=f76a44156573874fc420036c4fc058dace57c756;hpb=68d5eafc4d93d1305ee43ae8990b4485f1695b10;p=fa-stable.git diff --git a/includes/packages.inc b/includes/packages.inc index f76a4415..feab3d78 100644 --- a/includes/packages.inc +++ b/includes/packages.inc @@ -10,10 +10,11 @@ See the License here . ***********************************************************************/ include_once($path_to_root. "/includes/archive.inc"); +include_once($path_to_root. "/includes/remote_url.inc"); +include_once($path_to_root. "/includes/hooks.inc"); define('PKG_CACHE_PATH', $path_to_root.'/modules/_cache'); define('PUBKEY_PATH', $path_to_root); -define('REPO_URL', 'http://'.$repo_auth['login'].':'.$repo_auth['pass'].'@'.$repo_auth['host'].'/'.$repo_auth['branch']); // // FrontAccounting package class // @@ -71,7 +72,8 @@ class package extends gzip_file { $dpackage->extract_files(); //install package in target directory - $success &= $this->support('install'); + $install = hook_invoke($ctrl['Package'], 'install_extension', $dummy); + $success &= $install===null || $install; $success &= count($dpackage->error) == 0; $this->error = array_merge($this->error, $dpackage->error); return $success; @@ -96,7 +98,13 @@ class package extends gzip_file { $success &= copy_files($flist, "$cachepath/_back", $targetdir, true); - $success &= $this->support('uninstall'); + if (strpos($ctrl['InstallPath'], 'modules/') === 0) { // flush module directory + flush_dir($targetdir, true); + rmdir($targetdir); + } + + $uninstall = hook_invoke($ctrl['Package'], 'uninstall_extension', $dummy); + $success &= $uninstall===null || $uninstall; return $success; } @@ -108,23 +116,6 @@ class package extends gzip_file { return true; } - // - // Call special function defined in package install class - // - function support($name, $params = null) - { - $cachepath = $this->options['basedir']; - if (file_exists("$cachepath/_init/init.php")) { - include("$cachepath/_init/init.php"); - if (method_exists($installer, $name)) { - set_include_path("$cachepath/_init".PATH_SEPARATOR.get_include_path()); - - $ret = $installer->$name($params); - return $ret; - } - } - return true; - } } // // Changes field value read from control file (single, or multiline) into @@ -134,8 +125,8 @@ function ufmt_property($key, $value) { // indexes used in output arrays $sub_fields = array( - 'MenuTabs' => array('url', 'access', 'tab_id', 'title', 'section'), - 'MenuEntries' => array('url', 'access', 'tab_id', 'title'), +// 'MenuTabs' => array('url', 'access', 'tab_id', 'title', 'section'), +// 'MenuEntries' => array('url', 'access', 'tab_id', 'title'), ); if (!isset($sub_fields[$key])) return $value==='' ? null : $value; @@ -195,7 +186,7 @@ function get_control_file($file, $index = false) { if ($index !== true) { if ($index === false) break; if (!isset($pkg[$index])) { - display_error(_("No key field '$index' in file '$file'")); + display_error(sprintf(_("No key field '%s' in file '%s'"), $index, $file)); return null; } $repo[$pkg[$index]] = $pkg; @@ -279,36 +270,52 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey global $path_to_root, $repo_auth; + $repo = (isset($repo_auth['scheme']) ? $repo_auth['scheme'] : 'http://') + .(isset($repo_auth['login']) ? $repo_auth['login'].':' : '') + .(isset($repo_auth['pass']) ? $repo_auth['pass'].'@' : '') + .(isset($repo_auth['host']) ? $repo_auth['host'].'/' : '') + .(isset($repo_auth['path']) ? $repo_auth['path'].'/' : '') + .$repo_auth['branch']; + // first download local copy of repo release file // and check remote signature with local copy of public key // $loclist = PKG_CACHE_PATH.'/Release.gz'; - - if ($type!=null && !is_array($type)) { + $target_dir = $download==true ? "$path_to_root/tmp/" : $download; + + if (isset($type) && !is_array($type)) { $type = array($type); } $refresh = true; do{ if (!file_exists($loclist)) { - copy(REPO_URL.'/Release.gz', $loclist); + if (!url_copy($repo.'/Release.gz', $loclist)) + { + display_error(_("Cannot download repo index file." )); + return null; + } $refresh = false; } - $sig = file_get_contents(REPO_URL.'/Release.sig', 'rb'); + $sig = url_get_contents($repo.'/Release.sig'); $data = file_get_contents($loclist); $cert = file_get_contents(PUBKEY_PATH.'/FA.pem'); - if (!openssl_verify($data, $sig, $cert)) { - if ($refresh) - @unlink($loclist); - else { + if (openssl_verify($data, $sig, $cert) <= 0) { + if ($refresh) { + if (!@unlink($loclist)) + { + display_error(sprintf(_("Cannot delete outdated '%s' file."), $loclist)); + return null; + } + } else { display_error(_('Release file in repository is invalid, or public key is outdated.')); return null; } } else $refresh = false; + } while($refresh); $Release = get_control_file($loclist, 'Filename'); - // download and check all indexes containing given package types // then complete package list or seek for pkg $Packages = array(); @@ -319,18 +326,24 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey if ($Release[$fname]['Version'] != $repo_auth['branch']) { display_warning(_('Repository version does not match application version.')); // ? } - $remoteindex = REPO_URL.'/'.$fname; + $remoteindex = $repo.'/'.$fname; $locindex = PKG_CACHE_PATH.'/'.$fname; $refresh = true; do{ if (!file_exists($locindex)) { - copy($remoteindex, $locindex); + if (!url_copy($remoteindex, $locindex)) { + display_error(sprintf(_("Cannot download '%s' file." ), $fname)); + return null; + } $refresh = false; } if ($parms['SHA1sum'] != sha1_file($locindex)) { // check subdir index consistency - if ($refresh) - @unlink($locindex); - else { + if ($refresh) { + if (!@unlink($locindex)) { + display_error(sprintf(_("Cannot delete outdated '%s' file."), $locindex)); + return null; + } + } else { display_error(sprintf( _("Security alert: broken index file in repository '%s'. Please inform repository administrator about this issue."), $fname)); return null; @@ -342,8 +355,8 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey // scan subdir list and select packages of given type $pkglist = get_control_file($locindex, 'Package'); foreach($pkglist as $name => $pkg) { - $pkgfullname = REPO_URL.'/'.$parms['Path']."/".$pkg['Filename'].'.pkg'; - if ($type==null || in_array($pkg['Type'], $type)) { + $pkgfullname = $repo.'/'.$parms['Path']."/".$pkg['Filename'].'.pkg'; + if (!isset($type) || in_array($pkg['Type'], $type)) { if (empty($filter)) $p = $pkg; else { @@ -359,8 +372,11 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey } elseif ($pkgname == $pkg['Package']) { //download package to temp directory if ($download) { - $locname = "$path_to_root/tmp/".$pkg['Filename'].'.pkg'; - copy($pkgfullname, $locname); + $locname = $target_dir.$pkg['Filename'].'.pkg'; + if (!url_copy($pkgfullname, $locname)) { + display_error(sprintf(_("Cannot download '%s' file." ), $pkgfullname)); + return null; + } // checking sha1 hash is expensive proces, so chekc the package // consistency just before downloading if ($pkg['SHA1sum'] != sha1_file($locname)) { @@ -374,7 +390,7 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey } } } - + return $Packages; } @@ -460,30 +476,59 @@ function get_languages_list() // Return merged list of available and installed extensions as a local // configuration array supplemented with installed versions information. // -function get_extensions_list() +function get_extensions_list($type = null) { - $pkgs = get_pkg_or_list('extension', null, array( + global $path_to_root; + + if (isset($type) || !is_array($type)) { + $type = array($type); + } + + $pkgs = get_pkg_or_list($type, null, array( 'Package' => 'package', 'Version' => 'available', 'Name' => 'name', 'Description' => 'Descr', 'Type' => 'type', - 'DefaultStatus'=> 'active', - 'MenuTabs' => 'tabs', - 'MenuEntries' => 'entries', - 'AccessExtensions' => 'acc_file', + 'DefaultStatus' => 'active', +// 'MenuTabs' => 'tabs', +// 'MenuEntries' => 'entries', + 'Encoding' => 'encoding', +// 'AccessExtensions' => 'acc_file', 'InstallPath' => 'path' )); + // lookup for local extensions + $path = $path_to_root.'/modules/'; + $loc = array(); + $moddir = opendir($path); + + while(false != ($fname = readdir($moddir))) + { + if(!in_array($fname, array('.','..','CVS','_cache')) && is_dir($path.$fname)) + { + if (!isset($pkgs[$fname])) + $pkgs[$fname] = array( + 'package' => $fname, + 'name' => $fname, + 'version' => '', + 'available' => '', + 'type' => 'extension', + 'path' => 'modules/'.$fname, + 'active' => false + ); + } + } + // add/update extensions already installed // - $local = get_company_extensions(); - foreach($local as $extno => $ext) { - if ($ext['type'] != 'extension') continue; + $installed = get_company_extensions(); + foreach($installed as $extno => $ext) { + if (!in_array($ext['type'], $type)) continue; $ext['local_id'] = $extno; - if (!isset($pkgs[$ext['package']]) || $ext['package'] == '') - $pkgs[] = $ext; - else +// if (!isset($pkgs[$ext['package']]) || $ext['package'] == '') +// $pkgs[] = $ext; +// else $pkgs[$ext['package']] = array_merge($pkgs[$ext['package']], $ext); } ksort($pkgs); @@ -531,6 +576,7 @@ function get_charts_list() 'Description' => 'Descr', 'Type' => 'type', 'InstallPath' => 'path', + 'Encoding' => 'encoding', 'SqlScript' => 'sql' )); @@ -584,17 +630,22 @@ function install_language($pkg_name) write_lang($installed_languages); unlink("$path_to_root/tmp/".$pkg['Filename'].'.pkg'); $Ajax->activate('lang_tbl'); + } else { + display_error(implode('
', $package->error)); + return false; } - + } else { + display_error(sprintf(_("Package '%s' not found."), $pkg_name)); + return false; } - + return true; } //--------------------------------------------------------------------------------------------- // Install/update extension or theme package from repository // function install_extension($pkg_name) { - global $path_to_root, $next_extension_id, $Ajax; + global $path_to_root, $installed_extensions, $next_extension_id, $Ajax, $db_connections; $pkg = get_pkg_or_list(array('extension', 'theme', 'chart'), $pkg_name); if ($pkg) { @@ -604,24 +655,39 @@ function install_extension($pkg_name) $ext_id = array_search_key($pkg['Package'], $local_exts, 'package'); if ($ext_id === null) $ext_id = $next_extension_id++; + else { // remove another already installed package for this language + $old_pkg = $installed_extensions[$ext_id]['package']; + if ($old_pkg) + uninstall_package($old_pkg); + } $ext = array( 'name' => $pkg['Name'], 'package' => $pkg['Package'], 'version' => $pkg['Version'], 'type' => $pkg['Type'], - 'active' => true, + '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['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']; + $local_exts[$ext_id] = $ext; $ret = update_extensions($local_exts); + + if (($ext['active'] == true) && file_exists($path_to_root.'/'.$ext['path'].'/hooks.php')) + { + // we need to include the new hooks file to activate extension + include_once($path_to_root.'/'.$ext['path'].'/hooks.php'); + foreach($db_connections as $comp => $db) + activate_hooks($ext['package'], $comp); + } + unlink("$path_to_root/tmp/".$pkg['Filename'].'.pkg'); $Ajax->activate('ext_tbl'); return $ret; @@ -629,6 +695,9 @@ function install_extension($pkg_name) display_error(implode('
', $package->error)); return false; } + } else { + display_error(sprintf(_("Package '%s' not found."), $pkg_name)); + return false; } return true; } @@ -656,4 +725,3 @@ function get_package_info($pkg, $type=null, $filter=array(), $outkey=null, $down return get_pkg_or_list($type, $pkg, $filter, null, false); } -?> \ No newline at end of file