From 55992d0d94a3fb0490b24a8f7ae2cfc2cc727c4e Mon Sep 17 00:00:00 2001 From: remicollet Date: Wed, 17 Aug 2011 09:21:09 +0000 Subject: [PATCH] call functions (by Yllen) git-svn-id: https://forge.glpi-project.org/svn/example/trunk@168 349b9182-4a13-0410-896f-e5e9767dd1b3 --- config.php | 4 ++-- front/example.php | 8 ++++---- front/popup.php | 9 ++++----- hook.php | 4 ++-- report.php | 4 ++-- setup.php | 2 +- stat.php | 4 ++-- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/config.php b/config.php index 8163c99..1924cc2 100755 --- a/config.php +++ b/config.php @@ -45,8 +45,8 @@ Session::checkRight("config", "w"); // To be available when plugin in not activated Plugin::load('example'); -commonHeader("TITRE",$_SERVER['PHP_SELF'],"config","plugins"); +Html::header("TITRE",$_SERVER['PHP_SELF'],"config","plugins"); echo "This is the plugin config page
"; echo $LANG['plugin_example']["test"]; -commonFooter(); +Html::footer(); ?> \ No newline at end of file diff --git a/front/example.php b/front/example.php index 1880f58..09b7aa9 100755 --- a/front/example.php +++ b/front/example.php @@ -37,9 +37,9 @@ define('GLPI_ROOT', '../../..'); include (GLPI_ROOT . "/inc/includes.php"); if ($_SESSION["glpiactiveprofile"]["interface"] == "central") { - commonHeader("TITRE", $_SERVER['PHP_SELF'],"plugins","example","optionname"); + Html::header("TITRE", $_SERVER['PHP_SELF'],"plugins","example","optionname"); } else { - helpHeader("TITRE", $_SERVER['PHP_SELF']); + Html::helpHeader("TITRE", $_SERVER['PHP_SELF']); } @@ -47,5 +47,5 @@ if ($_SESSION["glpiactiveprofile"]["interface"] == "central") { Search::show('PluginExampleExample'); -commonFooter(); -?> +Html::footer(); +?> \ No newline at end of file diff --git a/front/popup.php b/front/popup.php index a788a07..4b53cfa 100644 --- a/front/popup.php +++ b/front/popup.php @@ -40,23 +40,22 @@ if (isset($_GET["popup"])) { if (isset($_SESSION["glpipopup"]["name"])) { switch ($_SESSION["glpipopup"]["name"]) { case "test_rule" : - popHeader($LANG['buttons'][50],$_SERVER['PHP_SELF']); + Html::popHeader($LANG['buttons'][50],$_SERVER['PHP_SELF']); include "../../../front/rule.test.php"; break; case "test_all_rules" : - popHeader($LANG['rulesengine'][84],$_SERVER['PHP_SELF']); + Html::popHeader($LANG['rulesengine'][84],$_SERVER['PHP_SELF']); include "../../../front/rulesengine.test.php"; break; case "show_cache" : - popHeader($LANG['rulesengine'][100],$_SERVER['PHP_SELF']); + Html::popHeader($LANG['rulesengine'][100],$_SERVER['PHP_SELF']); include "../../../front/rule.cache.php"; break; } echo "

".$LANG['buttons'][13].""; echo "
"; - popFooter(); + Html::popFooter(); } - ?> \ No newline at end of file diff --git a/hook.php b/hook.php index 4cf18b1..e89a2b3 100644 --- a/hook.php +++ b/hook.php @@ -39,10 +39,10 @@ function plugin_change_profile_example() { // For example : same right of computer - if (haveRight('computer','w')) { + if (Session::haveRight('computer','w')) { $_SESSION["glpi_plugin_example_profile"] = array('example' => 'w'); - } else if (haveRight('computer','r')) { + } else if (Session::haveRight('computer','r')) { $_SESSION["glpi_plugin_example_profile"] = array('example' => 'r'); } else { diff --git a/report.php b/report.php index 30aacab..8bef9a2 100644 --- a/report.php +++ b/report.php @@ -42,9 +42,9 @@ include (GLPI_ROOT . "/inc/includes.php"); Session::checkRight("config", "w"); -commonHeader("TITRE",$_SERVER['PHP_SELF'],"plugins"); +Html::header("TITRE",$_SERVER['PHP_SELF'],"plugins"); echo "This is the plugin report page"; -commonFooter(); +Html::footer(); ?> \ No newline at end of file diff --git a/setup.php b/setup.php index 460c053..4067d21 100755 --- a/setup.php +++ b/setup.php @@ -69,7 +69,7 @@ function plugin_init_example() { } // Config page - if (haveRight('config','w')) { + if (Session::haveRight('config','w')) { $PLUGIN_HOOKS['config_page']['example'] = 'config.php'; } diff --git a/stat.php b/stat.php index abb0087..0ccf52d 100644 --- a/stat.php +++ b/stat.php @@ -42,9 +42,9 @@ include (GLPI_ROOT . "/inc/includes.php"); Session::checkRight("config", "w"); -commonHeader("TITLE",$_SERVER['PHP_SELF'],"plugins"); +Html::header("TITLE",$_SERVER['PHP_SELF'],"plugins"); echo "This is the plugin stat page"; -commonFooter(); +Html::footer(); ?> \ No newline at end of file