Fix: Bad condition to enable menu

Dolibarr · Feb 25, 2011 · 5f42ab9 · 5f42ab9
1 parent 6a590ff
commit 5f42ab9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php
@@ -100,6 +100,7 @@ function modCashDesk ($DB)
 									'url'=>'/cashdesk/index.php',
 									'langs'=>'cashdesk',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 									'position'=>100,
+									'enabled'=>'$conf->cashdesk->enabled',
 									'perms'=>1,		// Use 'perms'=>'1' if you want your menu with no permission rules
 									'target'=>'pointofsale',
 									'user'=>0);				// 0=Menu for internal users, 1=external users, 2=both

diff --git a/htdocs/includes/modules/modFTP.class.php b/htdocs/includes/modules/modFTP.class.php
@@ -124,8 +124,8 @@ function modFTP($DB)
 							  'url'=>'/ftp/index.php',
 							  'langs'=>'ftp',
 							  'position'=>100,
-							  'perms'=>'$user->rights->ftp->read || $user->rights->ftp->write || $user->rights->ftp->setup',
-							  'enabled'=>1,
+                              'enabled'=>'$conf->ftp->enabled',
+		                      'perms'=>'$user->rights->ftp->read || $user->rights->ftp->write || $user->rights->ftp->setup',
 							  'target'=>'',
 							  'user'=>2);			// 0=Menu for internal users, 1=external users, 2=both
 		$r++;

diff --git a/htdocs/includes/modules/modMantis.class.php b/htdocs/includes/modules/modMantis.class.php
@@ -90,7 +90,18 @@ function modMantis($DB)
 		//------
 		$r=0;
 
-		$this->menu[$r]=array('fk_menu'=>0,'type'=>'top','titre'=>'BugTracker','mainmenu'=>'mantis','leftmenu'=>'1','url'=>'/mantis/mantis.php','langs'=>'other','position'=>100,'perms'=>'','target'=>'','user'=>0);
+        $this->menu[$r]=array('fk_menu'=>0,
+                              'type'=>'top',
+                              'titre'=>'BugTracker',
+                              'mainmenu'=>'mantis',
+                              'leftmenu'=>'1',
+                              'url'=>'/mantis/mantis.php',
+                              'langs'=>'other',
+                              'position'=>100,
+                              'enabled'=>'$conf->mantis->enabled',
+                              'perms'=>'',
+                              'target'=>'',
+                              'user'=>0);
 		$r++;
 
 	}