public/ws-vacation Changeset - r32:bf6004bf25dd

Changeset - r32:bf6004bf25dd

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Wolfgang Scherer (ws) - 13 years ago 2012-04-25 12:29:37
wolfgang.scherer@gmx.de

lib/config.php: prepended `formail -c` for problematic `From` headers, that are continued on next line.

4 files changed with 14 insertions and 23 deletions:

Makefile

doc/Makefile

doc/index-template.txt

lib/config.php

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -82,20 +82,23 @@ tags: @@
 # :ide: COMPILE: tags
 # . (let ((args "tags")) (compile (concat "make -k " args)))
 # :ide: COMPILE: dist
 # . (let ((args "dist")) (compile (concat "make -k " args)))
 # :ide: COMPILE: install
 # . (let ((args "install")) (compile (concat "make -k " args)))
 # :ide: COMPILE: clean
 # . (let ((args "clean")) (compile (concat "make -k " args)))
 # :ide: COMPILE: doc
 # . (let ((args "doc")) (compile (concat "make -k " args)))
 # :ide: COMPILE: Standard
 # . (let ((args "")) (compile (concat "make -k " args)))
+#
 # Local Variables:
 # mode: makefile
 # snip-mode: makefile-gmake
 # truncate-lines: t
 # End:

doc/Makefile

➞

Show inline comments

@@ @@ -13,42 +13,44 @@ EXTRA_DIST = @@
 CLEANFILES =
 TXTS += README.txt
 TXTS += README-de.txt
 HTML_TXTS += index.txt
 HTML_TXTS += README-GFDL.txt
 HTML_TXTS += README-COPYING.txt
 JPGS += ws-vacation.jpg
 JPGS += ws-vacation-user.jpg
 JPGS += ws-vacation-expert.jpg
-JPG_THUMBS = $(patsubst %.jpg, %-t.jpg, $(JPGS))
+SNIPPETS = ../lib/snippets.pl
 # use cp for Windows
 LN_S = cp
 LN_S = ln -s
 TXT_PDFS = $(patsubst %.txt,%.pdf,$(TXTS))
 TXT_HTMLS = $(patsubst %.txt,%.html,$(TXTS)) $(patsubst %.txt,%.html,$(HTML_TXTS))
 #CLEANFILES += $(TXT_PDFS)
 #CLEANFILES += $(TXT_HTMLS)
 SNIPPETS = ../lib/snippets.pl
 JPG_THUMBS = $(patsubst %.jpg, %-t.jpg, $(JPGS))
 #CLEANFILES += $(JPG_THUMBS)
 DISTFILES =
 DISTFILES += Makefile
 DISTFILES += $(TXTS)
 DISTFILES += $(TXT_HTMLS)
 DISTFILES += $(TXT_PDFS)
 DISTFILES += $(TXT_HTMLS)
 DISTFILES += $(JPGS)
 DISTFILES += $(JPG_THUMBS)
 DISTFILES += $(EXTRA_DIST)
 %: %.in
 	cat $< | $(SNIPPETS) --process --replace --mode text --key base_dir --value $(base_dir) --cat - >$@
 	test -s $@ || ( rm -f $@ && test 1 = 0 )
 %.html: %.txt docutils.conf
 	cat $< | PYTHONPATH="$$( pwd )" tools/ws_rst2html.py --traceback --cloak-email-addresses >$@
 	test -s $@ || (rm -f $@ && exit 1)
@@ @@ -66,25 +68,25 @@ index.html: index.txt index-template.txt @@
 	test -s $@ || (rm -f $@ && exit 1)
 all: $(DISTFILES) all-local
 all-local:
 clean: clean-local
 	test -z '$(CLEANFILES)' || rm -rf $(CLEANFILES)
 clean-local:
 	find . -name '*.pyc' | xargs -r rm
-install_top_dir = ../../wolfmanx.bitbucket.org
+install_top_dir = $(top_srcdir)/../wolfmanx.bitbucket.org
 install_dir = $(install_top_dir)/ws-vacation
 install: all
 	@(						\
 	test ! -d $(install_top_dir) ||			\
 	(						\
 	mkdir -p $(install_dir);			\
 	list='$(TXT_HTMLS)'; test -z "$$list" ||	\
 	for file in $$list; do				\
 	    echo "cp $$file $(install_dir)/";		\
 	    cp $$file $(install_dir)/;			\
 	done;						\

doc/index-template.txt

➞

Show inline comments

 %(head_prefix)s
 %(head)s
     <link class="jsbin" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css" />
     <script class="jsbin" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
     <script class="jsbin" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
 %(stylesheet)s
     <script type="text/javascript"><!--
       // Add a trailing slash to the URL, if it does not end in `.html' or `/'.
       // This is needed for relative links to work on bitbucket.org
       my_url = document.location.href;
       query = [];
       spc_pos = my_url.indexOf('?');
       if (spc_pos >= 0) {
           query.unshift(my_url.substr(spc_pos));
 	  my_url = my_url.substr(0, spc_pos);
+      }
       spc_pos = my_url.indexOf('#');
       if (spc_pos >= 0) {
           query.unshift(my_url.substr(spc_pos));
 	  my_url = my_url.substr(0, spc_pos);
+      }
       if (my_url.indexOf('.html') < my_url.length - '.html'.length) {
           if (my_url.substr(my_url.length - 1) != '/') {
 	      my_url += '/' + query.join('');
 	      document.location.href = my_url;
+          }
       // Elegant solution from David Chambers [Atlassian]
       if (!/(\.html|\/)$/.test(location.pathname)) {
           location.pathname += '/';
+      }
       $(document).ready(
 	  function() {
 	      // add click handler for screenshots
 	      $('a.external').each(
 		  function(i, e) {
 		      var link = $(e).attr('href');
 		      if ( link.indexOf('.jpg') > 0) {
 			  $(e).click(
 			      function (ev) {
 				  ev.preventDefault();

lib/config.php

➞

Show inline comments

@@ @@ -64,28 +64,29 @@ @@
 $LANGUAGE = 'de';
 $PASSWD_FILE = '/etc/passwd';
 $SHADOW_FILE = '/etc/shadow';
 $HTPASSWD_FILE = '.htpasswd';
 $HOME_PFX = '/home/';
 $USER_ID_MIN = 1000;
 $USER_ID_MAX = 60000;
 $SUDO_CMD = '/usr/bin/sudo';
 $SUDO_OPT_H = ' -H';
 $WRITE_TO_CMD = dirname(__FILE__) . '/write_to.sh';
 $FORMAIL_CMD = '/usr/bin/formail';
 $VACATION_CMD = '/usr/bin/vacation';
 $VACATION_MSG_FILE = '.vacation.msg';
 $VACATION_DB_FILE = '.vacation.db';
-$VACATION_FORWARD_ENTRY = '"|/usr/bin/vacation %s"'; // use sprintf($VFE, $user);
+$VACATION_FORWARD_ENTRY = sprintf('"| %s -c | %s %%s"', $FORMAIL_CMD, $VACATION_CMD); // use sprintf($VFE, $user);
 $FORWARD_FILE = '.forward';
 $EXPERT_ENABLED = True;
 $HEADER_REMOVE = Array(
     'bcc',
     'cc',
     'date',
     'delivered-to',
     'message-id',
     'received',
     'return-path',
     'to',

0 comments (0 inline, 0 general)