commit 248931ca86784f54fc7c818c72a1cdc374d4138a Author: Karl-Heinz Gödderz (GuKKDevel) Date: Wed Oct 31 07:01:55 2018 +0100 Bug-1442 follow up for new tarballs diff --git a/pages/account/27.php b/pages/account/27.php index 7c73be4..9b229d4 100644 --- a/pages/account/27.php +++ b/pages/account/27.php @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?>
diff --git a/scripts/59de-ate-freiburg-mail.php.txt b/scripts/59de-ate-freiburg-mail.php.txt index c8f0d81..681ca47 100644 --- a/scripts/59de-ate-freiburg-mail.php.txt +++ b/scripts/59de-ate-freiburg-mail.php.txt @@ -100,7 +100,7 @@ $city = "2. Februar 2015"; $query = "select * from `locations` where `id`='$locid'"; - $loc = mysql_fetch_assoc(mysql_query($query)); + $loc = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query)); $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * @@ -118,10 +118,10 @@ // comment next line when starting to send mail not only to me // $query = "select * from `users` where `email` like 'cacerttest%'"; - $res = mysql_query($query); - $xrows = mysql_num_rows($res); + $res = mysqli_query($_SESSION['mconn'], $query); + $xrows = mysqli_num_rows($res); - while($row = mysql_fetch_assoc($res)) + while($row = mysqli_fetch_assoc($res)) { // uncomment next line to send mails ... sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); diff --git a/scripts/60de-ate-bremen-mail.php.txt b/scripts/60de-ate-bremen-mail.php.txt index 909412d..94c3562 100644 --- a/scripts/60de-ate-bremen-mail.php.txt +++ b/scripts/60de-ate-bremen-mail.php.txt @@ -104,7 +104,7 @@ $city = "5. Mai 2015"; $query = "select * from `locations` where `id`='$locid'"; - $loc = mysql_fetch_assoc(mysql_query($query)); + $loc = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query)); $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * @@ -122,10 +122,10 @@ // comment next line when starting to send mail not only to me // $query = "select * from `users` where `email` like 'cacerttest%'"; - $res = mysql_query($query); - $xrows = mysql_num_rows($res); + $res = mysqli_query($_SESSION['mconn'], $query); + $xrows = mysqli_num_rows($res); - while($row = mysql_fetch_assoc($res)) + while($row = mysqli_fetch_assoc($res)) { // uncomment next line to send mails ... sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); diff --git a/scripts/61de-ate-dresden-mail.php.txt b/scripts/61de-ate-dresden-mail.php.txt index 2b3ec78..1fd0155 100644 --- a/scripts/61de-ate-dresden-mail.php.txt +++ b/scripts/61de-ate-dresden-mail.php.txt @@ -109,7 +109,7 @@ $query = "select * from `locations` where `id`='$locid'"; - $loc = mysql_fetch_assoc(mysql_query($query)); + $loc = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query)); $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * @@ -127,10 +127,10 @@ // comment next line when starting to send mail not only to me // $query = "select * from `users` where `email` like 'cacerttest%'"; - $res = mysql_query($query); - $xrows = mysql_num_rows($res); + $res = mysqli_query($_SESSION['mconn'], $query); + $xrows = mysqli_num_rows($res); - while($row = mysql_fetch_assoc($res)) + while($row = mysqli_fetch_assoc($res)) { // uncomment next line to send mails ... sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); diff --git a/scripts/62de-froscon2015-mail.php.txt b/scripts/62de-froscon2015-mail.php.txt index 3923e72..03593a2 100644 --- a/scripts/62de-froscon2015-mail.php.txt +++ b/scripts/62de-froscon2015-mail.php.txt @@ -113,7 +113,7 @@ $query = "select * from `locations` where `id`='$locid'"; - $loc = mysql_fetch_assoc(mysql_query($query)); + $loc = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query)); $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * @@ -131,10 +131,10 @@ // comment next line when starting to send mail not only to me // $query = "select * from `users` where `email` like 'cacerttest%'"; - $res = mysql_query($query); - $xrows = mysql_num_rows($res); + $res = mysqli_query($_SESSION['mconn'], $query); + $xrows = mysqli_num_rows($res); - while($row = mysql_fetch_assoc($res)) + while($row = mysqli_fetch_assoc($res)) { // uncomment next line to send mails ... sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); diff --git a/scripts/63dk-ate-nykobing-mail.php.txt b/scripts/63dk-ate-nykobing-mail.php.txt index f22e52a..1da962d 100644 --- a/scripts/63dk-ate-nykobing-mail.php.txt +++ b/scripts/63dk-ate-nykobing-mail.php.txt @@ -117,7 +117,7 @@ $query = "select * from `locations` where `id`='$locid'"; - $loc = mysql_fetch_assoc(mysql_query($query)); + $loc = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query)); $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * @@ -135,10 +135,10 @@ // comment next line when starting to send mail not only to me // $query = "select * from `users` where `email` like 'cacerttest%'"; - $res = mysql_query($query); - $xrows = mysql_num_rows($res); + $res = mysqli_query($_SESSION['mconn'], $query); + $xrows = mysqli_num_rows($res); - while($row = mysql_fetch_assoc($res)) + while($row = mysqli_fetch_assoc($res)) { // uncomment next line to send mails ... sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); diff --git a/scripts/oa03-csr_org_client_cert.php.txt b/scripts/oa03-csr_org_client_cert.php.txt index 89a49c4..76dbf5b 100644 --- a/scripts/oa03-csr_org_client_cert.php.txt +++ b/scripts/oa03-csr_org_client_cert.php.txt @@ -78,10 +78,10 @@ $query = "SELECT orginfo.contact as email, orginfo.O, 1 as status // comment next line when starting to send mail not only to me // $query = "select * from `users` where `email` like 'cacerttest%'"; - $res = mysql_query($query); - $xrows = mysql_num_rows($res); + $res = mysqli_query($_SESSION['mconn'], $query); + $xrows = mysqli_num_rows($res); - while($row = mysql_fetch_assoc($res)) + while($row = mysqli_fetch_assoc($res)) { // uncomment next line to send mails ... sendmail($row['email'], "[CAcert.org] ".$subject.(empty($country)?"":" (".$country.")") , $lines, "support@cacert.org", "", "", "CAcert OA Support", "returns@cacert.org", 1); diff --git a/scripts/send_policy_cca_correct_20150221_1.php b/scripts/send_policy_cca_correct_20150221_1.php index 797771a..bd1f7d6 100644 --- a/scripts/send_policy_cca_correct_20150221_1.php +++ b/scripts/send_policy_cca_correct_20150221_1.php @@ -92,9 +92,9 @@ $query = " AND user_agreements.document = 'CCA') GROUP BY users.id"; -$res = mysql_query($query); +$res = mysqli_query($_SESSION['mconn'], $query); -while($row = mysql_fetch_assoc($res)) +while($row = mysqli_fetch_assoc($res)) { $mailtxt = "Dear ${row["fname"]} ${row["lname"]},\n".$lines_EN."\n\n"; diff --git a/scripts/send_policy_cca_correct_20150221_2.php b/scripts/send_policy_cca_correct_20150221_2.php index fa9f384..c56cfdc 100644 --- a/scripts/send_policy_cca_correct_20150221_2.php +++ b/scripts/send_policy_cca_correct_20150221_2.php @@ -76,9 +76,9 @@ $query = " AND user_agreements.document = 'CCA') GROUP BY users.id"; -$res = mysql_query($query); +$res = mysqli_query($_SESSION['mconn'], $query); -while($row = mysql_fetch_assoc($res)) +while($row = mysqli_fetch_assoc($res)) { $mailtxt = "Dear ${row["fname"]} ${row["lname"]},\n".$lines_EN."\n\n";