lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Removed deprecated code/comments

Browse Source
This commit is contained in:
Laurent Destailleur 2011-12-17 18:35:12 +01:00
parent f48348cade
commit 3c611d284a
13 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/skeletons/modMyModule.class.php
View File

@ -174,7 +174,6 @@ class modMyModule extends DolibarrModules
// 'type'=>'top', // This is a Top menu entry // 'type'=>'top', // This is a Top menu entry
// 'titre'=>'MyModule top menu', // 'titre'=>'MyModule top menu',
// 'mainmenu'=>'mymodule', // 'mainmenu'=>'mymodule',
// 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor.
// 'url'=>'/mymodule/pagetop.php', // 'url'=>'/mymodule/pagetop.php',
// 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. // 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
// 'position'=>100, // 'position'=>100,

10
htdocs/core/class/menubase.class.php
View File

@ -48,7 +48,7 @@ class Menubase
var $titre; var $titre;
var $langs; var $langs;
var $level; var $level;
var $leftmenu; //<! 0=Left menu in pre.inc.php files must not be overwrite by database menu, 1=Must be var $leftmenu; //<! Not used
var $perms; var $perms;
var $enabled; var $enabled;
var $user; var $user;
@ -117,7 +117,7 @@ class Menubase
$sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")"; $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
$resqlrowidset=$this->db->query($sql); $resqlrowidset=$this->db->query($sql);
if (! $resqlrowidset) dol_print_error($this->db); if (! $resqlrowidset) dol_print_error($this->db);
} }
else dol_print_error($this->db); else dol_print_error($this->db);
} }
@ -468,9 +468,9 @@ class Menubase
/** /**
* Load entries found in database in a menu array. * Load entries found in database in a menu array.
* *
* @param array $newmenu Menu array to complete * @param array $newmenu Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)
* @param string $mainmenu Value for mainmenu that defined top menu of left menu * @param string $mainmenu Value for mainmenu that defines top menu of left menu
* @param string $myleftmenu Value that defined leftmenu * @param string $myleftmenu Value that defines leftmenu
* @param int $type_user 0=Internal,1=External,2=All * @param int $type_user 0=Internal,1=External,2=All
* @param string $menu_handler Name of menu_handler used (auguria, eldy...) * @param string $menu_handler Name of menu_handler used (auguria, eldy...)
* @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)

8
htdocs/core/menus/standard/eldy.lib.php
View File

@ -546,9 +546,9 @@ function print_end_menu_array()
/** /**
* Core function to output left menu eldy * Core function to output left menu eldy
* *
* @param db Database handler * @param DoliDB $db Database handler
* @param menu_array_before Table of menu entries to show before entries of menu handler * @param array $menu_array_before Table of menu entries to show before entries of menu handler
* @param menu_array_after Table of menu entries to show after entries of menu handler * @param array $menu_array_after Table of menu entries to show after entries of menu handler
*/ */
function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
{ {
@ -1324,7 +1324,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
} }
// Affichage des menus personnalises // Add personalized menus and modules menus
require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
$tabMenu=array(); $tabMenu=array();

2
htdocs/core/modules/modAgenda.class.php
View File

@ -168,7 +168,6 @@ class modAgenda extends DolibarrModules
// 'type'=>'top', // This is a Top menu entry // 'type'=>'top', // This is a Top menu entry
// 'titre'=>'MyModule top menu', // 'titre'=>'MyModule top menu',
// 'mainmenu'=>'mymodule', // 'mainmenu'=>'mymodule',
// 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor.
// 'url'=>'/mymodule/pagetop.php', // 'url'=>'/mymodule/pagetop.php',
// 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. // 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
// 'position'=>100, // 'position'=>100,
@ -181,7 +180,6 @@ class modAgenda extends DolibarrModules
'type'=>'top', 'type'=>'top',
'titre'=>'Agenda', 'titre'=>'Agenda',
'mainmenu'=>'agenda', 'mainmenu'=>'agenda',
'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor.
'url'=>'/comm/action/index.php', 'url'=>'/comm/action/index.php',
'langs'=>'agenda', 'langs'=>'agenda',
'position'=>100, 'position'=>100,

1
htdocs/core/modules/modCashDesk.class.php
View File

@ -101,7 +101,6 @@ class modCashDesk extends DolibarrModules
'type'=>'top', // This is a Top menu entry 'type'=>'top', // This is a Top menu entry
'titre'=>'CashDeskMenu', 'titre'=>'CashDeskMenu',
'mainmenu'=>'cashdesk', 'mainmenu'=>'cashdesk',
'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school).
'url'=>'/cashdesk/index.php?user=__LOGIN__', 'url'=>'/cashdesk/index.php?user=__LOGIN__',
'langs'=>'cashdesk', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'langs'=>'cashdesk', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>100, 'position'=>100,

1
htdocs/core/modules/modECM.class.php
View File

@ -121,7 +121,6 @@ class modECM extends DolibarrModules
'type'=>'top', 'type'=>'top',
'titre'=>'MenuECM', 'titre'=>'MenuECM',
'mainmenu'=>'ecm', 'mainmenu'=>'ecm',
'leftmenu'=>'1', // To say if we can overwrite leftmenu
'url'=>'/ecm/index.php', 'url'=>'/ecm/index.php',
'langs'=>'ecm', 'langs'=>'ecm',
'position'=>100, 'position'=>100,

1
htdocs/core/modules/modExternalSite.class.php
View File

@ -102,7 +102,6 @@ class modExternalSite extends DolibarrModules
'type'=>'top', 'type'=>'top',
'titre'=>'ExternalSites', 'titre'=>'ExternalSites',
'mainmenu'=>'externalsite', 'mainmenu'=>'externalsite',
'leftmenu'=>'1',
'url'=>'/externalsite/frames.php', 'url'=>'/externalsite/frames.php',
'langs'=>'other', 'langs'=>'other',
'position'=>100, 'position'=>100,

1
htdocs/core/modules/modFTP.class.php
View File

@ -117,7 +117,6 @@ class modFTP extends DolibarrModules
'type'=>'top', 'type'=>'top',
'titre'=>'FTP', 'titre'=>'FTP',
'mainmenu'=>'ftp', 'mainmenu'=>'ftp',
'leftmenu'=>'0', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school).
'url'=>'/ftp/index.php', 'url'=>'/ftp/index.php',
'langs'=>'ftp', 'langs'=>'ftp',
'position'=>100, 'position'=>100,

1
htdocs/core/modules/modGravatar.class.php
View File

@ -126,7 +126,6 @@ class modGravatar extends DolibarrModules
// 'type'=>'top', // This is a Top menu entry // 'type'=>'top', // This is a Top menu entry
// 'titre'=>'MyModule top menu', // 'titre'=>'MyModule top menu',
// 'mainmenu'=>'mymodule', // 'mainmenu'=>'mymodule',
// 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school).
// 'url'=>'/mymodule/pagetop.php', // 'url'=>'/mymodule/pagetop.php',
// 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. // 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
// 'position'=>100, // 'position'=>100,

1
htdocs/core/modules/modPaybox.class.php
View File

@ -125,7 +125,6 @@ class modPayBox extends DolibarrModules
// 'type'=>'top', // This is a Top menu entry // 'type'=>'top', // This is a Top menu entry
// 'titre'=>'MyModule top menu', // 'titre'=>'MyModule top menu',
// 'mainmenu'=>'mymodule', // 'mainmenu'=>'mymodule',
// 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school).
// 'url'=>'/mymodule/pagetop.php', // 'url'=>'/mymodule/pagetop.php',
// 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. // 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
// 'position'=>100, // 'position'=>100,

1
htdocs/core/modules/modPaypal.class.php
View File

@ -117,7 +117,6 @@ class modPaypal extends DolibarrModules
// 'type'=>'top', // This is a Top menu entry // 'type'=>'top', // This is a Top menu entry
// 'titre'=>'MyModule top menu', // 'titre'=>'MyModule top menu',
// 'mainmenu'=>'mymodule', // 'mainmenu'=>'mymodule',
// 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school).
// 'url'=>'/mymodule/pagetop.php', // 'url'=>'/mymodule/pagetop.php',
// 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. // 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
// 'position'=>100, // 'position'=>100,

3
htdocs/core/modules/modWorkflow.class.php
View File

@ -115,7 +115,6 @@ class modWorkflow extends DolibarrModules
'type'=>'top', 'type'=>'top',
'titre'=>'Workflow', 'titre'=>'Workflow',
'mainmenu'=>'workflow', 'mainmenu'=>'workflow',
'leftmenu'=>'1',
'url'=>'/workflow/index.php', 'url'=>'/workflow/index.php',
'langs'=>'@workflow', 'langs'=>'@workflow',
'position'=>100, 'position'=>100,
@ -149,7 +148,7 @@ class modWorkflow extends DolibarrModules
{ {
// Permissions // Permissions
$this->remove(); $this->remove();
$sql = array(); $sql = array();
return $this->_init($sql); return $this->_init($sql);

2
htdocs/install/mysql/migration/3.1.0-3.2.0.sql
View File

@ -113,3 +113,5 @@ ALTER TABLE llx_societe MODIFY COLUMN fk_stcomm integer NOT NULL;
ALTER TABLE llx_societe CHANGE COLUMN gencod barcode varchar(255); ALTER TABLE llx_societe CHANGE COLUMN gencod barcode varchar(255);
ALTER TABLE llx_societe ADD COLUMN fk_barcode_type integer DEFAULT 0; ALTER TABLE llx_societe ADD COLUMN fk_barcode_type integer DEFAULT 0;
UPDATE llx_menu SET leftmenu = NULL where leftmenu in ('', '0', '1');