Revert centering .. not needed
authorJamie Cameron <jcameron@webmin.com>
Wed, 17 Dec 2008 07:48:39 +0000 (07:48 +0000)
committerJamie Cameron <jcameron@webmin.com>
Wed, 17 Dec 2008 07:48:39 +0000 (07:48 +0000)
comments-to-pod.pl
cron/cron-lib.pl
makedebian.pl
makerpm.pl
overlay-theme/theme.info
session_login.cgi

index 642ca03..4bd1321 100644 (file)
@@ -48,15 +48,21 @@ foreach $f (@files) {
                                        $cont =~ s/^\s*#+\s*//;
                                        $args .= " ".$cont;
                                        }
+                               $args = undef if ($args =~ /^\(\s*\)$/);
                                }
-                       push(@out, "=head2 $name$args");
-                       push(@out, "");
-                       foreach $c (@cmts) {
-                               $c =~ s/^\s*#+\s*//;
-                               push(@out, $c);
+                       if (@cmts || $args) {
+                               push(@out, "=head2 $name$args");
+                               push(@out, "");
+                               if (!@cmts) {
+                                       @cmts = ( "MISSING DOCUMENTATION" );
+                                       }
+                               foreach $c (@cmts) {
+                                       $c =~ s/^\s*#+\s*//;
+                                       push(@out, $c);
+                                       }
+                               push(@out, "");
+                               push(@out, "=cut");
                                }
-                       push(@out, "");
-                       push(@out, "=cut");
                        push(@out, $lines[$i]);
                        @cmts = ( );
                        $count++;
index a298db9..186112b 100644 (file)
@@ -1,6 +1,5 @@
 # cron-lib.pl
 # Common crontab functions
-# XXX support for envs in /etc/crontab and /etc/cron.d (impossible!)
 
 do '../web-lib.pl';
 &init_config();
@@ -992,6 +991,9 @@ else {
 }
 
 # find_cron_process(&job, [&procs])
+# Finds the running process that was launched from a cron job.
+# job - A cron job hash reference
+# procs - An optional array reference of running process hash refs
 sub find_cron_process
 {
 local @procs;
index 9868e5f..71c17aa 100755 (executable)
@@ -409,7 +409,7 @@ system("gpg --output deb/${product}_$ver.dsc --clearsign deb/${product}_$ver.pla
 unlink("deb/${product}_$ver.plain");
 print "Wrote source deb/${product}_$ver.dsc\n";
 
-if (!$webmail) {
+if (!$webmail && -d "/usr/local/webadmin/deb/repository") {
        # Add to our repository
        chdir("/usr/local/webadmin/deb/repository");
        system("reprepro -Vb . remove sarge $product");
index 6ba14f7..5a6f5f2 100755 (executable)
@@ -303,4 +303,9 @@ if (-d "rpm") {
                }
        }
 
+if (!$webmail && -d "/usr/local/webadmin/rpm/yum") {
+       # Add to our repository
+       system("cp $rpms_dir/webmin-$ver-$rel.noarch.rpm /usr/local/webadmin/rpm/yum");
+       }
+
 
index f880ad1..92f49c5 100644 (file)
@@ -1 +1,6 @@
-desc=CSS Overlay Test
+desc=CSS Overlay Demo Theme
+overlay=1
+webmin=1
+usermin=1
+depends=virtual-server-theme
+version=1.0
index 4681a14..de7ae68 100755 (executable)
@@ -80,9 +80,9 @@ print &ui_table_end(),"\n";
 print &ui_submit($text{'session_login'});
 print &ui_reset($text{'session_clear'});
 print &ui_form_end();
+print "</center>\n";
 
 print "$text{'session_postfix'}\n";
-print "</center>\n";
 
 # Output frame-detection Javascript, if theme uses frames
 if ($tconfig{'inframe'}) {