[Phpcompta-dev] r4263 - in phpcompta/trunk: html include

[phpcompta-dev]

Author: danydb
Date: 2011-10-29 03:21:42 +0200 (Sat, 29 Oct 2011)
New Revision: 4263

Removed:
   phpcompta/trunk/html/extension.php
Modified:
   phpcompta/trunk/include/ext_inc.php
Log:
#423: Changement affichage plugin

Deleted: phpcompta/trunk/html/extension.php
===================================================================
--- phpcompta/trunk/html/extension.php  2011-10-29 01:10:52 UTC (rev 4262)
+++ phpcompta/trunk/html/extension.php  2011-10-29 01:21:42 UTC (rev 4263)
@@ -1,76 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta 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.
- *
- *   PhpCompta 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 PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder address@hidden
-
-/*!\file
- * \brief this file includes the called plugin. It  check first
- * the security. Load several javascript files
- */
-require_once('class_database.php');
-require_once('class_dossier.php');
-require_once("ac_common.php");
-require_once("constant.php");
-require_once('function_javascript.php');
-require_once('class_extension.php');
-require_once ('class_html_input.php');
-require_once('class_iselect.php');
-require_once ('constant.security.php');
-require_once ('class_user.php');
-echo '<div class="topmenu">';
address@hidden($_SESSION['g_theme']);
-$cn=new Database(dossier::id());
-$user=new User($cn);
-$user->check();
-$only_plugin=$user->check_dossier(dossier::id());
-
-
-/* javascript file */
-echo load_all_script();
-
-/* show button to return to access */
-
-/* show all the extension we can access */
-$a=new ISelect('plugin_code');
-$a->value=Extension::make_array($cn);
-$a->selected=(isset($_REQUEST['plugin_code']))?strtoupper($_REQUEST['plugin_code']):'';
-
-/* no plugin available */
-if ( count($a->value) == 0 )
-{
-    alert(j(_("Aucune extension  disponible")));
-    exit;
-}
-
-/* only one plugin available then we don't propose a choice*/
-if ( count($a->value)==1 )
-{
-    $_REQUEST['plugin_code']=$a->value[0]['value'];
-}
-else
-{
-    echo '<form method="get" action="extension.php">';
-    echo Dossier::hidden();
-    echo _('Extension').$a->input().HtmlInput::submit('go',_("Choix de 
l'extension"));
-    echo '</form>';
-    echo '<hr>';
-}
-
-require_once('ext_inc.php');

Modified: phpcompta/trunk/include/ext_inc.php
===================================================================
--- phpcompta/trunk/include/ext_inc.php 2011-10-29 01:10:52 UTC (rev 4262)
+++ phpcompta/trunk/include/ext_inc.php 2011-10-29 01:21:42 UTC (rev 4263)
@@ -1,5 +1,54 @@
 <?php
+require_once('class_database.php');
+require_once('class_dossier.php');
+require_once("ac_common.php");
+require_once("constant.php");
+require_once('function_javascript.php');
+require_once('class_extension.php');
+require_once ('class_html_input.php');
+require_once('class_iselect.php');
+require_once ('constant.security.php');
+require_once ('class_user.php');
+echo '<div class="topmenu">';
address@hidden($_SESSION['g_theme']);
 
+$cn=new Database(dossier::id());
+$user=new User($cn);
+$user->check();
+$only_plugin=$user->check_dossier(dossier::id());
+
+
+/* javascript file */
+echo load_all_script();
+
+/* show button to return to access */
+
+/* show all the extension we can access */
+$a=new ISelect('plugin_code');
+$a->value=Extension::make_array($cn);
+$a->selected=(isset($_REQUEST['plugin_code']))?strtoupper($_REQUEST['plugin_code']):'';
+
+/* no plugin available */
+if ( count($a->value) == 0 )
+{
+    alert(j(_("Aucune extension  disponible")));
+    exit;
+}
+
+/* only one plugin available then we don't propose a choice*/
+if ( count($a->value)==1 )
+{
+    $_REQUEST['plugin_code']=$a->value[0]['value'];
+}
+else
+{
+    echo '<form method="get" action="do.php">';
+    echo Dossier::hidden();
+    echo HtmlInput::request_to_hidden(array('plugin_code','ac'));
+    echo _('Extension').$a->input().HtmlInput::submit('go',_("Choix de 
l'extension"));
+    echo '</form>';
+    echo '<hr>';
+}
 /* if a code has been asked */
 if (isset($_REQUEST['plugin_code']) )
 {
@@ -14,12 +63,7 @@
             alert(j(_("Vous ne pouvez pas utiliser cette extension. Contactez 
votre responsable")));
             exit();
         }
-        /* show name of extension */
-        echo '<div 
style="position:absolute;right:30px;top:4px;margin:0;z-index:10" 
class="noprint">';
-        echo '<h2 class="error" 
style="display:inline;padding:0px;margin:0px">'.$ext->get_parameter('name').'</h2>';
-
-
-        echo '</div>';
+   
         if ( ! 
file_exists('../include/ext'.DIRECTORY_SEPARATOR.trim($ext->get_parameter('filepath'))))
         {
             alert(j(_("Ce fichier n'existe pas ")));