add more FAQs, various small changes.

4 years ago · ee0b9d8a40
6 changed files with 50 additions and 5 deletions
--- a/backup.sh
+++ b/backup.sh
@ -0,0 +1,30 @@
+#!/bin/bash
+
+SITE="cwops.telegraphy.de"
+
+echo "Backup of $SITE..." > /tmp/$SITE-backup
+
+echo "Dumping data..." >> /tmp/$SITE-backup
+DATE=$( date +%Y%m%d-%H%M )
+
+USER=cwops
+PASS=cwops
+DB=CWops
+
+mysqldump -u$USER -p$PASS $DB  | gzip > /home/fabian/sites/$SITE/backup/$SITE-daily-${DATE}.sql.gz
+
+ls -l /home/fabian/sites/$SITE/backup/ >> /tmp/$SITE-backup
+
+# sleep long enough to make sure the mtime +7 below only finds the stuff that's
+# older than one week, not a file that may be *exactly* one week old
+sleep 60
+
+echo "Removing old files (7 days or older)" >> /tmp/$SITE-backup
+
+find /home/fabian/sites/$SITE/backup/$SITE-daily*.sql.gz  \
+    -mtime +7 -exec echo {} \;  >> /tmp/$SITE-backup
+
+find /home/fabian/sites/$SITE/backup/$SITE-daily*.sql.gz  \
+    -mtime +7 -exec rm {} \;  >> /tmp/$SITE-backup
+
+cat /tmp/$SITE-backup | mail -s "CRON: $SITE backup" fabian@fkurz.net
--- a/functions.php
+++ b/functions.php
@ -547,6 +547,11 @@ function parse_adif($adif, $members, $ign, $startdate) {
                        $qso['was'] = "";
                    }

+                    # finally, some hard-coded exceptions:
+                    if ($qso['call'] == "K7SV") {
+                        $qso['waz'] = 5;
+                    }
+
                    array_push($out, $qso);

                }
--- a/help.php
+++ b/help.php
@ -13,9 +13,18 @@

 <p>This is a list of questions that users asked or <em>might</em> ask. It's a work in progress and it will be extended over time.</p>

+<h2>Where do I find the rules for the awards?</h2>
+<p>On the <a href="https://cwops.org/contact-us/awards/">CWops website</a>.</p>
+
+<h2>How to I report my scores?</h2>
+<p>Scores are automatically reported to the awards manager. There's nothing you need to do!</p>
+
 <h2>Can I import my contacts from CAM?</h2>
 <p>Yes, just upload the "yourcall.data" file from CAM instead of an ADIF file.</p>

+<h2>How are different callsigns handled?</h2>
+<p>All logs you upload are credited to the account you are logged in with, regardless of the callsign you made the contacts with. This means you can upload your ADIF files from portable, holiday or DXpedition operations just like those from your home station. They are all merged automatically.</p>
+
 <h2>Uploading the logs is very slow!</h2>
 <p>Depending on the current load on the server and your internet connection, uploading and processing 1000 QSOs takes about one minute. It is recommended to split up your log into smaller chunks if it's very large. Most logging programs will allow you to export ADIF logs by date, so it would be a reasonable idea to upload logs year by year.</p>

@ -33,7 +42,7 @@
 <li>Bud, AA3B (beta testing)</li>
 <li>Bill, W0TG (beta testing)</li>
 <li>Bob, N7WY (membership roster)</li>
-<li>Martin, OK1RR (Country resolution files)</li>
+<li>Martin, OK1RR (Country resolution files, testing)</li>
 <li>Petr, OK2CQR/OK7AN (HamQTH DXCC lookup API)</li>
 <li>Adam, SQ9S (beta testing)</li>
 <li>Giu, IT9VDQ (beta testing)</li>
--- a/index.php
+++ b/index.php
@ -12,7 +12,7 @@ include('functions.php');
 		</head>
 		<body>
 				<h1>CWops Award Tools</h1>
-				<p>This server provides services for members of <a href="https://cwops.org/">CWops</a>. <a href="/help">Help and Documentation</a> - <a href="/intro">Introduction Video</a></p>
+				<p>This server provides services for members of <a href="https://cwops.org/">CWops</a>. <a href="/help">Help and Documentation</a> - <a href="/intro">Introduction Video</a> - <a href="/scores">Score table</a></p>

 <h2>ACA, CMA, WAS, WAE and WAZ tracking</h2>
 <?
--- a/intro.php
+++ b/intro.php
@ -11,7 +11,7 @@

        <p><a href="/">Back to the main website</a></p>

-        <video onloadstart="this.volume=0.1" controls src="media/cat.mp4">
+        <video controls src="media/cat.mp4">

 </body>
 </html>
--- a/scores.php
+++ b/scores.php
@ -1,11 +1,12 @@
 <head>
 <link rel="stylesheet" type="text/css" href="/style.css">
 </head>
+<h2>Score overview</h2>
 <?php
 session_start();
 include("functions.php");

 echo score_table();
-
-
 ?>
+<br>
+<a href="/">Back</a>