Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76fd111221 | ||
|
|
01ec497f9f | ||
|
|
733e741929 | ||
|
|
087d963c49 | ||
|
|
91bc031321 | ||
|
|
fab7fa52d5 | ||
|
|
507a9a806f | ||
|
|
22bf6c13ca | ||
|
|
6f7b8a60ff | ||
|
|
1612659b44 | ||
|
|
e59d26d0ea | ||
|
|
c92a73ff4e | ||
|
|
59a4ea3d81 | ||
|
|
4152de87f0 | ||
|
|
c9e75950b0 | ||
|
|
e8c7924762 | ||
|
|
f096a02bfc | ||
|
|
76a137d94f | ||
|
|
3c5a9f6a4f | ||
|
|
e8d9af1f61 | ||
|
|
849536f694 | ||
|
|
df7fd5a3c2 | ||
|
|
0378282264 | ||
|
|
ebae3bc284 | ||
|
|
cfe29eb0e2 |
No files matched your search
+11
-8
@@ -116,10 +116,10 @@ else {
|
||||
|
||||
$provided_notes = urldecode( $decoded_json["notes"] );
|
||||
|
||||
if ( empty($provided_notes) or strlen($provided_notes) > 100000 ) {
|
||||
problem("Notes are missing not less than max");
|
||||
if ( empty($provided_notes) ) {
|
||||
problem("Notes are missing ");
|
||||
}
|
||||
logextra( "Notes are present and are under the max length" );
|
||||
logextra( "Notes are present " );
|
||||
|
||||
$notes = $provided_notes;
|
||||
|
||||
@@ -255,7 +255,7 @@ logextra( "Host ID was found \"$host_id\"" );
|
||||
|
||||
$provided_host_name = urldecode( $decoded_json["host_name"] );
|
||||
|
||||
if ( empty( $provided_host_name ) or strlen( $provided_host_name ) < 3 or strlen( $provided_host_name ) > 50 ) {
|
||||
if ( empty( $provided_host_name ) or strlen( $provided_host_name ) < 2 or strlen( $provided_host_name ) > 50 ) {
|
||||
problem("host_name length is not correct");
|
||||
}
|
||||
|
||||
@@ -531,20 +531,23 @@ if ( strcmp( $host_license, $db_license ) !== 0 ) {
|
||||
logextra( "Updating the host license" );
|
||||
}
|
||||
}
|
||||
else {
|
||||
logextra( "The host_license is the same to that in the db \"$host_license\"" );
|
||||
}
|
||||
logextra( "The host_license is the same to that in the db \"$host_license\"" );
|
||||
|
||||
$title = mysqli_real_escape_string( $connection, $title );
|
||||
$summary = mysqli_real_escape_string( $connection, $summary );
|
||||
$notes = mysqli_real_escape_string( $connection, $notes );
|
||||
$tags = mysqli_real_escape_string( $connection, $tags );
|
||||
|
||||
$query_add = "INSERT INTO eps VALUES ('$ep_num', '{$ep_date}', '{$title}', '{$duration}', '{$summary}', '{$notes}', '{$host_id}', '{$series_id}', '{$explicit}', '{$episode_license}', '{$tags}', '0', '0', '0')";
|
||||
$query_add = "INSERT INTO eps (id,date,title,duration,summary,notes,hostid,series,explicit,license,tags) VALUES ('$ep_num', '{$ep_date}', '{$title}', '{$duration}', '{$summary}', '{$notes}', '{$host_id}', '{$series_id}', '{$explicit}', '{$episode_license}', '{$tags}')";
|
||||
|
||||
logextra( "About to add to db" );
|
||||
|
||||
$result = mysqli_query($connection, $query_add );
|
||||
if(!$result) {
|
||||
problem("DB problem - The show $ep_num was not added to the eps db.");
|
||||
}
|
||||
logextra( "Response from db \"$result\"" );
|
||||
|
||||
if (mysqli_errno( $connection )) {
|
||||
$error = "MySQL error ".mysqli_errno( $connection ).": ".mysqli_error()."\n";
|
||||
problem("MySQL error- The show $ep_num was not added to the eps db.\n$error");
|
||||
|
||||
+43
-3
@@ -29,7 +29,7 @@ if ($result = mysqli_query($connection, $ep_retrieve)) {
|
||||
}
|
||||
|
||||
// --------------------------------------------
|
||||
// Shows in the Reserve Queue
|
||||
// Shows in the reserve pool
|
||||
|
||||
$ep_retrieve = "SELECT COUNT(*) as num_reserve_shows FROM reservations WHERE status='RESERVE_SHOW_SUBMITTED'";
|
||||
if ($result = mysqli_query($connection, $ep_retrieve)) {
|
||||
@@ -51,6 +51,35 @@ if ($result = mysqli_query($connection, $ep_retrieve)) {
|
||||
|
||||
$next_free_slot = "https://repo.anhonesthost.net/HPR/hpr_hub/issues/71";
|
||||
|
||||
// --------------------------------------------
|
||||
// Get the Shortest Show
|
||||
|
||||
$ep_retrieve = "SELECT id, duration FROM eps WHERE duration = ( SELECT MIN(duration) FROM eps WHERE duration > 0 AND id != 903)";
|
||||
if ($result = mysqli_query($connection, $ep_retrieve)) {
|
||||
$data=mysqli_fetch_assoc($result);
|
||||
$min_duration_seconds = intval( $data['duration'] );
|
||||
$min_duration_episode_number = intval( $data['id'] );
|
||||
}
|
||||
|
||||
// --------------------------------------------
|
||||
// Get the Longest Show
|
||||
|
||||
$ep_retrieve = "SELECT id, duration FROM eps WHERE duration = ( SELECT MAX(duration) FROM eps WHERE duration > 0 AND id != 903)";
|
||||
if ($result = mysqli_query($connection, $ep_retrieve)) {
|
||||
$data=mysqli_fetch_assoc($result);
|
||||
$max_duration_seconds = intval( $data['duration'] );
|
||||
$max_duration_episode_number = intval( $data['id'] );
|
||||
}
|
||||
|
||||
// --------------------------------------------
|
||||
// Get the Average Show
|
||||
|
||||
$ep_retrieve = "SELECT AVG(duration) as avg_duration FROM `eps` WHERE duration > 0";
|
||||
if ($result = mysqli_query($connection, $ep_retrieve)) {
|
||||
$data=mysqli_fetch_assoc($result);
|
||||
$avg_duration_seconds = intval( $data['avg_duration'] );
|
||||
}
|
||||
|
||||
// --------------------------------------------
|
||||
// playtime
|
||||
$ep_retrieve = "SELECT SUM(duration) as total_playtime_all_hpr_shows_seconds FROM `eps`";
|
||||
@@ -74,7 +103,10 @@ $total_released_shows = $latest_episode_id + $total_twt_shows;
|
||||
$total_submitted_shows = $latest_episode_id + $total_twt_shows + $num_future_shows + $num_reserve_shows;
|
||||
|
||||
$project_age_seconds = strtotime( $start_date_twt ) - $current_time;
|
||||
$project_age = convertSecToTime( $project_age_seconds );
|
||||
$project_age = convertSecToTime( $project_age_seconds );
|
||||
$min_duration = convertSecToTime( $min_duration_seconds );
|
||||
$max_duration = convertSecToTime( $max_duration_seconds );
|
||||
$avg_duration = convertSecToTime( $avg_duration_seconds );
|
||||
|
||||
|
||||
// --------------------------------------------
|
||||
@@ -90,7 +122,7 @@ if ($result = mysqli_query($connection, $ep_retrieve)) {
|
||||
}
|
||||
|
||||
// --------------------------------------------
|
||||
// Shows in the Reserve Queue
|
||||
// Shows in the reserve pool
|
||||
|
||||
$ep_retrieve = "SELECT COUNT(*) AS num_unprocessed_shows FROM reservations WHERE status!='RESERVE_SHOW_SUBMITTED' AND status!='REQUEST_UNVERIFIED'";
|
||||
if ($result = mysqli_query($connection, $ep_retrieve)) {
|
||||
@@ -114,6 +146,14 @@ $arr = array(
|
||||
'num_reserve_shows' => $num_reserve_shows,
|
||||
'total_submitted_shows' => $total_submitted_shows,
|
||||
'num_hosts' => $num_hosts,
|
||||
'shortest_show_number' => $min_duration_episode_number,
|
||||
'shortest_show_duration' => $min_duration,
|
||||
'shortest_show_seconds' => $min_duration_seconds,
|
||||
'longest_show_number' => $max_duration_episode_number,
|
||||
'longest_show_duration' => $max_duration,
|
||||
'longest_show_seconds' => $max_duration_seconds,
|
||||
'average_show_length' => $avg_duration,
|
||||
'average_show_length_seconds' => $avg_duration_seconds,
|
||||
'days_to_next_free_slot' => "todo",
|
||||
'total_playtime_all_shows_seconds' => $total_playtime_all_shows_seconds,
|
||||
'total_playtime_all_shows_human_readable' => $total_playtime_all_shows_human_readable,
|
||||
|
||||
+30
-15
@@ -2,8 +2,9 @@
|
||||
require "/home/hpr/php/include.php";
|
||||
|
||||
if ( $_SERVER['REQUEST_METHOD'] !== 'GET' ) {
|
||||
naughty("438a220a58dc34c200a8669547afc66b");
|
||||
naughty("438a220a58dc34c200a8669547afc66b REQUEST_METHOD not supported");
|
||||
}
|
||||
logextra( "GET Method used." );
|
||||
|
||||
$num_get_args=0;
|
||||
foreach($_GET as $k => $v) {
|
||||
@@ -12,9 +13,8 @@ foreach($_GET as $k => $v) {
|
||||
if ( $num_get_args !== 2 ){
|
||||
$result = mysqli_query($connection, "SET time_zone = '+0:00';");
|
||||
if (!isset($result)) {
|
||||
naughty("cca6408ae1febc3f07974177b2d04375");
|
||||
naughty("cca6408ae1febc3f07974177b2d04375 DB Error");
|
||||
}
|
||||
|
||||
header("Content-type: text/csv");
|
||||
print "timestamp_epoc,ep_num,ep_date,key,status,email\n";
|
||||
# 1649790226_3710_2022-10-21_b291590ce4ba23b519935bde53d0a5936255cd12e96b4
|
||||
@@ -26,36 +26,40 @@ if ( $num_get_args !== 2 ){
|
||||
}
|
||||
}
|
||||
else {
|
||||
naughty("2dcabda45255713ea9bf04523e804016");
|
||||
naughty("2dcabda45255713ea9bf04523e804016 Query error");
|
||||
}
|
||||
logextra( "Got status from DB" );
|
||||
mysqli_close($connection);
|
||||
exit;
|
||||
}
|
||||
|
||||
if ( empty($_GET["ep_num"]) or empty($_GET["status"]) ) {
|
||||
naughty("32bedea129648f27701f2f2f3ff4b7b5");
|
||||
naughty("32bedea129648f27701f2f2f3ff4b7b5 Empty ep_num or status");
|
||||
}
|
||||
logextra( "Got non Empty ep_num or status" );
|
||||
|
||||
if ( !in_array($_GET["status"], array('METADATA_PROCESSED','SHOW_POSTED','MEDIA_TRANSCODED','UPLOADED_TO_IA','UPLOADED_TO_RSYNC_NET','REMOVE_RESERVATION'), true ) ) {
|
||||
naughty("88882bc97094e7aabf2a258756f917f5 ");
|
||||
naughty("88882bc97094e7aabf2a258756f917f5 Wrong enum status");
|
||||
}
|
||||
else {
|
||||
$status = $_GET["status"];
|
||||
}
|
||||
logextra( "Got valid enum status" );
|
||||
|
||||
if ( !empty($_GET["ep_num"]) and isset( $_GET["ep_num"] ) ) {
|
||||
$ep_num = intval( $_GET["ep_num"] );
|
||||
}
|
||||
else {
|
||||
naughty("ecb0ebc5b38b4c09226ccbfce05978cb");
|
||||
naughty("ecb0ebc5b38b4c09226ccbfce05978cb ep_num not correct");
|
||||
}
|
||||
logextra( "Got valid ep_num" );
|
||||
|
||||
// // SELECT MAX(ep_num) FROM `reservations` → 3627
|
||||
// // SELECT MIN(ep_num) FROM `reservations` WHERE ep_num > 0 → 3582
|
||||
//
|
||||
$result = mysqli_query($connection, 'SELECT MAX(ep_num) FROM `reservations`;');
|
||||
if (!isset($result)) {
|
||||
naughty("360e6381ffca736b6f12056abd7dcc7d");
|
||||
naughty("360e6381ffca736b6f12056abd7dcc7d Cant get max from db");
|
||||
}
|
||||
$max_eps_array = mysqli_fetch_row( $result );
|
||||
$max_eps = $max_eps_array[0];
|
||||
@@ -63,23 +67,27 @@ mysqli_free_result($result);
|
||||
|
||||
$result = mysqli_query($connection, 'SELECT MIN(ep_num) FROM `reservations` WHERE ep_num > 0;');
|
||||
if (!isset($result)) {
|
||||
naughty("6971b6d378292e8fc9583de6082eddf4");
|
||||
naughty("6971b6d378292e8fc9583de6082eddf4 Cant get min from db");
|
||||
}
|
||||
$min_eps_array = mysqli_fetch_row( $result );
|
||||
$min_eps = $min_eps_array[0];
|
||||
mysqli_free_result($result);
|
||||
logextra( "Got smallest ep_num from db" );
|
||||
|
||||
if ( empty( $ep_num ) ) {
|
||||
naughty("6cf46a9b21e667c61b2c5bf87a7104f9 $ep_num");
|
||||
naughty("6cf46a9b21e667c61b2c5bf87a7104f9 Empty ep_num");
|
||||
}
|
||||
logextra( "ep_num is not empty" );
|
||||
|
||||
if ( $ep_num < $min_eps ) {
|
||||
naughty("bbcef7cd8a263dc57e85195935ad600a $ep_num < $min_eps");
|
||||
naughty("bbcef7cd8a263dc57e85195935ad600a Invalid $ep_num < $min_eps");
|
||||
}
|
||||
logextra( "ep_num is not less than the minimum ep" );
|
||||
|
||||
if ( $ep_num > $max_eps ) {
|
||||
naughty("a75115f3fa706ceee4b61971cd22b8f9 $ep_num > $max_eps");
|
||||
naughty("a75115f3fa706ceee4b61971cd22b8f9 Invalid $ep_num > $max_eps");
|
||||
}
|
||||
logextra( "ep_num is not greater than max ep" );
|
||||
|
||||
// SHOW_SUBMITTED → METADATA_PROCESSED → SHOW_POSTED → MEDIA_TRANSCODED → UPLOADED_TO_IA → UPLOADED_TO_RSYNC_NET
|
||||
switch ($status) {
|
||||
@@ -105,28 +113,35 @@ switch ($status) {
|
||||
$error = "MySQL error ".mysqli_errno( $connection).": ".mysqli_error($connection)."\n";
|
||||
problem("Could not update the show reservation to $status in the db");
|
||||
}
|
||||
logextra( "Was able to remove the reservation for $ep_num" );
|
||||
mysqli_free_result($result);
|
||||
mysqli_close($connection);
|
||||
logextra( "$query");
|
||||
die;
|
||||
}
|
||||
logextra( "Set current status to $current_status" );
|
||||
|
||||
$result = mysqli_query($connection, "SELECT ep_num FROM reservations WHERE `ep_num` = '$ep_num' AND status='$current_status';");
|
||||
if (!isset($result)) {
|
||||
naughty("7f2d7228ca355be6dd2a24769595b18f");
|
||||
naughty("7f2d7228ca355be6dd2a24769595b18f Cant get reservation");
|
||||
}
|
||||
logextra( "Retrieved the reservation for $ep_num with status of $current_status" );
|
||||
|
||||
$db_ep_num_array = mysqli_fetch_row( $result );
|
||||
$db_ep_num = $db_ep_num_array[0];
|
||||
mysqli_free_result($result);
|
||||
if ( $db_ep_num != $ep_num ){
|
||||
problem("da59731c6ae6d1ce0fa2fa9fc4e1e726 $db_ep_num != $ep_num");
|
||||
problem("da59731c6ae6d1ce0fa2fa9fc4e1e726 Error $db_ep_num != $ep_num");
|
||||
}
|
||||
logextra( "The ep_num matches the db" );
|
||||
|
||||
$query = "UPDATE reservations SET `status` = '$status' WHERE `ep_num` = '$ep_num' AND status='$current_status';";
|
||||
$result = mysqli_query($connection, $query );
|
||||
if(!isset($result)) {
|
||||
problem("8a76bb408877b1d33bf31ea96b6fc02f");
|
||||
problem("8a76bb408877b1d33bf31ea96b6fc02f Could not UPDATE Reservation");
|
||||
}
|
||||
logextra( "Was able to update the status of $ep_num from $current_status to $status" );
|
||||
|
||||
if (mysqli_errno( $connection )) {
|
||||
$error = "MySQL error ".mysqli_errno( $connection).": ".mysqli_error($connection)."\n";
|
||||
problem("Could not update the show reservation to $status in the db");
|
||||
|
||||
+69
-31
@@ -17,23 +17,64 @@ include 'header.php';
|
||||
|
||||
$ip = $_SERVER["REMOTE_ADDR"];
|
||||
|
||||
# Remove any stale requests.
|
||||
# Remove any stale REQUEST_UNVERIFIED requests.
|
||||
# This should be enough to deter attackers while been short enough to allow real hosts to request a show.
|
||||
$query_delete_old = "DELETE
|
||||
$query_delete_old_REQUEST_UNVERIFIED = "DELETE
|
||||
FROM
|
||||
reservations
|
||||
WHERE
|
||||
reservations.timestamp + INTERVAL 1 HOUR <= UTC_TIMESTAMP()
|
||||
AND reservations.status = 'REQUEST_UNVERIFIED'";
|
||||
$result_delete_old = @mysqli_query($connection, $query_delete_old);
|
||||
logextra( "Deleting requests older than 1 hour" . $result_delete_old );
|
||||
$result_delete_old_REQUEST_UNVERIFIED = @mysqli_query($connection, $query_delete_old_REQUEST_UNVERIFIED);
|
||||
if(!$result_delete_old_REQUEST_UNVERIFIED) {
|
||||
problem("ERROR: DB problem - The old REQUEST_UNVERIFIED records were not removed from the reservations db.");
|
||||
}
|
||||
else{
|
||||
logextra( "mysql_query.result: \"$result\"\n" );
|
||||
}
|
||||
|
||||
logextra( "Removed REQUEST_UNVERIFIED requests older than 1 hour " . $result_delete_old_REQUEST_UNVERIFIED );
|
||||
|
||||
|
||||
# Remove any stale REQUEST_EMAIL_SENT requests.
|
||||
# This should be enough for someone to acutally upload a show
|
||||
$query_delete_old_REQUEST_EMAIL_SENT = "DELETE
|
||||
FROM
|
||||
reservations
|
||||
WHERE
|
||||
reservations.timestamp + INTERVAL 3 HOUR <= UTC_TIMESTAMP()
|
||||
AND reservations.status = 'REQUEST_EMAIL_SENT'";
|
||||
$result_delete_old_REQUEST_EMAIL_SENT = @mysqli_query($connection, $query_delete_old_REQUEST_EMAIL_SENT);
|
||||
if(!$result_delete_old_REQUEST_EMAIL_SENT) {
|
||||
problem("ERROR: DB problem - The old REQUEST_EMAIL_SENT records were not removed from the reservations db.");
|
||||
}
|
||||
else{
|
||||
logextra( "mysql_query.result: \"$result\"\n" );
|
||||
}
|
||||
|
||||
logextra( "Removed REQUEST_EMAIL_SENT requests older than 3 hours " . $result_delete_old_REQUEST_EMAIL_SENT );
|
||||
|
||||
|
||||
# Remove stale requests from this IP Address after 15 minutes.
|
||||
# This should be enough to deter attackers while been short enough to allow real hosts to request a show.
|
||||
$query_delete = "DELETE FROM reservations WHERE reservations.ip = '$ip' AND reservations.timestamp + INTERVAL 15 MINUTE <= UTC_TIMESTAMP() AND reservations.status = 'REQUEST_UNVERIFIED'";
|
||||
$query_delete = "DELETE
|
||||
FROM
|
||||
reservations
|
||||
WHERE
|
||||
reservations.ip = '$ip'
|
||||
AND
|
||||
reservations.timestamp + INTERVAL 15 MINUTE <= UTC_TIMESTAMP()
|
||||
AND
|
||||
reservations.status = 'REQUEST_UNVERIFIED'";
|
||||
$result_delete = @mysqli_query($connection, $query_delete);
|
||||
logextra( "Remove stale requests from this \"${ip}\" IP Address after 15 minutes. " . $result_delete_old );
|
||||
if(!$result_delete) {
|
||||
problem("ERROR: DB problem - The old REQUEST_UNVERIFIED records were not removed from this \"${ip}\" IP Address after 15 minutes.");
|
||||
}
|
||||
else{
|
||||
logextra( "mysql_query.result: \"$result\"\n" );
|
||||
}
|
||||
|
||||
logextra( "Remove REQUEST_UNVERIFIED stale requests from this \"${ip}\" IP Address after 15 minutes. " . $result_delete );
|
||||
|
||||
// --------------------------------------------
|
||||
// Get first free slot
|
||||
@@ -74,20 +115,20 @@ $max_episode_number = $max_episode_array[0];
|
||||
print "<!-- max_episode_number is $max_episode_number -->\n";
|
||||
|
||||
// --------------------------------------------
|
||||
// Get the number of shows in the reserve queue.
|
||||
// Get the number of shows in the Reserve Pool.
|
||||
|
||||
$query = mysqli_query($connection, "SELECT COUNT(*) as count_reserve_queue FROM reservations WHERE status = 'RESERVE_SHOW_SUBMITTED' AND ip = '127.0.0.1';");
|
||||
$query = mysqli_query($connection, "SELECT COUNT(*) as count_reserve_pool FROM reservations WHERE status = 'RESERVE_SHOW_SUBMITTED' AND ip = '127.0.0.1';");
|
||||
$response_array = mysqli_fetch_row($query);
|
||||
$count_reserve_queue = $response_array[0];
|
||||
print "<!-- count_reserve_queue is $count_reserve_queue -->\n";
|
||||
$count_reserve_pool = $response_array[0];
|
||||
print "<!-- count_reserve_pool is $count_reserve_pool -->\n";
|
||||
|
||||
// --------------------------------------------
|
||||
// Get the number of shows in the reserve queue yet to be processed.
|
||||
// Get the number of shows in the Reserve Pool yet to be processed.
|
||||
|
||||
$query = mysqli_query($connection, "SELECT COUNT(*) as count_reserve_queue_unprocessed FROM reservations WHERE status = 'RESERVE_SHOW_SUBMITTED' AND ip != '127.0.0.1';");
|
||||
$query = mysqli_query($connection, "SELECT COUNT(*) as count_reserve_pool_unprocessed FROM reservations WHERE status = 'RESERVE_SHOW_SUBMITTED' AND ip != '127.0.0.1';");
|
||||
$response_array = mysqli_fetch_row($query);
|
||||
$count_reserve_queue_unprocessed = $response_array[0];
|
||||
print "<!-- count_reserve_queue_unprocessed is $count_reserve_queue_unprocessed -->\n";
|
||||
$count_reserve_pool_unprocessed = $response_array[0];
|
||||
print "<!-- count_reserve_pool_unprocessed is $count_reserve_pool_unprocessed -->\n";
|
||||
|
||||
// --------------------------------------------
|
||||
// Populate array with future shows and reservations
|
||||
@@ -256,30 +297,30 @@ The HPR Schedule is entirely community driven and we recommend that <strong>you<
|
||||
</p>
|
||||
|
||||
<p>
|
||||
There are only <strong><?php echo "${days_to_wait}"; ?></strong> days to wait until next free slot. Please consider <a aria-label="Help on Recording a podcast" href="<?php echo "${referrerurl}about.html#recording_a_podcast"; ?>">recording</a> a show for us.
|
||||
There are only <strong><?php echo "${days_to_wait}"; ?></strong> days to wait until next free slot.
|
||||
Please consider <a aria-label="Help on Recording a podcast" href="<?php echo "${referrerurl}contribute.html"; ?>">recording</a> a show for us.
|
||||
</p>
|
||||
<ol>
|
||||
<li>Review the updated <em><a aria-label="Learn the Stuff you need to know" href="<?php echo "${referrerurl}about.html#agreement"; ?>">Stuff you need to know</a></em> page.</li>
|
||||
<li>Select a date, or post to the reserve queue.</li>
|
||||
<li>Review the updated <em><a aria-label="Learn the Stuff you need to know" href="<?php echo "${referrerurl}contribute.html#stuff_you_need_to_know"; ?>">Stuff you need to know</a></em> page.</li>
|
||||
<li>Select a date, or post to the Reserve Pool.</li>
|
||||
<li>Click the link in the confirmation email</li>
|
||||
<li>Then <a aria-label="Help on Adding an episode" href="<?php echo "${baseurl}about.html#adding_an_episode"; ?>">fill in a form</a>.</li>
|
||||
<li>Then <a aria-label="Help on Adding an episode" href="<?php echo "${baseurl}contribute.html#uploading_an_episode"; ?>">fill in a form</a>.</li>
|
||||
</ol>
|
||||
|
||||
<h2 id="scheduling_guidelines">Scheduling Guidelines</h2>
|
||||
<h2 id="scheduling_rules">Scheduling Rules</h2>
|
||||
<ol>
|
||||
<li>You must have your audio recording ready to upload <strong>before</strong> you pick a slot.</li>
|
||||
<li>New hosts, Interviews, and other time critical shows should use the first free slot.</li>
|
||||
<li>Always try and fill any free slots that are available in the <strong>upcoming two weeks</strong>.</li>
|
||||
<li>When the queue is filling up then leave some slots free for new contributors.</li>
|
||||
<li>Post non urgent shows into the first empty week.</li>
|
||||
<li>If you are uploading a series of shows then post them one every two weeks.</li>
|
||||
<li>If you have a non urgent show that is timeless, then add it to the <a href="<?php echo $referrerurl ?>about.html#reserve_queue">Reserve Queue</a>.</li>
|
||||
<li>Otherwise, when the queue is filling up then leave some free slots for new contributors.</li>
|
||||
<li>Leave two weeks (9 slots) between your shows.</li>
|
||||
<li>If you have a non urgent show that is timeless, then add it to the <a href="<?php echo $referrerurl ?>contribute.html#reserve_pool">Reserve Pool</a>.</li>
|
||||
</ol>
|
||||
|
||||
<h2 id="reserve_queue">Add to the Reserve Queue ?</h2>
|
||||
<h2 id="reserve_pool">Add to the Reserve Pool ?</h2>
|
||||
|
||||
<p>
|
||||
<a aria-label="Post to the reserve queue" href="<?php echo "${hubBaseurl}"; ?>request.php?id=9999">Post your show to the <strong>reserve queue</strong></a> if you don't care when it will be released. <small><a aria-label="Help on the reserve queue" href="<?php echo "${referrerurl}"; ?>about.html#reserve_queue";">ⓘ</a></small>
|
||||
<a aria-label="Post to the Reserve Pool" href="<?php echo "${hubBaseurl}"; ?>request.php?id=9999">Post your show to the <strong>Reserve Pool</strong></a> if you don't care when it will be released.
|
||||
<small><a aria-label="Help on the Reserve Pool" href="<?php echo "${referrerurl}"; ?>contribute.html#reserve_pool";">ⓘ</a></small>
|
||||
</p>
|
||||
|
||||
<h2 id="current_schedule">Select a date in the current schedule ?</h2>
|
||||
@@ -288,10 +329,7 @@ There are only <strong><?php echo "${days_to_wait}"; ?></strong> days to wait un
|
||||
<strong>Schedule</strong> the release</a> day your show will be aired. <small><a aria-label="Help on the scheduling guidelines" href="<?php echo "${referrerurl}"; ?>about.html#scheduling_guidelines">ⓘ</a></small>
|
||||
</p>
|
||||
|
||||
<h3>Next Two Months <small><a aria-label="Help on the HPR processing workflow" href="<?php echo "${referrerurl}"; ?>about.html#workflow">ⓘ</a></small></h3>
|
||||
|
||||
|
||||
|
||||
<h3>Next Two Months <small><a aria-label="Help on the HPR processing workflow" href="https://repo.anhonesthost.net/HPR/hpr_documentation/src/branch/main/workflow/uploading_a_show.md">ⓘ</a></small></h3>
|
||||
|
||||
<?php
|
||||
$sizeof_show_array = sizeof($show_array);
|
||||
@@ -343,7 +381,7 @@ while ( $slot <= $max_episode_number) {
|
||||
}
|
||||
?>
|
||||
|
||||
<h3 id="reserve_queue_overview">Reserve Queue Overview</h3>
|
||||
<h3 id="reserve_pool_overview">Reserve Pool Overview</h3>
|
||||
<pre>
|
||||
<?php
|
||||
include 'reserve.txt';
|
||||
|
||||
@@ -101,6 +101,10 @@ if ($pos !== false) {
|
||||
|
||||
logextra( "Sending request to ${path}" );
|
||||
|
||||
// header("Content-Type: application/jpeg");
|
||||
// header("Content-Length: " . filesize($original_filename));
|
||||
// https://hub.hackerpublicradio.org/ccdn.php?filename=/eps/hpr4537/hpr4537.mp3
|
||||
header('Content-Disposition: attachment; filename="' .$name . '"');
|
||||
header("location:${path}");
|
||||
|
||||
?>
|
||||
+32
-28
@@ -10,53 +10,53 @@ foreach($_GET as $k => $v) {
|
||||
|
||||
if ( $num_get_args > 0 ){
|
||||
# they didn't supply any arguments
|
||||
naughty("9e756ee22b7cdcdb150a5baf167caa25 $num_get_args");
|
||||
naughty("9e756ee22b7cdcdb150a5baf167caa25 No arguments provided $num_get_args");
|
||||
}
|
||||
|
||||
if ( empty($_POST["anti_spam_question"]) ) {
|
||||
naughty("0601a23e358374c293b086bb75606cca");
|
||||
naughty("0601a23e358374c293b086bb75606cca You failed the anti spam question");
|
||||
}
|
||||
|
||||
if ( strlen($_POST["anti_spam_question"]) !== 6 ) {
|
||||
naughty("6f51e6e7e6820b3fdda5d4ca0df14db1");
|
||||
naughty("6f51e6e7e6820b3fdda5d4ca0df14db1 You have the wrong spam answer");
|
||||
}
|
||||
|
||||
if (strcasecmp('public', $_POST["anti_spam_question"]) !== 0) {
|
||||
naughty("6aef421ce05e3ac34f4cd91ae3248a45");
|
||||
naughty("6aef421ce05e3ac34f4cd91ae3248a45 You don't know what P is in HPR");
|
||||
}
|
||||
|
||||
if ( ! file_exists( $comment_directory ) ) {
|
||||
# Looks like the comments directory has not been created
|
||||
naughty("d5342ea497f701656433e81fb5eed064");
|
||||
naughty("d5342ea497f701656433e81fb5eed064 Comment file could not be created");
|
||||
}
|
||||
|
||||
$unprocessed_comments = iterator_count(new FilesystemIterator("$comment_directory", FilesystemIterator::SKIP_DOTS));
|
||||
|
||||
if( $unprocessed_comments >= 10 ) {
|
||||
# There has to be at least one comment here as they are calling the script, and too many is suspicious
|
||||
naughty("093f42abee30e69e0e4d5125c70a0f7c");
|
||||
naughty("093f42abee30e69e0e4d5125c70a0f7c Too many unprocessed comments - shutting myself down");
|
||||
}
|
||||
|
||||
# This is to prevent anything except hits from the web form.
|
||||
# Anyone wanting to script uploads can do so via ftp
|
||||
if ( $_SERVER['REQUEST_METHOD'] !== 'POST' ) {
|
||||
naughty("87613fc139b251b673e1dd51e378e462");
|
||||
naughty("87613fc139b251b673e1dd51e378e462 Must be a POST");
|
||||
}
|
||||
|
||||
if ( empty($_SERVER["REMOTE_ADDR"]) ) {
|
||||
naughty("d7d0b6ab9689be244e1b6a8fbe6effba");
|
||||
naughty("d7d0b6ab9689be244e1b6a8fbe6effba Missing remote address");
|
||||
}
|
||||
else {
|
||||
$ip = $_SERVER["REMOTE_ADDR"];
|
||||
}
|
||||
|
||||
if (count($_POST) !== 8) {
|
||||
naughty("086fe155b0588de68fc5d9e4580254a8");
|
||||
naughty("086fe155b0588de68fc5d9e4580254a8 Not correct number of fields");
|
||||
}
|
||||
|
||||
// Basic POST Checks
|
||||
if ( empty($_POST["comment_author_name"]) or strlen($_POST["comment_author_name"]) > 40 or strtolower($_POST["comment_author_name"]) == "testdog" ) {
|
||||
naughty("294356cd36d3f9b75da4d8c0a6108881");
|
||||
naughty("294356cd36d3f9b75da4d8c0a6108881 Your name wrong");
|
||||
}
|
||||
$comment_author_name = $_POST["comment_author_name"];
|
||||
$comment_author_name_json = json_encode( $_POST["comment_author_name"] );
|
||||
@@ -69,7 +69,7 @@ else {
|
||||
}
|
||||
|
||||
if ( empty($_POST["comment_title"]) or strlen($_POST["comment_title"]) > 100 ) {
|
||||
naughty("a89efb428cfe36996a65b371d5f4e303");
|
||||
naughty("a89efb428cfe36996a65b371d5f4e303 The title is too long");
|
||||
}
|
||||
$comment_title = $_POST["comment_title"];
|
||||
$comment_title_json = json_encode( $_POST["comment_title"] );
|
||||
@@ -81,9 +81,13 @@ else {
|
||||
$comment_title_ascii = "EXTENDED";
|
||||
}
|
||||
|
||||
if ( empty($_POST["comment_text"]) or strlen($_POST["comment_text"]) > 2000 or strpos(strtolower($_POST["comment_text"]), "outlook.con") !== false ) {
|
||||
naughty("cd57ab4d7b77a131ed3deb441bd93dcd");
|
||||
if ( empty($_POST["comment_text"]) ) {
|
||||
naughty("cd57ab4d7b77a131ed3deb441bd93dcd The comment text is missing.");
|
||||
}
|
||||
if ( strlen($_POST["comment_text"]) > 2000 or strpos(strtolower($_POST["comment_text"]), "outlook.con") !== false ) {
|
||||
naughty("cd57ab4d7b77a131ed3deb441bd93dcd The comment text is too verbose. Record a show instead.");
|
||||
}
|
||||
|
||||
$comment_text = $_POST["comment_text"];
|
||||
$comment_text_json = json_encode( $_POST["comment_text"] );
|
||||
|
||||
@@ -95,7 +99,7 @@ else {
|
||||
}
|
||||
|
||||
if ( empty($_POST["spammer"]) or strcmp($_POST["spammer"], "No") !== 0 ) {
|
||||
naughty("b2ec68bd04cee0f64143ce4827a97e7c");
|
||||
naughty("b2ec68bd04cee0f64143ce4827a97e7c You selected that you were a spammer");
|
||||
}
|
||||
|
||||
# We check to see if the eps_id has been suplied, that it's a integer, and that it's in our range.
|
||||
@@ -108,13 +112,13 @@ if (isset($_POST['eps_id'])){
|
||||
$row = mysqli_fetch_array($result, MYSQLI_NUM);
|
||||
$total = $row[0];
|
||||
if ( !isset($result) or ( $total != 1 ) ) {
|
||||
naughty("5348e3c2aee3644730c70d3f000bcb01");
|
||||
naughty("5348e3c2aee3644730c70d3f000bcb01 No response from the db");
|
||||
}
|
||||
mysqli_free_result($result);
|
||||
|
||||
$result = mysqli_query($connection, 'SELECT MAX(id) as max FROM eps;');
|
||||
if (!isset($result)) {
|
||||
naughty("f00fb1f47affc3286aadc15038cfd5d7");
|
||||
naughty("f00fb1f47affc3286aadc15038cfd5d7 Could not find the max id");
|
||||
}
|
||||
while ($row = mysqli_fetch_array($result)) {
|
||||
$max_eps = $row['max'];
|
||||
@@ -122,19 +126,19 @@ if (isset($_POST['eps_id'])){
|
||||
mysqli_free_result($result);
|
||||
}
|
||||
else {
|
||||
naughty("02c560adf1ff39b140fe8b7abe02fd31");
|
||||
naughty("02c560adf1ff39b140fe8b7abe02fd31 Commenting on a non existant show is odd");
|
||||
}
|
||||
|
||||
if ( intval($eps_id) <= 0 ){
|
||||
naughty("2903eeac51bb479edb428ae3c896671c");
|
||||
naughty("2903eeac51bb479edb428ae3c896671c Commenting on a non show with ID less than zero is odd");
|
||||
}
|
||||
|
||||
if ( intval($eps_id) > $max_eps ){
|
||||
naughty("54aa65c12ba71f3dfc451ff5bc82c798");
|
||||
naughty("54aa65c12ba71f3dfc451ff5bc82c798 Commenting on a show that is more than our posted episodes is odd");
|
||||
}
|
||||
|
||||
if ( intval($eps_id) === 0 ) {
|
||||
naughty("11fe1f9b76bf9f30e6a3a784832cb738");
|
||||
naughty("11fe1f9b76bf9f30e6a3a784832cb738 Commenting on a show zero is odd");
|
||||
}
|
||||
else {
|
||||
$eps_id = intval($eps_id);
|
||||
@@ -155,16 +159,16 @@ if ($result = mysqli_query($connection, $query)) {
|
||||
}
|
||||
}
|
||||
else {
|
||||
naughty("c34561d684ad97241c95a1287688638b");
|
||||
naughty("c34561d684ad97241c95a1287688638b Could not get the hosts from the db");
|
||||
}
|
||||
mysqli_free_result($result);
|
||||
|
||||
if ( empty($_POST["hostid"]) or intval($_POST["hostid"]) != $host_id ) {
|
||||
naughty("b4d71481b7055272728094292fd2a562");
|
||||
naughty("b4d71481b7055272728094292fd2a562 Cant find that host id. You picked the wrong host from the list");
|
||||
}
|
||||
|
||||
if ( empty($_POST["justification"]) or strlen($_POST["justification"]) > 200 or strlen($_POST["justification"]) < 20) {
|
||||
naughty("156d2d2d5780bd7f4a750f7c162b3394");
|
||||
naughty("156d2d2d5780bd7f4a750f7c162b3394 You need to have a sufficiently long answer to 'What does HPR mean to you?'.");
|
||||
}
|
||||
|
||||
# Checks to see how old the show is
|
||||
@@ -173,7 +177,7 @@ list ($current_episode_date, $current_episode_number) = GetLatestPublishedShow($
|
||||
|
||||
if ( ( $eps_id <= $current_episode_number ) and ( $eps_id >= ( $current_episode_number - 20 ) ) ) {
|
||||
if ( strcmp($_POST["justification"], "No justification is asked for or required.") !== 0 ) {
|
||||
naughty("9357d78bf73b03ee2dd902a4c975f91d");
|
||||
naughty("9357d78bf73b03ee2dd902a4c975f91d You're saying No justification on a show that requires justification");
|
||||
}
|
||||
else {
|
||||
$justification = "Current Comment";
|
||||
@@ -183,7 +187,7 @@ if ( ( $eps_id <= $current_episode_number ) and ( $eps_id >= ( $current_episode_
|
||||
else {
|
||||
if ( strcmp($_POST["justification"], "No justification is asked for or required.") === 0 ) {
|
||||
print ">" . $_POST["justification"] ."< eps_id: $eps_id, current_episode_number: $current_episode_number, ";
|
||||
naughty("df4af9bdd0302f672d6311c76bdc461a");
|
||||
naughty("df4af9bdd0302f672d6311c76bdc461a A current comment should not require Justification");
|
||||
}
|
||||
else {
|
||||
$justification = $_POST["justification"];
|
||||
@@ -199,7 +203,7 @@ else {
|
||||
}
|
||||
|
||||
if ( empty($_SERVER["REMOTE_ADDR"]) ) {
|
||||
naughty("611144d4c0d575fffbf8f3ef11f8ad68");
|
||||
naughty("611144d4c0d575fffbf8f3ef11f8ad68 Missing REMOTE_ADDR");
|
||||
}
|
||||
else {
|
||||
$ip = $_SERVER["REMOTE_ADDR"];
|
||||
@@ -216,7 +220,7 @@ $timestamp = $timestamp;
|
||||
$timestamp_json = json_encode($timestamp);
|
||||
$comment_key_json = json_encode( $key );
|
||||
if ( file_exists( $comment_file ) ) {
|
||||
naughty("ef5d14b33b262bfbf5d40544fdeb9ec3");
|
||||
naughty("ef5d14b33b262bfbf5d40544fdeb9ec3 File already exists");
|
||||
}
|
||||
|
||||
$comment_data = "{
|
||||
@@ -233,7 +237,7 @@ $comment_data = "{
|
||||
file_put_contents($comment_file, $comment_data );
|
||||
|
||||
if ( filesize( $comment_file ) > 4000 ) {
|
||||
naughty("56e00e793a27168511d1cfda11d3bc55");
|
||||
naughty("56e00e793a27168511d1cfda11d3bc55 Filesize is too big");
|
||||
}
|
||||
|
||||
$user_agent = preg_replace('/ \(/', "\n", $_SERVER["HTTP_USER_AGENT"] );
|
||||
|
||||
+55
-6
@@ -349,7 +349,7 @@ article > p,
|
||||
2px 4px 4px var(--shadow-cards);
|
||||
transition: 0.3s;
|
||||
flex: 1 0 100%;
|
||||
overflow-x: scroll;
|
||||
overflow: auto;
|
||||
padding-bottom: 1rem;
|
||||
}
|
||||
.lane > article:hover,
|
||||
@@ -363,7 +363,7 @@ article > p,
|
||||
margin-right: 1rem;
|
||||
}
|
||||
.lane > article > header,
|
||||
.lane > article > h3 {
|
||||
.lane > article > h3:first-child {
|
||||
background: var(--background-secondary);
|
||||
padding: 1.5rem 1rem 1rem 1rem;
|
||||
margin: 0;
|
||||
@@ -371,12 +371,25 @@ article > p,
|
||||
font-size: 1.45rem;
|
||||
color: var(--background-primary);
|
||||
}
|
||||
.lane > article > header > .index-link {
|
||||
float: right;
|
||||
}
|
||||
.lane.stack > article {
|
||||
border-radius: 0.5rem;
|
||||
border: thin solid var(--background-secondary);
|
||||
max-width: calc(100vw - 12px);
|
||||
}
|
||||
.lane.stack > article > header,
|
||||
.lane.stack > article > h3:first-child {
|
||||
border-top-left-radius: 0.5rem;
|
||||
border-top-right-radius: 0.5rem;
|
||||
}
|
||||
.lane > article > header a,
|
||||
.lane > article > h3 a {
|
||||
.lane > article > h3:first-child a {
|
||||
color: var(--link-secondary);
|
||||
}
|
||||
.lane > article > header a:hover,
|
||||
.lane > article > h3:hover {
|
||||
.lane > article > h3:first-child:hover {
|
||||
color: var(--link-secondary-hover);
|
||||
}
|
||||
.lane.stack> * > header * {
|
||||
@@ -595,8 +608,8 @@ fieldset > table td input[type="radio"] {
|
||||
}
|
||||
#youtube {
|
||||
--video-ratio: calc(390 / 640);
|
||||
width: min(calc(95vw + 0px), 640px);
|
||||
height: min(calc(calc(95vw + 0px) * var(--video-ratio)), 320px);
|
||||
width: min(calc(89vw + 0px), 640px);
|
||||
height: min(calc(calc(89vw + 0px) * var(--video-ratio)), 390px);
|
||||
}
|
||||
#upload_method pre {
|
||||
max-width: 80vw;
|
||||
@@ -828,3 +841,39 @@ fieldset > table td input[type="radio"] {
|
||||
max-width: 30%;
|
||||
}
|
||||
}
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
--link-primary: #bbdfe7;
|
||||
--link-header-hover: #b54c08; /* original --link-primary-hover */;
|
||||
--link-primary-hover: var(--link-secondary-hover);
|
||||
--background-primary: #4d4d4d; /* HPR Grey */
|
||||
--text-primary: #dfdfdf /*#fffff7#fafafa#fbfbee #dfdfdf */;
|
||||
--banner-text-primary: #b6b6b6;
|
||||
--shadow-secondary-color: hsl(0, 0%, 40%);
|
||||
--input-border-primary: var(--shadow-secondary-color);
|
||||
--lane-button-color: #d5e6ea;
|
||||
}
|
||||
body > header {
|
||||
background-image: url("/images/main-header-background-dark.png");
|
||||
background-color: #22545a;
|
||||
}
|
||||
img {
|
||||
filter: brightness(0.70);
|
||||
}
|
||||
a.lane-button {
|
||||
background-image: url("/images/lane-button-background-dark.png");
|
||||
color: var(--lane-button-color);
|
||||
}
|
||||
a.lane-button img {
|
||||
filter: none;
|
||||
}
|
||||
.lane > article > header {
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
#title a:hover {
|
||||
color: var(--link-header-hover);
|
||||
}
|
||||
#hosts td:nth-child(-n+2) {
|
||||
color: var(--text-primary);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="395.87204mm"
|
||||
height="328.98892mm"
|
||||
viewBox="0 0 395.87204 328.98892"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
|
||||
sodipodi:docname="hpr-splatter-logo.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<sodipodi:namedview
|
||||
id="namedview7"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.69664703"
|
||||
inkscape:cx="505.99513"
|
||||
inkscape:cy="693.32098"
|
||||
inkscape:window-width="1495"
|
||||
inkscape:window-height="991"
|
||||
inkscape:window-x="26"
|
||||
inkscape:window-y="23"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="layer1"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0" />
|
||||
<defs
|
||||
id="defs2" />
|
||||
<g
|
||||
inkscape:label="splatter"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
style="display:inline;opacity:1"
|
||||
transform="translate(151.28806,58.570345)">
|
||||
<g
|
||||
id="g1121"
|
||||
transform="matrix(2.8529517,0,0,2.7427599,-281.26325,-351.42616)"
|
||||
style="opacity:1;fill:#ec7615;fill-opacity:1;stroke-width:0.999888;stroke-miterlimit:4;stroke-dasharray:none">
|
||||
<path
|
||||
style="fill:#ec7615;fill-opacity:1;stroke-width:0.999888;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
d="m 124.64984,202.82463 c -0.71637,-0.50932 -1.21071,-0.92604 -1.09853,-0.92604 0.11219,0 0.80978,0.41672 1.5502,0.92604 0.74043,0.50933 1.23476,0.92605 1.09853,0.92605 -0.13624,0 -0.83383,-0.41672 -1.5502,-0.92605 z m -2.01526,-1.10678 c 0.191,-0.0764 0.4192,-0.067 0.50712,0.0209 0.0879,0.0879 -0.0683,0.15045 -0.34726,0.13896 -0.30823,-0.0127 -0.37092,-0.0754 -0.15986,-0.15985 z m -1.73548,-0.67915 c -0.46838,-0.32742 -0.85365,-0.70537 -0.85617,-0.83987 -0.003,-0.13451 0.26332,-0.002 0.59074,0.29459 0.32742,0.29654 0.83344,0.67086 1.12448,0.83183 0.29104,0.16097 0.40843,0.29629 0.26086,0.30071 -0.14757,0.004 -0.65153,-0.25984 -1.11991,-0.58726 z m 16.8002,-0.91433 c 0.32742,-0.0631 0.8632,-0.0631 1.19062,0 0.32743,0.0631 0.0595,0.11466 -0.59531,0.11466 -0.65484,0 -0.92273,-0.0516 -0.59531,-0.11466 z m -25.28028,-1.59921 c -0.96373,-1.37056 -1.37648,-2.42175 -1.34537,-3.42645 l 0.0311,-1.00533 0.20692,1.22458 c 0.2452,1.45107 0.61355,2.22197 1.53246,3.2072 0.37325,0.40018 0.5454,0.7276 0.38256,0.7276 -0.16284,0 -0.5263,-0.32742 -0.80769,-0.7276 z m -1.80102,-5.24151 c -0.21708,-0.8649 0.0296,-2.73764 0.41084,-3.11887 0.20623,-0.20623 0.20262,-0.0344 -0.0123,0.58196 -0.16962,0.48656 -0.23375,1.39367 -0.14455,2.04448 0.17469,1.27444 0.0183,1.57757 -0.25405,0.49243 z m 8.22973,-44.03714 c 0.2634,-0.29104 0.52416,-0.52917 0.57949,-0.52917 0.0553,0 -0.0269,0.23813 -0.18261,0.52917 -0.15576,0.29104 -0.41653,0.52917 -0.57948,0.52917 -0.16296,0 -0.0808,-0.23813 0.1826,-0.52917 z m 1.06671,-0.8073 c 0.0888,-0.1436 0.77802,-0.57014 1.53171,-0.94787 0.75368,-0.37773 2.01323,-1.35773 2.79899,-2.17778 1.0536,-1.09959 1.21754,-1.21318 0.62446,-0.43267 -0.4423,0.58208 -1.02567,1.25712 -1.29636,1.50008 -0.65191,0.58513 -3.86571,2.39304 -3.6588,2.05824 z m 33.37002,-4.81509 -1.93294,-1.91823 1.87207,1.70526 c 1.02964,0.93789 1.98517,1.80109 2.12342,1.91823 0.13824,0.11713 0.16564,0.21296 0.0609,0.21296 -0.10477,0 -1.06031,-0.8632 -2.12342,-1.91822 z m -27.55462,-0.19368 c -0.0915,-0.14814 -0.02,-0.26935 0.15905,-0.26935 0.17903,0 0.54398,-0.1977 0.81099,-0.43935 0.26701,-0.24164 0.52859,-0.39047 0.58128,-0.33073 0.0527,0.0598 -0.23735,0.37866 -0.64453,0.7087 -0.44715,0.36243 -0.80625,0.4934 -0.90679,0.33073 z m 24.45678,-3.08925 c -0.60246,-0.63947 -0.7016,-0.82723 -0.29224,-0.55342 0.55581,0.37177 1.53768,1.52124 1.29943,1.52124 -0.0525,0 -0.5057,-0.43552 -1.00719,-0.96782 z m -19.95912,-0.0939 c 0.60864,-0.67297 2.49038,-1.69284 2.71289,-1.47033 0.0829,0.0829 0.0238,0.15075 -0.13134,0.15075 -0.15515,0 -0.91794,0.42789 -1.69507,0.95086 -0.9122,0.61387 -1.22638,0.74455 -0.88648,0.36872 z m 15.74003,-2.37791 c -0.21828,-0.14107 -0.27781,-0.25648 -0.13229,-0.25648 0.14552,0 0.44317,0.11541 0.66145,0.25648 0.21829,0.14106 0.27782,0.25648 0.1323,0.25648 -0.14552,0 -0.44318,-0.11542 -0.66146,-0.25648 z m -3.42583,-0.54327 c 0.35359,-0.2237 2.32905,-0.37046 2.08086,-0.15459 -0.0606,0.0527 -0.63983,0.16363 -1.28711,0.24643 -0.76137,0.0974 -1.04161,0.065 -0.79375,-0.0918 z m 8.4738,-0.6694 c 0.0127,-0.30823 0.0754,-0.37092 0.15985,-0.15986 0.0764,0.191 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15046,-0.0684 -0.13897,-0.34726 z m 17.65659,0.23818 c 0.19099,-0.0764 0.4192,-0.067 0.50712,0.0209 0.0879,0.0879 -0.0684,0.15046 -0.34727,0.13897 -0.30823,-0.0127 -0.37092,-0.0754 -0.15985,-0.15985 z m -84.617066,-0.44986 c 0,-0.0558 0.23829,-0.16375 0.529532,-0.23991 0.291243,-0.0762 0.462809,-0.0305 0.38126,0.10143 -0.142412,0.23043 -0.910792,0.34725 -0.910792,0.13848 z"
|
||||
id="path1135" />
|
||||
<path
|
||||
style="fill:#ec7615;fill-opacity:1;stroke-width:0.999888;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
d="m 113.18575,198.91 c -0.33467,-0.5573 -0.32903,-0.56294 0.12656,-0.12656 0.26227,0.2512 0.41989,0.51367 0.35028,0.58328 -0.0696,0.0696 -0.28418,-0.13592 -0.47684,-0.45672 z m -1.82706,-3.4937 c 0.005,-0.43656 0.0647,-0.58312 0.13177,-0.32569 0.0671,0.25743 0.0627,0.61462 -0.01,0.79375 -0.0725,0.17913 -0.12737,-0.0315 -0.12197,-0.46806 z m -35.165493,-2.38125 c 0.0021,-0.7276 0.05337,-0.99386 0.114187,-0.59167 0.06082,0.40218 0.05919,0.99749 -0.0036,1.32291 -0.0628,0.32543 -0.112559,-0.004 -0.110574,-0.73124 z m 34.605633,-0.28663 c 0.0127,-0.30823 0.0754,-0.37092 0.15985,-0.15985 0.0764,0.19099 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15046,-0.0684 -0.13897,-0.34727 z m 0,-1.32292 c 0.0127,-0.30822 0.0754,-0.37092 0.15985,-0.15985 0.0764,0.191 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15046,-0.0684 -0.13897,-0.34727 z m 13.07599,-45.35399 c 0.26339,-0.29104 0.53842,-0.52917 0.61118,-0.52917 0.0728,0 -0.0832,0.23813 -0.3466,0.52917 -0.26339,0.29104 -0.53842,0.52917 -0.61118,0.52917 -0.0728,0 0.0832,-0.23813 0.3466,-0.52917 z m 28.95185,-2.57969 -0.64143,-0.7276 0.7276,0.64143 c 0.68006,0.59952 0.84894,0.81378 0.64143,0.81378 -0.0474,0 -0.37481,-0.32742 -0.7276,-0.72761 z m -1.33664,-1.32291 c -0.32911,-0.41965 -0.31975,-0.42901 0.0999,-0.0999 0.44073,0.34564 0.58089,0.56292 0.36313,0.56292 -0.0549,0 -0.2633,-0.20836 -0.46302,-0.46302 z m -21.3975,-1.48896 c 0,-0.0549 0.20836,-0.2633 0.46302,-0.46302 0.41964,-0.32911 0.429,-0.31975 0.0999,0.0999 -0.34564,0.44073 -0.56291,0.58089 -0.56291,0.36313 z m 5.09323,-2.19916 c 0.25466,-0.0666 0.67138,-0.0666 0.92604,0 0.25466,0.0665 0.0463,0.121 -0.46302,0.121 -0.50933,0 -0.71768,-0.0545 -0.46302,-0.121 z"
|
||||
id="path1133" />
|
||||
<path
|
||||
style="fill:#ec7615;fill-opacity:1;stroke-width:0.999888;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
d="m 124.64343,202.36161 -0.50403,-0.59531 0.59531,0.50403 c 0.55945,0.47366 0.71577,0.6866 0.50403,0.6866 -0.0502,0 -0.31809,-0.26789 -0.59531,-0.59532 z m 13.58504,-2.49033 c 0.1819,-0.0734 0.47955,-0.0734 0.66145,0 0.1819,0.0734 0.0331,0.13345 -0.33073,0.13345 -0.3638,0 -0.51263,-0.06 -0.33072,-0.13345 z m -26.13974,-2.49327 c -0.16243,-0.3035 -0.24549,-0.60166 -0.18458,-0.66257 0.0609,-0.0609 0.2466,0.18741 0.41264,0.55183 0.36462,0.80024 0.18709,0.88645 -0.22806,0.11074 z m -0.47526,-1.56483 c 0,-0.36381 0.06,-0.51263 0.13345,-0.33073 0.0734,0.1819 0.0734,0.47955 0,0.66146 -0.0734,0.1819 -0.13345,0.0331 -0.13345,-0.33073 z m 42.39871,-51.13073 -0.50403,-0.59531 0.59532,0.50402 c 0.32742,0.27722 0.59531,0.54511 0.59531,0.59532 0,0.21173 -0.21294,0.0554 -0.6866,-0.50403 z m -31.54099,-0.8599 c 0.005,-0.43656 0.0647,-0.58312 0.13177,-0.32569 0.0671,0.25743 0.0627,0.61462 -0.01,0.79375 -0.0725,0.17913 -0.12736,-0.0315 -0.12197,-0.46806 z m 29.42433,-0.99218 -0.50403,-0.59532 0.59531,0.50403 c 0.55945,0.47366 0.71576,0.6866 0.50403,0.6866 -0.0502,0 -0.3181,-0.26789 -0.59531,-0.59531 z m -1.97927,-2.51355 -0.64143,-0.7276 0.7276,0.64143 c 0.68006,0.59952 0.84894,0.81378 0.64144,0.81378 -0.0474,0 -0.37482,-0.32742 -0.72761,-0.72761 z m -19.16226,-0.0661 c 0.26339,-0.29104 0.53842,-0.52917 0.61118,-0.52917 0.0728,0 -0.0832,0.23813 -0.3466,0.52917 -0.26339,0.29104 -0.53842,0.52916 -0.61118,0.52916 -0.0728,0 0.0832,-0.23812 0.3466,-0.52916 z m 11.43881,-2.41408 c 0.17948,-0.18083 0.39297,-0.26212 0.47444,-0.18066 0.0815,0.0815 -0.0654,0.22941 -0.32632,0.32877 -0.37709,0.14358 -0.40748,0.11319 -0.14812,-0.14811 z m 1.32733,-0.40698 c 0.1819,-0.0734 0.47956,-0.0734 0.66146,0 0.1819,0.0734 0.0331,0.13345 -0.33073,0.13345 -0.3638,0 -0.51263,-0.0601 -0.33073,-0.13345 z"
|
||||
id="path1131" />
|
||||
<path
|
||||
style="fill:#ec7615;fill-opacity:1;stroke-width:0.999888;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
d="m 120.4101,199.98036 -0.50403,-0.59531 0.59531,0.50403 c 0.55945,0.47366 0.71576,0.6866 0.50403,0.6866 -0.0502,0 -0.3181,-0.26789 -0.59531,-0.59532 z m -7.54924,-1.71979 c -0.32911,-0.41964 -0.31975,-0.429 0.0999,-0.0999 0.44073,0.34564 0.58088,0.56291 0.36312,0.56291 -0.0549,0 -0.2633,-0.20836 -0.46302,-0.46302 z m -1.26828,-3.39548 c 0.0127,-0.30823 0.0754,-0.37092 0.15985,-0.15986 0.0764,0.191 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15046,-0.0683 -0.13897,-0.34726 z m 45.18912,-47.93368 c -0.32911,-0.41965 -0.31975,-0.42901 0.0999,-0.0999 0.25466,0.19972 0.46302,0.40808 0.46302,0.46302 0,0.21776 -0.21727,0.0776 -0.56291,-0.36312 z m -32.77459,-0.72761 c 0.34178,-0.3638 0.68094,-0.66146 0.7537,-0.66146 0.0728,0 -0.14734,0.29766 -0.48912,0.66146 -0.34177,0.3638 -0.68094,0.66146 -0.7537,0.66146 -0.0728,0 0.14734,-0.29766 0.48912,-0.66146 z m 29.21982,-2.05052 -0.77711,-0.85989 0.8599,0.7771 c 0.80154,0.72437 0.98151,0.94269 0.7771,0.94269 -0.0455,0 -0.43249,-0.38696 -0.85989,-0.8599 z m -17.90888,-5.41224 c 0.32742,-0.0631 0.8632,-0.0631 1.19062,0 0.32743,0.0631 0.0595,0.11466 -0.59531,0.11466 -0.65484,0 -0.92273,-0.0516 -0.59531,-0.11466 z"
|
||||
id="path1129" />
|
||||
<path
|
||||
style="fill:#ec7615;fill-opacity:1;stroke-width:0.999888;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
d="m 130.90717,205.44842 c 0.0127,-0.30823 0.0754,-0.37092 0.15985,-0.15985 0.0764,0.19099 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15045,-0.0684 -0.13896,-0.34727 z m -3.85735,-1.96233 c -0.0899,-0.14552 -0.0374,-0.26458 0.11667,-0.26458 0.15411,0 0.2802,0.11906 0.2802,0.26458 0,0.14552 -0.0525,0.26459 -0.11667,0.26459 -0.0642,0 -0.19026,-0.11907 -0.2802,-0.26459 z m -2.54729,-1.52135 c -0.32911,-0.41965 -0.31975,-0.429 0.0999,-0.0999 0.44073,0.34565 0.58089,0.56292 0.36313,0.56292 -0.0549,0 -0.2633,-0.20836 -0.46302,-0.46302 z m -3.34826,-1.5875 c -0.40949,-0.40018 -0.50067,-0.53551 -0.20261,-0.30072 0.29805,0.23479 0.78003,0.55859 1.07108,0.71956 0.29104,0.16097 0.38221,0.29629 0.20261,0.30072 -0.17961,0.004 -0.66159,-0.31938 -1.07108,-0.71956 z m -8.15251,-2.24896 -0.50403,-0.59531 0.59532,0.50403 c 0.55944,0.47366 0.71576,0.68659 0.50403,0.68659 -0.0502,0 -0.3181,-0.26789 -0.59532,-0.59531 z m -1.00051,-1.66387 c -0.0907,-0.23646 -0.15279,-0.68808 -0.13789,-1.0036 0.0171,-0.36266 0.10699,-0.23371 0.24433,0.35057 0.23112,0.98328 0.16827,1.36889 -0.10644,0.65303 z m -0.93784,-4.24516 c 0.0127,-0.30822 0.0754,-0.37092 0.15986,-0.15985 0.0764,0.191 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15045,-0.0684 -0.13896,-0.34727 z m 0.52917,-2.11666 c 0.0127,-0.30823 0.0754,-0.37092 0.15985,-0.15986 0.0764,0.191 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15046,-0.0684 -0.13897,-0.34726 z m -8.80175,-20.39932 c 0.191,-0.0764 0.4192,-0.067 0.50712,0.0209 0.0879,0.0879 -0.0683,0.15045 -0.34726,0.13896 -0.30823,-0.0127 -0.37092,-0.0754 -0.15986,-0.15985 z m 17.00499,-20.53163 c 0.0606,-0.0412 0.34837,-0.24953 0.63942,-0.46302 0.48948,-0.35904 0.50193,-0.35343 0.16604,0.0749 -0.19972,0.25466 -0.48746,0.46302 -0.63941,0.46302 -0.15196,0 -0.22668,-0.0337 -0.16605,-0.0749 z m 1.30087,-0.83255 c 0,-0.0728 0.23813,-0.25974 0.52917,-0.4155 0.29104,-0.15576 0.52917,-0.22367 0.52917,-0.15091 0,0.0728 -0.23813,0.25974 -0.52917,0.4155 -0.29104,0.15576 -0.52917,0.22367 -0.52917,0.15091 z m 35.29674,-1.53997 -0.50403,-0.59532 0.59532,0.50403 c 0.32742,0.27722 0.59531,0.54511 0.59531,0.59531 0,0.21174 -0.21294,0.0554 -0.6866,-0.50402 z m -1.99298,-1.45521 c -0.32911,-0.41965 -0.31975,-0.42901 0.0999,-0.0999 0.25466,0.19972 0.46302,0.40808 0.46302,0.46302 0,0.21776 -0.21727,0.0776 -0.56291,-0.36312 z m -29.59959,0.0985 c 0,-0.0549 0.20836,-0.2633 0.46302,-0.46302 0.41965,-0.32911 0.429,-0.31975 0.0999,0.0999 -0.34565,0.44073 -0.56292,0.58089 -0.56292,0.36313 z m 27.24103,-2.20768 c -0.64877,-0.68708 -0.93178,-1.04401 -0.62893,-0.79317 0.30285,0.25084 0.6005,0.42604 0.66146,0.38934 0.0609,-0.0367 0.0794,-0.0154 0.041,0.0472 -0.0384,0.0627 0.25175,0.44962 0.64481,0.85989 0.39307,0.41027 0.65765,0.74595 0.58796,0.74595 -0.0697,0 -0.65751,-0.56216 -1.30627,-1.24924 z m -21.2879,-2.71951 c 0.26339,-0.29104 0.53842,-0.52917 0.61118,-0.52917 0.0728,0 -0.0832,0.23813 -0.3466,0.52917 -0.26339,0.29104 -0.53842,0.52917 -0.61118,0.52917 -0.0728,0 0.0832,-0.23813 0.3466,-0.52917 z m 19.02486,-0.0661 -0.50403,-0.59532 0.59531,0.50403 c 0.55945,0.47366 0.71576,0.6866 0.50403,0.6866 -0.0502,0 -0.3181,-0.26789 -0.59531,-0.59531 z m -6.12139,-2.76305 c 0.25743,-0.0671 0.61462,-0.0627 0.79375,0.01 0.17913,0.0725 -0.0315,0.12736 -0.46806,0.12197 -0.43656,-0.005 -0.58312,-0.0647 -0.32569,-0.13177 z m 14.69588,-12.4328 c 0.19099,-0.0764 0.4192,-0.067 0.50712,0.0209 0.0879,0.0879 -0.0684,0.15045 -0.34727,0.13896 -0.30823,-0.0127 -0.37092,-0.0754 -0.15985,-0.15985 z"
|
||||
id="path1127" />
|
||||
<path
|
||||
style="fill:#ec7615;fill-opacity:1;stroke-width:0.999888;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
d="m 102.86133,226.3505 c 0.0127,-0.30822 0.0754,-0.37092 0.15985,-0.15985 0.0764,0.19099 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15046,-0.0683 -0.13897,-0.34727 z m 0.77286,-1.58106 c 0,-0.22687 0.12101,-0.33771 0.2689,-0.24631 0.1479,0.0914 0.2004,0.27703 0.11668,0.4125 -0.22681,0.36698 -0.38558,0.29855 -0.38558,-0.16619 z m -5.605857,-5.05992 c 0.190994,-0.0764 0.419198,-0.067 0.507119,0.0209 0.08792,0.0879 -0.06835,0.15045 -0.347266,0.13896 -0.308226,-0.0127 -0.370919,-0.0754 -0.159853,-0.15985 z m -0.692561,-1.00989 c 0.0054,-0.43656 0.06469,-0.58312 0.131774,-0.32569 0.06708,0.25743 0.06267,0.61462 -0.0098,0.79375 -0.07248,0.17913 -0.127363,-0.0315 -0.121971,-0.46806 z m -26.640333,-7.80217 c -0.09269,-0.14999 0.01352,-0.19434 0.248967,-0.10399 0.45837,0.17589 0.542235,0.36554 0.16165,0.36554 -0.136932,0 -0.321712,-0.1177 -0.410617,-0.26155 z m 68.623751,-1.2598 c -0.3291,-0.41965 -0.31974,-0.42901 0.0999,-0.0999 0.44073,0.34564 0.58089,0.56292 0.36313,0.56292 -0.0549,0 -0.2633,-0.20836 -0.46303,-0.46302 z m -5.52902,-1.7075 c -0.0702,-0.68445 -0.0298,-1.14663 0.0898,-1.02705 0.11958,0.11958 0.17701,0.67959 0.12762,1.24447 l -0.0898,1.02705 z m -0.66581,-2.08042 c -0.0959,-0.1552 -0.11766,-0.33893 -0.0483,-0.40829 0.0693,-0.0694 0.1966,0.0576 0.28277,0.28219 0.17891,0.46622 0.0264,0.54823 -0.23447,0.1261 z m -6.45053,-0.40132 c 0.0127,-0.30823 0.0754,-0.37092 0.15985,-0.15985 0.0764,0.19099 0.067,0.4192 -0.0209,0.50712 -0.0879,0.0879 -0.15046,-0.0684 -0.13897,-0.34727 z m 4.08203,-0.63638 c -0.0927,-0.14998 0.0135,-0.19434 0.24897,-0.10398 0.45837,0.17589 0.54223,0.36553 0.16165,0.36553 -0.13694,0 -0.32172,-0.1177 -0.41062,-0.26155 z m -82.285423,-0.26458 c -0.09269,-0.14999 0.01351,-0.19434 0.248968,-0.10399 0.458369,0.17589 0.542234,0.36554 0.161649,0.36554 -0.136933,0 -0.32171,-0.1177 -0.410617,-0.26155 z m 83.424563,0.0808 c 0.191,-0.0764 0.4192,-0.067 0.50712,0.0209 0.0879,0.0879 -0.0684,0.15045 -0.34727,0.13896 -0.30822,-0.0127 -0.37091,-0.0754 -0.15985,-0.15985 z m -85.410811,-0.61301 -0.926042,-0.19492 0.844281,-0.0348 c 0.464355,-0.0192 0.917866,0.0842 1.007803,0.22975 0.08994,0.14552 0.126729,0.24891 0.08176,0.22975 -0.04497,-0.0191 -0.498479,-0.12254 -1.007802,-0.22975 z m 96.523311,-0.18074 c 0.191,-0.0764 0.4192,-0.067 0.50712,0.0209 0.0879,0.0879 -0.0684,0.15045 -0.34726,0.13896 -0.30823,-0.0127 -0.37092,-0.0754 -0.15986,-0.15985 z m -90.186963,-0.70635 c 0.124735,-0.1241 1.00645,-0.24316 1.959366,-0.26458 0.952916,-0.0214 1.649101,0.0407 1.547076,0.13807 -0.276265,0.26366 -3.771028,0.38974 -3.506442,0.12651 z m 65.894903,-0.39173 c 0,-0.16977 -0.26789,-0.32249 -0.59531,-0.33937 -0.49,-0.0253 -0.50843,-0.0531 -0.10419,-0.15711 0.52777,-0.13584 1.17877,0.32589 0.8803,0.62436 -0.0994,0.0994 -0.1808,0.0419 -0.1808,-0.12788 z m 7.01334,-0.0411 c -0.0927,-0.14998 0.0135,-0.19433 0.24896,-0.10398 0.45837,0.17589 0.54224,0.36554 0.16165,0.36554 -0.13693,0 -0.32171,-0.1177 -0.41061,-0.26156 z m 8.61797,0.0631 c -0.0115,-0.1819 -0.11019,-0.30096 -0.21933,-0.26458 -0.10914,0.0364 -0.22499,-0.0529 -0.25745,-0.19844 -0.0325,-0.14552 0.26426,-0.28943 0.65939,-0.3198 0.39513,-0.0304 0.58837,0.0292 0.42942,0.13229 -0.15894,0.10313 -0.35697,0.3661 -0.44007,0.58438 -0.0925,0.24304 -0.15917,0.26868 -0.17196,0.0661 z m 11.05786,-0.52917 c -0.32911,-0.41964 -0.31975,-0.429 0.0999,-0.0999 0.25466,0.19972 0.46302,0.40808 0.46302,0.46302 0,0.21776 -0.21727,0.0776 -0.56292,-0.36313 z m -87.278754,0.0945 c 0,-0.0572 0.184778,-0.17489 0.410617,-0.26156 0.235459,-0.0904 0.341662,-0.046 0.248969,0.10399 -0.155379,0.25141 -0.659586,0.37185 -0.659586,0.15757 z m 66.641254,-0.35904 c -0.32911,-0.41965 -0.31975,-0.429 0.0999,-0.0999 0.44073,0.34565 0.58088,0.56292 0.36312,0.56292 -0.0549,0 -0.2633,-0.20836 -0.46302,-0.46302 z m -8.67094,-0.40891 c -0.33468,-0.55729 -0.32904,-0.56293 0.12656,-0.12656 0.26226,0.2512 0.41989,0.51368 0.35028,0.58328 -0.0696,0.0696 -0.28418,-0.13591 -0.47684,-0.45672 z m -55.853647,-0.0233 c 0,-0.0558 0.294053,-0.15766 0.653452,-0.22636 0.359398,-0.0687 0.590496,-0.023 0.513551,0.10145 -0.135488,0.21922 -1.167003,0.32963 -1.167003,0.12491 z m 20.058725,-0.0793 c 0.190995,-0.0764 0.419198,-0.067 0.507119,0.0209 0.08792,0.0879 -0.06835,0.15045 -0.347265,0.13896 -0.308227,-0.0127 -0.37092,-0.0754 -0.159854,-0.15985 z m 30.178362,-0.28228 c -0.32129,-0.40967 -0.3146,-0.42518 0.0581,-0.13459 0.23167,0.18064 0.51865,0.24017 0.63773,0.13229 0.11909,-0.10787 0.13087,-0.0473 0.0262,0.13459 -0.24601,0.42749 -0.28922,0.41957 -0.72202,-0.13229 z m -42.828753,-0.43216 c 0,-0.0558 0.238289,-0.16375 0.529532,-0.23991 0.291242,-0.0762 0.462809,-0.0305 0.381259,0.10143 -0.142412,0.23043 -0.910791,0.34725 -0.910791,0.13848 z m 13.563291,-0.38514 c 0.02805,-0.37243 0.131839,-0.47622 0.304027,-0.30403 0.172189,0.17219 0.157647,0.36522 -0.0426,0.56546 -0.228981,0.22898 -0.293513,0.16445 -0.261432,-0.26143 z m 28.790932,-0.0763 c -0.0115,-0.23684 0.18747,-0.59403 0.44213,-0.79375 0.40236,-0.3155Line truncated
|
||||
id="path1125" />
|
||||
<path
|
||||
id="path1123"
|
||||
style="fill:#b54c08;fill-opacity:1;stroke-width:9.61908;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
d="m 1019.6152,0.01171875 c -2.2025,-0.35880592 -8.2461,8.10015785 -8.2461,11.93359325 0,1.86335 2.913,3.277344 6.7481,3.277344 6.0678,0 6.5671,-0.693591 4.9629,-6.8828122 -0.9815,-3.785371 -2.3665,-7.44540439 -3.0781,-8.13476568 -0.1098,-0.10628082 -0.2399,-0.16943898 -0.3868,-0.19335937 z m 51.0489,23.97656225 -3.8262,8.533203 C 1064.7321,37.214325 1063.745,43.278837 1064.6367,46 h -0.01 c 2.465,7.51943 6.1634,0.23285 6.0879,-11.994141 z M 918.85938,60.71875 c -2.82135,0.02732 -5.84506,2.536555 -11.42383,8.001953 -15.4026,15.089343 -18.50093,20.831914 -13.96094,25.871094 5.21478,5.787943 14.25344,3.446079 24.32227,-6.302735 13.07081,-12.655218 14.82479,-17.544427 8.38476,-23.353515 -3.05697,-2.757355 -5.12792,-4.238042 -7.32226,-4.216797 z m 146.83202,4.595703 c -1.4227,0 -2.5859,1.689543 -2.5859,3.755859 0,2.066219 1.1632,3.757813 2.5859,3.757813 1.4228,0 2.5879,-1.691594 2.5879,-3.757813 0,-2.066316 -1.1651,-3.755859 -2.5879,-3.755859 z M 695.73242,80.341797 c -2.93152,0 -1.20623,9.123558 4.14258,21.914063 1.87211,4.47681 3.9716,8.14062 4.66602,8.14062 2.14189,0 -1.66588,-18.732814 -3.98829,-19.619136 -1.20109,-0.459229 -2.18359,-2.996413 -2.18359,-5.636719 0,-2.640202 -1.18697,-4.798828 -2.63672,-4.798828 z m 361.69338,2.597656 c -1.0122,0.171905 -2.1255,1.414214 -3.0977,3.867188 -2.3299,5.87864 -2.0136,7.154622 3.0879,12.472656 2.5616,2.670373 5.4348,6.827593 6.3848,9.238283 2.601,6.5962 4.4785,5.28422 4.4785,-3.13086 0,-5.00902 -1.294,-7.513673 -3.8809,-7.513673 -2.5867,0 -3.8789,-2.504554 -3.8789,-7.513672 0,-5.01802 -1.4067,-7.70643 -3.0937,-7.419922 z M 844.7832,99.429688 c -1.85876,-0.186557 -3.61067,1.830422 -7.66015,6.970702 -8.03438,10.19882 -8.14661,10.95635 -2.54688,16.94727 7.46537,7.98674 24.17383,4.89099 24.17383,-4.47852 0,-3.28312 -1.1651,-5.96875 -2.58789,-5.96875 -1.42268,0 -2.58594,-1.51636 -2.58594,-3.36914 0,-1.85278 -2.1645,-5.26545 -4.81055,-7.58398 -1.71155,-1.49972 -2.86716,-2.405654 -3.98242,-2.517582 z M 707.08594,115.66406 c -0.58741,-0.2014 -0.37543,0.74755 0.50195,2.97852 0.97142,2.47009 2.41907,3.8611 3.21484,3.08984 0.79642,-0.77115 0.002,-2.79314 -1.76562,-4.49219 -0.95804,-0.92068 -1.59873,-1.45533 -1.95117,-1.57617 z m 431.39256,12.1836 c -3.0301,-0.047 -5.6811,0.79428 -6.9844,2.83593 -0.9678,1.50986 -4.8744,2.15307 -8.6816,1.41602 -8.2541,-1.59839 -12.2102,0.40523 -13.4922,6.83008 -1.4757,7.39503 -8.9508,10.87229 -15.2226,7.08008 -4.3333,-2.6201 -5.4917,-2.53952 -6.6817,0.46289 -0.7914,1.99728 -0.9122,6.24965 -0.2695,9.44922 l 1.1699,5.8164 1.9238,-5.63476 c 1.4815,-4.34029 3.8981,-5.63477 10.5215,-5.63477 4.7297,0 9.3204,1.12643 10.1992,2.50391 2.4555,3.84663 13.1928,2.97163 16.9219,-1.37891 5.4722,-6.38421 15.9327,-3.52021 18.7637,5.13672 1.3514,4.13244 6.0354,11.17554 10.4082,15.65234 9.3378,9.56067 15.8958,10.28654 22.6015,2.50391 5.2165,-6.05353 6.5157,-11.89649 2.6465,-11.89649 -1.3099,0 -3.1463,-3.36769 -4.08,-7.48437 -0.9341,-4.11668 -2.7707,-8.12829 -4.084,-8.91406 -1.3138,-0.78588 -2.3887,-3.61733 -2.3887,-6.29102 0,-5.06955 -6.2796,-6.70259 -9.0547,-2.35547 -2.1356,3.34636 -9.0527,3.20834 -9.0527,-0.17969 0,-5.40852 -8.4979,-9.8146 -15.1641,-9.91796 z m 62.3399,34.22851 c -2.9394,-0.0114 -5.7872,0.91565 -5.7872,2.43555 0,0.54112 3.2008,0.96604 7.1133,0.94531 5.1773,-0.028 6.1219,-0.64717 3.4688,-2.27344 -1.2352,-0.75706 -3.0314,-1.10058 -4.7949,-1.10742 z m -283.08402,3.21094 c -5.5675,-0.17913 -11.17003,2.18045 -16.25391,7.0957 -8.92073,8.62365 -11.35392,14.76216 -9.81445,24.74805 1.79426,11.6358 -3.94933,13.44654 -12.22266,3.85156 -3.76352,-4.36495 -8.11765,-7.9375 -9.67383,-7.9375 -1.55628,0 -3.36239,-1.40901 -4.01367,-3.13086 -0.94856,-2.50461 -1.87132,-2.50461 -4.61328,0 -1.88516,1.72185 -5.52307,3.13086 -8.08399,3.13086 -9.92881,0 -2.83552,8.916 8.27735,10.4043 4.49718,0.60239 7.2559,3.15581 9.05468,8.38086 1.42285,4.13243 3.40716,8.73433 4.41211,10.22656 1.00453,1.48944 5.37037,2.20847 9.70118,1.59375 5.63574,-0.8009 7.87304,-2.48409 7.87304,-5.92187 0,-5.41102 8.1828,-9.68373 9.76172,-5.09766 1.17662,3.41685 10.9336,4.06248 10.9336,0.72266 0,-1.228 2.94015,-2.94747 6.5332,-3.82032 7.9272,-1.92627 16.74805,-10.03767 16.74805,-15.40039 0,-2.15682 1.10201,-5.91618 2.44921,-8.35351 1.8816,-3.404 0.7158,-6.26933 -5.02734,-12.35742 -4.94106,-5.23775 -10.47357,-7.95564 -16.04101,-8.13477 z m 319.82812,13.57422 c -0.6884,0.0659 -1.1426,0.60189 -1.1426,1.51367 0,1.45875 1.1632,2.65234 2.586,2.65234 1.4226,0 2.5874,-0.49805 2.5879,-1.10546 0,-0.60747 -1.1653,-1.80231 -2.5879,-2.65235 -0.5336,-0.31927 -1.0304,-0.44778 -1.4434,-0.4082 z M 720.75,188.03711 c -2.61634,0 -2.75008,2.40154 -0.625,11.26953 2.22482,9.2844 3.7373,11.27149 8.58008,11.27148 3.23344,0 5.85079,-1.40901 5.79687,-3.13085 -0.11925,-4.53652 -6.41692,-11.89649 -10.17968,-11.89649 -1.80084,0 -2.56877,-1.65645 -1.73633,-3.75781 0.84753,-2.13858 0.0567,-3.75586 -1.83594,-3.75586 z m 102.92578,0 c -2.21845,0 -3.31434,1.12643 -2.43555,2.50391 0.87934,1.37747 2.69441,2.5039 4.03321,2.5039 Line truncated
|
||||
transform="matrix(0.09274021,0,0,0.09646609,45.558146,106.77413)" />
|
||||
</g>
|
||||
</g>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer2"
|
||||
inkscape:label="logo"
|
||||
style="display:inline"
|
||||
transform="translate(151.28806,58.570345)" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 96 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 529 KiB |
@@ -0,0 +1,3 @@
|
||||
/*! For license information please see quill.js.LICENSE.txt */
|
||||
!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Quill=e():t.Quill=e()}(self,(function(){return function(){var t={9698:function(t,e,n){"use strict";n.d(e,{Ay:function(){return c},Ji:function(){return d},mG:function(){return h},zo:function(){return u}});var r=n(6003),i=n(5232),s=n.n(i),o=n(3036),l=n(4850),a=n(5508);class c extends r.BlockBlot{cache={};delta(){return null==this.cache.delta&&(this.cache.delta=h(this)),this.cache.delta}deleteAt(t,e){super.deleteAt(t,e),this.cache={}}formatAt(t,e,n,i){e<=0||(this.scroll.query(n,r.Scope.BLOCK)?t+e===this.length()&&this.format(n,i):super.formatAt(t,Math.min(e,this.length()-t-1),n,i),this.cache={})}insertAt(t,e,n){if(null!=n)return super.insertAt(t,e,n),void(this.cache={});if(0===e.length)return;const r=e.split("\n"),i=r.shift();i.length>0&&(t<this.length()-1||null==this.children.tail?super.insertAt(Math.min(t,this.length()-1),i):this.children.tail.insertAt(this.children.tail.length(),i),this.cache={});let s=this;r.reduce(((t,e)=>(s=s.split(t,!0),s.insertAt(0,e),e.length)),t+i.length)}insertBefore(t,e){const{head:n}=this.children;super.insertBefore(t,e),n instanceof o.A&&n.remove(),this.cache={}}length(){return null==this.cache.length&&(this.cache.length=super.length()+1),this.cache.length}moveChildren(t,e){super.moveChildren(t,e),this.cache={}}optimize(t){super.optimize(t),this.cache={}}path(t){return super.path(t,!0)}removeChild(t){super.removeChild(t),this.cache={}}split(t){let e=arguments.length>1&&void 0!==arguments[1]&&arguments[1];if(e&&(0===t||t>=this.length()-1)){const e=this.clone();return 0===t?(this.parent.insertBefore(e,this),this):(this.parent.insertBefore(e,this.next),e)}const n=super.split(t,e);return this.cache={},n}}c.blotName="block",c.tagName="P",c.defaultChild=o.A,c.allowedChildren=[o.A,l.A,r.EmbedBlot,a.A];class u extends r.EmbedBlot{attach(){super.attach(),this.attributes=new r.AttributorStore(this.domNode)}delta(){return(new(s())).insert(this.value(),{...this.formats(),...this.attributes.values()})}format(t,e){const n=this.scroll.query(t,r.Scope.BLOCK_ATTRIBUTE);null!=n&&this.attributes.attribute(n,e)}formatAt(t,e,n,r){this.format(n,r)}insertAt(t,e,n){if(null!=n)return void super.insertAt(t,e,n);const r=e.split("\n"),i=r.pop(),s=r.map((t=>{const e=this.scroll.create(c.blotName);return e.insertAt(0,t),e})),o=this.split(t);s.forEach((t=>{this.parent.insertBefore(t,o)})),i&&this.parent.insertBefore(this.scroll.create("text",i),o)}}function h(t){let e=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];return t.descendants(r.LeafBlot).reduce(((t,n)=>0===n.length()?t:t.insert(n.value(),d(n,{},e))),new(s())).insert("\n",d(t))}function d(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=!(arguments.length>2&&void 0!==arguments[2])||arguments[2];return null==t?e:("formats"in t&&"function"==typeof t.formats&&(e={...e,...t.formats()},n&&delete e["code-token"]),null==t.parent||"scroll"===t.parent.statics.blotName||t.parent.statics.scope!==t.statics.scope?e:d(t.parent,e,n))}u.scope=r.Scope.BLOCK_BLOT},3036:function(t,e,n){"use strict";var r=n(6003);class i extends r.EmbedBlot{static value(){}optimize(){(this.prev||this.next)&&this.remove()}length(){return 0}value(){return""}}i.blotName="break",i.tagName="BR",e.A=i},580:function(t,e,n){"use strict";var r=n(6003);class i extends r.ContainerBlot{}e.A=i},4541:function(t,e,n){"use strict";var r=n(6003),i=n(5508);class s extends r.EmbedBlot{static blotName="cursor";static className="ql-cursor";static tagName="span";static CONTENTS="\ufeff";static value(){}constructor(t,e,n){super(t,e),this.selection=n,this.textNode=document.createTextNode(s.CONTENTS),this.domNode.appendChild(this.textNode),this.savedLength=0}detach(){null!=this.parent&&this.parent.removeChild(this)}format(t,e){if(0!==this.savedLength)return void super.format(t,e);let n=this,i=0;for(;null!=n&&n.statics.scope!==r.Scope.BLOCK_BLOT;)i+=n.offset(n.parent),n=n.parent;null!=n&&(this.savedLength=s.CONTENTS.length,n.optimize(),n.formatAt(i,s.CONTENTS.length,t,e),this.savedLength=0)}index(t,e){return t===this.textNode?0:super.index(t,e)}length(){return this.savedLength}position(){return[this.textNode,this.textNode.data.length]}remove(){super.remove(),this.parent=null}restore(){if(this.selection.composing||null==this.parent)return null;const t=this.selection.getNativeRange();for(;null!=this.domNode.lastChild&&this.domNode.lastChild!==this.textNode;)this.domNode.parentNode.insertBefore(this.domNode.lastChild,this.domNode);const e=this.prev instanceof i.A?this.prev:null,n=e?e.length():0,r=this.next instanceof i.A?this.next:null,o=r?r.text:"",{textNode:l}=this,a=l.data.split(s.CONTENTS).join("");let c;if(l.data=s.CONTENTS,e)c=e,(a||r)&&(e.insertAt(e.length(),a+o),r&&r.remove());else if(r)c=r,r.insertAt(0,a);else{const t=document.createTextNode(a);c=this.scroll.create(t),this.parent.insertBefore(c,this)}if(this.reLine truncated
|
||||
//# sourceMappingURL=quill.js.map
|
||||
@@ -0,0 +1,10 @@
|
||||
/*!
|
||||
* Quill Editor v2.0.3
|
||||
* https://quilljs.com
|
||||
* Copyright (c) 2017-2024, Slab
|
||||
* Copyright (c) 2014, Jason Chen
|
||||
* Copyright (c) 2013, salesforce.com
|
||||
*/
|
||||
.ql-container{box-sizing:border-box;font-family:Helvetica,Arial,sans-serif;font-size:13px;height:100%;margin:0;position:relative}.ql-container.ql-disabled .ql-tooltip{visibility:hidden}.ql-container:not(.ql-disabled) li[data-list=checked] > .ql-ui,.ql-container:not(.ql-disabled) li[data-list=unchecked] > .ql-ui{cursor:pointer}.ql-clipboard{left:-100000px;height:1px;overflow-y:hidden;position:absolute;top:50%}.ql-clipboard p{margin:0;padding:0}.ql-editor{box-sizing:border-box;counter-reset:list-0 list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;line-height:1.42;height:100%;outline:none;overflow-y:auto;padding:12px 15px;tab-size:4;-moz-tab-size:4;text-align:left;white-space:pre-wrap;word-wrap:break-word}.ql-editor > *{cursor:text}.ql-editor p,.ql-editor ol,.ql-editor pre,.ql-editor blockquote,.ql-editor h1,.ql-editor h2,.ql-editor h3,.ql-editor h4,.ql-editor h5,.ql-editor h6{margin:0;padding:0}@supports (counter-set:none){.ql-editor p,.ql-editor h1,.ql-editor h2,.ql-editor h3,.ql-editor h4,.ql-editor h5,.ql-editor h6{counter-set:list-0 list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9}}@supports not (counter-set:none){.ql-editor p,.ql-editor h1,.ql-editor h2,.ql-editor h3,.ql-editor h4,.ql-editor h5,.ql-editor h6{counter-reset:list-0 list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9}}.ql-editor table{border-collapse:collapse}.ql-editor td{border:1px solid #000;padding:2px 5px}.ql-editor ol{padding-left:1.5em}.ql-editor li{list-style-type:none;padding-left:1.5em;position:relative}.ql-editor li > .ql-ui:before{display:inline-block;margin-left:-1.5em;margin-right:.3em;text-align:right;white-space:nowrap;width:1.2em}.ql-editor li[data-list=checked] > .ql-ui,.ql-editor li[data-list=unchecked] > .ql-ui{color:#777}.ql-editor li[data-list=bullet] > .ql-ui:before{content:'\2022'}.ql-editor li[data-list=checked] > .ql-ui:before{content:'\2611'}.ql-editor li[data-list=unchecked] > .ql-ui:before{content:'\2610'}@supports (counter-set:none){.ql-editor li[data-list]{counter-set:list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9}}@supports not (counter-set:none){.ql-editor li[data-list]{counter-reset:list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9}}.ql-editor li[data-list=ordered]{counter-increment:list-0}.ql-editor li[data-list=ordered] > .ql-ui:before{content:counter(list-0, decimal) '. '}.ql-editor li[data-list=ordered].ql-indent-1{counter-increment:list-1}.ql-editor li[data-list=ordered].ql-indent-1 > .ql-ui:before{content:counter(list-1, lower-alpha) '. '}@supports (counter-set:none){.ql-editor li[data-list].ql-indent-1{counter-set:list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9}}@supports not (counter-set:none){.ql-editor li[data-list].ql-indent-1{counter-reset:list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9}}.ql-editor li[data-list=ordered].ql-indent-2{counter-increment:list-2}.ql-editor li[data-list=ordered].ql-indent-2 > .ql-ui:before{content:counter(list-2, lower-roman) '. '}@supports (counter-set:none){.ql-editor li[data-list].ql-indent-2{counter-set:list-3 list-4 list-5 list-6 list-7 list-8 list-9}}@supports not (counter-set:none){.ql-editor li[data-list].ql-indent-2{counter-reset:list-3 list-4 list-5 list-6 list-7 list-8 list-9}}.ql-editor li[data-list=ordered].ql-indent-3{counter-increment:list-3}.ql-editor li[data-list=ordered].ql-indent-3 > .ql-ui:before{content:counter(list-3, decimal) '. '}@supports (counter-set:none){.ql-editor li[data-list].ql-indent-3{counter-set:list-4 list-5 list-6 list-7 list-8 list-9}}@supports not (counter-set:none){.ql-editor li[data-list].ql-indent-3{counter-reset:list-4 list-5 list-6 list-7 list-8 list-9}}.ql-editor li[data-list=ordered].ql-indent-4{counter-increment:list-4}.ql-editor li[data-list=ordered].ql-indent-4 > .ql-ui:before{content:counter(list-4, lower-alpha) '. '}@supports (counter-set:none){.ql-editor li[data-list].ql-indent-4{counter-set:list-5 list-6 list-7 list-8 list-9}}@supports not (counter-set:none){.ql-editor li[data-list].ql-indent-4{counter-reset:list-5 list-6 list-7 list-8 list-9}}.ql-editor li[data-list=ordered].ql-indent-5{counter-increment:list-5}.ql-editor li[data-list=ordered].ql-indent-5 > .ql-ui:before{content:counter(list-5, lower-roman) '. '}@supports (counter-set:none){.ql-editor li[data-list].ql-indent-5{counter-set:list-6 list-7 list-8 list-9}}@supports not (counter-set:none){.ql-editor li[data-list].ql-indent-5{counter-reset:list-6 list-7 list-8 list-9}}.ql-editor li[data-list=ordered].ql-indent-6{counter-increment:list-6}.ql-editor li[data-list=ordered].ql-indent-6 > .ql-ui:before{content:counter(list-6, decimal) '. '}@supports (counter-set:none){.ql-editor li[data-list].ql-indent-6{counter-set:list-7 list-8 list-9}}@supports not (counter-set:none){.ql-editor li[data-list].ql-indent-6{counter-reset:list-7 list-8 list-9}}.ql-editor li[data-list=ordered].ql-indent-7{counter-increment:list-7}.ql-editor li[data-list=ordered].ql-indent-7 > .ql-ui:before{content:coLine truncated
|
||||
|
||||
/*# sourceMappingURL=quill.snow.css.map*/
|
||||
+7
-7
@@ -112,24 +112,24 @@ if (isset($_GET['id'])){
|
||||
}
|
||||
|
||||
if ( strval( intval( $id ) ) != strval( $id ) ) {
|
||||
naughty("e015b7c89da03385a9156d3e5d2eb25d");
|
||||
naughty("e015b7c89da03385a9156d3e5d2eb25d The id is not a integer");
|
||||
}
|
||||
|
||||
if ( intval( $id ) <= 0 ) {
|
||||
naughty("1493a07dec01a006d11bf43d2f17e5aa");
|
||||
naughty("1493a07dec01a006d11bf43d2f17e5aa The ID is less than or equal to one");
|
||||
}
|
||||
|
||||
if ( $num_get_args > 2 ) {
|
||||
naughty("79543dbb498ec47404aaed4d56bdc22b");
|
||||
naughty("79543dbb498ec47404aaed4d56bdc22b The number of arguments is greater than 2");
|
||||
}
|
||||
|
||||
if ( intval($id) > 9999 ) {
|
||||
naughty("f1f531c768f64404cb00437254b06d71");
|
||||
naughty("f1f531c768f64404cb00437254b06d71 The id is too high");
|
||||
}
|
||||
|
||||
if ( $id != 9999 ) {
|
||||
if ( isset( $show_array[$id] ) ) {
|
||||
naughty("2227263ac7171aca3214d155dec539ad");
|
||||
naughty("2227263ac7171aca3214d155dec539ad The id \"${id}\" is already reserved");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -168,10 +168,10 @@ include 'header.php';
|
||||
echo "<select name=\"ep_num_date\">\n";
|
||||
$this_episode_date = $next_show_date;
|
||||
if ( $id == 9999 ) {
|
||||
echo "<option value=\"9999_1970-01-01\" selected>Reserve Queue.</option>\n";
|
||||
echo "<option value=\"9999_1970-01-01\" selected>Reserve Pool.</option>\n";
|
||||
}
|
||||
else {
|
||||
echo "<option value=\"9999_1970-01-01\">Reserve Queue.</option>\n";
|
||||
echo "<option value=\"9999_1970-01-01\">Reserve Pool.</option>\n";
|
||||
}
|
||||
for ( $slot = $next_show_num; $slot<($next_show_num+365); $slot++ ) {
|
||||
if (empty($show_array[$slot])) {
|
||||
|
||||
+29
-26
@@ -10,23 +10,23 @@ $total = $row[0];
|
||||
if(!isset($total) or $total > 150 ) {
|
||||
# This seems to indicate that we are under an attack as we never get 5 shows in the one day from different hosts.
|
||||
# A host doing bulk upload will need to do them one by one
|
||||
naughty("5971624889258aefb44e5f7bf8dffbd4");
|
||||
naughty("5971624889258aefb44e5f7bf8dffbd4 Too many requests - shutting down");
|
||||
}
|
||||
|
||||
# This is to prevent anything except hits from the web form.
|
||||
if ( $_SERVER['REQUEST_METHOD'] !== 'POST' ) {
|
||||
naughty("19e9019c9615f755aec834000892ee9e");
|
||||
naughty("19e9019c9615f755aec834000892ee9e Request method is not POST");
|
||||
}
|
||||
|
||||
if ( empty($_SERVER["REMOTE_ADDR"]) ) {
|
||||
naughty("9bb147a251e8db132dafa93d98f8487f");
|
||||
naughty("9bb147a251e8db132dafa93d98f8487f The REMOTE_ADDR is missing");
|
||||
}
|
||||
else {
|
||||
$ip = $_SERVER["REMOTE_ADDR"];
|
||||
}
|
||||
|
||||
if (count($_POST) !== 2) {
|
||||
naughty("02de1aef3b9490a417c39170d8f06028");
|
||||
naughty("02de1aef3b9490a417c39170d8f06028 The post contains the incorrect number of entries");
|
||||
}
|
||||
|
||||
# This will check to see if there are any existing requests from this ip address
|
||||
@@ -36,58 +36,58 @@ $db = mysqli_fetch_array($result, MYSQLI_ASSOC);
|
||||
|
||||
if ( empty($db["ip"]) ) {
|
||||
# the request did not come via the web form
|
||||
naughty("2162941738512bfdb1d21f288ee7cdb4");
|
||||
naughty("2162941738512bfdb1d21f288ee7cdb4 There is no reservation available for this ip");
|
||||
}
|
||||
|
||||
if ( strtotime($db['timestamp']) >= $_SERVER["REQUEST_TIME"] ) {
|
||||
# they are playing with the database or time settings
|
||||
naughty("f0ad965f523b5c2ade071eb20d3618b5");
|
||||
naughty("f0ad965f523b5c2ade071eb20d3618b5 The timestamp is not correct");
|
||||
}
|
||||
|
||||
if ( strtotime($db['timestamp']) >= ( $_SERVER["REQUEST_TIME"] ) + 1800 ) {
|
||||
# There is too long a time entering the form
|
||||
naughty("6570026fd11fc31ac0cada3e1dae4d0b");
|
||||
naughty("6570026fd11fc31ac0cada3e1dae4d0b Timeout. You waited too long to react. ");
|
||||
}
|
||||
|
||||
// Basic POST Checks
|
||||
if ( empty($_POST["ep_num_date"]) or strlen($_POST["ep_num_date"]) !== 15 ) {
|
||||
naughty("a32fbe5f0494eb7f34034b164739314d");
|
||||
naughty("a32fbe5f0494eb7f34034b164739314d The date is not correct");
|
||||
}
|
||||
|
||||
|
||||
if ( empty($_POST["email"]) ) {
|
||||
naughty("76eaa1a1556faeadfc14631c35b8590a");
|
||||
naughty("76eaa1a1556faeadfc14631c35b8590a The email is missing");
|
||||
}
|
||||
|
||||
// Getting to the keep section
|
||||
|
||||
if ( filter_var($_POST["email"], FILTER_VALIDATE_EMAIL) === false ) {
|
||||
naughty("8c307efe37146015a35e2d928c2c0f69");
|
||||
naughty("8c307efe37146015a35e2d928c2c0f69 Invalid email");
|
||||
}
|
||||
else {
|
||||
$email = htmlspecialchars(filter_var($_POST["email"], FILTER_VALIDATE_EMAIL));
|
||||
}
|
||||
|
||||
if ( strpos($_POST["ep_num_date"], '_') !== 4 or strpos($_POST["ep_num_date"], '-') !== 9 or strpos($_POST["ep_num_date"], '-', 10 ) !== 12 ) {
|
||||
naughty("705f8e26e42a90b31075a110674b19ee");
|
||||
naughty("705f8e26e42a90b31075a110674b19ee The date format is not correct");
|
||||
}
|
||||
|
||||
if ( !preg_match("/^\d{4}_\d{4}-\d{2}-\d{2}$/", $_POST["ep_num_date"]) ) {
|
||||
naughty("ad7f805c2f42be77122ec52f114fe318");
|
||||
naughty("ad7f805c2f42be77122ec52f114fe318 The date fails a regex");
|
||||
}
|
||||
else {
|
||||
list($ep_num, $ep_date) = explode('_', $_POST["ep_num_date"]);
|
||||
}
|
||||
|
||||
if ( intval($ep_num) === 0 ) {
|
||||
naughty("9424f7407b2fb83407760ad763286b53");
|
||||
naughty("9424f7407b2fb83407760ad763286b53 The episode number is not an integer");
|
||||
}
|
||||
else {
|
||||
$ep_num = intval($ep_num);
|
||||
}
|
||||
|
||||
if ( strtotime($ep_date) === false ) {
|
||||
naughty("59c7bff340d023773d987d71df545110");
|
||||
naughty("59c7bff340d023773d987d71df545110 The date is not a valid time");
|
||||
}
|
||||
else {
|
||||
$ep_date_epoch = strtotime($ep_date);
|
||||
@@ -122,16 +122,16 @@ $current_ep_date_epoch = strtotime($current_ep_date);
|
||||
$next_year_ep_date = strtotime(date("Y-m-d", time()) . " + 365 day" );
|
||||
|
||||
if ( $ep_num == $row[2] or !empty($row[2]) ) {
|
||||
naughty("$ep_num == $row[2] or !empty($row[2]) 47d186ad8d5b21ec7d455477ea08b023");
|
||||
naughty("$ep_num == $row[2] or !empty($row[2]) 47d186ad8d5b21ec7d455477ea08b023 Could not make the reservation in the db");
|
||||
}
|
||||
|
||||
if ( $ep_num != 9999 ) {
|
||||
if ( ( $ep_num <= $current_ep_num ) OR ( $ep_num > $next_year_ep_num ) ) {
|
||||
naughty("7304801e8ce3b9096d28dbe1a0faa642 $ep_num <= $current_ep_num or $ep_num > $next_year_ep_num");
|
||||
naughty("7304801e8ce3b9096d28dbe1a0faa642 Episode in wrong range $ep_num <= $current_ep_num or $ep_num > $next_year_ep_num");
|
||||
}
|
||||
|
||||
if ( $ep_date_epoch < $current_ep_date_epoch or $ep_date_epoch > $next_year_ep_date ) {
|
||||
naughty("34c4259b45927da50ba5c49970f880a4");
|
||||
naughty("34c4259b45927da50ba5c49970f880a4 Date in wrong range");
|
||||
}
|
||||
|
||||
for ($slot=$current_ep_num; $slot < $next_year_ep_num; $slot++) {
|
||||
@@ -141,11 +141,11 @@ if ( $ep_num != 9999 ) {
|
||||
}
|
||||
|
||||
if ( empty($shows_slot_date["$ep_num"]) or empty($shows_date_slot["$ep_date"]) ) {
|
||||
naughty("d0e113355b35f96945124d8e507759a0");
|
||||
naughty("d0e113355b35f96945124d8e507759a0 This slot date is not empty");
|
||||
}
|
||||
|
||||
if ( $ep_date !== $shows_slot_date["$ep_num"] or $ep_num !== $shows_date_slot["$ep_date"] ) {
|
||||
naughty("434cb53552ce1e2708e74a42f438028c");
|
||||
naughty("434cb53552ce1e2708e74a42f438028c This slot is invalid");
|
||||
}
|
||||
} // End of bypass checks
|
||||
|
||||
@@ -162,7 +162,7 @@ $query = "UPDATE reservations SET `ep_num` = '$ep_num', `ep_date` = '$ep_date',
|
||||
$result = mysqli_query($connection, $query );
|
||||
|
||||
if(!isset($result)) {
|
||||
naughty("c7405e79b54f582e8db46c69ec4b0f24");
|
||||
naughty("c7405e79b54f582e8db46c69ec4b0f24 Could not write reservation to the db");
|
||||
}
|
||||
|
||||
use PHPMailer\PHPMailer\PHPMailer;
|
||||
@@ -193,8 +193,8 @@ $mailer->addBCC('admin@hackerpublicradio.org');
|
||||
$mailer->addBCC('admin@hobbypublicradio.org');
|
||||
$mailer->addAddress("$email");
|
||||
if ( $ep_num == 9999 ) {
|
||||
$mailer->Subject = "Confirmation of request to submit to the reserve queue";
|
||||
$mailer->MsgHTML("<p>This email is an automatic reply to a request to submit to the reserve queue on the longest running Community Podcast.<br />
|
||||
$mailer->Subject = "Confirmation of request to submit to the reserve pool";
|
||||
$mailer->MsgHTML("<p>This email is an automatic reply to a request to submit to the reserve pool on the longest running Community Podcast.<br />
|
||||
<em>If you have not made this request then please ignore this email.</em>
|
||||
</p>
|
||||
<p>
|
||||
@@ -216,7 +216,7 @@ if ( $ep_num == 9999 ) {
|
||||
</p>
|
||||
<pre>" . date('Y-m-d\TH:i:s') . "\t" . getUserIP() . "\t" . $db_key . "\t" . $_SERVER["HTTP_USER_AGENT"] . "</pre>"
|
||||
);
|
||||
$mailer->AltBody = "This email is an automatic reply to a request to submit to the reserve queue on the longest running Community Podcast.
|
||||
$mailer->AltBody = "This email is an automatic reply to a request to submit to the reserve pool on the longest running Community Podcast.
|
||||
If you have not made this request then please ignore this email.
|
||||
|
||||
To confirm your request please confirm by copying and pasting the following link into your browser
|
||||
@@ -304,9 +304,12 @@ include 'header.php';
|
||||
<p>
|
||||
Thank you for your submission. A confirmation email has been sent to <em><?php echo $email; ?></em>. Please copy and paste the link into your browser to confirm your email address, and upload your show media.
|
||||
</p>
|
||||
<p>You need to <em>open</em> the link within <strong>15 minutes</strong> or the temporary lock will be released. Once you open the link, you can fill in the information at your leisure.</p>
|
||||
<p>You need to <em>open</em> the link within <strong>15 minutes</strong> or the temporary lock will be released.
|
||||
Once you open the link, you have a maximum of 4 Hours to fill in the information.</p>
|
||||
<p>The email is sent from the address <strong>robot@hobbypublicradio.com</strong>, and should be in your inbox by the time you read this.</p>
|
||||
<p>If it is not there by now, then please <strong>spam</strong> folder. We have had reports that sometimes gmail and hotmail consider the messages as spam. Please consider <a href="https://onlinegroups.net/blog/2014/02/25/how-to-whitelist-an-email-address/" target="_blank">whitelisting</a> the email address <em>robot@hobbypublicradio.com</em>.</p>
|
||||
<p>If it is not there by now, then please <strong>spam</strong> folder.
|
||||
We have had reports that sometimes gmail and hotmail consider the messages as spam.
|
||||
Please consider <a href="https://onlinegroups.net/blog/2014/02/25/how-to-whitelist-an-email-address/" target="_blank">whitelisting</a> the email address <em>robot@hobbypublicradio.com</em>.</p>
|
||||
<p>
|
||||
<img src="images/gmail-spam.png" alt="gmail is blocking us" />
|
||||
</p>
|
||||
@@ -318,7 +321,7 @@ include 'header.php';
|
||||
</p>
|
||||
<pre>
|
||||
<pre>
|
||||
<?php print date('Y-m-d\TH:i:s') . "\t" . getUserIP() . "\t" . $db_key . "\t" . $_SERVER["HTTP_USER_AGENT"]; ?>
|
||||
<?php print date('Y-m-d\TH:i:s') . "\n" . getUserIP() . "\n" . $db_key . "\t" . $_SERVER["HTTP_USER_AGENT"]; ?>
|
||||
</pre>
|
||||
</article>
|
||||
<?php
|
||||
|
||||
+94
-40
@@ -7,31 +7,38 @@
|
||||
require "/home/hpr/php/include.php";
|
||||
|
||||
if ( $_SERVER['REQUEST_METHOD'] !== 'GET' and empty($_SERVER["REMOTE_ADDR"]) and count($_GET) !== 1 ) {
|
||||
call412("9a77e4ab24410cbf68a3a05ba97221e4");
|
||||
call412("9a77e4ab24410cbf68a3a05ba97221e4 Not a GET request");
|
||||
}
|
||||
|
||||
logextra( "Is a GET Request" );
|
||||
|
||||
if ( isset( $_GET['key'] ) and strlen( $_GET['key'] ) === 45 and strlen( htmlspecialchars( stripslashes( strip_tags( $_GET['key'] ) ) ) ) === 45 and ctype_xdigit( $_GET['key'] ) ) {
|
||||
$key = htmlspecialchars( stripslashes( strip_tags( $_GET['key'] ) ) );
|
||||
}
|
||||
else {
|
||||
if ( isset( $_GET['delete'] ) and strlen( $_GET['delete'] ) === 45 and strlen( htmlspecialchars( stripslashes( strip_tags( $_GET['delete'] ) ) ) ) === 45 and ctype_xdigit( $_GET['delete'] ) ) {
|
||||
$key = htmlspecialchars( stripslashes( strip_tags( $_GET['delete'] ) ) );
|
||||
logextra( "Is delete request" );
|
||||
}
|
||||
else {
|
||||
call412("e8ac90fc2a8996e5fb7a83e73e636e80");
|
||||
call412("e8ac90fc2a8996e5fb7a83e73e636e80 Invalid key");
|
||||
}
|
||||
}
|
||||
|
||||
logextra( "Key is valid" );
|
||||
|
||||
$ip = $_SERVER["REMOTE_ADDR"];
|
||||
|
||||
$query = "select * FROM reservations WHERE reservations.ip = '$ip' AND reservations.key = '$key' ";
|
||||
$result = mysqli_query($connection, $query);
|
||||
if($result === FALSE) {
|
||||
call412("91432866e3c9c36a9c4884345d578761");
|
||||
call412("91432866e3c9c36a9c4884345d578761 Could not find ip=\"$ip\" AND key=\"$key\" in the database. Did your IP address change ? Was the removed after 15 Munites ?");
|
||||
}
|
||||
logextra( "Found ip=\"$ip\" AND key=\"$key\" in the database" );
|
||||
|
||||
$db = mysqli_fetch_array($result, MYSQLI_ASSOC);
|
||||
if ( empty($db) or empty( $db['timestamp'] ) or empty( $db['key'] ) or empty( $db['ep_num'] ) or empty( $db['ep_date'] ) or empty( $db['email'] ) ) {
|
||||
call412("b019bd29c1fe5b756e4b620a5428f730");
|
||||
call412("b019bd29c1fe5b756e4b620a5428f730 The information for this reservation is not correct in the database.");
|
||||
}
|
||||
else {
|
||||
$db_timestamp = $db['timestamp'];
|
||||
@@ -41,31 +48,50 @@ else {
|
||||
$ep_num = $db['ep_num'];
|
||||
$ep_date = $db['ep_date'];
|
||||
$db_ip = $db['ip'];
|
||||
$status = $db['status'];
|
||||
}
|
||||
|
||||
logextra( "The information for this reservation is correct in the database." );
|
||||
|
||||
// User selects delete
|
||||
if ( isset( $_GET['delete'] ) ) {
|
||||
$query = "DELETE FROM reservations WHERE reservations.ip = '$ip' AND reservations.key = '$key' ";
|
||||
$result = mysqli_query($connection, $query);
|
||||
if($result === FALSE) {
|
||||
call412("35a7f4e80ecba8284049e9d6261ae523");
|
||||
call412("35a7f4e80ecba8284049e9d6261ae523 Could not remove the reservation.");
|
||||
}
|
||||
else {
|
||||
header( "Location: ${hubBaseurl}calendar.php" ) ;
|
||||
$dir_structure = "/home/hpr/upload/" . strtotime($db_timestamp) . "_${ep_num}_${ep_date}_${db_key}/";
|
||||
rrmdir("$dir_structure");
|
||||
logextra( "Removed the reservation" );
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
logextra( "Not a delete" );
|
||||
|
||||
if ( empty($status) ) {
|
||||
naughty("317be55a55a82110b2836499580be486 did not find a status \"$status\" in the db.");
|
||||
}
|
||||
|
||||
logextra( "Found the status $status" );
|
||||
|
||||
if ($status !== 'REQUEST_EMAIL_SENT' && $status !== 'EMAIL_LINK_CLICKED') {
|
||||
naughty("65743c3fb8a2e171f56ec514ec45c1bc The status \"$status\" is not expected, should be REQUEST_EMAIL_SENT or EMAIL_LINK_CLICKED in the db.");
|
||||
}
|
||||
logextra( "The status \"$status\" is expected, should be either REQUEST_EMAIL_SENT or EMAIL_LINK_CLICKED." );
|
||||
|
||||
// Set the show to verified so that we can remove the temporary lock
|
||||
$status = strtotime("now") . ".EMAIL_LINK_CLICKED." . date('Y-m-d\TH:i:s\Z');
|
||||
$query = "UPDATE reservations SET `verified` = '1', `status` = 'EMAIL_LINK_CLICKED' WHERE `ip` = '$db_ip' AND `timestamp` = '$db_timestamp' AND `key` = '$db_key'";
|
||||
$result = mysqli_query($connection, $query );
|
||||
if(!isset($result)) {
|
||||
naughty("066c518314f0d3b1ad3e4af60fcf36ce");
|
||||
naughty("066c518314f0d3b1ad3e4af60fcf36ce Could not change status to EMAIL_LINK_CLICKED");
|
||||
}
|
||||
|
||||
logextra( "Updated status to EMAIL_LINK_CLICKED" );
|
||||
|
||||
// Display host information
|
||||
/*
|
||||
*/
|
||||
@@ -75,7 +101,7 @@ $ip = $_SERVER["REMOTE_ADDR"];
|
||||
$query = "SELECT * FROM hosts WHERE hosts.email = '$email' OR hosts.email = '$email_padded'";
|
||||
$result = mysqli_query($connection, $query);
|
||||
if($result === FALSE) {
|
||||
call412("5cb513b590ab5859bf7603b79402a5cb");
|
||||
call412("5cb513b590ab5859bf7603b79402a5cb Could not find a host with email=\"$email\"");
|
||||
}
|
||||
$db = mysqli_fetch_array($result, MYSQLI_ASSOC);
|
||||
if ( empty($db) or empty( $db['hostid'] ) or empty( $db['host'] ) or empty( $db['email'] ) ) {
|
||||
@@ -111,28 +137,29 @@ include 'header.php';
|
||||
?>
|
||||
|
||||
<body>
|
||||
<link href="quill.snow.css" rel="stylesheet">
|
||||
<script src="quill.js"></script>
|
||||
<link href="quill.snow.2.0.3.css" rel="stylesheet">
|
||||
<script src="quill.2.0.3.js"></script>
|
||||
<?php
|
||||
if ( $ep_num == 9999 ) {
|
||||
echo "<h2>Uploading to the Reserve Queue.</h2>\n";
|
||||
echo "<h2>Uploading to the reserve pool.</h2>\n";
|
||||
}
|
||||
else {
|
||||
echo "<h2>Uploading hpr${ep_num} for release on ${ep_date}</h2>\n";
|
||||
}
|
||||
?>
|
||||
<p>
|
||||
You can fill in information about yourself and your show below. Please see the <a href="request_a_slot.php">help</a> page for more information.
|
||||
You can fill in information about yourself and your show below.
|
||||
Please see the "<em><a href="<?php echo "${referrerurl}contribute.html#uploading_an_episode"; ?>" target="_blank">Uploading an Episode help page</a></em>" for more information.
|
||||
</p>
|
||||
<h2><?php echo $status ?></h2>
|
||||
<form method="POST" action="upload_confirm.php" enctype="multipart/form-data">
|
||||
<table class="upload">
|
||||
<tr>
|
||||
<td>Host Email (<a href="<?php echo "${referrerurl}about.html#email"; ?>" target="_blank">?</a>):</td>
|
||||
<td>Host Email (<a href="<?php echo "${referrerurl}contribute.html#profile_email"; ?>" target="_blank">?</a>):</td>
|
||||
<td><?php echo $email;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Image: (<a href="<?php echo "${referrerurl}about.html#image"; ?>" target="_blank">?</a>)</td>
|
||||
<td>Image: (<a href="<?php echo "${referrerurl}contribute.html#profile_image"; ?>" target="_blank">?</a>)</td>
|
||||
<td>
|
||||
<?php
|
||||
echo "<img src=\"$image_url\" alt=\"host image\" /><br /><small><em>";
|
||||
@@ -148,25 +175,21 @@ include 'header.php';
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Name/Handle: (<a href="<?php echo "${baseurl}about.html#Name_Handle"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td><strong>Name/Handle: (<a href="<?php echo "${baseurl}contribute.html#profile_name_handle"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td><input required type="text" name="host_name" size="40" maxlength="40" placeholder="Enter the name you wish to be know as on HPR" value="<?php echo $host?>"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Your Default license: (<a href="<?php echo "${baseurl}about.html#Default_license"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td><strong>Your Default license: (<a href="<?php echo "${baseurl}contribute.html#profile_default_license"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td>
|
||||
<select name="host_license">
|
||||
<option value="CC-0" <?php if($license == "CC-0") echo "selected"; ?>>CC-Zero/Public Domain (CC-0)
|
||||
<option value="CC-BY" <?php if($license == "CC-BY") echo "selected"; ?>>Attribution (CC-BY)
|
||||
<option value="CC-BY-SA" <?php if($license == "CC-BY-SA") echo "selected"; ?>>Attribution-ShareAlike (CC-BY-SA)
|
||||
<option value="CC-BY-ND" <?php if($license == "CC-BY-ND") echo "selected"; ?>>Attribution-NoDerivs (CC-BY-ND)
|
||||
<option value="CC-BY-NC" <?php if($license == "CC-BY-NC") echo "selected"; ?>>Attribution-NonCommercial (CC-BY-NC)
|
||||
<option value="CC-BY-NC-SA" <?php if($license == "CC-BY-NC-SA") echo "selected"; ?>>Attribution-NonCommercial-ShareAlike (CC-BY-NC-SA)
|
||||
<option value="CC-BY-NC-ND" <?php if($license == "CC-BY-NC-ND") echo "selected"; ?>>Attribution-NonCommercial-NoDerivs (CC-BY-NC-ND)
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Profile: (<a href="<?php echo "${baseurl}about.html#Profile"; ?>" target="_blank">?</a>)</td>
|
||||
<td>Profile: (<a href="<?php echo "${baseurl}contribute.html#profile"; ?>" target="_blank">?</a>)</td>
|
||||
<td>
|
||||
<noscript>
|
||||
<textarea name="host_profile" maxlength="2000" rows="10" cols="50" placeholder="Enter some text about yourself with links to your blog or other online presence."><?php echo htmlspecialchars($profile) ?></textarea>
|
||||
@@ -175,18 +198,20 @@ include 'header.php';
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
<h2>Please fill in some information about this episode</h2>
|
||||
<table class="upload">
|
||||
<tr>
|
||||
<td><strong>Title(*) (<a href="<?php echo "${referrerurl}about.html#Title"; ?>" target="_blank">?</a>):</strong></td>
|
||||
<td><strong>Title(*) (<a href="<?php echo "${referrerurl}contribute.html#episode_title"; ?>" target="_blank">?</a>):</strong></td>
|
||||
<td><input required type="text" name="title" size="50" maxlength="100" placeholder="Enter a short descriptive title for your show."></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Summary(*) (<a href="<?php echo "${referrerurl}about.html#Short_Summary"; ?>" target="_blank">?</a>):</strong></td>
|
||||
<td><strong>Summary(*) (<a href="<?php echo "${referrerurl}contribute.html#episode_short_summary"; ?>" target="_blank">?</a>):</strong></td>
|
||||
<td><input required type="text" name="summary" size="70" maxlength="100" placeholder="This is a short 100 character summary of what your show is about."></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Explicit: (<a href="<?php echo "${referrerurl}about.html#Explicit"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td><strong>Explicit: (<a href="<?php echo "${referrerurl}contribute.html#episode_explicit"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td>
|
||||
Is the show <em>Explicit</em> ?:
|
||||
<input required type="radio" name="explicit" value="Yes">Yes
|
||||
@@ -195,14 +220,11 @@ include 'header.php';
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>License: (<a href="<?php echo "${referrerurl}about.html#License"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td><strong>License: (<a href="<?php echo "${referrerurl}contribute.html#episode_license"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td>
|
||||
<select name="license">
|
||||
<option value="CC-BY-SA" selected>CC-BY-SA</option>
|
||||
<option value="CC-BY-NC-SA" >CC-BY-NC-SA</option>
|
||||
<option value="CC-BY-NC-ND" >CC-BY-NC-ND</option>
|
||||
<option value="CC-0" >CC-0</option>
|
||||
<option value="CC-BY-NC" >CC-BY-NC</option>
|
||||
<option value="CC-BY" >CC-BY</option>
|
||||
<option value="Other" >Other</option>
|
||||
</select>
|
||||
@@ -210,7 +232,7 @@ include 'header.php';
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Notes(*) (<a href="<?php echo "${referrerurl}about.html#show_notes"; ?>" target="_blank">?</a>):</strong></td>
|
||||
<td><strong>Notes(*) (<a href="<?php echo "${referrerurl}contribute.html#episode_show_notes"; ?>" target="_blank">?</a>):</strong></td>
|
||||
<td>
|
||||
<noscript>
|
||||
<textarea required name="notes" maxlength="40000" rows="20" cols="70" placeholder="Please add your show notes here." ></textarea>
|
||||
@@ -220,7 +242,7 @@ include 'header.php';
|
||||
</tr>
|
||||
<noscript>
|
||||
<tr>
|
||||
<td>Format: (<a href="<?php echo "${referrerurl}about.html#shownotes_format"; ?>" target="_blank">?</a>)</td>
|
||||
<td>Format: (<a href="<?php echo "${referrerurl}contribute.html#shownotes_format"; ?>" target="_blank">?</a>)</td>
|
||||
<td>
|
||||
<small>What format if any did you just use in the show notes above ?</small><br />
|
||||
<select name="shownotes_format">
|
||||
@@ -235,7 +257,7 @@ include 'header.php';
|
||||
</tr>
|
||||
</noscript>
|
||||
<tr>
|
||||
<td>Series: (<a href="<?php echo "${referrerurl}about.html#series"; ?>" target="_blank">?</a>)</td>
|
||||
<td>Series: (<a href="<?php echo "${referrerurl}contribute.html#episode_series"; ?>" target="_blank">?</a>)</td>
|
||||
<td>
|
||||
<?php
|
||||
$result = mysqli_query($connection, "SELECT id, name FROM miniseries WHERE private=0 ORDER BY name ASC");
|
||||
@@ -249,22 +271,22 @@ include 'header.php';
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Tags: (<a href="<?php echo "${referrerurl}about.html#tags"; ?>" target="_blank">?</a>)</td>
|
||||
<td>Tags: (<a href="<?php echo "${referrerurl}contribute.html#episode_tags"; ?>" target="_blank">?</a>)</td>
|
||||
<td><input required type="text" name="tags" size="70" maxlength="100" placeholder="Add a list of comma separated tags." /><br />
|
||||
Add a list of <strong>comma separated</strong> tags.<br />
|
||||
If you can provide tags for your show that would be appreciated; you are certainly the best judge of what makes good tags, but if not then a volunteer will add them later.
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Upload Method: (<a href="<?php echo "${referrerurl}about.html#upload_method"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td><strong>Upload Method: (<a href="<?php echo "${referrerurl}contribute.html#episode_upload_method"; ?>" target="_blank">?</a>)</strong></td>
|
||||
<td>
|
||||
<em>You have the choice of the following upload options:</em> <br />
|
||||
<p>
|
||||
<strong>1. Upload now</strong> via this browser: (<a href="<?php echo "${referrerurl}about.html#browser"; ?>" target="_blank">?</a>)<br />
|
||||
<strong>1. Upload now</strong> via this browser: (<a href="<?php echo "${referrerurl}contribute.html#episode_upload_method_browser"; ?>" target="_blank">?</a>)<br />
|
||||
<input type="file" multiple="multiple" name="media_files[]" title="select if using the http upload option" />
|
||||
</p>
|
||||
<p>
|
||||
<strong>2. Provide a url</strong> we we can directly download it from: (<a href="<?php echo "${referrerurl}about.html#url"; ?>" target="_blank">?</a>)<br />
|
||||
<strong>2. Provide a url</strong> we we can directly download it from: (<a href="<?php echo "${referrerurl}contribute.html#episode_upload_method_url"; ?>" target="_blank">?</a>)<br />
|
||||
This must be accessable using a curl or wget command.<br />
|
||||
Please avoid services that require login or downloading via a browser.<br />
|
||||
<input type="url" size="30" name="url" placeholder="https://example.com/hpr9999.flac">
|
||||
@@ -281,14 +303,12 @@ include 'header.php';
|
||||
<input type="submit" name="submit_edit" value="Submit"> This will take a <strong>long time</strong>, leave the browser running. You will get an email once the upload is complete.
|
||||
<?php
|
||||
if ( $ep_num == 9999 ) {
|
||||
echo "<p>\n<em><a href=\"https://" . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . "?delete=$key\">Delete this reservation for the Reserve Queue</a>.</em>\n</p>\n";
|
||||
echo "<p>\n<em><a href=\"https://" . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . "?delete=$key\">Delete this reservation for the reserve pool</a>.</em>\n</p>\n";
|
||||
}
|
||||
else {
|
||||
echo "<p>\n<em><a href=\"https://" . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'] . "?delete=$key\">Delete this reservation for hpr${ep_num} on ${ep_date}</a>.</em>\n</p>\n";
|
||||
}
|
||||
|
||||
|
||||
|
||||
?>
|
||||
<div id="progressbar">
|
||||
<div></div>
|
||||
@@ -319,6 +339,18 @@ include 'header.php';
|
||||
event.formData.append("host_profile", quill_profile.root.innerHTML);
|
||||
});
|
||||
|
||||
// const quill = new Quill('#editor_notes', {
|
||||
// modules: {
|
||||
// toolbar: toolbarOptions
|
||||
// },
|
||||
// placeholder: 'Enter your show notes here...',
|
||||
// theme: 'snow'
|
||||
// });
|
||||
// const form = document.querySelector("form");
|
||||
// form.addEventListener("formdata", (event) => {
|
||||
// event.formData.append("notes", quill.root.innerHTML);
|
||||
// });
|
||||
|
||||
const quill = new Quill('#editor_notes', {
|
||||
modules: {
|
||||
toolbar: toolbarOptions
|
||||
@@ -326,12 +358,34 @@ include 'header.php';
|
||||
placeholder: 'Enter your show notes here...',
|
||||
theme: 'snow'
|
||||
});
|
||||
const form = document.querySelector("form");
|
||||
form.addEventListener("formdata", (event) => {
|
||||
event.formData.append("notes", quill.root.innerHTML);
|
||||
|
||||
function prettyPrintHTML(html) {
|
||||
const doc = new DOMParser().parseFromString(html, 'text/html');
|
||||
return doc.body.innerHTML
|
||||
.replace(/ /g, ' ')
|
||||
.replace(/></g, '>\n<');
|
||||
}
|
||||
|
||||
const form = document.querySelector('form');
|
||||
|
||||
form.addEventListener('submit', function (event) {
|
||||
const text = quill.getText().trim();
|
||||
|
||||
if (text.length < 30) {
|
||||
event.preventDefault();
|
||||
alert('You must provide shownotes');
|
||||
}
|
||||
});
|
||||
|
||||
form.addEventListener('formdata', event => {
|
||||
const rawHTML = quill.getSemanticHTML();
|
||||
const prettyHTML = prettyPrintHTML(rawHTML);
|
||||
event.formData.append('notes', prettyHTML);
|
||||
});
|
||||
|
||||
</script>
|
||||
</form>
|
||||
<?php
|
||||
logextra( "Form displayed" );
|
||||
include 'footer.php';
|
||||
?>
|
||||
+69
-63
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
# request.php > request_confirm.php > upload.php > upload_confirm.php
|
||||
# request.php > request_confirm.php > upload.php > upload_confirm.php
|
||||
|
||||
## Recent Changes
|
||||
# TODO disabled the max notes check. We need to re-enable after we get a feel for the max length
|
||||
@@ -24,7 +24,7 @@ logextra( "Got reservations" );
|
||||
if ($total > 150 ) {
|
||||
# This seems to indicate that we are under an attack as we never get 5 shows in the one day from different hosts.
|
||||
# A host doing bulk upload will need to do them one by one
|
||||
naughty("88fe2bc11a90f9f9ab9bdcc8a82d7401");
|
||||
naughty("88fe2bc11a90f9f9ab9bdcc8a82d7401 Too many shows waiting - uploads have been suspended.");
|
||||
}
|
||||
logextra( "No bulk upload" );
|
||||
// // // print '<pre>';
|
||||
@@ -34,12 +34,12 @@ logextra( "No bulk upload" );
|
||||
|
||||
|
||||
if ( $_SERVER['REQUEST_METHOD'] !== 'POST' ) {
|
||||
naughty("29e9019c9615f755aec834000892ee9e");
|
||||
naughty("29e9019c9615f755aec834000892ee9e, Wrong request method");
|
||||
}
|
||||
logextra( "It is a POST" );
|
||||
|
||||
if ( empty($_SERVER["REMOTE_ADDR"]) ) {
|
||||
naughty("abb147a251e8db132dafa93d98f8487f");
|
||||
naughty("abb147a251e8db132dafa93d98f8487f Missing remote IP address");
|
||||
}
|
||||
else {
|
||||
$ip = $_SERVER["REMOTE_ADDR"];
|
||||
@@ -51,7 +51,7 @@ if (count($_POST) !== 15) {
|
||||
if (count($_POST) !== 17) {
|
||||
# 19 is for mosaic
|
||||
# if this reports 0 is could be that the max upload is not set correctly in php.ini.
|
||||
naughty("7a994999b40e3dc2e3eecfdc36a78d23 ".count($_POST) );
|
||||
naughty("7a994999b40e3dc2e3eecfdc36a78d23 Incorrect number of POST entries ".count($_POST) );
|
||||
}
|
||||
}
|
||||
logextra( "Correct number of POST entries" );
|
||||
@@ -60,7 +60,7 @@ if ( isset( $_POST['key'] ) and strlen( $_POST['key'] ) === 45 and strlen( htm
|
||||
$db_key = htmlspecialchars( stripslashes( strip_tags( $_POST['key'] ) ) );
|
||||
}
|
||||
else {
|
||||
naughty("2fb4c4e05f0e8f37a5b47565cfb863f5");
|
||||
naughty("2fb4c4e05f0e8f37a5b47565cfb863f5 Field lengths are not correct");
|
||||
}
|
||||
logextra( "Field lengths are correct" );
|
||||
|
||||
@@ -70,7 +70,7 @@ $db = mysqli_fetch_array($result, MYSQLI_ASSOC);
|
||||
logextra( "Getting this reservation from the db" );
|
||||
|
||||
if ( empty($db["ip"]) or $db["key"] != $db_key ) {
|
||||
naughty("3162941738512bfdb1d21f288ee7cdb4");
|
||||
naughty("3162941738512bfdb1d21f288ee7cdb4 Could not find this reservation from the db for \"$ip\" and \"$db_key\". Are you using the correct link, or did your ip address change ?");
|
||||
}
|
||||
else {
|
||||
$db_ip = $db['ip'];
|
||||
@@ -82,32 +82,32 @@ else {
|
||||
logextra( "Found this reservation from the db" );
|
||||
|
||||
if ( empty($db_email) ) {
|
||||
naughty("457bf84c726d1cbbd381933e3a08b2ac");
|
||||
naughty("457bf84c726d1cbbd381933e3a08b2ac did not find a email \"$db_email\" in the db.");
|
||||
}
|
||||
logextra( "Got an email $db_email" );
|
||||
|
||||
if ( strtotime($db['timestamp']) >= $_SERVER["REQUEST_TIME"] ) {
|
||||
naughty("00ad965f523b5c2ade071eb20d3618b5");
|
||||
naughty("00ad965f523b5c2ade071eb20d3618b5 The Timestamp is too old");
|
||||
}
|
||||
logextra( "Timestamp is not to old" );
|
||||
logextra( "Timestamp is not too old" );
|
||||
|
||||
if ( strtotime($db['timestamp']) >= ( $_SERVER["REQUEST_TIME"] ) + 1800 ) {
|
||||
naughty("7570026fd11fc31ac0cada3e1dae4d0b");
|
||||
naughty("7570026fd11fc31ac0cada3e1dae4d0b The Timestamp is too young");
|
||||
}
|
||||
logextra( "Timestamp is not to young" );
|
||||
|
||||
if ( empty($_POST["title"]) or strlen($_POST["title"]) > 100 ) {
|
||||
naughty("32831f22fb96d02ce819127d558d28a2");
|
||||
naughty("32831f22fb96d02ce819127d558d28a2 The Title length is not less than 100");
|
||||
}
|
||||
logextra( "Title length is OK" );
|
||||
|
||||
if ( empty($_POST["summary"]) or strlen( $_POST["summary"]) > 200 or strlen(str_replace('\\', '', $_POST["summary"])) > 100 ) {
|
||||
naughty("ecfcc4c12bf4319d412d66fd2e239249");
|
||||
naughty("ecfcc4c12bf4319d412d66fd2e239249 The summary length is not between 100 and 200");
|
||||
}
|
||||
logextra( "Summary length is OK" );
|
||||
|
||||
if ( empty($_POST["shownotes_format"]) ) {
|
||||
naughty("a8345484b7a4ebad5af54937a3b2e26b");
|
||||
naughty("a8345484b7a4ebad5af54937a3b2e26b The Shownotes are missing");
|
||||
}
|
||||
logextra( "Shownotes are not missing" );
|
||||
|
||||
@@ -117,107 +117,113 @@ if ( !(
|
||||
strcmp($_POST["shownotes_format"], "Markdown_GitHub") === 0 or
|
||||
strcmp($_POST["shownotes_format"], "Markdown_Pandoc") === 0 or
|
||||
strcmp($_POST["shownotes_format"], "restructured_text") === 0 or
|
||||
strcmp($_POST["shownotes_format"], "txt2tags") === 0 )
|
||||
strcmp($_POST["shownotes_format"], "txt2tags") === 0 )
|
||||
) {
|
||||
naughty("b5609bad7edd70d76d75652fb0592ec4 " . $_POST["shownotes_format"] . " " . strcmp($_POST["shownotes_format"], "."));
|
||||
naughty("b5609bad7edd70d76d75652fb0592ec4 " . $_POST["shownotes_format"] . " " . strcmp($_POST["shownotes_format"], ". The shownotes_format is not OK"));
|
||||
}
|
||||
logextra( "shownotes_format is set OK" );
|
||||
|
||||
if ( empty($_POST["explicit"]) ) {
|
||||
naughty("39cc8812b02607d613c6a7ba7e789f2c");
|
||||
naughty("39cc8812b02607d613c6a7ba7e789f2c The explicit flag is missing");
|
||||
}
|
||||
logextra( "explicit exists" );
|
||||
|
||||
if ( strcmp($_POST["explicit"], "Yes") !== 0 ) {
|
||||
logextra( "" );
|
||||
if ( strcmp($_POST["explicit"], "Clean") !== 0 ) {
|
||||
naughty("198ab3b8af59ffba12c335239bde2876");
|
||||
naughty("198ab3b8af59ffba12c335239bde2876 The explicit flsg is not Yes or Clean");
|
||||
}
|
||||
}
|
||||
logextra( "explicit is either Yes or Clean" );
|
||||
|
||||
if ( empty($_POST["license"]) or strlen($_POST["license"]) < 4 or strlen($_POST["license"]) > 11 ) {
|
||||
naughty("194c24ff7396901c0ccc42fb21344683");
|
||||
naughty("194c24ff7396901c0ccc42fb21344683 The license length is not correct");
|
||||
}
|
||||
logextra( "license length is fine" );
|
||||
|
||||
if ( !(
|
||||
strcmp($_POST["license"], "CC-BY-SA") === 0 or
|
||||
strcmp($_POST["license"], "CC-BY-NC-SA") === 0 or
|
||||
strcmp($_POST["license"], "CC-BY-NC-ND") === 0 or
|
||||
strcmp($_POST["license"], "CC-0") === 0 or
|
||||
strcmp($_POST["license"], "CC-BY-NC") === 0 or
|
||||
strcmp($_POST["license"], "CC-BY") === 0 or
|
||||
strcmp($_POST["license"], "Other") === 0 )
|
||||
strcmp($_POST["license"], "CC-BY-SA") === 0 or
|
||||
strcmp($_POST["license"], "CC-BY-NC-SA") === 0 or
|
||||
strcmp($_POST["license"], "CC-BY-NC-ND") === 0 or
|
||||
strcmp($_POST["license"], "CC-0") === 0 or
|
||||
strcmp($_POST["license"], "CC-BY-NC") === 0 or
|
||||
strcmp($_POST["license"], "CC-BY") === 0 or
|
||||
strcmp($_POST["license"], "Other") === 0 )
|
||||
) {
|
||||
naughty("f5609bad7edd70d76d75652fb0592ec4");
|
||||
naughty("f5609bad7edd70d76d75652fb0592ec4 The license is has an invalid value");
|
||||
}
|
||||
logextra( "license is a valid value" );
|
||||
|
||||
// TODO re-enable after we get a feel for the max length
|
||||
// if ( empty($_POST["notes"]) or strlen($_POST["notes"]) > 100000 ) {
|
||||
// naughty("5860799406a323209b902d5104fe7bae");
|
||||
// naughty("5860799406a323209b902d5104fe7bae The shownotes are too long");
|
||||
// }
|
||||
// logextra( "Notes are less than max" );
|
||||
|
||||
if ( empty($_POST["notes"]) or strlen($_POST["notes"]) < 30 ) {
|
||||
naughty("5860799406a323209b902d5104fe7bae The shownotes are too short");
|
||||
}
|
||||
logextra( "Notes are not too short" );
|
||||
|
||||
$notes_length = strlen($_POST["notes"]);
|
||||
logextra( "Notes are $notes_length long." );
|
||||
|
||||
if ( ( empty($_POST["series"]) and ($_POST["series"] != 0 ) ) or (strlen($_POST["series"]) > 3 ) ) {
|
||||
naughty("f1c83b57821d562f66246d975ef28994");
|
||||
naughty("f1c83b57821d562f66246d975ef28994 The Series is either missing, zero or greater than 3 in length");
|
||||
}
|
||||
logextra( "The Series exists and is less than 3 but not zero" );
|
||||
$series = $_POST["series"];
|
||||
$result_series = mysqli_query($connection, "SELECT name FROM miniseries WHERE id='$series'");
|
||||
logextra( "Series id is in the correct range" );
|
||||
if (!isset($result_series)) {
|
||||
naughty("27457bada69cbc352af762bdf649e905");
|
||||
naughty("27457bada69cbc352af762bdf649e905 The Series id is not in the correct range");
|
||||
}
|
||||
$data=mysqli_fetch_assoc($result_series);
|
||||
$series_name = $data['name'];
|
||||
logextra( "Series has been found" );
|
||||
|
||||
if ( !empty($_POST["tags"]) and strlen($_POST["tags"]) > 100 ) {
|
||||
naughty("49a69b565acecf9d2a96aacc73aec5aa");
|
||||
naughty("49a69b565acecf9d2a96aacc73aec5aa The tags are missing or greate than 100 long");
|
||||
}
|
||||
logextra( "Tags are the correct length" );
|
||||
|
||||
if ( empty($_POST["host_name"]) or strlen($_POST["host_name"]) > 40 ) {
|
||||
naughty("626eae845e0a448be0544775ab5e4dc4");
|
||||
naughty("626eae845e0a448be0544775ab5e4dc4 The hostname is missing or greater than 40 long");
|
||||
}
|
||||
logextra( "host_name is set and correct length" );
|
||||
|
||||
if ( strlen($_POST["host_profile"]) > 2000 ) {
|
||||
naughty("f69ec5999e0a02def5a110489401347f");
|
||||
naughty("f69ec5999e0a02def5a110489401347f The Host profile exceeds 2000");
|
||||
}
|
||||
logextra( "host_profile is correct length" );
|
||||
|
||||
if ( empty($_POST["host_license"]) or strlen($_POST["host_license"]) < 4 or strlen($_POST["host_license"]) > 11 ) {
|
||||
naughty("f2816b32e97be090a96ceabdc9230c9c");
|
||||
naughty("f2816b32e97be090a96ceabdc9230c9c The host license length is not correct");
|
||||
}
|
||||
logextra( "host_license is in the correct range" );
|
||||
logextra( "host_license is in the correct range " );
|
||||
|
||||
if ( !(
|
||||
strcmp($_POST["host_license"], "CC-BY-SA") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-BY-NC-SA") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-BY-NC-ND") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-0") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-BY-NC") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-BY") === 0 or
|
||||
strcmp($_POST["host_license"], "Other") === 0 )
|
||||
strcmp($_POST["host_license"], "CC-BY-SA") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-BY-NC-SA") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-BY-NC-ND") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-0") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-BY-NC") === 0 or
|
||||
strcmp($_POST["host_license"], "CC-BY") === 0 or
|
||||
strcmp($_POST["host_license"], "Other") === 0 )
|
||||
) {
|
||||
naughty("978a18fa8558f3180897429e63d6ae55");
|
||||
naughty("978a18fa8558f3180897429e63d6ae55 The show license is has an invalid value");
|
||||
}
|
||||
logextra( "host_license is a predfined value" );
|
||||
|
||||
if ( empty($_POST["hostid"]) and $_POST["hostid"] != 0 ) {
|
||||
naughty("277dc98d43e7840d9f296cce1bc3ec2c");
|
||||
naughty("277dc98d43e7840d9f296cce1bc3ec2c The hostid is missing or is 0");
|
||||
}
|
||||
logextra( "hostid exists and is not 0" );
|
||||
|
||||
$result = mysqli_query($connection, 'SELECT MAX(hostid) as max FROM hosts;');
|
||||
|
||||
if (!isset($result)) {
|
||||
naughty("93fcc22d0c5ee3fac35e6d658db76059");
|
||||
naughty("93fcc22d0c5ee3fac35e6d658db76059 Failed to retrieve the max host from db");
|
||||
}
|
||||
$data=mysqli_fetch_assoc($result);
|
||||
$maxhost = $data['max'];
|
||||
@@ -227,21 +233,21 @@ logextra( "retrieved the max host from db" );
|
||||
$hostid = $_POST["hostid"];
|
||||
logextra( "" );
|
||||
if ( (strval(intval($hostid)) != strval($hostid)) or ( intval($hostid) < 0 ) or ( intval($hostid) > $maxhost ) ){
|
||||
naughty("a0f6cae871b85cb66f85d7ed5e91d1bb");
|
||||
naughty("a0f6cae871b85cb66f85d7ed5e91d1bb The host id is not an int, or the range is not correct");
|
||||
}
|
||||
logextra( "host id is int, and in the correct range" );
|
||||
|
||||
if ( !empty($_POST["url"]) and strlen($_POST["url"]) > 1024 ) {
|
||||
naughty("6d4f180c49ff9b9154bd80070ec2c1f3");
|
||||
naughty("6d4f180c49ff9b9154bd80070ec2c1f3 The url is not set or is not the correct length");
|
||||
}
|
||||
logextra( "The url is set and the correct length" );
|
||||
|
||||
if ( !empty($_POST["url"]) ) {
|
||||
if ( filter_var($_POST["url"], FILTER_VALIDATE_URL) === false ) {
|
||||
naughty("9c307efe37146015a35e2d928c2c0f69");
|
||||
naughty("9c307efe37146015a35e2d928c2c0f69 The url has been altered");
|
||||
}
|
||||
else {
|
||||
$url = htmlspecialchars(filter_var($_POST["url"], FILTER_VALIDATE_URL));
|
||||
$url = htmlspecialchars(filter_var($_POST["url"], FILTER_VALIDATE_URL));
|
||||
}
|
||||
}
|
||||
logextra( "The url has not been altered" );
|
||||
@@ -249,17 +255,17 @@ logextra( "The url has not been altered" );
|
||||
$dir_structure = "/home/hpr/upload/" . strtotime($db_timestamp) . "_${ep_num}_${ep_date}_${db_key}/";
|
||||
|
||||
if ( file_exists( $dir_structure ) ) {
|
||||
naughty("d4250c369bd81b27cdc53d0d53321ecd");
|
||||
naughty("d4250c369bd81b27cdc53d0d53321ecd There is an error with the upload dir");
|
||||
}
|
||||
logextra( "The upload dir seems fine $dir_structure" );
|
||||
|
||||
if (!mkdir($dir_structure, 0777, true)) {
|
||||
naughty("804c4be123ca0327840b76bf4f8eb19e");
|
||||
naughty("804c4be123ca0327840b76bf4f8eb19e The upload directory could not be created");
|
||||
}
|
||||
|
||||
$shownote_file_json = "${dir_structure}/shownotes.json";
|
||||
if ( file_exists( $shownote_file_json ) ) {
|
||||
naughty("85c8df74d172794c49233c1a94c299fd");
|
||||
naughty("85c8df74d172794c49233c1a94c299fd The shownotes json file is missing");
|
||||
}
|
||||
logextra( "The shownotes json file exists $shownote_file_json" );
|
||||
|
||||
@@ -304,12 +310,12 @@ $shownote_file_json_length = strlen( json_encode( $show_data_json ) );
|
||||
logextra( "Wrote the shownotes which are $shownote_file_json_length long" );
|
||||
|
||||
if ( !file_exists( $dir_structure ) ) {
|
||||
naughty("a1534e6d525352dce7183a2e22862049");
|
||||
naughty("a1534e6d525352dce7183a2e22862049 The dir_structure is missing");
|
||||
}
|
||||
logextra( "The dir_structure still exists" );
|
||||
|
||||
if ( !file_exists( "$dir_structure/shownotes.json" ) ) {
|
||||
naughty("3eb02d6b9ea801d4c5909b4fac0ccd96");
|
||||
naughty("3eb02d6b9ea801d4c5909b4fac0ccd96 The shownotes.json is missing");
|
||||
}
|
||||
logextra( "shownotes.json still exists" );
|
||||
|
||||
@@ -318,7 +324,7 @@ $message="";
|
||||
if ( !empty($_FILES["host_photo"]["tmp_name"]) and !empty($_FILES["host_photo"]["type"]) and $_FILES["host_photo"]["error"] == 0 ) {
|
||||
list($type_main, $type_sub)= explode("/", $_FILES["host_photo"]["type"]);
|
||||
if ( empty($type_sub) or strlen($type_sub) > 4 ) {
|
||||
naughty("c1381f1d2492f81074d8cb70c85f5fc8");
|
||||
naughty("c1381f1d2492f81074d8cb70c85f5fc8 There was an issue with the upload");
|
||||
}
|
||||
else {
|
||||
$temp_photo = $_FILES["host_photo"]["tmp_name"];
|
||||
@@ -350,7 +356,7 @@ else {
|
||||
|
||||
You have chosen to upload the files separately from these show notes.
|
||||
|
||||
If you wish to send a show using another method then please discuss
|
||||
If you wish to send a show using another method then please discuss
|
||||
it with the HPR Volunteer at admin@hackerpublicradio.org
|
||||
|
||||
";
|
||||
@@ -379,7 +385,7 @@ foreach($_FILES["media_files"]["tmp_name"] as $key => $val) {
|
||||
logextra( "All Files moved" );
|
||||
|
||||
########################################################
|
||||
// OK You convinced me.
|
||||
// OK You convinced me.
|
||||
|
||||
if ( $ep_num == 9999 ) {
|
||||
$show_submitted = "RESERVE_SHOW_SUBMITTED";
|
||||
@@ -400,12 +406,12 @@ if (mysqli_errno($connection)) {
|
||||
}
|
||||
logextra( "Updating the db to $show_submitted" );
|
||||
if (!isset($result)) {
|
||||
naughty("76ec33229ca023336a2b1c649b0491f5");
|
||||
naughty("76ec33229ca023336a2b1c649b0491f5 There was a problem updating the db");
|
||||
}
|
||||
|
||||
$body="give";
|
||||
//$body="index_full";
|
||||
include 'header.php';
|
||||
include 'header.php';
|
||||
|
||||
?>
|
||||
<article>
|
||||
@@ -430,7 +436,7 @@ include 'header.php';
|
||||
<?php
|
||||
logextra( "Sending email" );
|
||||
|
||||
# TODO check for both url and file upload
|
||||
# TODO check for both url and file upload
|
||||
|
||||
use PHPMailer\PHPMailer\PHPMailer;
|
||||
use PHPMailer\PHPMailer\Exception;
|
||||
@@ -442,7 +448,7 @@ require_once('/home/hpr/php/PHPMailer/SMTP.php');
|
||||
|
||||
date_default_timezone_set('Etc/UTC');
|
||||
|
||||
$mailer = new PHPMailer(true);
|
||||
$mailer = new PHPMailer(true);
|
||||
$mailer->isSMTP();
|
||||
$mailer->Host = "$mailerHost";
|
||||
$mailer->SMTPAuth = true;
|
||||
@@ -460,9 +466,9 @@ $mailer->addBCC('admin@hobbypublicradio.org');
|
||||
$mailer->AddAddress("$db_email");
|
||||
$mailer->isHTML(false);
|
||||
if ( $ep_num == "9999" ) {
|
||||
$mailer->Subject = "Thank you for uploading to the Reserve Queue";
|
||||
$mailer->Subject = "Thank you for uploading to the reserve pool";
|
||||
$mailer->MsgHTML("<p><em>This email is an automatic reply. If you have not made this request then please ignore this email.</em></p>
|
||||
<p>Thank You for recording an episode for the Reserve Queue.</p>
|
||||
<p>Thank You for recording an episode for the reserve pool.</p>
|
||||
<pre>
|
||||
$message
|
||||
</pre>
|
||||
|
||||
+3
-1
@@ -25,7 +25,9 @@ if (!mysqli_select_db($connection, "$databaseName")) {
|
||||
return "Requested page is temporarily unavailable, please try again later.";
|
||||
}
|
||||
|
||||
$connection->set_charset('utf8');
|
||||
// $connection->set_charset('utf8');
|
||||
$connection->set_charset('utf8mb4');
|
||||
|
||||
|
||||
function rrmdir($src) {
|
||||
$dir = opendir($src);
|
||||
|
||||
+5
-7
@@ -1,11 +1,11 @@
|
||||
RewriteEngine on
|
||||
|
||||
RewriteCond %{HTTP_USER_AGENT} (ClaudeBot|DataForSeoBot|MJ12bot|AhrefsBot|AwarioBot|BLEXBot|dotbot|PetalBot|SemrushBot*|SiteAuditBot|SplitSignalBot|Yandex) [NC]
|
||||
RewriteCond %{HTTP_USER_AGENT} (AhrefsBot|anthropic-ai|AwarioBot|Barkrowler|BLEXBot|CCbot|ClaudeBot|Claude-Web|DataForSeoBot|dotbot|FacebookBot|Go-http-client|Google-Extended|GPTBot|GPTBot*|MJ12bot|PetalBot|PiplBot|SemrushBot*|SiteAuditBot|SplitSignalBot|Yandex|Thinkbot|Barkrowler|SemrushBot) [NC]
|
||||
RewriteRule (.*) - [F,L]
|
||||
|
||||
RewriteRule "^comments_rss.php$" "/comments.rss" [R]
|
||||
|
||||
RewriteRule "^live$" "https://stream.lugcast.mywire.org/stream" [R=301,NE,L]
|
||||
RewriteRule "^live$" "https://files.shownotes.ooguy.com/stream" [R=301,NE,L]
|
||||
RewriteRule "^maillist$" "https://lists.hackerpublicradio.com/mailman/listinfo/hpr" [R=301,NE,L]
|
||||
RewriteRule "^download.php" "/syndication.html" [R=301,NE,L]
|
||||
RewriteRule "^about.php|^help_out.php" "/about.html" [R=301,NE,L]
|
||||
@@ -20,6 +20,8 @@ RewriteRule "^correspondents.php" "/correspondents/index.html" [R=301,NE,L]
|
||||
RewriteRule "^index_full.php|^show.php|^index.php|^twat.php" "/eps/index.html" [R=301,NE,L]
|
||||
RewriteRule "hosts/ken_fallon" "https://hackerpublicradio.org/correspondents/0030.html" [R=301,NE,L]
|
||||
|
||||
RewriteRule "^eps/hpr([0-9]{4})\.(mp3|ogg|opus|spx|flac|wav)$" "https://hub.hackerpublicradio.org/ccdn.php?filename=/eps/hpr$1/hpr$1.$2" [redirect=301,last]
|
||||
|
||||
RewriteRule "^calendar.php$" "http://hub.hackerpublicradio.org/calendar.php" [R,L]
|
||||
|
||||
ErrorDocument 404 /404.shtml
|
||||
@@ -43,10 +45,6 @@ RewriteCond %{QUERY_STRING} ^(.*)(?:^|&)fbclid=(?:[^&]*)((?:&|$).*)$ [NC]
|
||||
RewriteCond %1%2 (^|&)([^&].*|$)
|
||||
RewriteRule ^(.*) /$1?%2 [R=301,L]
|
||||
|
||||
# Redirect episodes to archive.org
|
||||
RewriteRule "eps/hpr([0-9]{4})\.(ogg|mp3|spx|wav|flac|opus)" "https://archive.org/download/hpr$1/hpr$1.$2"
|
||||
RewriteRule "local/hpr([0-9]{4})\.(ogg|mp3|spx|wav|flac|opus)" "https://archive.org/download/hpr$1/hpr$1.$2" [R=301,L]
|
||||
|
||||
# Rewrite the host series and episode pages
|
||||
|
||||
RewriteCond %{QUERY_STRING} id=(\d{1})$
|
||||
@@ -86,5 +84,5 @@ Allow from all
|
||||
</Files>
|
||||
|
||||
<IfModule headers_module>
|
||||
header set X-Clacks-Overhead "GNU Terry Pratchett"
|
||||
header set X-Clacks-Overhead "GNU Terry Pratchett, FiftyOneFifty, Lord Drachenblut"
|
||||
</IfModule>
|
||||
Reference in new issue
Block a user