renamed Posting::Handle as Posting::Admin

did several style changes in many files

diff --git a/selfforum-cgi/shared/Conf.pm b/selfforum-cgi/shared/Conf.pm
index 1fa97b2379fd9fe44d82b4b77897b864a66a0ee6..3d2d5be9e7881ac1908e4c90e2c477889c298909 100644 (file)
--- a/selfforum-cgi/shared/Conf.pm
+++ b/selfforum-cgi/shared/Conf.pm
@@ -12,17 +12,14 @@ use strict;
 
 package Conf;
 
 
 package Conf;
 

-use vars qw(@ISA @EXPORT);
-

 use XML::DOM;
 
 # ====================================================
 # Funktionsexport
 # ====================================================
 
 use XML::DOM;
 
 # ====================================================
 # Funktionsexport
 # ====================================================
 

-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(read_script_conf);
+use base qw(Exporter);
+@Conf::EXPORT = qw(read_script_conf);

 
 ################################
 # sub read_script_conf
 
 ################################
 # sub read_script_conf

diff --git a/selfforum-cgi/shared/Id.pm b/selfforum-cgi/shared/Id.pm
index 33c0c83483f89188e63dcd0dedb5f8e486d15396..fb51d48925bd0be2525ea5cd9a5e42a51c2c1db4 100644 (file)
--- a/selfforum-cgi/shared/Id.pm
+++ b/selfforum-cgi/shared/Id.pm
@@ -17,14 +17,12 @@
 use strict;
 
 package Id;
 use strict;
 
 package Id;

-require 5.000;

 
 #####################
 # Funktionsexport
 #####################
 
 
 #####################
 # Funktionsexport
 #####################
 

-require Exporter;
-@Id::ISA = qw(Exporter);
+use base qw(Exporter);

 @Id::EXPORT = qw(unique_id);
 
 use vars qw(@table);
 @Id::EXPORT = qw(unique_id);
 
 use vars qw(@table);


@@ -38,7 +36,11 @@ use vars qw(@table);
 #      Rueckgabe der ID                  #
 ##########################################
 
 #      Rueckgabe der ID                  #
 ##########################################
 

-sub unique_id {
+# sub unique_id ################################################
+#
+# composing of an unique ID...
+#
+sub unique_id () {

   my $id;
 
   my $ip=$ENV{'REMOTE_ADDR'};
   my $id;
 
   my $ip=$ENV{'REMOTE_ADDR'};


@@ -47,16 +49,21 @@ sub unique_id {
   my $rand=int(rand(time()));
   $ip =  hex(join ('',map {sprintf ('%02X',$_)} split (/\./,$ip)));
 
   my $rand=int(rand(time()));
   $ip =  hex(join ('',map {sprintf ('%02X',$_)} split (/\./,$ip)));
 

-  join '',map {to_base64 ($_)} (substr ($time,-9), $port, $ip, $rand, $$);
+  join '',map {to_base64 ($_)} ($time, $port, $ip, $rand, $$);

 }
 
 }
 

+# sub to_base64 ################################################
+#
+# only converts (max.) 32-bit numbers into a
+# system with base 64
+# its not the RFC base64 format!
+#

 sub to_base64 ($) {
   my $x = shift;
   my $y = $table[$x % 64];
 
 sub to_base64 ($) {
   my $x = shift;
   my $y = $table[$x % 64];
 

-  while ($x = int ($x/64)) {$y = $table[$x % 64] . $y}
+  $y = $table[$x % 64].$y while ($x = int ($x/64));

 
 

-  # Rueckgabe

   $y;
 }
 
   $y;
 }
 

diff --git a/selfforum-cgi/shared/Lock.pm b/selfforum-cgi/shared/Lock.pm
index b1e42d37120dff29660152d1f7ca0f8da205e763..f7234f07d9271907af9afbb38ef2fa7a70bcfc85 100644 (file)
--- a/selfforum-cgi/shared/Lock.pm
+++ b/selfforum-cgi/shared/Lock.pm
@@ -12,14 +12,13 @@ use strict;
 
 package Lock;
 
 
 package Lock;
 

-use vars qw(@ISA @EXPORT_OK %EXPORT_TAGS $Timeout $violentTimeout $masterTimeout $iAmMaster);
+use vars qw(@EXPORT_OK %EXPORT_TAGS $Timeout $violentTimeout $masterTimeout $iAmMaster);

 
 # ====================================================
 # Funktionsexport
 # ====================================================
 
 
 # ====================================================
 # Funktionsexport
 # ====================================================
 

-require Exporter;
-@ISA         = qw(Exporter);
+use base qw(Exporter);

 
 @EXPORT_OK   = qw(lock_file unlock_file write_lock_file write_unlock_file
                   violent_unlock_file set_master_lock release_file);
 
 @EXPORT_OK   = qw(lock_file unlock_file write_lock_file write_unlock_file
                   violent_unlock_file set_master_lock release_file);

diff --git a/selfforum-cgi/shared/Mail.pm b/selfforum-cgi/shared/Mail.pm
index 73166c9a00dc0c5173d92a776c57c223476292bf..8ba56e3971587a162f4e4acd14de1f115faa8ba5 100644 (file)
--- a/selfforum-cgi/shared/Mail.pm
+++ b/selfforum-cgi/shared/Mail.pm
@@ -18,14 +18,13 @@ use strict;
 
 package Mail;
 
 
 package Mail;
 

-use vars qw($mailbox $mailprog @ISA @EXPORT);
+use vars qw($mailbox $mailprog @EXPORT);

 
 # ===================
 # Funktionsexport
 # ===================
 
 
 # ===================
 # Funktionsexport
 # ===================
 

-require Exporter;
-@ISA = qw(Exporter);
+use base qw(Exporter);

 @EXPORT = qw(is_mail_address send_mail);
 
 ########################################
 @EXPORT = qw(is_mail_address send_mail);
 
 ########################################

diff --git a/selfforum-cgi/shared/Posting/Handle.pm b/selfforum-cgi/shared/Posting/Admin.pm
similarity index 95%
rename from selfforum-cgi/shared/Posting/Handle.pm
rename to selfforum-cgi/shared/Posting/Admin.pm
index 700a101f583cb75dbf4cf584a358993edd982185..f3a4330141eba81cfadf07c14b722f9848288ea5 100644 (file)
--- a/selfforum-cgi/shared/Posting/Handle.pm
+++ b/selfforum-cgi/shared/Posting/Admin.pm
@@ -1,12 +1,14 @@
-package Posting::Handle;
+package Posting::Admin;

 
 ################################################################################
 #                                                                              #
 
 ################################################################################
 #                                                                              #

-# File:        shared/Posting/Handle.pm                                        #
+# File:        shared/Posting/Admin.pm                                         #
+#              (was: ~Handle.pm)                                               #

 #                                                                              #
 # Authors:     Frank Schoenmann <fs@tower.de>, 2001-03-13                      #
 #                                                                              #
 # Authors:     Frank Schoenmann <fs@tower.de>, 2001-03-13                      #

+#              Andre Malo       <nd@o3media.de>, 2001-03-29                    #

 #                                                                              #
 #                                                                              #

-# Description: Allow modifications of postings                                 #
+# Description: Allow administration of postings                                #

 #                                                                              #
 # Todo:        * Lock files before modification                                #
 #              * Change body in change_posting_body()                          #
 #                                                                              #
 # Todo:        * Lock files before modification                                #
 #              * Change body in change_posting_body()                          #


@@ -17,10 +19,9 @@ package Posting::Handle;
 
 use strict;
 
 
 use strict;
 

-use vars qw(@EXPORT);

 use base qw(Exporter);
 
 use base qw(Exporter);
 

-@EXPORT = qw(hide_posting recover_posting modify_posting add_user_vote level_vote);
+@Posting::Admin::EXPORT = qw(hide_posting recover_posting modify_posting add_user_vote level_vote);

 
 use Lock qw(:READ);
 use Posting::_lib qw(get_message_node save_file get_all_threads
 
 use Lock qw(:READ);
 use Posting::_lib qw(get_message_node save_file get_all_threads


@@ -330,4 +331,4 @@ sub change_posting_body($$$$)
 
 
 # Let it be true
 
 
 # Let it be true

-1;
+1;
\ No newline at end of file

diff --git a/selfforum-cgi/shared/Posting/Write.pm b/selfforum-cgi/shared/Posting/Write.pm
index 7e6ba975b9d9fe31162be01290f9ffde2157383b..48941d1ab8cf9b62c6cc51b711abbeb3826c671f 100644 (file)
--- a/selfforum-cgi/shared/Posting/Write.pm
+++ b/selfforum-cgi/shared/Posting/Write.pm
@@ -12,14 +12,13 @@ package Posting::Write;
 
 use strict;
 
 
 use strict;
 

-use vars qw(@EXPORT);

 use base qw(Exporter);
 
 # ====================================================
 # Funktionsexport
 # ====================================================
 
 use base qw(Exporter);
 
 # ====================================================
 # Funktionsexport
 # ====================================================
 

-@EXPORT = qw(write_posting);
+@Posting::Write::EXPORT = qw(write_posting);

 
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Encode::Posting;
 
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Encode::Posting;


@@ -278,4 +277,4 @@ sub create_new_thread ($) {
 
 # ====================================================
 # end of Posting::Write
 
 # ====================================================
 # end of Posting::Write

-# ====================================================
+# ====================================================
\ No newline at end of file

diff --git a/selfforum-cgi/shared/Template/Forum.pm b/selfforum-cgi/shared/Template/Forum.pm
index 6b29a226b9c7262f3147fbb9c853fc0efb4e62f3..c03f05a236fde7657fb61e42b7122c6dec10ce93 100644 (file)
--- a/selfforum-cgi/shared/Template/Forum.pm
+++ b/selfforum-cgi/shared/Template/Forum.pm
@@ -13,8 +13,6 @@ use strict;
 
 package Template::Forum;
 
 
 package Template::Forum;
 

-use vars qw(@ISA @EXPORT);
-

 use Lock qw(:READ);
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Posting::_lib qw(get_all_threads long_hr_time);
 use Lock qw(:READ);
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Posting::_lib qw(get_all_threads long_hr_time);


@@ -26,9 +24,8 @@ use Template::_thread;
 # Funktionsexport
 # ====================================================
 
 # Funktionsexport
 # ====================================================
 

-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(print_forum_as_HTML);
+use base qw(Exporter);
+@Template::Forum::EXPORT = qw(print_forum_as_HTML);

 
 ################################
 # sub print_forum_as_HTML
 
 ################################
 # sub print_forum_as_HTML

diff --git a/selfforum-cgi/shared/Template/Posting.pm b/selfforum-cgi/shared/Template/Posting.pm
index fe504f0d84a09108c77648c7b0b1b2dd408289ed..441178de243a4ad198b702876dbd29513e17ba6b 100644 (file)
--- a/selfforum-cgi/shared/Template/Posting.pm
+++ b/selfforum-cgi/shared/Template/Posting.pm
@@ -12,8 +12,6 @@ use strict;
 
 package Template::Posting;
 
 
 package Template::Posting;
 

-use vars qw(@ISA @EXPORT);
-

 use Encode::Posting;
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Id;
 use Encode::Posting;
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Id;


@@ -30,9 +28,8 @@ use XML::DOM;
 # Funktionsexport
 # ====================================================
 
 # Funktionsexport
 # ====================================================
 

-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(print_posting_as_HTML message_as_HTML);
+use base qw(Exporter);
+@Template::Posting::EXPORT = qw(print_posting_as_HTML message_as_HTML);

 
 ################################
 # sub print_posting_as_HTML
 
 ################################
 # sub print_posting_as_HTML

diff --git a/selfforum-cgi/shared/Template/_conf.pm b/selfforum-cgi/shared/Template/_conf.pm
index b94d01ddffb4eb7e81f2852dc4837651ad1d1db2..6528d38b9c71187d2776561f4354dc4961714de4 100644 (file)
--- a/selfforum-cgi/shared/Template/_conf.pm
+++ b/selfforum-cgi/shared/Template/_conf.pm
@@ -13,15 +13,12 @@ use strict;
 
 package Template::_conf;
 
 
 package Template::_conf;
 

-use vars qw(@ISA @EXPORT);
-

 # ====================================================
 # Funktionsexport
 # ====================================================
 
 # ====================================================
 # Funktionsexport
 # ====================================================
 

-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(get_view_params);
+use base qw(Exporter);
+@Template::_conf::EXPORT = qw(get_view_params);

 
 ################################
 # sub get_view_params
 
 ################################
 # sub get_view_params

diff --git a/selfforum-cgi/shared/Template/_query.pm b/selfforum-cgi/shared/Template/_query.pm
index 606f4f34107e77297c679294b8db2b58d49d29f8..66be8fc0aa4d73eacb28da8e54e338cb766745d7 100644 (file)
--- a/selfforum-cgi/shared/Template/_query.pm
+++ b/selfforum-cgi/shared/Template/_query.pm
@@ -12,15 +12,12 @@ use strict;
 
 package Template::_query;
 
 
 package Template::_query;
 

-use vars qw(@ISA @EXPORT);
-

 # ====================================================
 # Funktionsexport
 # ====================================================
 
 # ====================================================
 # Funktionsexport
 # ====================================================
 

-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(query_string);
+use base qw(Exporter);
+@Template::_query::EXPORT = qw(query_string);

 
 ################################
 # sub query_string
 
 ################################
 # sub query_string

diff --git a/selfforum-cgi/shared/Template/_thread.pm b/selfforum-cgi/shared/Template/_thread.pm
index 74ae404329955092804e6e98894dde8f0d7da1a8..0cea038ab6649bdc92f0bcb0b104eb00e50e6952 100644 (file)
--- a/selfforum-cgi/shared/Template/_thread.pm
+++ b/selfforum-cgi/shared/Template/_thread.pm
@@ -12,8 +12,6 @@ use strict;
 
 package Template::_thread;
 
 
 package Template::_thread;
 

-use vars qw(@ISA @EXPORT);
-

 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Posting::_lib qw(short_hr_time);
 use Template;
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Posting::_lib qw(short_hr_time);
 use Template;


@@ -23,9 +21,8 @@ use Template::_query;
 # Funktionsexport
 # ====================================================
 
 # Funktionsexport
 # ====================================================
 

-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(html_thread);
+use base qw(Exporter);
+@Template::_thread::EXPORT = qw(html_thread);

 
 ################################
 # sub html_thread
 
 ################################
 # sub html_thread