diff --git a/lib/GchangeUser.class.php b/lib/GchangeUser.class.php index 7f30d0a..6d305d7 100644 --- a/lib/GchangeUser.class.php +++ b/lib/GchangeUser.class.php @@ -23,7 +23,11 @@ class GchangeUser { } else { - $this->userName = $gchangeObject->_source->title; + if (isset($gchangeObject->_source->title)) { + + $this->userName = $gchangeObject->_source->title; + + } if (isset($gchangeObject->_source->geoPoint->lat, $gchangeObject->_source->geoPoint->lon)) { diff --git a/lib/Jaklis.class.php b/lib/Jaklis.class.php index d69a17b..c0cdc7c 100644 --- a/lib/Jaklis.class.php +++ b/lib/Jaklis.class.php @@ -6,14 +6,14 @@ class Jaklis { private $mode; - private $jaklisPath = __DIR__ . '/../vendors/jaklisse/jaklis'; + private $jaklisPath = __DIR__ . '/../vendors/jaklis/jaklis'; private $nodes = [ 'gchange' => 'data.gchange.fr' ]; - private $msgLimit = 30; + private $msgLimit = 15; private $userPubsecPath; diff --git a/messenger.php b/messenger.php index 13ec5a7..6430480 100644 --- a/messenger.php +++ b/messenger.php @@ -25,6 +25,7 @@ if (isset($_POST['message'], $_POST['to'])) { // $msgIn = $jaklis->getInboundMessages('QP1VkfaFUMdHZmHgPMi7q5wJJHaQhZcEqs5A86NigKr'); list($msgIn, $msgOut) = $jaklis->getMessages(); +// list($msgIn, $msgOut) = $fred->donneMoiSesPutainDeMessagesGchange($_SESSION['salt'], $_SESSION['pepper']); // echo '
'; var_dump($msgIn); echo '
'; // echo '
'; var_dump($msgOut); echo '
'; diff --git a/vendors/jaklisse/.env.template b/vendors/jaklis/.env.template similarity index 100% rename from vendors/jaklisse/.env.template rename to vendors/jaklis/.env.template diff --git a/vendors/jaklisse/.gitignore b/vendors/jaklis/.gitignore similarity index 100% rename from vendors/jaklisse/.gitignore rename to vendors/jaklis/.gitignore diff --git a/vendors/jaklisse/.vscode/settings.json b/vendors/jaklis/.vscode/settings.json similarity index 100% rename from vendors/jaklisse/.vscode/settings.json rename to vendors/jaklis/.vscode/settings.json diff --git a/vendors/jaklisse/README.md b/vendors/jaklis/README.md similarity index 100% rename from vendors/jaklisse/README.md rename to vendors/jaklis/README.md diff --git a/vendors/jaklisse/jaklis b/vendors/jaklis/jaklis similarity index 100% rename from vendors/jaklisse/jaklis rename to vendors/jaklis/jaklis diff --git a/vendors/jaklisse/jaklis.py b/vendors/jaklis/jaklis.py similarity index 100% rename from vendors/jaklisse/jaklis.py rename to vendors/jaklis/jaklis.py diff --git a/vendors/jaklisse/lib/cesium.py b/vendors/jaklis/lib/cesium.py similarity index 100% rename from vendors/jaklisse/lib/cesium.py rename to vendors/jaklis/lib/cesium.py diff --git a/vendors/jaklisse/lib/cesiumCommon.py b/vendors/jaklis/lib/cesiumCommon.py similarity index 100% rename from vendors/jaklisse/lib/cesiumCommon.py rename to vendors/jaklis/lib/cesiumCommon.py diff --git a/vendors/jaklisse/lib/crypt.py b/vendors/jaklis/lib/crypt.py similarity index 100% rename from vendors/jaklisse/lib/crypt.py rename to vendors/jaklis/lib/crypt.py diff --git a/vendors/jaklisse/lib/currentUd.py b/vendors/jaklis/lib/currentUd.py similarity index 100% rename from vendors/jaklisse/lib/currentUd.py rename to vendors/jaklis/lib/currentUd.py diff --git a/vendors/jaklisse/lib/gva.py b/vendors/jaklis/lib/gva.py similarity index 100% rename from vendors/jaklisse/lib/gva.py rename to vendors/jaklis/lib/gva.py diff --git a/vendors/jaklisse/lib/gvaBalance.py b/vendors/jaklis/lib/gvaBalance.py similarity index 100% rename from vendors/jaklisse/lib/gvaBalance.py rename to vendors/jaklis/lib/gvaBalance.py diff --git a/vendors/jaklisse/lib/gvaHistory.py b/vendors/jaklis/lib/gvaHistory.py similarity index 100% rename from vendors/jaklisse/lib/gvaHistory.py rename to vendors/jaklis/lib/gvaHistory.py diff --git a/vendors/jaklisse/lib/gvaID.py b/vendors/jaklis/lib/gvaID.py similarity index 100% rename from vendors/jaklisse/lib/gvaID.py rename to vendors/jaklis/lib/gvaID.py diff --git a/vendors/jaklisse/lib/gvaPay.py b/vendors/jaklis/lib/gvaPay.py similarity index 100% rename from vendors/jaklisse/lib/gvaPay.py rename to vendors/jaklis/lib/gvaPay.py diff --git a/vendors/jaklisse/lib/gvaWallets.py b/vendors/jaklis/lib/gvaWallets.py similarity index 100% rename from vendors/jaklisse/lib/gvaWallets.py rename to vendors/jaklis/lib/gvaWallets.py diff --git a/vendors/jaklisse/lib/messaging.py b/vendors/jaklis/lib/messaging.py similarity index 100% rename from vendors/jaklisse/lib/messaging.py rename to vendors/jaklis/lib/messaging.py diff --git a/vendors/jaklisse/lib/natools.py b/vendors/jaklis/lib/natools.py similarity index 100% rename from vendors/jaklisse/lib/natools.py rename to vendors/jaklis/lib/natools.py diff --git a/vendors/jaklisse/lib/offers.py b/vendors/jaklis/lib/offers.py similarity index 100% rename from vendors/jaklisse/lib/offers.py rename to vendors/jaklis/lib/offers.py diff --git a/vendors/jaklisse/lib/profiles.py b/vendors/jaklis/lib/profiles.py similarity index 100% rename from vendors/jaklisse/lib/profiles.py rename to vendors/jaklis/lib/profiles.py diff --git a/vendors/jaklisse/lib/qrcode-reader.py b/vendors/jaklis/lib/qrcode-reader.py similarity index 100% rename from vendors/jaklisse/lib/qrcode-reader.py rename to vendors/jaklis/lib/qrcode-reader.py diff --git a/vendors/jaklisse/lib/stars.py b/vendors/jaklis/lib/stars.py similarity index 100% rename from vendors/jaklisse/lib/stars.py rename to vendors/jaklis/lib/stars.py diff --git a/vendors/jaklisse/paiements.py b/vendors/jaklis/paiements.py similarity index 100% rename from vendors/jaklisse/paiements.py rename to vendors/jaklis/paiements.py diff --git a/vendors/jaklisse/requirements.txt b/vendors/jaklis/requirements.txt similarity index 100% rename from vendors/jaklisse/requirements.txt rename to vendors/jaklis/requirements.txt diff --git a/vendors/jaklisse/setup.sh b/vendors/jaklis/setup.sh similarity index 100% rename from vendors/jaklisse/setup.sh rename to vendors/jaklis/setup.sh