Skip to content
Snippets Groups Projects
Commit 8231a627 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Conflict with id

parent f4ff252b
Branches
No related tags found
No related merge requests found
...@@ -66,7 +66,7 @@ $alwaysuncheckedmodules=array('paybox','paypal','filemanager','google','scanner' ...@@ -66,7 +66,7 @@ $alwaysuncheckedmodules=array('paybox','paypal','filemanager','google','scanner'
$alwayshiddenmodules=array('accounting','barcode','bookmark','boutique','clicktodial','document','domain','externalrss','externalsite','fckeditor','ftp','geoipmaxmind','gravatar','label','ldap','mantis','memcached','notification', $alwayshiddenmodules=array('accounting','barcode','bookmark','boutique','clicktodial','document','domain','externalrss','externalsite','fckeditor','ftp','geoipmaxmind','gravatar','label','ldap','mantis','memcached','notification',
'syslog','user','webservices', 'syslog','user','webservices',
// Extended modules // Extended modules
'awstats','bittorrent','cabinetmed','concatpdf','filemanager','monitoring','nltechno','ovh','phenix','phpsysinfo','postnuke','submiteverywhere', 'awstats','bittorrent','cabinetmed','concatpdf','filemanager','monitoring','nltechno','numberwords','ovh','phenix','phpsysinfo','postnuke','submiteverywhere',
'survey','thomsonphonebook','voyage','webcalendar','webmail','zipautofillfr'); 'survey','thomsonphonebook','voyage','webcalendar','webmail','zipautofillfr');
// Search modules // Search modules
...@@ -277,7 +277,9 @@ foreach ($demoprofiles as $profilarray) ...@@ -277,7 +277,9 @@ foreach ($demoprofiles as $profilarray)
print '<td><input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"'; print '<td><input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled="true"'; if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled="true"';
if (! in_array($modulekeyname,$alwaysuncheckedmodules) && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked="true"'; if (! in_array($modulekeyname,$alwaysuncheckedmodules) && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked="true"';
print '>'.$val->getName().' &nbsp;</td>'; print '>'.$val->getName().' &nbsp;';
print '<!-- id='.$val->numero.' -->';
print '</td>';
if ($modulo == ($nbcolsmod - 1)) print '</tr>'; if ($modulo == ($nbcolsmod - 1)) print '</tr>';
$j++; $j++;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment