This commit is contained in:
Squidly271 2023-03-03 16:34:04 -05:00
parent 828b45717e
commit 7c2e54ba56
5 changed files with 25 additions and 8 deletions

View File

@ -781,7 +781,7 @@ $(function(){
});
}
});
} else {
} else {
if ( "<?=$startupDisplayed?>" != "true" && (document.referrer.indexOf("/Apps/") > 1) && ( document.referrer.indexOf("/Apps/ca_settings") < 1 ) && cookiesEnabled() && ("<?=$dockerConvertFlag?>" != "true") || $.cookie("ca_languageSwitch") ) {
initialStartup = false;
getCategories();
@ -815,6 +815,22 @@ $(function(){
actionCentreRestoreState = true;
setupActionCentre();
}
if ( true ) {
swal({
title: "Public Service Announcement",
text: "In advance of International Bat Appreciation Day on April 17, Community Applications is helping to bring attention to the <a href='https://nationaltoday.com/international-bat-appreciation-day/' target='_blank'>plight of the bats</a>. Would you like to participate?",
type: 'info',
html: true,
showCancelButton: true,
showConfirmButton: true,
cancelButtonText: "No",
confirmButtonText: "Yes"
}, function (isConfirm) {
if (isConfirm) {
$(".mainArea,.menuItems,.sidebar").css("transform","rotateX(180deg)");
}
});
}
});
<?endif;?>
function disableSort() {

View File

@ -1,9 +1,9 @@
7b855f6ee50b7abfd6c9c35f1de647df ./Apps.page
8c5dacac9b3bb4ae97dd6f1389b1bfda ./Apps.page
106b521c1feebda4d7b3f558cc016cda ./CA_notices.page
eb1f0ee4148747c0473e73e4e973994f ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
6f37a8e88b8b7ff82c8be2cc8d686005 ./include/exec.php
41fd8377dadc9dad5abb4c5fc3fe71ea ./include/helpers.php
6a2cd1927d391aff2345233a514d7a87 ./include/helpers.php
8e053d6cd83fbe2202c13b692beabb4f ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md

View File

@ -268,12 +268,13 @@ function makeXML($template) {
fixAttributes($template,"Config");
# Sanitize the Requires entry if there is any CA links within it
if ($template['Requires'] && $searchMatches)
if ($template['Requires'] ?? false) {
preg_match_all("/\/\/(.*?)&#92;/m",$template['Requires'],$searchMatches);
if ( isset($searchMatches[1]) && count($searchMatches[1]) ) {
foreach ($searchMatches[1] as $searchResult) {
$template['Requires'] = str_replace("//$searchResult\\\\",$searchResult,$template['Requires']);
if ( isset($searchMatches[1]) && count($searchMatches[1]) ) {
foreach ($searchMatches[1] as $searchResult) {
$template['Requires'] = str_replace("//$searchResult\\\\",$searchResult,$template['Requires']);
}
}
}
$Array2XML = new Array2XML();