Merge pull request #626 from OCSInventory-NG/reworkExtensionEngine

Ready -  Rework extension engine

Author: charleneauger

config/main_menu.xml

@@ -130,13 +130,13 @@
       </menu-elem>
     </submenu>
   </menu-elem>
-  <menu-elem id="plugins">
+  <menu-elem id="extension">
     <label>g(7000)</label>
-    <url>ms_plugins</url>
+    <url>ms_extension</url>
     <submenu>
-      <menu-elem id="ms_pluginsmanager">
+      <menu-elem id="ms_extensionmanager">
     	<label>g(7001)</label>
-    	<url>ms_pluginsmanager</url>
+    	<url>ms_extensionmanager</url>
       </menu-elem>
     </submenu>
   </menu-elem>

config/profiles/sadmin.xml

@@ -98,14 +98,14 @@
     <page>ms_add_key</page>
     <page>ms_export_ocs</page>
     <page>ms_qrcode</page>
-    <page>ms_plugins</page>
+    <page>ms_extension</page>
     <page>ms_stats_top</page>
     <page>ms_server_infos</page>
     <page>ms_wiki</page>
     <page>ms_irc</page>
     <page>ms_offers</page>
     <page>ms_ask</page>
-    <page>ms_pluginsmanager</page>
+    <page>ms_extensionmanager</page>
     <page>ms_soft_cat</page>
     <page>ms_asset_cat</page>
     <page>ms_asset_cat_list</page>

config/urls.xml

@@ -280,13 +280,13 @@
         <value>qrcode</value>
         <directory>ms_computer</directory>
     </url>
-    <url key="ms_plugins">
-        <value>plugins</value>
-        <directory>ms_plugins</directory>
+    <url key="ms_extension">
+        <value>extension</value>
+        <directory>ms_extension</directory>
     </url>
-    <url key="ms_pluginsmanager">
-        <value>pluginsmanager</value>
-        <directory>ms_plugins</directory>
+    <url key="ms_extensionmanager">
+        <value>extensionmanager</value>
+        <directory>ms_extensionmanager</directory>
     </url>
     <url key="ms_stats_top">
         <value>stats_top</value>

download/README

@@ -0,0 +1 @@
+Add extensions in this folder

extensions/Readme.md

@@ -0,0 +1,14 @@
+DROP TABLE `plugins`;
+
+CREATE TABLE IF NOT EXISTS `extensions` (
+  `id` varchar(255) COLLATE utf8_bin NOT NULL,
+  `name` varchar(255) COLLATE utf8_bin NOT NULL,
+  `description` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+  `version` double NOT NULL,
+  `licence` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+  `author` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+  `contributor` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+  `install_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+ALTER TABLE `plugins` ADD PRIMARY KEY (`id`);

files/update/7021.sql

@@ -1535,21 +1535,21 @@
 6011 Click here to solve your problem
 6012 Select All
 
-7000 Plugins
-7001 Plugins manager
-7002 Plugin's name
+7000 Extensions
+7001 Extensions manager
+7002 Extension's name
 7003 Version
 7004 License
 7005 Author
 7006 Last updated
 7007 Are you sure you want to delete this plugin
-7008 Plugin Install
-7009 Installed Plugins
-7010 This plugin has been already installed
-7011 is an invalid plugin, check your sources.
+7008 Extension Install
+7009 Installed Extensions
+7010 This extension has been already installed
+7011 is an invalid extension, check your sources.
 7012 Installation aborted !
 7013 installed
-7014 There is currently no plugin available for installation
+7014 There is currently no extensions available for installation
 7015 Select at least one computer !
 7016 MTU
 

plugins/language/en_GB/en_GB.txt

@@ -1534,20 +1534,20 @@
 6012 Tout afficher
 
 7000 Plugins
-7001 Gestionnaire de plugins
-7002 Nom du plugin
+7001 Gestionnaire d'extensions
+7002 Nom de l'extension
 7003 Version
 7004 Licence
 7005 Auteur
 7006 Dernière mise à jour
 7007 Etes-vous sûr de vouloir supprimer ce plugin
-7008 Installer un plugin
-7009 Plugins installés
-7010 Ce plugin a déjà été installé
-7011 est un plugin non valide, vérifiez vos sources.
+7008 Installer une extension
+7009 Extensions installés
+7010 Cette extension a déjà été installé
+7011 est une extension non valide, vérifiez vos sources.
 7012 Installation annulée !
 7013 installé
-7014 Il n'y a aucun plugin disponible
+7014 Il n'y a aucune extensions disponible
 7015 Sélectionnez au minimum un ordinateur !
 
 8000 Notifications

plugins/language/fr_FR/fr_FR.txt

@@ -28,6 +28,8 @@
 }
 require('require/function_opt_param.php');
 require('require/function_graphic.php');
+require_once('require/extensions/ExtensionManager.php');
+require_once('require/extensions/ExtensionHook.php');
 require_once('require/function_machine.php');
 require_once('require/function_files.php');
 require_once('ms_computer_views.php');
@@ -85,6 +87,8 @@
 
 $plugins_serializer = new XMLPluginsSerializer();
 $plugins = $plugins_serializer->unserialize(file_get_contents( CD_CONFIG_DIR .'plugins.xml'));
+$extMgr = new ExtensionManager();
+$extHooks = new ExtensionHook($extMgr->installedExtensionsList);
 
 if (isset($protectedGet['cat']) && in_array($protectedGet['cat'], array('software', 'hardware', 'network', 'devices', 'admin', 'config', 'teledeploy', 'other'))) {
     // If category
@@ -103,6 +107,15 @@
             }
         }
     }
+    // Load cd entries for extensions
+    foreach ($extHooks->getCdEntryByCategory($protectedGet['cat']) as $extensionPlugins){
+        $fileName = EXT_DL_DIR.$extensionPlugins[ExtensionHook::EXTENSION]."/".$extensionPlugins[ExtensionHook::IDENTIFIER]."/".$extensionPlugins[ExtensionHook::IDENTIFIER].".php";
+        if(file_exists($fileName)){
+            echo '<div class="plugin-name-' . $extensionPlugins[ExtensionHook::IDENTIFIER] . ' ">';
+            require $fileName;
+            echo '</div>';
+        }
+    }
 } else if (isset($protectedGet['option']) && isset($plugins[$protectedGet['option']])) {
     // If specific plugin
     $plugin = $plugins[$protectedGet['option']];

plugins/main_sections/ms_computer/ms_computer.php

@@ -0,0 +1,123 @@
+<?php
+/*
+ * Copyright 2005-2016 OCSInventory-NG/OCSInventory-ocsreports contributors.
+ * See the Contributors file for more details about them.
+ *
+ * This file is part of OCSInventory-NG/OCSInventory-ocsreports.
+ *
+ * OCSInventory-NG/OCSInventory-ocsreports is free software: you can redistribute
+ * it and/or modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * OCSInventory-NG/OCSInventory-ocsreports is distributed in the hope that it
+ * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OCSInventory-NG/OCSInventory-ocsreports. if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+if (AJAX) {
+    parse_str($protectedPost['ocs']['0'], $params);
+    $protectedPost += $params;
+
+    ob_start();
+}
+
+require_once 'require/extensions/ExtensionManager.php';
+require_once 'require/extensions/ExtensionCommon.php';
+
+printEnTete($l->g(7008));
+
+?>
+<div class="container">
+    <div class="col col-md-12">
+<?php
+
+$extMgr = new ExtensionManager();
+if($extMgr->checkPrerequisites()){
+    $extMgr->checkInstallableExtensions();
+    
+    if(empty($extMgr->installableExtensionsList)){
+        msg_warning($l->g(7014));
+    }else{   
+        echo open_form("PluginInstall", '', '', 'form-horizontal');
+        ?>
+            <div class="form-group">
+                <div class="col col-sm-5 col-sm-offset-3">
+                    <select class="form-control" name="extensions">
+                        <?php
+                        foreach ($extMgr->installableExtensionsList as $key => $value) {
+                            echo "<option value=$value >$value</option>";
+                        }
+                        ?>
+                    </select>
+                </div>
+                <div class="col col-sm-2">
+                    <input type="submit" class="form-control btn btn-success" value="Install">
+                </div>
+            </div>
+        <?php
+        echo close_form();
+    }
+    
+}else{
+    msg_warning($l->g(7014));
+}
+
+?>
+    </div>
+</div>
+<?php
+
+if (!AJAX) {
+    if(isset($protectedPost['extensions'])){
+        $extMgr->installExtension($protectedPost['extensions']);
+    }
+
+    if(isset($protectedPost['SUP_PROF'])){
+        $extMgr->deleteExtension($protectedPost['SUP_PROF']);
+    }
+}
+
+// Plugins Tab
+printEnTete($l->g(7009));
+$form_name = "show_all_extensions";
+$table_name = $form_name;
+$tab_options = $protectedPost;
+$tab_options['form_name'] = $form_name;
+$tab_options['table_name'] = $table_name;
+echo open_form($form_name, '', '', 'form-horizontal');
+
+$list_fields = array('ID' => 'id',
+    $l->g(7002) => 'name',
+    $l->g(53) => 'description',
+    $l->g(7003) => 'version',
+    $l->g(7005) => 'author',
+    $l->g(7004) => 'licence'
+);
+
+$tab_options['FILTRE'] = array_flip($list_fields);
+$tab_options['FILTRE']['NAME'] = $l->g(49);
+asort($tab_options['FILTRE']);
+$list_fields['SUP'] = 'ID';
+$list_col_cant_del = array('SUP' => 'SUP');
+$default_fields = array($l->g(7002) => $l->g(7002), $l->g(7003) => $l->g(7003), $l->g(7004) => $l->g(7005), $l->g(7006), $l->g(7006));
+$sql = prepare_sql_tab($list_fields, $list_col_cant_del);
+$tab_options['ARG_SQL'] = $sql['ARG'];
+$queryDetails = $sql['SQL'] . ",ID from extensions";
+$tab_options['LBL_POPUP']['SUP'] = $l->g(7007) . " ";
+$tab_options['LBL']['SUP'] = $l->g(122);
+$tab_options['LIEN_CHAMP']['NAME'] = 'ID';
+$tab_options['LBL']['NAME'] = $l->g(49);
+ajaxtab_entete_fixe($list_fields, $default_fields, $tab_options, $list_col_cant_del);
+echo close_form();
+
+if (AJAX) {
+    ob_end_clean();
+    tab_req($list_fields, $default_fields, $list_col_cant_del, $queryDetails, $tab_options);
+}