the donation button was not distributed anywhere

index.php reads it from FTOK_PATH/brisk_donate.txt, but that file was not in
the repository: whoever installed from scratch had no button, and the daemon
wrote a file_get_contents warning on every page load.

The html fragment now lives in data/, next to the other data files of the
installation, and INSTALL.sh copies it into FTOK_PATH only if it is not there
already, so as not to overwrite the one of the installation.

The file stays optional: index.php checks that it exists before reading it,
so whoever does not want the button does not get a dirty log (the code
already handled the case, but only after the warning had been written).

Checked in the container with a full installation, no longer just -W: the
file lands in FTOK_PATH, the page shows the form, the log stays clean;
without the file the page still loads with no form and no warning; and a
second installation does not touch the file already there.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014M1jiEq9cHdE5SE5j6vFuE

diff --git a/INSTALL.sh b/INSTALL.sh
index a424076cd4f4a4597cc159b371448e72c55bfce1..4095c739db0cdda41c847cd8c66b0863fb25c3d3 100755 (executable)
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -377,6 +377,15 @@ if [ "$web_only" = "FALSE" ]; then
     done
     chmod -R 777 ${proxy_path}/bin5
 
+    # The donation button is a fragment of html that index.php reads from
+    # FTOK_PATH. It is installed only if it is not there already, so as not to
+    # overwrite the one of the installation: whoever does not want it simply
+    # does not put it there.
+    if [ -f data/brisk_donate.txt -a ! -f "${ftokk_path}/brisk_donate.txt" ]; then
+        install -m 644 data/brisk_donate.txt "${ftokk_path}/brisk_donate.txt"
+        echo "  installed brisk_donate.txt in ${ftok_path}"
+    fi
+
     mkdir -p "${legal_path}"
     chmod 777 "${legal_path}"
 fi
@@ -501,7 +510,7 @@ sed -i "s@^\(\$DOCUMENT_ROOT *= *[\"']\)[^\"']*\([\"']\)@\1$document_root\2@g" $
 if [ -d docroot ] && [ ! -z "$document_root" ]; then
     for i in $(find docroot -maxdepth 1 -type f ! -name 'README'); do
         install -m 644 "$i" "${document_root}/$(basename "$i")"
-        echo "  installato $(basename "$i") in ${document_root}"
+        echo "  installed $(basename "$i") in ${document_root}"
     done
 fi
 

diff --git a/data/brisk_donate.txt b/data/brisk_donate.txt
new file mode 100644 (file)
index 0000000..35c554d
--- /dev/null
+++ b/data/brisk_donate.txt
@@ -0,0 +1,7 @@
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="image" src="https://www.alternativeoutput.it/brisk/img/brisk_donate.gif" border="0" name="submit" alt="Effettua i tuoi pagamenti con PayPal.  un sistema rapido, gratuito e sicuro.">
+<!-- <img alt="" border="0" src="https://www.paypal.com/it_IT/i/scr/pixel.gif" width="1" height="1"> -->
+<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
+">
+</form>

diff --git a/web/index.php b/web/index.php
index 4269821e26b236106d8c1a5b8dc42dc374fffb45..b87af3794b157720c630fdffd865c86f46efef87 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -631,8 +631,13 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
 
 
     /* NOTE: Brisk donate or donate fake if local */
-    if (!$G_is_local)
-        $brisk_donate = file_get_contents(FTOK_PATH."/brisk_donate.txt");
+    if (!$G_is_local) {
+        /* the file is optional, and an installation with no donation button
+           must not write a warning in the log on every page */
+        $brisk_donate_path = FTOK_PATH."/brisk_donate.txt";
+        $brisk_donate = (file_exists($brisk_donate_path) ?
+                         file_get_contents($brisk_donate_path) : FALSE);
+    }
     else
         $brisk_donate = '<div style="background-color: #ff0; height: 27px; margin-top: 4px;">BRISK_DONATE</div>';