rename plugin folder name - refs BT#9092

plugin/advanced_subscription/ajax/advsub.ajax.php

@@ -3,7 +3,7 @@
 /**
  * Script to receipt request to subscribe and confirmation action to queue
  * @author Daniel Alejandro Barreto Alva <daniel.barreto@beeznest.com>
- * @package chamilo.plugin.advancedsubscription
+ * @package chamilo.plugin.advanced_subscription
  */
 
 /**
@@ -113,7 +113,7 @@ if ($verified) {
                     if (!empty($res)) {
                         // Prepare admin url
                         $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) .
-                            'advancedsubscription/src/admin_view.php?s=' . $data['s'];
+                            'advanced_subscription/src/admin_view.php?s=' . $data['s'];
                         // Send mails
                         $result['mailIds'] = $plugin->sendMail($data, ADV_SUB_ACTION_STUDENT_REQUEST_NO_BOSS);
                         // Check if mails were sent
@@ -225,7 +225,7 @@ if ($verified) {
                     $data['admins'] = $adminsArray;
                     $data['session'] = $sessionArray;
                     $data['signature'] = api_get_setting('Institution');
-                    $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) . 'advancedsubscription/src/admin_view.php?s=' . $data['s'];
+                    $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) . 'advanced_subscription/src/admin_view.php?s=' . $data['s'];
                     // Check if exist and action in data
                     if (empty($data['action'])) {
                         // set action in data by new status

plugin/advanced_subscription/config.php

@@ -3,7 +3,7 @@
 /**
  * Config the plugin
  * @author Daniel Alejandro Barreto Alva <daniel.barreto@beeznest.com>
- * @package chamilo.plugin.advancedsubscription
+ * @package chamilo.plugin.advanced_subscription
  */
 
 define('TABLE_ADV_SUB_QUEUE', 'plugin_advsub_queue');
@@ -25,5 +25,5 @@ define('ADV_SUB_QUEUE_STATUS_ADMIN_APPROVED', 10);
 
 require_once __DIR__ . '/../../main/inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php';
-require_once api_get_path(PLUGIN_PATH) . 'advancedsubscription/src/AdvancedSubscriptionPlugin.php';
-require_once api_get_path(PLUGIN_PATH) . 'advancedsubscription/src/HookAdvancedSubscription.php';
+require_once api_get_path(PLUGIN_PATH) . 'advanced_subscription/src/AdvancedSubscriptionPlugin.php';
+require_once api_get_path(PLUGIN_PATH) . 'advanced_subscription/src/HookAdvancedSubscription.php';

plugin/advanced_subscription/install.php

@@ -3,7 +3,7 @@
 /**
  * This script is included by main/admin/settings.lib.php and generally
  * includes things to execute in the main database (settings_current table)
- * @package chamilo.plugin.advancedsubscription
+ * @package chamilo.plugin.advanced_subscription
  */
 
 /**

plugin/advanced_subscription/plugin.php

@@ -3,7 +3,7 @@
 /**
  * This script is a configuration file for the date plugin. You can use it as a master for other platform plugins (course plugins are slightly different).
  * These settings will be used in the administration interface for plugins (Chamilo configuration settings->Plugins)
- * @package chamilo.plugin.advancedsubscription
+ * @package chamilo.plugin.advanced_subscription
  */
 /**
  * Plugin details (must be present)

plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php

@@ -4,12 +4,13 @@
  * @TODO: Improve description
  * This class is used to add an advanced subscription allowing the admin to
  * create user queues requesting a subscribe to a session
- * @package chamilo.plugin.advancedsubscription
+ * @package chamilo.plugin.advanced_subscription
  */
 
 
 class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
 {
+    protected $strings;
     /**
      * Constructor
      */
@@ -99,7 +100,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
 
         /* Delete settings */
         $tSettings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
-        Database::query("DELETE FROM $tSettings WHERE subkey = 'advancedsubscription'");
+        Database::query("DELETE FROM $tSettings WHERE subkey = 'advanced_subscription'");
     }
 
     /**
@@ -383,7 +384,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['student']['user_id'],
                     $this->get_lang('MailStudentRequest'),
-                    $tpl->fetch('/advancedsubscription/views/student_notice_student.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/student_notice_student.tpl'),
                     $data['s']
                 );
                 // Mail to superior
@@ -391,7 +392,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['superior']['user_id'],
                     $this->get_lang('MailStudentRequest'),
-                    $tpl->fetch('/advancedsubscription/views/student_notice_superior.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/student_notice_superior.tpl'),
                     $data['s'],
                     true
                 );
@@ -402,7 +403,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['student']['user_id'],
                     $this->get_lang('MailBossAccept'),
-                    $tpl->fetch('/advancedsubscription/views/superior_accepted_notice_student.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/superior_accepted_notice_student.tpl'),
                     $data['s']
                 );
                 // Mail to superior
@@ -410,7 +411,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['superior']['user_id'],
                     $this->get_lang('MailBossAccept'),
-                    $tpl->fetch('/advancedsubscription/views/superior_accepted_notice_superior.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/superior_accepted_notice_superior.tpl'),
                     $data['s']
                 );
                 // Mail to admin
@@ -420,7 +421,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                         $data['u'],
                         $adminId,
                         $this->get_lang('MailBossAccept'),
-                        $tpl->fetch('/advancedsubscription/views/superior_accepted_notice_admin.tpl'),
+                        $tpl->fetch('/advanced_subscription/views/superior_accepted_notice_admin.tpl'),
                         $data['s'],
                         true
                     );
@@ -432,7 +433,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['student']['user_id'],
                     $this->get_lang('MailBossReject'),
-                    $tpl->fetch('/advancedsubscription/views/superior_rejected_notice_student.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/superior_rejected_notice_student.tpl'),
                     $data['s'],
                     true
                 );
@@ -441,7 +442,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['superior']['user_id'],
                     $this->get_lang('MailBossReject'),
-                    $tpl->fetch('/advancedsubscription/views/superior_rejected_notice_superior.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/superior_rejected_notice_superior.tpl'),
                     $data['s']
                 );
                 break;
@@ -451,7 +452,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['student']['user_id'],
                     $this->get_lang('MailStudentRequestSelect'),
-                    $tpl->fetch('/advancedsubscription/views/student_notice_student.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/student_notice_student.tpl'),
                     $data['s']
                 );
                 // Mail to superior
@@ -459,7 +460,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['superior']['user_id'],
                     $this->get_lang('MailStudentRequestSelect'),
-                    $tpl->fetch('/advancedsubscription/views/student_notice_superior.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/student_notice_superior.tpl'),
                     $data['s'],
                     true
                 );
@@ -470,7 +471,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['student']['user_id'],
                     $this->get_lang('MailAdminAccept'),
-                    $tpl->fetch('/advancedsubscription/views/admin_accepted_notice_student.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/admin_accepted_notice_student.tpl'),
                     $data['s']
                 );
                 // Mail to superior
@@ -478,7 +479,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['superior']['user_id'],
                     $this->get_lang('MailAdminAccept'),
-                    $tpl->fetch('/advancedsubscription/views/admin_accepted_notice_superior.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/admin_accepted_notice_superior.tpl'),
                     $data['s']
                 );
                 // Mail to admin
@@ -488,7 +489,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $adminId,
                     $this->get_lang('MailAdminAccept'),
-                    $tpl->fetch('/advancedsubscription/views/admin_accepted_notice_admin.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/admin_accepted_notice_admin.tpl'),
                     $data['s'],
                     true
                 );
@@ -499,7 +500,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['student']['user_id'],
                     $this->get_lang('MailAdminReject'),
-                    $tpl->fetch('/advancedsubscription/views/admin_rejected_notice_student.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/admin_rejected_notice_student.tpl'),
                     $data['s'],
                     true
                 );
@@ -508,7 +509,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['superior']['user_id'],
                     $this->get_lang('MailAdminReject'),
-                    $tpl->fetch('/advancedsubscription/views/admin_rejected_notice_superior.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/admin_rejected_notice_superior.tpl'),
                     $data['s']
                 );
                 // Mail to admin
@@ -518,7 +519,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $adminId,
                     $this->get_lang('MailAdminReject'),
-                    $tpl->fetch('/advancedsubscription/views/admin_rejected_notice_admin.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/admin_rejected_notice_admin.tpl'),
                     $data['s']
                 );
                 break;
@@ -528,7 +529,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $data['u'],
                     $data['student']['user_id'],
                     $this->get_lang('MailStudentRequestNoBoss'),
-                    $tpl->fetch('/advancedsubscription/views/student_no_superior_notice_student.tpl'),
+                    $tpl->fetch('/advanced_subscription/views/student_no_superior_notice_student.tpl'),
                     $data['s']
                 );
                 // Mail to admin
@@ -538,7 +539,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                         $data['u'],
                         $adminId,
                         $this->get_lang('MailStudentRequestNoBoss'),
-                        $tpl->fetch('/advancedsubscription/views/student_no_superior_notice_admin.tpl'),
+                        $tpl->fetch('/advanced_subscription/views/student_no_superior_notice_admin.tpl'),
                         $data['s'],
                         true
                     );
@@ -760,7 +761,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
      */
     public function getQueueUrl($params)
     {
-        $url = api_get_path(WEB_PLUGIN_PATH) . 'advancedsubscription/ajax/advsub.ajax.php?' .
+        $url = api_get_path(WEB_PLUGIN_PATH) . 'advanced_subscription/ajax/advsub.ajax.php?' .
             'a=' . Security::remove_XSS($params['a']) . '&' .
             's=' . intval($params['s']) . '&' .
             'current_user_id=' . intval($params['current_user_id']) . '&' .
@@ -900,4 +901,14 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
     {
         return $this->generateHash($data) == $hash;
     }
+
+    /**
+     * Copied and fixed from plugin.class.php
+     * Returns the "system" name of the plugin in lowercase letters
+     * @return string
+     */
+    public function get_name()
+    {
+        return 'advanced_subscription';
+    }
 }

plugin/advanced_subscription/src/HookAdvancedSubscription.php

@@ -3,7 +3,7 @@
 /**
  * Hook Observer for Advanced subscription plugin
  * @author Daniel Alejandro Barreto Alva <daniel.barreto@beeznest.com>
- * @package chamilo.plugin.advancedsubscription
+ * @package chamilo.plugin.advanced_subscription
  */
 
 require_once __DIR__ . '/../config.php';
@@ -17,8 +17,8 @@ class HookAdvancedSubscription extends HookObserver implements
     protected function __construct()
     {
         parent::__construct(
-            'plugin/advancedsubscription/src/HookAdvancedSubscription.class.php',
-            'advancedsubscription'
+            'plugin/advanced_subscription/src/HookAdvancedSubscription.class.php',
+            'advanced_subscription'
         );
     }
 
@@ -35,7 +35,7 @@ class HookAdvancedSubscription extends HookObserver implements
 
             if (isset($data['blocks'])) {
                 $data['blocks']['sessions']['items'][] = array(
-                    'url' => '../../plugin/advancedsubscription/src/admin_view.php',
+                    'url' => '../../plugin/advanced_subscription/src/admin_view.php',
                     'label' => get_plugin_lang('plugin_title', 'AdvancedSubscriptionPlugin'),
                 );
             }

plugin/advanced_subscription/src/admin_view.php

@@ -2,7 +2,7 @@
 /* For license terms, see /license.txt */
 /**
  * Index of the Advanced subscription plugin courses list
- * @package chamilo.plugin.advancedsubscription
+ * @package chamilo.plugin.advanced_subscription
  */
 /**
  * Init
@@ -81,7 +81,7 @@ $tpl->assign('sessionItems', $sessionList);
 $tpl->assign('approveAdmin', ADV_SUB_QUEUE_STATUS_ADMIN_APPROVED);
 $tpl->assign('disapproveAdmin', ADV_SUB_QUEUE_STATUS_ADMIN_DISAPPROVED);
 // Get rendered template
-$content = $tpl->fetch('/advancedsubscription/views/admin_view.tpl');
+$content = $tpl->fetch('/advanced_subscription/views/admin_view.tpl');
 // Assign into content
 $tpl->assign('content', $content);
 // Display

plugin/advanced_subscription/test/mails.php

@@ -79,7 +79,7 @@ $data['admin'] = current($adminsArray);
 $data['session'] = $sessionArray;
 $data['signature'] = api_get_setting('Institution');
 $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) .
-    'advancedsubscription/src/admin_view.php?s=' . $data['s'];
+    'advanced_subscription/src/admin_view.php?s=' . $data['s'];
 $data['e'] = ADV_SUB_QUEUE_STATUS_BOSS_APPROVED;
 $data['student']['acceptUrl'] = $plugin->getQueueUrl($data);
 $data['e'] = ADV_SUB_QUEUE_STATUS_BOSS_DISAPPROVED;
@@ -115,7 +115,7 @@ foreach ($files as $k =>&$file) {
         $file != 'admin_view.tpl'
     ) {
         echo '<pre>', $file, '</pre>';
-        echo $tpl->fetch('/advancedsubscription/views/' . $file);
+        echo $tpl->fetch('/advanced_subscription/views/' . $file);
     } else {
         unset($files[$k]);
     }

plugin/advanced_subscription/uninstall.php

@@ -4,7 +4,7 @@
  * This script is included by main/admin/settings.lib.php when unselecting a plugin
  * and is meant to remove things installed by the install.php script in both
  * the global database and the courses tables
- * @package chamilo.plugin.advancedsubscription
+ * @package chamilo.plugin.advanced_subscription
 */
 
 /**

plugin/advanced_subscription/views/admin_view.tpl

@@ -1,4 +1,4 @@
-<form id="form_advsub_admin" class="form-search" method="post" action="/plugin/advancedsubscription/src/admin_view.php" name="form_advsub_admin">
+<form id="form_advsub_admin" class="form-search" method="post" action="/plugin/advanced_subscription/src/admin_view.php" name="form_advsub_admin">
     <div class="row">
         <div class="span6">
             <p class="text-title-select">{{ 'SelectASession' | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p>