Delete Extra Setting functions, use the default one and set the translation - refs #6715

main/inc/lib/plugin.class.php

@@ -531,7 +531,7 @@ class Plugin
             $whereCond = array(
                     'variable = ? AND subkey = ?' => array('show_tabs', $key)
             );
-            Database::delete('settings_current', $whereCond);
+            $resp = Database::delete('settings_current', $whereCond);
 
             //if there is more than one tab
             //reenumerate them
@@ -541,7 +541,7 @@ class Plugin
                     $attributes = array(
                         'subkey' => 'custom_tab_' . $i
                     );
-                    $resp = $this->updateTab($row['subkey'], $attributes);
+                    $this->updateTab($row['subkey'], $attributes);
                     $i++;
                 }
 
@@ -565,78 +565,4 @@ class Plugin
         $resp = Database::update('settings_current', $attributes, $whereCond);
         return $resp;
     }
-    
-    /**
-     * Add aditional plugin Settings
-     * @param array $settings
-     */
-    public function addExtraSettings($settings) 
-    {
-        $pluginName = $this->get_name();
-        $resp = false;
-        foreach ($settings as $setting => $value) {
-            $attributes = array(
-                'variable' => 'plugin_settings_' . $pluginName,
-                'subkey' => $setting,
-                'selected_value' => $value,
-                'category' => 'PluginSettings'
-            );
-            if (empty($this->getExtraSettingValue($setting))) {
-                $resp = Database::insert('settings_current', $attributes);
-            }
-        }
-        
-        return $resp;
-    }
-    
-   /**
-    * Edit Extra settings
-    * @param string $key
-    * @param array $attributes
-    * @return boolean
-    */
-    public function editExtraSetting($key, $attributes)
-    {
-        $pluginName = $this->get_name();
-        
-        $whereCond = array(
-            'variable = ? AND subkey = ?' => array('plugin_settings_' . $pluginName, $key)
-        );
-        
-        $resp = Database::update('settings_current', $attributes, $whereCond);
-         
-        return $resp;
-    }
-    
-    
-    /**
-     * Delete all aditional plugin settings
-     */
-    public function deleteExtraSettings() 
-    {
-        $pluginName = $this->get_name();
-        $whereCond = array(
-            'variable = ?' => 'plugin_settings_' . $pluginName
-        );
-        $resp = Database::delete('settings_current', $whereCond);
-        
-        return $resp;
-    }
-    
-    /**
-     * Give extra setting value
-     * @param string $settingName
-     */
-    public function getExtraSettingValue($settingName)
-    {
-        $pluginName = $this->get_name();
-        $fullSetting = api_get_full_setting('plugin_settings_' . $pluginName, $settingName);
-        
-        if (empty($fullSetting)) {
-            return false;
-        } else {
-            $setting = current($fullSetting);
-            return $setting['selected_value'];
-        }
-    }
 }

plugin/ticket/lang/spanish.php

@@ -83,4 +83,6 @@ $strings['ToBeAssigned'] = "Por Asignar";
 $strings['Untill'] = "Hasta";
 $strings['TicketWasThisAnswerSatisfying'] = "¿Fué la respuesta al Ticket satisfactoria?";
 $strings['TicketDetail'] = "Detalle del Ticket";
-$strings['AreYouSure'] = "¿Está seguro?";
+$strings['AreYouSure'] = "¿Está seguro?";
+
+$strings['allow_student_add'] = "Permitir al studiante generar Tickets";

plugin/ticket/src/myticket.php

@@ -350,7 +350,7 @@ if ($isAdmin) {
             <div class="clear">&nbsp;</div>
          </form>';
 } else {
-    if ($plugin->getExtraSettingValue('allow_student_add') == 'true') {
+    if ($plugin->get('allow_student_add') == 'true') {
         echo '<div class="actions" >';
         echo '<span style="float:right;">' .
                 '<a href="' . api_get_path(WEB_PLUGIN_PATH) . 'ticket/src/new_ticket.php">' .

plugin/ticket/src/new_ticket.php

@@ -12,7 +12,7 @@ $cidReset = true;
 require_once '../config.php';
 $plugin = TicketPlugin::create();
 
-if (!api_is_platform_admin() && $plugin->getExtraSettingValue('allow_student_add') != 'true') {
+if (!api_is_platform_admin() && $plugin->get('allow_student_add') != 'true') {
     header('location:' . api_get_path(WEB_PLUGIN_PATH) . PLUGIN_NAME . '/src/myticket.php');
     exit;
 }

plugin/ticket/src/ticket_plugin.class.php

@@ -21,7 +21,11 @@ class TicketPlugin extends Plugin
     }
     protected function __construct()
     {
-        parent::__construct('1.0', 'Kenny Rodas Chavez, Genesis Lopez, Francis Gonzales, Yannick Warnier', array('tool_enable' => 'boolean'));
+        $settings = array(
+            'tool_enable' => 'boolean',
+            'allow_student_add' => 'boolean'
+        );
+        parent::__construct('1.0', 'Kenny Rodas Chavez, Genesis Lopez, Francis Gonzales, Yannick Warnier', $settings);
     }
 
     /**
@@ -31,7 +35,7 @@ class TicketPlugin extends Plugin
     {
         // Create database tables and insert a Tab
         require_once api_get_path(SYS_PLUGIN_PATH) . PLUGIN_NAME . '/database.php';
-
+        
     }
     /**
      * Uninstall the ticket plugin
@@ -75,7 +79,10 @@ class TicketPlugin extends Plugin
         $sql = "DROP TABLE IF EXISTS $tblTicketTicket";
         Database::query($sql);
         
-        $this->deleteTab($plugSetting['comment']);
-        $this->deleteExtraSettings();
+        $rsTab = $this->deleteTab($plugSetting['comment']);
+        
+        if ($rsTab) {
+            echo "<script>location.href = '" . $_SERVER['REQUEST_URI'] . "';</script>";
+        }
     }
 }