X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpackages.inc;h=aa6304228e0d354ee786860c5db4942b76678278;hb=1d8ca637beb25da5f36084fdecb6c24dc5d61eab;hp=300741387d754f294a3c5a30dbca847706d88c41;hpb=845ddc30b8993d5112393377dd47b1b43f3f266d;p=fa-stable.git diff --git a/includes/packages.inc b/includes/packages.inc index 30074138..aa630422 100644 --- a/includes/packages.inc +++ b/includes/packages.inc @@ -10,12 +10,13 @@ See the License here . ***********************************************************************/ include_once($path_to_root. "/includes/archive.inc"); +include_once($path_to_root. "/includes/remote_url.inc"); define('PKG_CACHE_PATH', $path_to_root.'/modules/_cache'); define('PUBKEY_PATH', $path_to_root); -define('REPO_URL', "$repository/$FA_repo_version"); +define('REPO_URL', 'http://'.$repo_auth['login'].':'.$repo_auth['pass'].'@'.$repo_auth['host'].'/'.$repo_auth['branch']); // -// FrontAccounting package class +// FrontAccounting package class // class package extends gzip_file { function package($filename, $basedir=null) @@ -54,11 +55,6 @@ class package extends gzip_file { $cachepath = $this->options['basedir']; $ctrl = get_control_file("$cachepath/_init/config"); -// $targetdir = $pkg_data_basedir[$ctrl['Type']]; -// if ($targetdir) -// $targetdir = $path_to_root.$targetdir.$ctrl['Package']; -// else -// $targetdir = $path_to_root; $targetdir = $path_to_root.'/'.$ctrl['InstallPath']; if (!is_dir($targetdir)) @@ -76,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; @@ -92,11 +89,7 @@ class package extends gzip_file { $cachepath = $this->options['basedir']; $ctrl = get_control_file("$cachepath/_init/config"); -// $targetdir = $pkg_data_basedir[$ctrl['Type']]; -// if ($targetdir) -// $targetdir = $path_to_root.$targetdir.$ctrl['Package']; -// else -// $targetdir = $path_to_root; + $targetdir = $path_to_root.'/'.$ctrl['InstallPath']; $dpackage = new package("$cachepath/_data", $targetdir); @@ -105,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; } @@ -117,25 +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()); -// $old = getcwd(); -// chdir("$cachepath/_init"); - $ret = $installer->$name($params); -// chdir($old); - return $ret; - } - } - return true; - } } // // Changes field value read from control file (single, or multiline) into @@ -145,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; @@ -190,7 +170,7 @@ function get_control_file($file, $index = false) { $line = ''; do { $line = rtrim($line); - if (@ctype_space($line[0])) { // continuation of multiline property + if ($line && ctype_space($line[0])) { // continuation of multiline property if (strlen(ltrim($line))) { if ($value !== '' && !is_array($value)) $value = array($value); @@ -216,7 +196,6 @@ function get_control_file($file, $index = false) { $pkg = array(); $key = null; $value = ''; continue; -// } elseif (preg_match('/([\w-]*):\s*(.*)/', $line, $m)) { } elseif (preg_match('/([^:]*):\s*(.*)/', $line, $m)) { $key = $m[1]; $value = $m[2]; if (!strlen($key)) { @@ -256,8 +235,7 @@ function save_control_file($fname, $list, $zip=false) } } // array elements on subsequent lines starting with white space - $value = //(count($value) ? "\n " :''). - implode("\n ", $value); + $value = implode("\n ", $value); } $zip ? gzwrite($file, "$key: $value\n") : fwrite($file, "$key: $value\n"); } @@ -290,23 +268,23 @@ function pkg_prop($pkg, $property, $lang=false) // function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey=null, $download=true) { - global $path_to_root, $repository, $FA_repo_version; + global $path_to_root, $repo_auth; // 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)) { + if (isset($type) && !is_array($type)) { $type = array($type); } $refresh = true; do{ if (!file_exists($loclist)) { - copy(REPO_URL.'/Release.gz', $loclist); + url_copy(REPO_URL.'/Release.gz', $loclist); $refresh = false; } - $sig = file_get_contents(REPO_URL.'/Release.sig', 'rb'); + $sig = url_get_contents(REPO_URL.'/Release.sig'); $data = file_get_contents($loclist); $cert = file_get_contents(PUBKEY_PATH.'/FA.pem'); if (!openssl_verify($data, $sig, $cert)) { @@ -321,7 +299,6 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey } 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(); @@ -329,7 +306,7 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey if ($type && !count(array_intersect(explode(' ', $parms['Type']), $type))) { unset($Release[$fname]); continue; // no packages of selected type in this index } - if ($Release[$fname]['Version'] != $FA_repo_version) { + if ($Release[$fname]['Version'] != $repo_auth['branch']) { display_warning(_('Repository version does not match application version.')); // ? } $remoteindex = REPO_URL.'/'.$fname; @@ -337,7 +314,7 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey $refresh = true; do{ if (!file_exists($locindex)) { - copy($remoteindex, $locindex); + url_copy($remoteindex, $locindex); $refresh = false; } if ($parms['SHA1sum'] != sha1_file($locindex)) { // check subdir index consistency @@ -356,7 +333,7 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey $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)) { + if (!isset($type) || in_array($pkg['Type'], $type)) { if (empty($filter)) $p = $pkg; else { @@ -373,7 +350,7 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey //download package to temp directory if ($download) { $locname = "$path_to_root/tmp/".$pkg['Filename'].'.pkg'; - copy($pkgfullname, $locname); + url_copy($pkgfullname, $locname); // checking sha1 hash is expensive proces, so chekc the package // consistency just before downloading if ($pkg['SHA1sum'] != sha1_file($locname)) { @@ -387,14 +364,13 @@ function get_pkg_or_list($type = null, $pkgname = null, $filter=array(), $outkey } } } - + return $Packages; } function get_package($pkgname, $type = null) { - $all = get_pkg_or_list($type, $pkgname); - $pkg = array_search_value($all, $pkgname, 'Package'); + return get_pkg_or_list($type, $pkgname); } /* Returns full name of installed package, or null if package is not installed. @@ -471,40 +447,69 @@ function get_languages_list() } //--------------------------------------------------------------------------------------- // -// Return merged list of available and installed extensions in inform of local +// 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', +// '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'] == 'theme') 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); return $pkgs; } // -// Return merged list of available and installed extensions in inform of local +// Return merged list of available and installed extensions as a local // configuration array supplemented with installed versions information. // function get_themes_list() @@ -531,6 +536,39 @@ function get_themes_list() ksort($pkgs); return $pkgs; } +//--------------------------------------------------------------------------------------- +// +// Return merged list of available and installed COAs as a local +// configuration array supplemented with installed versions information. +// +function get_charts_list() +{ + $pkgs = get_pkg_or_list('chart', null, array( + 'Package' => 'package', + 'Version' => 'available', + 'Name' => 'name', + 'Description' => 'Descr', + 'Type' => 'type', + 'InstallPath' => 'path', + 'Encoding' => 'encoding', + 'SqlScript' => 'sql' + )); + + // add/update default charts + // + $local = get_company_extensions(); + + foreach($local as $extno => $ext) { + if ($ext['type'] != 'chart') continue; + $ext['local_id'] = $extno; + if (!isset($pkgs[$ext['package']]) || $ext['package'] == '') + $pkgs[] = $ext; + else + $pkgs[$ext['package']] = array_merge($pkgs[$ext['package']], $ext); + } + ksort($pkgs); + return $pkgs; +} //--------------------------------------------------------------------------------------------- // Install/update package from repository // @@ -566,19 +604,24 @@ 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; - $pkg = get_pkg_or_list(array('extension', 'theme'), $pkg_name); + $pkg = get_pkg_or_list(array('extension', 'theme', 'chart'), $pkg_name); if ($pkg) { $package = new package("$path_to_root/tmp/".$pkg['Filename'].'.pkg'); $local_exts = get_company_extensions(); @@ -586,6 +629,11 @@ 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'], @@ -593,24 +641,29 @@ function install_extension($pkg_name) 'type' => $pkg['Type'], 'active' => true, 'path' => $pkg['InstallPath'], -// 'tabs' => $pkg['MenuTabs'], -// 'entries' => $pkg['MenuEntries'], -// '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['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; - update_extensions($local_exts); + $ret = update_extensions($local_exts); unlink("$path_to_root/tmp/".$pkg['Filename'].'.pkg'); $Ajax->activate('ext_tbl'); + return $ret; } else { display_error(implode('
', $package->error)); + return false; } + } else { + display_error(sprintf(_("Package '%s' not found."), $pkg_name)); + return false; } + return true; } /* Returns true if newer package version is available