Version 0.2.18

- Fix wrong thumbnail reference in YouTube JSON response when adding playlist items. - Adjust date and inventory selection for suggested sale period suggestions. - Change how versioning is done with patch releases, releases and full frozen versions. Consult [CONTRIBUTING.md](https://github.com/DiemenDesign/AuroraCMS/blob/master/CONTRIBUTING.md) for more information. - Reduce file access times and latency by combining icons for Administration and Front End into Separate Font files, and combining them directly into the icons stylesheets. - Improve icons stylesheets, removing unnecessary style declarations. - Fix Author Social Buttons. - Modify Events display in Administration to display order based on Start Date of Event in descending order first, then Created Date if the Start Date isn't set. - Adjust area under footer so it is less obtrusive on the main design. - Remove HTMLPurifer from front end page processing, as we are already sanitising text input for safe output before database insertion. No point in doing it twice, which helps speed up site rendering. - Adjust Administration Favicon to use Favicon from theme. - Restyle Administration area, making it easier to use, and visually improved. Now uses less Styling. - Fix Descending order for widget referrers. - Add ctrl+s SaveAll keyboard shortcut, this override's the browser default, but makes it much more user friendly for user's. - Fix Admin Activity Page not clearing entries. - Fix Admin Side Menu not showing correct active page. - Fix Login not using correct variable name for setting theme. - Replace deprecated filter option "FILTER_SANITIZE_STRING" in favour of "FILTER_UNSAFE_RAW". - Adjust AuroraCMS logo size, Firefox was showing image too large, pushing elements off page. - Improve the Accessibility Widget. - Fix Admin theme switcher displaying both icons if theme not set. - Fix Schema not encoding single or double quotes, causing issues of malformed Schema Data. - Add button to Bookings items to copy booking to Job List. - Fix z-index of elFinder so it opens above Summernote's dialogs. - Fix reference to Share icon on Administration Content list page. - Fix wrong icon references in quickedit dropdown. - Comment out array functions, that look to currently be deprecated or not added to PHP 8.1 - Adjust Administration content dropdowns for status, and stock so they don't appear of the top of elements other than the image. - Adjust Administraion Tabs font size to avoid wrapping when widget's are present. - Add Fill style to correctly change the AuroraCMS logo colour when theme modes are changed. - Fix Administration header menu dropdown styling. - Fix Safari button styling not rendering button elements as expected styling. - Fix missing vars for sales array when checking for sale dates. - Fix typo in escaper function. - Fix escaping that was removing Meta Dscription information if it contained some already escaped characters. - Fix wrong ID value for A11Y Checkbox option. - Remove margin declaration for `section article` styling, due to the margin pushing elements outside of the viewport area on mobile devices. - Fix Page view parser typo causing a 500 error. - Add check for empty thumbnail_url for Playlist parser. - Fix Playlist editing not retrieving thumbnail URL. - Add project links to Administration dropdown account menu. - Add extra variable style for more consistent and customisable form elements. - Improve styling of Login Form. - Fix previous update that added an !important directive to button styling, that was overriding button appearance and interaction. - Improve QuickEdit dropdowns, may require more information added. - Fix Login inputs not being selectable when clicking on them. - Add and reorder SEO Links to Dashboard SEO Links Widget. - Add Downloadable Media, such as eBooks or other files from secure folder. - Adjust Thumbnail display to use generated SM, MD, LG images instead of elFinder's auto thumbnails. - Remove unnecessary comments. - Change AVIF format images to WEBP, due to Safari (and Chrome, which is actually Safari on iOS and Mac) not having AVIF capabilities. - Adjust "Maintenance", and "Coming Soon" pages to check if unavailable background could be AVIF, WEBP, JPG, JPEG, or PNG. - Fix Open Weather Map API Link. Preferences -> Contact. - Remove Cover Image SrcSet extra image size causing some images to not display as intended. - Add option to change available time for file downloads. - Fix Summernote WYSIWYG Styling showing wrong colour when scrolling editable area. - Add removing line breaks /r and /n characters causing unnecessary space between elements. - Fix Inventory items showing options if reference ID happens to match the Inventory Items ID. - Add new Content Type "course". - Add Course Mangement to Administration. - Add ability to change Created Content Date. - Remove the previously missed loading="lazy" attribute when previously adjusting the cover images, the attribute is unnecessary for above the fold content. - Fix missing parsing for State information on contact page. - Adjust cart display parser to not show weight or dimensions if they are zero. - Update PHPMailer and adjust mail sending code. - Fix Stripe and PayPal payment processing. - Adjust Account Menu z-index and active colour. - Add Accounts Information export to .csv - Fix typo in side content menu sort parser. - Add including purchasable Links to Inventory. - Add Purchased Links to Orders.
DennisSuitters · Sep 1, 2022 · 54e23e0 · 54e23e0
1 parent caa9a6c
commit 54e23e0
Show file tree

Hide file tree

Showing 120 changed files with 11,823 additions and 1,149 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,11 @@
-### v0.2.9
+### v0.2.18
 - Fix wrong thumbnail reference in YouTube JSON response when adding playlist items.
 - Adjust date and inventory selection for suggested sale period suggestions.
 - Change how versioning is done with patch releases, releases and full frozen versions. Consult [CONTRIBUTING.md](https://github.com/DiemenDesign/AuroraCMS/blob/master/CONTRIBUTING.md) for more information.
-
-#### v0.2.10
 - Reduce file access times and latency by combining icons for Administration and Front End into Separate Font files, and combining them directly into the icons stylesheets.
 - Improve icons stylesheets, removing unnecessary style declarations.
-
-#### v0.2.11
 - Fix Author Social Buttons.
 - Modify Events display in Administration to display order based on Start Date of Event in descending order first, then Created Date if the Start Date isn't set.
-
-#### v0.2.12
 - Adjust area under footer so it is less obtrusive on the main design.
 - Remove HTMLPurifer from front end page processing, as we are already sanitising text input for safe output before database insertion. No point in doing it twice, which helps speed up site rendering.
 - Adjust Administration Favicon to use Favicon from theme.
@@ -20,8 +14,6 @@
 - Add ctrl+s SaveAll keyboard shortcut, this override's the browser default, but makes it much more user friendly for user's.
 - Fix Admin Activity Page not clearing entries.
 - Fix Admin Side Menu not showing correct active page.
-
-#### v0.2.13
 - Fix Login not using correct variable name for setting theme.
 - Replace deprecated filter option "FILTER_SANITIZE_STRING" in favour of "FILTER_UNSAFE_RAW".
 - Adjust AuroraCMS logo size, Firefox was showing image too large, pushing elements off page.
@@ -30,8 +22,6 @@
 - Fix Schema not encoding single or double quotes, causing issues of malformed Schema Data.
 - Add button to Bookings items to copy booking to Job List.
 - Fix z-index of elFinder so it opens above Summernote's dialogs.
-
-#### v0.2.14
 - Fix reference to Share icon on Administration Content list page.
 - Fix wrong icon references in quickedit dropdown.
 - Comment out array functions, that look to currently be deprecated or not added to PHP 8.1
@@ -41,8 +31,6 @@
 - Fix Administration header menu dropdown styling.
 - Fix Safari button styling not rendering button elements as expected styling.
 - Fix missing vars for sales array when checking for sale dates.
-
-#### v0.2.15
 - Fix typo in escaper function.
 - Fix escaping that was removing Meta Dscription information if it contained some already escaped characters.
 - Fix wrong ID value for A11Y Checkbox option.
@@ -52,8 +40,6 @@
 - Fix Playlist editing not retrieving thumbnail URL.
 - Add project links to Administration dropdown account menu.
 - Add extra variable style for more consistent and customisable form elements.
-
-#### v0.2.16
 - Improve styling of Login Form.
 - Fix previous update that added an !important directive to button styling, that was overriding button appearance and interaction.
 - Improve QuickEdit dropdowns, may require more information added.
@@ -64,11 +50,22 @@
 - Remove unnecessary comments.
 - Change AVIF format images to WEBP, due to Safari (and Chrome, which is actually Safari on iOS and Mac) not having AVIF capabilities.
 - Adjust "Maintenance", and "Coming Soon" pages to check if unavailable background could be AVIF, WEBP, JPG, JPEG, or PNG.
-
-#### v0.2.17
 - Fix Open Weather Map API Link. Preferences -> Contact.
 - Remove Cover Image SrcSet extra image size causing some images to not display as intended.
 - Add option to change available time for file downloads.
 - Fix Summernote WYSIWYG Styling showing wrong colour when scrolling editable area.
 - Add removing line breaks /r and /n characters causing unnecessary space between elements.
 - Fix Inventory items showing options if reference ID happens to match the Inventory Items ID.
+- Add new Content Type "course".
+- Add Course Mangement to Administration.
+- Add ability to change Created Content Date.
+- Remove the previously missed loading="lazy" attribute when previously adjusting the cover images, the attribute is unnecessary for above the fold content.
+- Fix missing parsing for State information on contact page.
+- Adjust cart display parser to not show weight or dimensions if they are zero.
+- Update PHPMailer and adjust mail sending code.
+- Fix Stripe and PayPal payment processing.
+- Adjust Account Menu z-index and active colour.
+- Add Accounts Information export to .csv
+- Fix typo in side content menu sort parser.
+- Add including purchasable Links to Inventory.
+- Add Purchased Links to Orders.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ![AuroraCMS](core/images/readmelogo.webp)
 AuroraCMS the **Free** Australian Open Source [MIT](https://github.com/DiemenDesign/AuroraCMS/blob/master/LICENSE) licensed Content Management System, built primarily for Australian Businesses, built utilising [PHP](http://php.net/), PDO, [jQuery](http://jquery.com/) and [iCONS](https://github.com/DiemenDesign/iCONS). Built to take advantage of HTML5 and CSS3, with necessary SEO attributes that fit in with Google's recommendations, Micro-formats, JSON-LD, ARIA (A11Y), and general SEO Markup.
 
-Current version is v0.2.17
+Current version is v0.2.18
 
 ### Features
 - AuroraCMS is a Quasi-MVC, Front End is completely MVC, with some AJAX Functions for Form Processing.
@@ -45,6 +45,9 @@ Current version is v0.2.17
     - Download available directly from page when Order required isn't set.
       - Option that file/s only available via Invoice, and time limit.
       - Download link sent via Invoice when Invoice is Paid.
+    - Link/s to other services or content.
+      - Option that Link/s only available via Invoice, and time limit.
+      - Link/s sent via Invoice when Invoice is Paid.
   - Newsletters.
   - Proofs.
     - User accessible area.
@@ -76,6 +79,13 @@ Current version is v0.2.17
   - Post, Reply as per other Forums.
   - Integrated Help Tickets as Forum Posts.
   - Upvote or Downvote posts and comments.
+- Course Management.
+  - Add/Edit Courses.
+    - Add Multiple-Choice Questions.
+    - Add Multiple Questions, with Answer Entry.
+  - Track User Progression.
+  - Display available courses, with online Payments.
+  - Display Paid Courses when User is logged in, including Current Progression.
 - Banner Notifications with Entrance Animation choice. Dissmissable with local storage variable.
 - Media.
   - Upload and manage various types of files for addition into content using elFinder.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.2.17
+v0.2.18
diff --git a/core/add_account.php b/core/add_account.php
@@ -7,7 +7,7 @@
  * @author     Dennis Suitters <dennis@diemen.design>
  * @copyright  2014-2019 Diemen Design
  * @license    http://opensource.org/licenses/MIT  MIT License
- * @version    0.2.13
+ * @version    0.2.18
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -96,8 +96,10 @@
                 ':active'=>0,
                 ':ti'=>time()
               ]);
-              require'phpmailer/class.phpmailer.php';
-              $mail=new PHPMailer;
+              require'phpmailer/PHPMailer.php';
+              require'phpmailer/SMTP.php';
+              require'phpmailer/Exception.php';
+              $mail = new PHPMailer\PHPMailer\PHPMailer;
             	$mail->isSendmail();
             	$toname=$username;
             	$mail->SetFrom($config['email'],$config['business']);

diff --git a/core/add_adminsuggestion.php b/core/add_adminsuggestion.php
@@ -7,7 +7,7 @@
  * @author     Dennis Suitters <dennis@diemen.design>
  * @copyright  2014-2019 Diemen Design
  * @license    http://opensource.org/licenses/MIT  MIT License
- * @version    0.2.1
+ * @version    0.2.18
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -39,8 +39,10 @@
   ]);
   $rf=$fu->fetch(PDO::FETCH_ASSOC);
   if($rt['email']!=''){
-    require'phpmailer/class.phpmailer.php';
-    $mail=new PHPMailer;
+    require'phpmailer/PHPMailer.php';
+    require'phpmailer/SMTP.php';
+    require'phpmailer/Exception.php';
+    $mail = new PHPMailer\PHPMailer\PHPMailer;
     $mail->isSendmail();
     $toname=$c['name'];
     $mail->SetFrom($config['email'],$config['business']);

diff --git a/core/add_booking.php b/core/add_booking.php
@@ -7,7 +7,7 @@
  * @author     Dennis Suitters <dennis@diemen.design>
  * @copyright  2014-2019 Diemen Design
  * @license    http://opensource.org/licenses/MIT  MIT License
- * @version    0.2.13
+ * @version    0.2.18
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -200,8 +200,10 @@
               $not=['spammer'=>false,'target'=>'booking','element'=>'div','action'=>'replace','class'=>'not alert alert-success','text'=>'A Booking has been created for your attendance. A confirmation email has been sent to the email address you provided with details of how to access the Event.','reason'=>''];
             }
 						if($config['email']!=''){
-							require'phpmailer/class.phpmailer.php';
-							$mail=new PHPMailer;
+              require'phpmailer/PHPMailer.php';
+              require'phpmailer/SMTP.php';
+              require'phpmailer/Exception.php';
+							$mail = new PHPMailer\PHPMailer\PHPMailer;
 							$mail->isSendmail();
 							$mail->SetFrom($email,$name);
 							$toname=$config['email'];

diff --git a/core/add_cart.php b/core/add_cart.php
@@ -16,7 +16,7 @@
 $iid=filter_input(INPUT_POST,'id',FILTER_SANITIZE_NUMBER_INT);
 $cid=filter_input(INPUT_POST,'cid',FILTER_SANITIZE_NUMBER_INT);
 $ti=time();
-$uid=isset($_SESSION['uid'])?$_SESSION['uid']:$_SESSION['uid'];
+$uid=isset($_SESSION['uid'])?$_SESSION['uid']:0;
 $rank=isset($_SESSION['rank'])?$_SESSION['rank']:0;
 $limit=0;
 $add=true;

diff --git a/core/add_comment.php b/core/add_comment.php
@@ -7,7 +7,7 @@
  * @author     Dennis Suitters <dennis@diemen.design>
  * @copyright  2014-2019 Diemen Design
  * @license    http://opensource.org/licenses/MIT  MIT License
- * @version    0.2.13
+ * @version    0.2.18
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -97,8 +97,10 @@
               $q=$db->prepare("SELECT * FROM `".$prefix."content` WHERE `id`=:id");
               $q->execute([':id'=>$rid]);
               $r=$q->fetch(PDO::FETCH_ASSOC);
-              require'phpmailer/class.phpmailer.php';
-              $mail=new PHPMailer;
+              require'phpmailer/PHPMailer.php';
+              require'phpmailer/SMTP.php';
+              require'phpmailer/Exception.php';
+              $mail = new PHPMailer\PHPMailer\PHPMailer;
               $mail->isSendmail();
               $mail->SetFrom($email,$name);
               $toname=$config['email'];

diff --git a/core/add_contactus.php b/core/add_contactus.php
@@ -7,7 +7,7 @@
  * @author     Dennis Suitters <dennis@diemen.design>
  * @copyright  2014-2019 Diemen Design
  * @license    http://opensource.org/licenses/MIT  MIT License
- * @version    0.2.13
+ * @version    0.2.18
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -87,8 +87,10 @@
           }
   				if($config['email']!=''){
   					if($not['spammer']==false){
-  						require'phpmailer/class.phpmailer.php';
-  						$mail=new PHPMailer;
+              require'phpmailer/PHPMailer.php';
+              require'phpmailer/SMTP.php';
+              require'phpmailer/Exception.php';
+  						$mail = new PHPMailer\PHPMailer\PHPMailer;
               $mail->isSendmail();
     					$mail->SetFrom($email, $name);
   						$toname=$config['email'];

diff --git a/core/add_download.php b/core/add_download.php
@@ -7,7 +7,7 @@
  * @author     Dennis Suitters <dennis@diemen.design>
  * @copyright  2014-2019 Diemen Design
  * @license    http://opensource.org/licenses/MIT  MIT License
- * @version    0.2.17
+ * @version    0.2.18
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -22,9 +22,9 @@
 if(isset($_FILES['fu'])){
 	$ft=$_FILES['fu']['type'];
 	if(in_array($ft,[
-'audio/aac','audio/midi','audio/mpeg','audio/ogg','audio/wav','audio/x-midi',
-'application/epub+zip','application/gzip','application/java-archive','application/msword','application/ogg','application/pdf','application/rtf','application/vnd.amazon.ebook','application/vnd.ms-excel','application/vnd.ms-powerpoint','application/vnd.oasis.opendocument.presentation','application/vnd.oasis.opendocument.spreadsheet','application/vnd.oasis.opendocument.text','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','application/vnd.openxmlformats-officedocument.presentationml.presentation','application/vnd.openxmlformats-officedocument.wordprocessingml.document','application/vnd.rar','application/x-7z-compressed','application/x-bzip','application/x-bzip2','application/x-freearc','application/x-tar','application/zip',
-'text/plain','video/mp4','video/mpeg','video/ogg'
+		'audio/aac','audio/midi','audio/mpeg','audio/ogg','audio/wav','audio/x-midi',
+		'application/epub+zip','application/gzip','application/java-archive','application/msword','application/ogg','application/pdf','application/rtf','application/vnd.amazon.ebook','application/vnd.ms-excel','application/vnd.ms-powerpoint','application/vnd.oasis.opendocument.presentation','application/vnd.oasis.opendocument.spreadsheet','application/vnd.oasis.opendocument.text','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','application/vnd.openxmlformats-officedocument.presentationml.presentation','application/vnd.openxmlformats-officedocument.wordprocessingml.document','application/vnd.rar','application/x-7z-compressed','application/x-bzip','application/x-bzip2','application/x-freearc','application/x-tar','application/zip',
+		'text/plain','video/mp4','video/mpeg','video/ogg'
 	])){
 		$tp='../media/downloads/'.basename($_FILES['fu']['name']);
 		$file=basename($_FILES['fu']['name']);
@@ -45,51 +45,52 @@
 				':ord'=>$iid+1
 			]);
 			echo'<script>'.
-'window.top.window.$("#downloads").append(`<div class="row mt-1" id="l_'.$iid.'">'.
-	'<div class="form-row">'.
-		'<div class="input-text border-right-0 border-bottom-0">'.
-			'<label>Title:</label>'.
-		'</div>'.
-		'<input class="border-bottom-0 border-left-0" type="text" name="t" value="'.$t.'" placeholder="Uses Filename in place of title..." readonly>'.
-	'</div>';
-if($r==1){
-	echo'<div class="form-row">'.
-		'<div class="input-text border-right-0 border-bottom-0">'.
-			'<label>Requires Order</label>&nbsp;<input type="checkbox" name="r" checked disabled>'.
-		'</div>'.
-		'<div class="input-text border-right-0 border-bottom-0 border-left-0 pr-0">'.
-			'<label>and&nbsp;is&nbsp;available&nbsp;for&nbsp;download&nbsp;for:</label>'.
-		'</div>'.
-		'<select class="border-bottom-0 border-left-0" id="downloada" name="a" onchange="update(\`'.$iid.'\`,\`choices\`,\`tie\`,$(this).val(),\`select\`);">'.
-			'<option value="0"'.($a==0?' selected':'').'>Forever</option>'.
-			'<option value="3600"'.($a==3600?' selected':'').'>1 Hour</option>'.
-			'<option value="7200"'.($a==7200?' selected':'').'>2 Hours</option>'.
-			'<option value="14400"'.($a==14400?' selected':'').'>4 Hours</option>'.
-			'<option value="28800"'.($a==28800?' selected':'').'>8 Hours</option>'.
-			'<option value="86400"'.($a==86400?' selected':'').'>24 Hours</option>'.
-			'<option value="172800"'.($a==172800?' selected':'').'>48 Hours</option>'.
-			'<option value="604800"'.($a==604800?' selected':'').'>1 Week</option>'.
-			'<option value="1209600"'.($a==1209600?' selected':'').'>2 Weeks</option>'.
-			'<option value="2592000"'.($a==2592000?' selected':'').'>1 Month</option>'.
-			'<option value="7776000"'.($a==7776000?' selected':'').'>3 Months</option>'.
-			'<option value="15552000"'.($a==15552000?' selected':'').'>6 Months</option>'.
-			'<option value="31536000"'.($a==31536000?' selected':'').'>1 Year</option>'.
-    '</select>'.
-	'</div>';
-}
-	echo'<div class="form-row">'.
-  	'<input id="url'.$iid.'" name="url" type="text" value="'.$file.'" readonly>'.
-  	'<form target="sp" action="core/purge.php">'.
-    	'<input name="id" type="hidden" value="'.$iid.'">'.
-    	'<input name="t" type="hidden" value="choices">'.
-    	'<button class="trash" data-tooltip="tooltip" aria-label="Delete"><i class="i">trash</i></button>'.
-  	'</form>'.
-	'</div>'.
-'</div>`);</script>';
+				'window.top.window.$("#downloads").append(`<div class="row mt-1" id="l_'.$iid.'">'.
+					'<div class="form-row">'.
+						'<div class="input-text border-right-0 border-bottom-0">'.
+							'<label>Title:</label>'.
+						'</div>'.
+						'<input class="border-bottom-0 border-left-0" type="text" name="t" value="'.$t.'" placeholder="Uses Filename in place of title..." readonly>'.
+					'</div>';
+					if($r==1){
+						echo'<div class="form-row">'.
+							'<div class="input-text border-right-0 border-bottom-0">'.
+								'<label>Requires Order</label>&nbsp;<input type="checkbox" name="r" checked disabled>'.
+							'</div>'.
+							'<div class="input-text border-right-0 border-bottom-0 border-left-0 pr-0">'.
+								'<label>and&nbsp;is&nbsp;available&nbsp;for&nbsp;download&nbsp;for:</label>'.
+							'</div>'.
+							'<select class="border-bottom-0 border-left-0" id="downloada" name="a" onchange="update(\`'.$iid.'\`,\`choices\`,\`tie\`,$(this).val(),\`select\`);">'.
+								'<option value="0"'.($a==0?' selected':'').'>Forever</option>'.
+								'<option value="3600"'.($a==3600?' selected':'').'>1 Hour</option>'.
+								'<option value="7200"'.($a==7200?' selected':'').'>2 Hours</option>'.
+								'<option value="14400"'.($a==14400?' selected':'').'>4 Hours</option>'.
+								'<option value="28800"'.($a==28800?' selected':'').'>8 Hours</option>'.
+								'<option value="86400"'.($a==86400?' selected':'').'>24 Hours</option>'.
+								'<option value="172800"'.($a==172800?' selected':'').'>48 Hours</option>'.
+								'<option value="604800"'.($a==604800?' selected':'').'>1 Week</option>'.
+								'<option value="1209600"'.($a==1209600?' selected':'').'>2 Weeks</option>'.
+								'<option value="2592000"'.($a==2592000?' selected':'').'>1 Month</option>'.
+								'<option value="7776000"'.($a==7776000?' selected':'').'>3 Months</option>'.
+								'<option value="15552000"'.($a==15552000?' selected':'').'>6 Months</option>'.
+								'<option value="31536000"'.($a==31536000?' selected':'').'>1 Year</option>'.
+    					'</select>'.
+						'</div>';
+					}
+					echo'<div class="form-row">'.
+  					'<input id="url'.$iid.'" name="url" type="text" value="'.$file.'" readonly>'.
+  					'<form target="sp" action="core/purge.php">'.
+    					'<input name="id" type="hidden" value="'.$iid.'">'.
+    					'<input name="t" type="hidden" value="choices">'.
+    					'<button class="trash" data-tooltip="tooltip" aria-label="Delete"><i class="i">trash</i></button>'.
+  					'</form>'.
+					'</div>'.
+				'</div>`);'.
+			'</script>';
 		}else{
-			echo'window.top.window.toastr["error"]("An error occured while uploading the file!");';
+			echo'<script>window.top.window.toastr["error"](`An error occured while uploading the file!`);</script>';
 		}
 	}else{
-		echo'window.top.window.toastr["error"]("Filetype not allowed!");';
+		echo'<script>window.top.window.toastr["error"]("Filetype not allowed!");</script>';
 	}
 }