summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinteck <contact@minteck.org>2023-02-11 11:49:59 +0100
committerMinteck <contact@minteck.org>2023-02-11 11:49:59 +0100
commit35d622ad561c7f693c396020820f3d8cfdb71a88 (patch)
tree03e60ce72761fd3648702a0d26eb6355e68cbc38
parent885a05be06d0b42835652208c729e5fded451c26 (diff)
downloadpluralconnect-35d622ad561c7f693c396020820f3d8cfdb71a88.tar.gz
pluralconnect-35d622ad561c7f693c396020820f3d8cfdb71a88.tar.bz2
pluralconnect-35d622ad561c7f693c396020820f3d8cfdb71a88.zip
Updated 6 files and added .idea/sshConfigs.xml (automated)
-rw-r--r--.idea/deployment.xml9
-rw-r--r--.idea/sshConfigs.xml8
-rw-r--r--.idea/webServers.xml7
-rw-r--r--api/raindrops-img-round.php2
-rw-r--r--includes/exchange.txt2
-rw-r--r--includes/header.inc2
-rw-r--r--includes/titlebar.inc4
7 files changed, 28 insertions, 6 deletions
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index c2f202c..d88f01f 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="PublishConfigData" autoUpload="Always" serverName="Minteck.org" remoteFilesAllowedToDisappearOnAutoupload="false">
+ <component name="PublishConfigData" autoUpload="Always" serverName="bridlewood" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData>
<paths name="Minteck.org">
<serverdata>
@@ -9,6 +9,13 @@
</mappings>
</serverdata>
</paths>
+ <paths name="bridlewood">
+ <serverdata>
+ <mappings>
+ <mapping deploy="/opt/peh" local="$PROJECT_DIR$" web="/" />
+ </mappings>
+ </serverdata>
+ </paths>
</serverData>
<option name="myAutoUpload" value="ALWAYS" />
</component>
diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml
new file mode 100644
index 0000000..885b30b
--- /dev/null
+++ b/.idea/sshConfigs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="SshConfigs">
+ <configs>
+ <sshConfig authType="OPEN_SSH" host="bridlewood.equestria.dev" id="7c107e55-7a18-43b2-ad36-8fe44939d496" port="22" nameFormat="DESCRIPTIVE" username="fedora" useOpenSSHConfig="true" />
+ </configs>
+ </component>
+</project> \ No newline at end of file
diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index e2155f0..5455464 100644
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -9,6 +9,13 @@
</advancedOptions>
</fileTransfer>
</webServer>
+ <webServer id="87ce5106-f1a2-4a48-8512-b9bdb81982e6" name="bridlewood">
+ <fileTransfer accessType="SFTP" host="bridlewood.equestria.dev" port="22" sshConfigId="7c107e55-7a18-43b2-ad36-8fe44939d496" sshConfig="fedora@bridlewood.equestria.dev:22 agent" authAgent="true">
+ <advancedOptions>
+ <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+ </advancedOptions>
+ </fileTransfer>
+ </webServer>
</option>
</component>
</project> \ No newline at end of file
diff --git a/api/raindrops-img-round.php b/api/raindrops-img-round.php
index af4acbe..f733cc8 100644
--- a/api/raindrops-img-round.php
+++ b/api/raindrops-img-round.php
@@ -2,7 +2,7 @@
$fronters = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/fronters.json"), true);
-$url = isset($fronters['members'][0]) ? ($fronters['members'][0]["avatar_url"] ?? "https://static.equestria.horse/ponies/uploads/raindrops.png") : "https://static.equestria.horse/ponies/uploads/raindrops.png";
+$url = isset($fronters['members'][0]) ? ($fronters['members'][0]["avatar_url"] ?? "/assets/uploads/raindrops.png") : "/assets/uploads/raindrops.png";
file_put_contents("/tmp/temp", file_get_contents($url));
function imageCreateCorners($sourceImageFile, $radius) {
diff --git a/includes/exchange.txt b/includes/exchange.txt
index 79156ae..07cccdc 100644
--- a/includes/exchange.txt
+++ b/includes/exchange.txt
@@ -1 +1 @@
-0.88 \ No newline at end of file
+0.89 \ No newline at end of file
diff --git a/includes/header.inc b/includes/header.inc
index ede6a29..4261f1c 100644
--- a/includes/header.inc
+++ b/includes/header.inc
@@ -2,7 +2,7 @@
$useNewUI = !isset($_GET['old']);
$readOnly = false;
-@file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/.test", "hello");
+file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/.test", "hello");
if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/.test")) {
unlink($_SERVER['DOCUMENT_ROOT'] . "/includes/data/.test");
diff --git a/includes/titlebar.inc b/includes/titlebar.inc
index b0c1e8b..c49f7b2 100644
--- a/includes/titlebar.inc
+++ b/includes/titlebar.inc
@@ -380,7 +380,7 @@ $links = [
"type" => "js",
"text" => "document.getElementById('planner-add-link-cloudburst-0').click()"
],
- "icon" => "https://static.equestria.horse/ponies/icons/add-cloudburst.svg",
+ "icon" => "/assets/icons/add-cloudburst.svg",
"invert" => false
],
[
@@ -389,7 +389,7 @@ $links = [
"type" => "js",
"text" => "document.getElementById('planner-add-link-raindrops-0').click()"
],
- "icon" => "https://static.equestria.horse/ponies/icons/add-raindrops.svg",
+ "icon" => "/assets/icons/add-raindrops.svg",
"invert" => false
]
],