Changeset 2459620

Timestamp:

01/20/2021 11:58:39 AM (5 years ago)

Author:

vinema

Message:

vy_user -> user

Location:

vine-ma/trunk

Files:

• readme.txt (modified) (1 diff)
• vine_ma_plugin.php (modified) (2 diffs)

vine-ma/trunk/readme.txt

@@ -21 +21 @@
 
 == Changelog ==
+
+= 1.1.2 =
+* Bugfixing
 
 = 1.1.1 =

vine-ma/trunk/vine_ma_plugin.php

@@ -131 +131 @@
 //get user organization id
 function vine_ma_get_organizationid_username($token) {
-    $url=VINEHOST."/api/rest/2.0/vy_user?\$authtoken={$token}";
+    $url=VINEHOST."/api/rest/2.0/user?\$authtoken={$token}";
     $args = array(
       'timeout' => 20,
@@ -145 +145 @@
         foreach($xml->xpath('//m:properties') as $event) {
           $orgid = (string)$event->xpath('d:ORGANIZATIONID')[0];
-          $username = (string)$event->xpath('d:NAME')[0];
+          $firstname = (string)$event->xpath('d:FIRSTNAME')[0];
+          $lastname = (string)$event->xpath('d:LASTNAME')[0];
+          $email = (string)$event->xpath('d:EMAIL')[0];
+          $username = $firstname . ' ' . $lastname . ' (' . $email . ')';
         }
         return array(