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

Restore work lost by savannah backup

Browse Source
This commit is contained in:
Laurent Destailleur 2010-12-01 21:28:08 +00:00
parent 6e75a3d203
commit 5caf3d9b09
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/index.php
View File

@ -118,6 +118,8 @@ print "</table>\n";
*/ */
$langs->load("commercial"); $langs->load("commercial");
$langs->load("bills"); $langs->load("bills");
$langs->load("orders");
if ($user->societe_id == 0) if ($user->societe_id == 0)
{ {
print '<br>'; print '<br>';
@ -260,7 +262,7 @@ print '</td><td width="65%" valign="top" class="notopnoleftnoright">';
/* /*
* Dolibarr Working Board with weather * Dolibarr Working Board with weather
*/ */
$showweather=1; $showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0;
$rowspan=0; $rowspan=0;
$dashboardlines=array(); $dashboardlines=array();

2
htdocs/main.inc.php
View File

@ -349,7 +349,7 @@ if (! defined('NOLOGIN'))
// If error, we will put error message in session under the name dol_loginmesg // If error, we will put error message in session under the name dol_loginmesg
$goontestloop=false; $goontestloop=false;
if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true; if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
if (isset($_POST["username"])) $goontestloop=true; if (isset($_POST["username"]) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
if ($test && $goontestloop) if ($test && $goontestloop)
{ {

18
htdocs/viewimage.php
View File

@ -280,8 +280,8 @@ if ($modulepart)
// GENERIC Wrapping // GENERIC Wrapping
// If modulepart=module_user_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser // If modulepart=module_user_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
// If modulepart=module_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp // If modulepart=module_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
// If modulepart=module Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser // If modulepart=module_user Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
// If modulepart=module_user Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart // If modulepart=module Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
else else
{ {
if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg)) if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
@ -301,8 +301,18 @@ if ($modulepart)
} }
else else
{ {
if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read) $accessallowed=1; $perm=GETPOST('perm');
$original_file=$conf->$modulepart->dir_output.'/'.$original_file; $subperm=GETPOST('subperm');
if ($perm || $subperm)
{
if (($perm && $user->rights->$modulepart->$perm) || ($perm && $subperm && $user->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
}
else
{
if ($user->rights->$modulepart->lire || $user->rights->$modulepart->read) $accessallowed=1;
$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
}
} }
} }
} }