Fixed backward compatibility for extensions repository settings in config.php, cleanu...

diff --git a/admin/inst_chart.php b/admin/inst_chart.php
index c291a0308edfddd1401e3088b3b878be2f230dba..0bdfcb7466e57dc21b688c34bd1a86b6df26a071 100644 (file)
--- a/admin/inst_chart.php
+++ b/admin/inst_chart.php
@@ -45,50 +45,53 @@ if ($id = find_submit('Update', false))
 start_form(true);
 
        div_start('ext_tbl');
-       start_table(TABLESTYLE);
 
-       $th = array(_("Chart"),  _("Installed"), _("Available"), _("Encoding"), "", "");
-       table_header($th);
-
-       $k = 0;
        $mods = get_charts_list();
 
-       foreach($mods as $pkg_name => $ext)
+       if (!$mods)
+               display_note(_("No optional chart of accounts is currently available."));
+       else
        {
-               $available = @$ext['available'];
-               $installed = @$ext['version'];
-               $id = @$ext['local_id'];
-               $encoding = @$ext['encoding'];
+               $th = array(_("Chart"),  _("Installed"), _("Available"), _("Encoding"), "", "");
+               $k = 0;
 
-               alt_table_row_color($k);
+               start_table(TABLESTYLE);
+               table_header($th);
+               foreach($mods as $pkg_name => $ext)
+               {
+                       $available = @$ext['available'];
+                       $installed = @$ext['version'];
+                       $id = @$ext['local_id'];
+                       $encoding = @$ext['encoding'];
 
-//             label_cell(is_array($ext['Descr']) ? $ext['Descr'][0] : $ext['Descr']);
-               label_cell($available ? get_package_view_str($pkg_name, $ext['name']) : $ext['name']);
-
-               label_cell($id === null ? _("None") :
-                       ($available && $installed ? $installed : _("Unknown")));
-               label_cell($available ? $available : _("None"));
-               label_cell($encoding ? $encoding : _("Unknown"));
-
-               if ($available && check_pkg_upgrade($installed, $available)) // outdated or not installed theme in repo
-                       button_cell('Update'.$pkg_name, $installed ? _("Update") : _("Install"),
-                               _('Upload and install latest extension package'), ICON_DOWN);
-               else
-                       label_cell('');
-
-               if ($id !== null) {
-                       delete_button_cell('Delete'.$id, _('Delete'));
-                       submit_js_confirm('Delete'.$id, 
-                               sprintf(_("You are about to remove package \'%s\'.\nDo you want to continue ?"), 
-                                       $ext['name']));
-               } else
-                       label_cell('');
-
-               end_row();
-       }
+                       alt_table_row_color($k);
 
+//             label_cell(is_array($ext['Descr']) ? $ext['Descr'][0] : $ext['Descr']);
+                       label_cell($available ? get_package_view_str($pkg_name, $ext['name']) : $ext['name']);
+
+                       label_cell($id === null ? _("None") :
+                               ($available && $installed ? $installed : _("Unknown")));
+                       label_cell($available ? $available : _("None"));
+                       label_cell($encoding ? $encoding : _("Unknown"));
+
+                       if ($available && check_pkg_upgrade($installed, $available)) // outdated or not installed theme in repo
+                               button_cell('Update'.$pkg_name, $installed ? _("Update") : _("Install"),
+                                       _('Upload and install latest extension package'), ICON_DOWN);
+                       else
+                               label_cell('');
+
+                       if ($id !== null) {
+                               delete_button_cell('Delete'.$id, _('Delete'));
+                               submit_js_confirm('Delete'.$id, 
+                                       sprintf(_("You are about to remove package \'%s\'.\nDo you want to continue ?"), 
+                                               $ext['name']));
+                       } else
+                               label_cell('');
+
+                       end_row();
+               }
        end_table(1);
-
+       }
        div_end();
 
 //---------------------------------------------------------------------------------------------

diff --git a/admin/inst_module.php b/admin/inst_module.php
index 50d2e3e7184b8a6f37d5149f5d9938653355ed3e..71d6f7424200b1634439de6b4fca394bc159a6db 100644 (file)
--- a/admin/inst_module.php
+++ b/admin/inst_module.php
@@ -94,7 +94,7 @@ function fmt_titles($defs)
 //
 // Display list of all extensions - installed and available from repository
 //
-function display_extensions()
+function display_extensions($mods)
 {
        global $installed_extensions;
        
@@ -106,7 +106,6 @@ function display_extensions()
        table_header($th);
 
        $k = 0;
-       $mods = get_extensions_list('extension');
 
        foreach($mods as $pkg_name => $ext)
        {
@@ -264,8 +263,13 @@ echo extset_list('extset', null, true);
 echo "</center><br>";
 
 if ($set == -1) 
-       display_extensions();
-else 
+{
+       $mods = get_extensions_list('extension');
+       if (!$mods)
+               display_note(_("No optional extension module is currently available."));
+       else
+               display_extensions($mods);
+} else 
        company_extensions($set);
 
 //---------------------------------------------------------------------------------------------

diff --git a/admin/inst_theme.php b/admin/inst_theme.php
index 70d8eb60a34afbc5768c5d6704e634a07367fa25..76b0843303a8c0246ced42819067c1002528d811 100644 (file)
--- a/admin/inst_theme.php
+++ b/admin/inst_theme.php
@@ -53,45 +53,49 @@ start_form(true);
        start_table(TABLESTYLE);
 
        $th = array(_("Theme"),  _("Installed"), _("Available"), "", "");
-       table_header($th);
-
        $k = 0;
        $mods = get_themes_list();
 
-       foreach($mods as $pkg_name => $ext)
+       if (!$mods)
+               display_note(_("No optional theme is currently available."));
+       else
        {
-               $available = @$ext['available'];
-               $installed = @$ext['version'];
-               $id = @$ext['local_id'];
+               table_header($th);
 
-               alt_table_row_color($k);
+               foreach($mods as $pkg_name => $ext)
+               {
+                       $available = @$ext['available'];
+                       $installed = @$ext['version'];
+                       $id = @$ext['local_id'];
 
-//             label_cell(is_array($ext['Descr']) ? $ext['Descr'][0] : $ext['Descr']);
-               label_cell($available ? get_package_view_str($pkg_name, $ext['name']) : $ext['name']);
-
-               label_cell($id === null ? _("None") :
-                       ($available && $installed ? $installed : _("Unknown")));
-               label_cell($available ? $available : _("None"));
-
-               if ($available && check_pkg_upgrade($installed, $available)) // outdated or not installed theme in repo
-                       button_cell('Update'.$pkg_name, $installed ? _("Update") : _("Install"),
-                               _('Upload and install latest extension package'), ICON_DOWN);
-               else
-                       label_cell('');
-
-               if ($id !== null) {
-                       delete_button_cell('Delete'.$id, _('Delete'));
-                       submit_js_confirm('Delete'.$id, 
-                               sprintf(_("You are about to remove package \'%s\'.\nDo you want to continue ?"), 
-                                       $ext['name']));
-               } else
-                       label_cell('');
-
-               end_row();
-       }
+                       alt_table_row_color($k);
 
-       end_table(1);
+//             label_cell(is_array($ext['Descr']) ? $ext['Descr'][0] : $ext['Descr']);
+                       label_cell($available ? get_package_view_str($pkg_name, $ext['name']) : $ext['name']);
+
+                       label_cell($id === null ? _("None") :
+                               ($available && $installed ? $installed : _("Unknown")));
+                       label_cell($available ? $available : _("None"));
+
+                       if ($available && check_pkg_upgrade($installed, $available)) // outdated or not installed theme in repo
+                               button_cell('Update'.$pkg_name, $installed ? _("Update") : _("Install"),
+                                       _('Upload and install latest extension package'), ICON_DOWN);
+                       else
+                               label_cell('');
+
+                       if ($id !== null) {
+                               delete_button_cell('Delete'.$id, _('Delete'));
+                               submit_js_confirm('Delete'.$id, 
+                                       sprintf(_("You are about to remove package \'%s\'.\nDo you want to continue ?"), 
+                                               $ext['name']));
+                       } else
+                               label_cell('');
+
+                       end_row();
+               }
 
+               end_table(1);
+       }
        div_end();
 
 //---------------------------------------------------------------------------------------------

diff --git a/includes/packages.inc b/includes/packages.inc
index 70d3be491a19bcc9b7b89445436bdd1fd348721e..2dc7bd3e46a87ac931ee5eede02ba604b7c45b58 100644 (file)
--- a/includes/packages.inc
+++ b/includes/packages.inc
@@ -468,7 +468,8 @@ function get_languages_list()
                else
                        $pkgs[$l['package']] = array_merge($pkgs[$l['package']], $l);
        }
-       ksort($pkgs);
+       if ($pkgs)
+               ksort($pkgs);
        return $pkgs;
 }
 //---------------------------------------------------------------------------------------
@@ -531,7 +532,8 @@ function get_extensions_list($type = null)
 //             else
                        $pkgs[$ext['package']] = array_merge($pkgs[$ext['package']], $ext);
        }
-       ksort($pkgs);
+       if ($pkgs)
+               ksort($pkgs);
        return $pkgs;
 }
 //
@@ -558,8 +560,8 @@ function get_themes_list()
                }
        }
        // TODO: Add other themes from themes directory
-       
-       ksort($pkgs);
+       if ($pkgs)
+               ksort($pkgs);
        return $pkgs;
 }
 //---------------------------------------------------------------------------------------
@@ -592,7 +594,8 @@ function get_charts_list()
                else
                        $pkgs[$ext['package']] = array_merge($pkgs[$ext['package']], $ext);
        }
-       ksort($pkgs);
+       if ($pkgs)
+               ksort($pkgs);
        return $pkgs;
 }
 //---------------------------------------------------------------------------------------------

diff --git a/version.php b/version.php
index 8964676933856494ef5b51b7c0eeb434e53d1886..0784c49584835c0a34802136be71d409d701496a 100644 (file)
--- a/version.php
+++ b/version.php
@@ -9,16 +9,15 @@ $db_version = "2.4.0";
 $src_version = "2.4.0";
 
 // application version - can be overriden in config.php
-if (!isset($version))
-       $version = $src_version;
+$version = isset($SysPrefs->version) ? $SysPrefs->version : $src_version;
 
 //======================================================================
 // Extension packages repository settings 
 //
 // Extensions repository. Can be overriden in config.php
 
-if (!isset($repo_auth))
-       $repo_auth = array(
+$repo_auth = isset($SysPrefs->repo_auth) ? $SysPrefs->repo_auth :
+array(
                 'login' => 'anonymous',
                 'pass' => 'password',
                 'host' => 'repo.frontaccounting.eu', // repo server address