--- rpms/smeserver-userpanels/contribs9/smeserver-userpanels-1.1.credit2koozali.patch	2016/06/22 20:37:20	1.1
+++ rpms/smeserver-userpanels/contribs9/smeserver-userpanels-1.1.credit2koozali.patch	2016/06/29 18:45:20	1.2
@@ -1,112 +1,98 @@
 diff -Nur smeserver-userpanels-1.1.old/root/etc/e-smith/web/functions/userpanel-useraccounts smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-useraccounts
 --- smeserver-userpanels-1.1.old/root/etc/e-smith/web/functions/userpanel-useraccounts	2016-06-22 12:07:11.481618554 +0200
-+++ smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-useraccounts	2016-06-22 12:57:44.434503739 +0200
-@@ -38,6 +38,11 @@
++++ smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-useraccounts	2016-06-29 08:54:03.259230788 +0200
+@@ -38,6 +38,8 @@
  use esmith::util;
  use esmith::db;
  use esmith::event;
-+use esmith::FormMagick;
 +use esmith::cgi;
 +
-+my $fm = esmith::FormMagick->new();
-+
  
  # added by lorenzo
  use Crypt::Cracklib;
-@@ -386,8 +391,10 @@
+@@ -386,8 +388,10 @@
      }#if accounts >0
  
      print $q->endform;
 -    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme",
 -          $q->a ({href => $q->url (-absolute => 1) . "?state=help"}, 'Useraccounts help'), " ..."));
 +#    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme",
-+    esmith::cgi::genFooter($fm);
++    esmith::cgi::genFooter($q);
 +
 +          print $q->a ({href => $q->url (-absolute => 1) . "?state=help"}, 'Useraccounts help'), " ...";
      print '</FONT>';
      print '</DIV>';
      print $q->end_html;
-@@ -598,7 +605,8 @@
+@@ -598,7 +602,8 @@
  
      print $q->endform;
  
 -    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme"));
 +#    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme"));
-+    esmith::cgi::genFooter($fm);
++    esmith::cgi::genFooter($q);
  
      print '</FONT>';
      print '</DIV>';
-@@ -1043,7 +1051,9 @@
+@@ -1043,7 +1048,9 @@
  
      print $q->endform;
  
 -    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme"));
 +#    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme"));
-+    esmith::cgi::genFooter($fm);
++    esmith::cgi::genFooter($q);
 +
  
      print '</FONT>';
      print '</DIV>';
-@@ -1410,7 +1420,7 @@
+@@ -1410,7 +1417,7 @@
      }
  
      print $q->endform;
 -    esmith::cgi5::genFooter ($q);
-+    esmith::cgi::genFooter($fm);
++    esmith::cgi::genFooter($q);
      return;
  }
  
-@@ -1594,7 +1604,7 @@
+@@ -1594,7 +1601,7 @@
      }
  
      print $q->endform;
 -    esmith::cgi5::genFooter ($q);
-+    esmith::cgi::genFooter($fm);
++    esmith::cgi::genFooter($q);
      return;
  }
  
-@@ -1746,7 +1756,7 @@
+@@ -1746,7 +1753,7 @@
  		      -default  => 'performLock');
  
      print $q->endform;
 -    esmith::cgi5::genFooter ($q);
-+    esmith::cgi::genFooter($fm);
++    esmith::cgi::genFooter($q);
      return;
  }
  
-@@ -1936,8 +1946,10 @@
+@@ -1936,8 +1943,8 @@
  </pre>   ')));
  
      print $q->endform;
 -    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme ",
 -          $q->a ({href => $q->url (-absolute => 1) . ""}, 'Return to main'), " ..."));
+-    return;
 +#    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme ",
-+    esmith::cgi::genFooter($fm);
-+
-+          $q->a ({href => $q->url (-absolute => 1) . ""}, 'Return to main'), " ...";
-     return;
++    esmith::cgi::genFooter($q);
++    return;
  }
  
 diff -Nur smeserver-userpanels-1.1.old/root/etc/e-smith/web/functions/userpanel-userbackup smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-userbackup
 --- smeserver-userpanels-1.1.old/root/etc/e-smith/web/functions/userpanel-userbackup	2005-09-21 12:24:18.000000000 +0200
-+++ smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-userbackup	2016-06-22 12:18:28.273369737 +0200
-@@ -34,6 +34,9 @@
- use esmith::util;
- use esmith::db;
- use esmith::lockfile;
-+use esmith::FormMagick;
-+
-+my $fm = esmith::FormMagick->new();
- 
- sub showInitial ($$);
- sub performAndShowResult ($);
-@@ -211,7 +214,9 @@
++++ smeserver-userpanels-1.1.new/root/etc/e-smith/web/functions/userpanel-userbackup	2016-06-29 08:55:10.956117514 +0200
+@@ -211,7 +211,9 @@
  
      print $q->endform;
  
 -    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme"));
 +    #    print $q->p ($q->hr, $q->font ({size => "-1"}, "www.dungog.net/sme"));
-+    esmith::cgi::genFooter($fm);
++    esmith::cgi::genFooter($q);
 +
  
      print '</FONT>';