diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index 3340aa89d4477afed76c3d1178c334e9775a30ca..072375c89d9f88cdfa017208c51f6c722d276b90 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -24,7 +24,7 @@
*/
// Put here all includes required by your class file
-//require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
@@ -32,13 +32,13 @@
/**
* Put here description of your class
*/
-class Skeleton_Class // extends CommonObject
+class Skeleton_Class extends CommonObject
{
var $db; //!< To store db handler
var $error; //!< To return error code (or message)
var $errors=array(); //!< To return several error codes (or messages)
- //var $element='skeleton'; //!< Id that identify managed objects
- //var $table_element='skeleton'; //!< Name of table without prefix where object is stored
+ var $element='skeleton'; //!< Id that identify managed objects
+ var $table_element='skeleton'; //!< Name of table without prefix where object is stored
var $id;
var $prop1;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bd61e245715b68f4c50bae7ad1ccf449380d3142..52f4c03f1fabe81a9a17f71fea8e850f741f866f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -562,29 +562,31 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
/**
* Show tab header of a card
*
- * @param array $links Array of tabs
- * @param string $active Active tab name (document', 'info', 'ldap', ....)
- * @param string $title Title
- * @param int $notab 0=Add tab header, 1=no tab header
- * @param string $picto Add a picto on tab title
+ * @param array $links Array of tabs
+ * @param string $active Active tab name (document', 'info', 'ldap', ....)
+ * @param string $title Title
+ * @param int $notab 0=Add tab header, 1=no tab header
+ * @param string $picto Add a picto on tab title
+ * @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_build_path('/mymodyle/img/myimg.png',1) for $picto.
* @return void
*/
-function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='')
+function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='', $pictoisfullpath=0)
{
- print dol_get_fiche_head($links, $active, $title, $notab, $picto);
+ print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath);
}
/**
* Show tab header of a card
*
- * @param array $links Array of tabs
- * @param int $active Active tab name
- * @param string $title Title
- * @param int $notab 0=Add tab header, 1=no tab header
- * @param string $picto Add a picto on tab title
+ * @param array $links Array of tabs
+ * @param int $active Active tab name
+ * @param string $title Title
+ * @param int $notab 0=Add tab header, 1=no tab header
+ * @param string $picto Add a picto on tab title
+ * @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_build_path('/mymodyle/img/myimg.png',1) for $picto.
* @return void
*/
-function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='')
+function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='', $pictoisfullpath=0)
{
$out="\n".'<div class="tabs">'."\n";
@@ -593,7 +595,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
{
$limittitle=30;
$out.='<a class="tabTitle">';
- if ($picto) $out.=img_object('',$picto).' ';
+ if ($picto) $out.=img_picto('',($pictoisfullpath?'':'object_').$picto,'',$pictoisfullpath).' ';
$out.=dol_trunc($title,$limittitle);
$out.='</a>';
}
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index e96fe02141102c5b92df847ff1371c54e91bcb71..36bedd2398b9cf5c81f80e0b59c2ce02ce47fa3c 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -335,9 +335,10 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
*/
function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexternal)
{
+ global $conf;
+
//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-
if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition
if ($type_user && $menuentry['module'])
{
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e5ea13ea1ae1e5d9f8e4632453e9e57161e49348..a4dd6bbab9c1b2d68958c0f597b964baa4b46e11 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1160,9 +1160,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
for ($i = 0; $i < $num; $i++)
{
$showmenu=true;
- if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
- $showmenu=false;
- }
+ if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) $showmenu=false;
$alt++;
if (empty($menu_array[$i]['level']) && $showmenu)
@@ -1268,6 +1266,8 @@ function print_jmobile_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
*/
function dol_eldy_showmenu($type_user, &$menuentry, &$listofmodulesforexternal)
{
+ global $conf;
+
//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition
diff --git a/htdocs/printipp/index.php b/htdocs/printipp/index.php
index 5a9e60a628010bda2d54f787604593882ec89813..c6f678a6595d4ee2beb91da077d969b7c4f5ecf5 100644
--- a/htdocs/printipp/index.php
+++ b/htdocs/printipp/index.php
@@ -16,10 +16,10 @@
*/
/**
-\file htdocs/printipp/index.php
-\ingroup printipp
-\brief Printipp
-*/
+ * \file htdocs/printipp/index.php
+ * \ingroup printipp
+ * \brief Printipp
+ */
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/dolprintipp.class.php';
@@ -33,4 +33,5 @@ $printer->list_jobs('commande');
llxFooter();
+$db->close();
?>