Add GDPR (personal data page) when social tool is disabled BT#15080

chamilo · Nov 20, 2018 · b621f2d · b621f2d
1 parent ac173d6
commit b621f2d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
@@ -885,6 +885,7 @@ public function return_profile_block()
                 'link' => api_get_path(WEB_PATH).'main/messages/inbox.php',
                 'title' => get_lang('Inbox').$cant_msg,
             ];
+
             $items[] = [
                 'class' => 'new-message-social',
                 'icon' => Display::return_icon('new-message.png', get_lang('Compose')),
@@ -900,6 +901,13 @@ public function return_profile_block()
                     'link' => api_get_path(WEB_PATH).'main/social/invitations.php',
                     'title' => get_lang('PendingInvitations').$total_invitations,
                 ];
+            } else {
+                $items[] = [
+                    'class' => 'personal-data',
+                    'icon' => Display::return_icon('database.png', get_lang('PersonalDataReport')),
+                    'link' => api_get_path(WEB_CODE_PATH).'social/personal_data.php',
+                    'title' => get_lang('PersonalDataReport'),
+                ];
             }
 
             if (api_get_configuration_value('allow_my_files_link_in_homepage')) {
@@ -947,7 +955,6 @@ public function return_profile_block()
         }
 
         if (true === api_get_configuration_value('whispeak_auth_enabled')) {
-            //if (!WhispeakAuthPlugin::checkUserIsEnrolled($userId)) {
             $itemTitle = WhispeakAuthPlugin::create()->get_title();
 
             $items[] = [
@@ -956,7 +963,6 @@ public function return_profile_block()
                 'link' => WhispeakAuthPlugin::getEnrollmentUrl(),
                 'title' => $itemTitle,
             ];
-            //}
         }
 
         return $items;

diff --git a/main/social/personal_data.php b/main/social/personal_data.php
@@ -51,7 +51,6 @@
     $formDelete->addButtonDelete(get_lang('DeleteAccount'));
     $formToString .= $formDelete->returnForm();
 }
-
 switch ($action) {
     case 'send_legal':
         $language = api_get_interface_language();

diff --git a/main/template/default/social/personal_data.tpl b/main/template/default/social/personal_data.tpl
@@ -3,13 +3,18 @@
 
 {% block content %}
 <div class="row">
-    <div class="col-md-3">
-        <div class="social-network-menu">
-            {{ social_avatar_block }}
-            {{ social_menu_block }}
+    {% set columns = '12' %}
+    {% if social_menu_block %}
+        <div class="col-md-3">
+            <div class="social-network-menu">
+                {{ social_avatar_block }}
+                {{ social_menu_block }}
+            </div>
         </div>
-    </div>
-    <div class="col-md-9">
+        {% set columns = '9' %}
+    {% endif %}
+
+    <div class="col-md-{{ columns }}">
         {{ display.panel('PersonalDataIntroductionTitle' | get_lang , 'PersonalDataIntroductionText' | get_lang) }}
         {{ display.collapse('', 'PersonalDataKeptOnYou' | get_lang, personal_data.data, false, 'false') }}