From 0155d963812a5b5254f2e6e3bc6bc35eeacd6da7 Mon Sep 17 00:00:00 2001
From: Julian Prieber <julian.prieber@llc.ovh>
Date: Tue, 28 Mar 2023 14:19:37 +0200
Subject: [PATCH] Bugfix

Fixed vcard title bug
---
 app/Http/Controllers/UserController.php       |  4 +-
 .../components/pageitems/vcard-form.blade.php | 95 ++++++++++++-------
 2 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 7a36471..046a9f3 100755
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -362,7 +362,7 @@ class UserController extends Controller
                 $suffix = $request->input('suffix');
                 $nickname = $request->input('nickname');
                 $organization = $request->input('organization');
-                $title = $request->input('title');
+                $vtitle = $request->input('vtitle');
                 $role = $request->input('role');
                 $workUrl = $request->input('work_url');
                 $email = $request->input('email');
@@ -392,7 +392,7 @@ class UserController extends Controller
                 
                 // Set the organization information
                 $vCard->addCompany($organization);
-                $vCard->addJobtitle($title);
+                $vCard->addJobtitle($vtitle);
                 $vCard->addUrl($workUrl);
                 
                 // Set the phone numbers
diff --git a/resources/views/components/pageitems/vcard-form.blade.php b/resources/views/components/pageitems/vcard-form.blade.php
index d56e5db..a5bad29 100644
--- a/resources/views/components/pageitems/vcard-form.blade.php
+++ b/resources/views/components/pageitems/vcard-form.blade.php
@@ -1,11 +1,42 @@
-<?php use App\Models\Button; $button = Button::find($button_id); if(isset($button->name)){$buttonName = $button->name;}else{$buttonName = 0;} ?>
+<?php use JeroenDesloovere\VCard\VCard; use App\Models\Button; $button = Button::find($button_id); if(isset($button->name)){$buttonName = $button->name;}else{$buttonName = 0;} ?>
 
 <select style="display:none" name="button" class="form-control"><option class="button button-default email" value="vcard">Vcard</option></select>
 
-<label for='title' class='form-label'>Custom Title</label>
-<input type='text' name='link_title' value='' class='form-control' />
-<span class='small text-muted'>Leave blank for default title</span><br>
+{{-- @php
+$vcard = new VCard($link_url);
 
+$prefix = $vcard->getPrefix();
+$firstName = $vcard->getFirstName();
+$middleName = $vcard->getMiddleName();
+$lastName = $vcard->getLastName();
+$suffix = $vcard->getSuffix();
+$organization = $vcard->getOrganization();
+$title = $vcard->getTitle();
+$role = $vcard->getRole();
+$workUrl = $vcard->getUrl();
+$email = $vcard->getEmail();
+$workEmail = $vcard->getWorkEmail();
+$homePhone = $vcard->getHomePhone();
+$workPhone = $vcard->getWorkPhone();
+$cellPhone = $vcard->getCellPhone();
+$homeAddressLabel = $vcard->getHomeAddressLabel();
+$homeAddressStreet = $vcard->getHomeAddressStreet();
+$homeAddressCity = $vcard->getHomeAddressCity();
+$homeAddressState = $vcard->getHomeAddressRegion();
+$homeAddressZip = $vcard->getHomeAddressPostalCode();
+$homeAddressCountry = $vcard->getHomeAddressCountry();
+$workAddressLabel = $vcard->getWorkAddressLabel();
+$workAddressStreet = $vcard->getWorkAddressStreet();
+$workAddressCity = $vcard->getWorkAddressCity();
+$workAddressState = $vcard->getWorkAddressRegion();
+$workAddressZip = $vcard->getWorkAddressPostalCode();
+$workAddressCountry = $vcard->getWorkAddressCountry();
+@endphp --}}
+
+<label for='title' class='form-label'>Custom Title</label>
+<input type='text' name='link_title' value='{{ $link_title }}' class='form-control' />
+<span class='small text-muted'>Leave blank for default title</span><br>
+{{$link_url}}
 <br><h5>Upload existing file</h5>
 <div class="form-group col-lg-8">
     <label>Vcard</label>
@@ -14,95 +45,95 @@
 
 <br><h4>Name</h4>
 <label for='prefix' class='form-label'>Prefix</label>
-<input type='text' name='prefix' value='' class='form-control'/>
+<input type='text' name='prefix' value='{{$prefix ?? ''}}' class='form-control'/>
 <br>
 <label for='first_name' class='form-label'>First Name</label>
-<input type='text' name='first_name' value='' class='form-control'/>
+<input type='text' name='first_name' value='{{$firstName ?? ''}}' class='form-control'/>
 <br>
 <label for='middle_name' class='form-label'>Middle Name</label>
-<input type='text' name='middle_name' value='' class='form-control'/>
+<input type='text' name='middle_name' value='{{$middleName ?? ''}}' class='form-control'/>
 <br>
 <label for='last_name' class='form-label'>Last Name</label>
-<input type='text' name='last_name' value='' class='form-control'/>
+<input type='text' name='last_name' value='{{$lastName ?? ''}}' class='form-control'/>
 <br>
 <label for='suffix' class='form-label'>Suffix</label>
-<input type='text' name='suffix' value='' class='form-control'/>
+<input type='text' name='suffix' value='{{$suffix ?? ''}}' class='form-control'/>
 <br>
 {{-- <label for='nickname' class='form-label'>Nickname</label>
-<input type='text' name='nickname' value='' class='form-control'/>
+<input type='text' name='nickname' value='{{ ?? ''}}' class='form-control'/>
 <br> --}}
 
 <br><h4>Work</h4>
 <label for='organization' class='form-label'>Organization</label>
-<input type='text' name='organization' value='' class='form-control'/>
+<input type='text' name='organization' value='{{$organization ?? ''}}' class='form-control'/>
 <br>
-<label for='title' class='form-label'>Title</label>
-<input type='text' name='title' value='' class='form-control'/>
+<label for='vtitle' class='form-label'>Title</label>
+<input type='text' name='vtitle' value='{{$vtitle ?? ''}}' class='form-control'/>
 <br>
 <label for='role' class='form-label'>Role</label>
-<input type='text' name='role' value='' class='form-control'/>
+<input type='text' name='role' value='{{$role ?? ''}}' class='form-control'/>
 <br>
 <label for='work_url' class='form-label'>Work URL</label>
-<input type='url' name='work_url' value='' class='form-control'/>
+<input type='url' name='work_url' value='{{$workUrl ?? ''}}' class='form-control'/>
 <br>
 
 <br><h4>Emails</h4>
 <label for='email' class='form-label'>Email</label>
-<input type='email' name='email' value='' class='form-control'/>
+<input type='email' name='email' value='{{$email ?? ''}}' class='form-control'/>
 <span class='small text-muted'>Enter your personal email</span>
 <br>
 <label for='work_email' class='form-label'>Work Email</label>
-<input type='email' name='work_email' value='' class='form-control'/>
+<input type='email' name='work_email' value='{{$workEmail ?? ''}}' class='form-control'/>
 <span class='small text-muted'>Enter your work email</span>
 <br>
 
 <br><h4>Phones</h4>
 <label for='home_phone' class='form-label'>Home Phone</label>
-<input type='tel' name='home_phone' value='' class='form-control'/>
+<input type='tel' name='home_phone' value='{{$homePhone ?? ''}}' class='form-control'/>
 <br>
 <label for='work_phone' class='form-label'>Work Phone</label>
-<input type='tel' name='work_phone' value='' class='form-control'/>
+<input type='tel' name='work_phone' value='{{$workPhone ?? ''}}' class='form-control'/>
 <br>
 <label for='cell_phone' class='form-label'>Cell Phone</label>
-<input type='tel' name='cell_phone' value='' class='form-control'/>
+<input type='tel' name='cell_phone' value='{{$cellPhone ?? ''}}' class='form-control'/>
 <br>
 
 <br><h4>Home Address</h4>
 <label for='home_address_label' class='form-label'>Label</label>
-<input type='text' name='home_address_label' value='' class='form-control'/>
+<input type='text' name='home_address_label' value='{{$homeAddressLabel ?? ''}}' class='form-control'/>
 <br>
 <label for='home_address_street' class='form-label'>Street</label>
-<input type='text' name='home_address_street' value='' class='form-control'/>
+<input type='text' name='home_address_street' value='{{$homeAddressStreet ?? ''}}' class='form-control'/>
 <br>
 <label for='home_address_city' class='form-label'>City</label>
-<input type='text' name='home_address_city' value='' class='form-control'/>
+<input type='text' name='home_address_city' value='{{$homeAddressCity ?? ''}}' class='form-control'/>
 <br>
 <label for='home_address_state' class='form-label'>State/Province</label>
-<input type='text' name='home_address_state' value='' class='form-control'/>
+<input type='text' name='home_address_state' value='{{$homeAddressState ?? ''}}' class='form-control'/>
 <br>
 <label for='home_address_zip' class='form-label'>Zip/Postal Code</label>
-<input type='text' name='home_address_zip' value='' class='form-control'/>
+<input type='text' name='home_address_zip' value='{{$homeAddressZip ?? ''}}' class='form-control'/>
 <br>
 <label for='home_address_country' class='form-label'>Country</label>
-<input type='text' name='home_address_country' value='' class='form-control'/>
+<input type='text' name='home_address_country' value='{{$homeAddressCountry ?? ''}}' class='form-control'/>
 <br>
 <br><h4>Work Address</h4>
 <label for='work_address_label' class='form-label'>Label</label>
-<input type='text' name='work_address_label' value='' class='form-control'/>
+<input type='text' name='work_address_label' value='{{$workAddressLabel ?? ''}}' class='form-control'/>
 <br>
 <label for='work_address_street' class='form-label'>Street</label>
-<input type='text' name='work_address_street' value='' class='form-control'/>
+<input type='text' name='work_address_street' value='{{$workAddressStreet ?? ''}}' class='form-control'/>
 <br>
 <label for='work_address_city' class='form-label'>City</label>
-<input type='text' name='work_address_city' value='' class='form-control'/>
+<input type='text' name='work_address_city' value='{{$workAddressCity ?? ''}}' class='form-control'/>
 <br>
 <label for='work_address_state' class='form-label'>State/Province</label>
-<input type='text' name='work_address_state' value='' class='form-control'/>
+<input type='text' name='work_address_state' value='{{$workAddressState ?? ''}}' class='form-control'/>
 <br>
 <label for='work_address_zip' class='form-label'>Zip/Postal Code</label>
-<input type='text' name='work_address_zip' value='' class='form-control'/>
+<input type='text' name='work_address_zip' value='{{$workAddressZip ?? ''}}' class='form-control'/>
 <br>
 <label for='work_address_country' class='form-label'>Country</label>
-<input type='text' name='work_address_country' value='' class='form-control'/>
+<input type='text' name='work_address_country' value='{{$workAddressCountry ?? ''}}' class='form-control'/>
 <br>