fixes & more

This commit is contained in:
fred 2023-09-02 22:32:59 +02:00
parent 59954771cc
commit e284a53d4d
2 changed files with 29 additions and 16 deletions

View File

@ -42,7 +42,7 @@ function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
## GET TW
mkdir -p ~/.zen/tmp/${MOATS}/
## DIRECT VISA.print.sh
## GET PARAM, with case uplanet="" decalage !
PLAYER=${THAT}
[[ ${PLAYER} == "salt" ]] && PLAYER="@"
@ -53,7 +53,7 @@ input_number=${SALT}
if [[ ! $input_number =~ ^-?[0-9]{1,3}(\.[0-9]{1,2})?$ ]]; then
(echo "$HTTPCORS ERROR - BAD LAT $LAT" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
else
LAT=${input_number}
LAT=$(printf "%.2f" $input_number)
fi
[[ ${APPNAME} == "pepper" ]] && PEPPER=${WHAT} || PEPPER=${APPNAME}
@ -63,10 +63,12 @@ input_number=${PEPPER}
if [[ ! $input_number =~ ^-?[0-9]{1,3}(\.[0-9]{1,2})?$ ]]; then
(echo "$HTTPCORS ERROR - BAD LON $LON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
else
LON=${input_number}
LON=$(printf "%.2f" $input_number)
fi
PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
## CHOOSEN PASS
[[ ${OBJ} == "PASS" ]] && PASS=${VAL}
### CHECK PLAYER EMAIL
EMAIL="${PLAYER,,}" # lowercase
@ -99,6 +101,8 @@ echo "MAPG1PUB : ${G1PUB}"
echo "# CALCULATING UMAP IPNS ADDRESS"
mkdir -p ~/.zen/tmp/${MOATS}/${G1PUB}
mkdir -p ~/.zen/tmp/${MOATS}/${SALT}_${PEPPER}
ipfs key rm ${G1PUB} > /dev/null 2>&1
rm ~/.zen/tmp/${MOATS}/_ipns.priv 2>/dev/null
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/_ipns.priv "$LAT" "$LON"
@ -114,20 +118,21 @@ ipfs --timeout 22s get -o ~/.zen/tmp/${MOATS}/ /ipns/${UMAPNS}/
####################################### Umap.png
## CREATING Umap_${SALT}_${PEPPER}.png
echo "# OSM2IPFS ~/.zen/tmp/${MOATS}/Umap_${SALT}_${PEPPER}.png"
UMAPGEN="https://ipfs.copylaradio.com/ipfs/QmSaFpSM6ps2pBqYxxLjKJfuigpEo98GNCPdK4PkMXnDaY/Umap.html?southWestLat=$SALT&southWestLon=$PEPPER&deg=0.01"
UMAPGEN="/ipfs/QmSaFpSM6ps2pBqYxxLjKJfuigpEo98GNCPdK4PkMXnDaY/Umap.html?southWestLat=$SALT&southWestLon=$PEPPER&deg=0.01"
echo ${UMAPGEN}
echo "<meta http-equiv=\"refresh\" content=\"0; url='${UMAPGEN}'\" />" > ~/.zen/tmp/${MOATS}/Umap.html
## TODO find a better crawling method (pb tiles are not fully loaded before screenshot)
echo "chromium --headless --disable-gpu --screenshot=/tmp/Umap_${SALT}_${PEPPER}.jpg --window-size=1200x1200 \"${UMAPGEN}\""
chromium --headless --disable-gpu --screenshot=/tmp/Umap.jpg --window-size=1200x1200 ${UMAPGEN}
chromium --headless --disable-gpu --screenshot=/tmp/Umap.png --window-size=1200x1200 ${UMAPGEN}
echo "chromium --headless --disable-gpu --screenshot=/tmp/Umap_${SALT}_${PEPPER}.jpg --window-size=1200x1200 \"https://ipfs.copylaradio.com${UMAPGEN}\""
chromium --headless --disable-gpu --screenshot=/tmp/Umap.jpg --window-size=1200x1200 "https://ipfs.copylaradio.com${UMAPGEN}"
chromium --headless --disable-gpu --screenshot=/tmp/Umap.png --window-size=1200x1200 "https://ipfs.copylaradio.com${UMAPGEN}"
## COPYING FILES FROM ABROAD
cp /tmp/Umap.jpg ~/.zen/tmp/${MOATS}/
cp /tmp/Umap.png ~/.zen/tmp/${MOATS}/
cp ~/.zen/tmp/${PASS}##/G1*.jpg ~/.zen/tmp/${MOATS}/
cp -f ~/.zen/tmp/${PASS}##/${PASS}.jpg ~/.zen/tmp/${MOATS}/G1Card.${PASS}.jpg
rm -f ~/.zen/tmp/${MOATS}/G1*.jpg ## DELETE VISA FROM PREVIOUS VISITOR
cp ~/.zen/tmp/${PASS}##/G1Visa.${PASS}.jpg ~/.zen/tmp/${MOATS}/G1Visa.${EMAIL}.jpg
cp -f ~/.zen/tmp/${PASS}##/${PASS}.jpg ~/.zen/tmp/${MOATS}/G1Card.${EMAIL}.jpg
ls ~/.zen/tmp/${MOATS}/
echo "<img src=G1Card.${PASS}.jpg \>" > ~/.zen/tmp/${MOATS}/G1Card.html
@ -145,12 +150,11 @@ ZCHAIN=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}/_chain 2>/dev/null)
ZMOATS=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}/_moats 2>/dev/null)
[[ ${ZCHAIN} && ${ZMOATS} ]] \
&& cp ~/.zen/tmp/${MOATS}/${G1PUB}/_chain ~/.zen/tmp/${MOATS}/${G1PUB}/_chain.${ZMOATS} \
&& cp ~/.zen/tmp/${MOATS}/${G1PUB}/_HPASS ~/.zen/tmp/${MOATS}/${G1PUB}/_HPASS.${ZMOATS} \
&& echo "UPDATING MOATS"
## UPDATE HPASS last G1Visa PASS
HPASS=$(echo $PASS | sha512sum | cut -d ' ' -f 1)
echo "${HPASS}" > ~/.zen/tmp/${MOATS}/${G1PUB}/_HPASS
echo "${HPASS}" > ~/.zen/tmp/${MOATS}/${G1PUB}/_${EMAIL}.HPASS
## DOES CHAIN CHANGED or INIT ?
[[ ${ZCHAIN} != ${IPFSROOT} || ${ZCHAIN} == "" ]] \

View File

@ -70,17 +70,19 @@ header {
<form id="formlink" action = "http://127.0.0.1:1234" method = "GET" enctype="application/x-www-form-urlencoded">
<h1><a href="https://qo-op.com">U Planet</a></h1>
<span>Email : </span><input name=uplanet value=''></br></br>
<span>Email : </span><input name=uplanet value=''></br>
<div id="yellow">
<input name='salt' value='0.00'>
<h3><a target="info" title="CHECK BY YOURSELF" href="http://127.0.0.1:12345"> >>> (◕‿‿◕) <<< </a></h3>
<h3><a target="info" title="CHECK BY YOURSELF" href="http://127.0.0.1:12345"> >>> (◕‿‿◕) <<< </a></h3>
<input name='pepper' value='0.00'>
</div>
</div>
<span>PASS : </span><input type=password name='PASS' size=6 value=''></br></br>
<input type='submit' value='[(♥‿‿♥)]'>
</form>
registre
<br>
<span>Astroport <a href="https://pad.p2p.legal/s/Astroport.ONE">Ŋ1</a> - Crypto Commons Defender -</span>
<h2>
@ -115,6 +117,13 @@ document.addEventListener('DOMContentLoaded', function() {
const latElement = document.querySelector('input[name="salt"]');
const lonElement = document.querySelector('input[name="pepper"]');
const uplanetElement = document.querySelector('input[name="uplanet"]');
const passElement = document.querySelector('input[name="PASS"]');
// Generate a random 6-digit number and set it as the default value for "PASS"
if (passElement) {
const randomPass = Math.floor(100000 + Math.random() * 900000); // Generates a random 6-digit number
passElement.value = randomPass.toString();
}
if (latElement && lonElement) {
latElement.value = salt || '0.00'; // Default to '0.00' if lat is missing
@ -185,7 +194,7 @@ function testLatency(cb) {
function countdown() {
if (timeLeft == -1) {
clearTimeout(timerId);
elem.innerHTML = "Try to click on the yellow face now !"
elem.innerHTML = "Hey ! Now. Click on the yellow face..."
} else {
elem.innerHTML = timeLeft + " s";
timeLeft--;