move merge_settings to common library

[ott/bsta] / bsta_lib.1.pm

diff --git a/bsta_lib.1.pm b/bsta_lib.1.pm
index 781ee0ed7a3a4cdba827619da059fe2bd9a936e3..90e6e448cebd0f05322f1d6cc2366129b8561cf7 100644 (file)
--- a/bsta_lib.1.pm
+++ b/bsta_lib.1.pm
@@ -37,7 +37,6 @@ our @EXPORT      = ();
 our @EXPORT_OK   = (
        'STATE', 'TEXT_MODE', 'INTF_STATE', 'CHAT_STATE', 'CHAT_ACTION',
        'get_remote_addr', 'get_id', 'get_frame', 'get_password',
-       'merge_settings',
        'print_html_start', 'print_html_end',
        'print_html_head_start', 'print_html_head_end',
        'print_html_body_start', 'print_html_body_end',
@@ -67,7 +66,8 @@ use botm_common (
        'join_path',
        'copy_encoded', 'open_encoded', '_x_encoded',
        'http_header_line', 'http_status',
-       'http_header_status', 'http_header_allow', 'http_header_location'
+       'http_header_status', 'http_header_allow', 'http_header_location',
+       'merge_settings'
 );
 
 ###PERL_PATH_SEPARATOR:     PATH_SEPARATOR     = /
@@ -281,18 +281,6 @@ sub get_password {
 }
 
 
-sub merge_settings {
-               my %final_settings;
-       
-       foreach my $settings (@_) {
-               foreach my $ind (keys %$settings) {
-                       $final_settings{$ind} = $settings->{$ind};
-               }
-       }
-       return %final_settings;
-}
-
-
 # BB code stuff
 # different & simpler implementation than in post library
 # to consider: