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

Qual: Removed deprecated code

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-20 00:53:58 +00:00
parent f374058805
commit 7d785d6878
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/modules.php
View File

@ -115,9 +115,6 @@ foreach ($conf->file->dol_document_root as $dirroot)
$modulequalified=1; $modulequalified=1;
// We discard modules that does not respect constraint on menu handlers
if (! empty($objMod->needtopmenu) && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
// We discard modules according to features level (PS: if module is activated we always show it) // We discard modules according to features level (PS: if module is activated we always show it)
$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod))); $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0; if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;

13
htdocs/core/class/html.formadmin.class.php
View File

@ -155,8 +155,10 @@ class FormAdmin
if (preg_match('/lib\.php$/i',$file)) continue; // We exclude library files if (preg_match('/lib\.php$/i',$file)) continue; // We exclude library files
$filelib=preg_replace('/\.php$/i','',$file); $filelib=preg_replace('/\.php$/i','',$file);
$prefix=''; $prefix='';
if (preg_match('/^eldy|^smartphone/i',$file)) $prefix='0'; // 0=Recommanded, 1=Experimental, 2=Other // 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
else $prefix='2'; if (preg_match('/^eldy/i',$file)) $prefix='0';
else if (preg_match('/^smartphone/i',$file)) $prefix='2';
else $prefix='3';
if ($file == $selected) if ($file == $selected)
{ {
@ -182,13 +184,16 @@ class FormAdmin
{ {
$tab=explode('_',$key); $tab=explode('_',$key);
$newprefix=$tab[0]; $newprefix=$tab[0];
if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
if (! empty($conf->browser->firefox) && $newprefix != $oldprefix) // Add separators if (! empty($conf->browser->firefox) && $newprefix != $oldprefix) // Add separators
{ {
// Affiche titre // Affiche titre
print '<option value="-1" disabled="disabled">'; print '<option value="-1" disabled="disabled">';
if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --'; if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --'; if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
if ($newprefix=='2') print '-- '.$langs->trans("Other").' --'; if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
print '</option>'; print '</option>';
$oldprefix=$newprefix; $oldprefix=$newprefix;
} }

3
htdocs/lib/admin.lib.php
View File

@ -759,9 +759,6 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
$modulequalified=1; $modulequalified=1;
// We discard modules that does not respect constraint on menu handlers
if (! empty($objMod->needtopmenu) && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
// We discard modules according to features level (PS: if module is activated we always show it) // We discard modules according to features level (PS: if module is activated we always show it)
$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod))); $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0; if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;

1
htdocs/lib/functions.lib.php
View File

@ -2096,7 +2096,6 @@ function dol_print_error($db='',$error='')
$out.="<br>\n"; $out.="<br>\n";
$out.="<b>".$langs->trans("RequestedUrl").":</b> ".$_SERVER["REQUEST_URI"]."<br>\n";; $out.="<b>".$langs->trans("RequestedUrl").":</b> ".$_SERVER["REQUEST_URI"]."<br>\n";;
$out.="<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"])?$_SERVER["HTTP_REFERER"]:'')."<br>\n";; $out.="<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"])?$_SERVER["HTTP_REFERER"]:'')."<br>\n";;
//$out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->top_menu.($conf->top_menu||$conf->left_menu?'/':'').$conf->left_menu."<br>\n";
$out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->top_menu."<br>\n"; $out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->top_menu."<br>\n";
$out.="<br>\n"; $out.="<br>\n";
$syslog.="url=".$_SERVER["REQUEST_URI"]; $syslog.="url=".$_SERVER["REQUEST_URI"];

3
htdocs/public/demo/index.php
View File

@ -113,9 +113,6 @@ foreach ($dirlist as $dirroot)
$modulequalified=1; $modulequalified=1;
// We discard modules that does not respect constraint on menu handlers
if ($objMod->needtopmenu && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
// We discard modules according to features level (PS: if module is activated we always show it) // We discard modules according to features level (PS: if module is activated we always show it)
$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod))); $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0; if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;