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

Fix: Le rep de cache de donnes RSS du module externalRSS n'est pas cre l'install. De plus l'appli le cherche dans le rep courant au lieu de DOL_DOCUMENT_ROOT.document/rsscache.

Browse Source
This commit is contained in:
Laurent Destailleur 2004-06-26 19:32:08 +00:00
parent d20fdfef6f
commit c10f4a89eb
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/includes/magpierss/rss_fetch.inc
View File

@ -117,8 +117,10 @@ function fetch_rss ($url) {
$cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE ); $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
if (MAGPIE_DEBUG and $cache->ERROR) { if ($cache->ERROR) {
debug($cache->ERROR, E_USER_WARNING); // Erreur
print $cache->ERROR;
if (MAGPIE_DEBUG) { debug($cache->ERROR, E_USER_WARNING); }
} }
@ -336,7 +338,7 @@ function init () {
} }
if ( !defined('MAGPIE_CACHE_DIR') ) { if ( !defined('MAGPIE_CACHE_DIR') ) {
define('MAGPIE_CACHE_DIR', './cache'); define('MAGPIE_CACHE_DIR', DOL_DOCUMENT_ROOT.'/document/rsscache');
} }
if ( !defined('MAGPIE_CACHE_AGE') ) { if ( !defined('MAGPIE_CACHE_AGE') ) {

10
htdocs/includes/menus/barre_top/default.php
View File

@ -43,7 +43,7 @@ else {
{ {
$class=""; $class="";
if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "commercial") { $class="menusel"; } if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "commercial") { $class="menusel"; }
elseif (ereg('^\/comm\/',$PHP_SELF)) { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/comm\/",$PHP_SELF)) { $class="menusel"; }
print '<td class="'.$class.'" width="'.$widthtd.'%" align=center>'; print '<td class="'.$class.'" width="'.$widthtd.'%" align=center>';
print '<a class="'.$class.'" href="'.DOL_URL_ROOT.'/comm/index.php">Commercial</A>'; print '<a class="'.$class.'" href="'.DOL_URL_ROOT.'/comm/index.php">Commercial</A>';
print '</td>'; print '</td>';
@ -53,7 +53,7 @@ else {
{ {
$class=""; $class="";
if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "adherent") { $class="menusel"; } if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "adherent") { $class="menusel"; }
elseif (ereg('^\/adherents\/',$PHP_SELF)) { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/adherents\/",$PHP_SELF)) { $class="menusel"; }
print '<td class="'.$class.'" width="'.$widthtd.'%" align=center>'; print '<td class="'.$class.'" width="'.$widthtd.'%" align=center>';
print '<a class="'.$class.'" href="'.DOL_URL_ROOT.'/adherents/index.php">Adhérents</A>'; print '<a class="'.$class.'" href="'.DOL_URL_ROOT.'/adherents/index.php">Adhérents</A>';
print '</td>'; print '</td>';
@ -63,7 +63,7 @@ else {
{ {
$class=""; $class="";
if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "compta") { $class="menusel"; } if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "compta") { $class="menusel"; }
elseif (ereg('^\/compta\/',$PHP_SELF)) { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/compta\/",$PHP_SELF)) { $class="menusel"; }
print '<td class="'.$class.'" width="'.$widthtd.'%" align=center>'; print '<td class="'.$class.'" width="'.$widthtd.'%" align=center>';
print '<a class="'.$class.'" href="'.DOL_URL_ROOT.'/compta/index.php">Compta</A>'; print '<a class="'.$class.'" href="'.DOL_URL_ROOT.'/compta/index.php">Compta</A>';
print '</td>'; print '</td>';
@ -73,7 +73,7 @@ else {
{ {
$class=""; $class="";
if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "product") { $class="menusel"; } if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "product") { $class="menusel"; }
elseif (ereg('^\/product\/',$PHP_SELF)) { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/product\/",$PHP_SELF)) { $class="menusel"; }
$chaine=""; $chaine="";
if ($conf->produit->enabled) { $chaine.="Produits"; } if ($conf->produit->enabled) { $chaine.="Produits"; }
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; } if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
@ -87,7 +87,7 @@ else {
{ {
$class=""; $class="";
if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; } if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; }
elseif (ereg('^\/webcalendar\/',$PHP_SELF)) { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/webcalendar\/",$PHP_SELF)) { $class="menusel"; }
print '<td class="'.$class.'" width="'.$widthtd.'%" align=center>'; print '<td class="'.$class.'" width="'.$widthtd.'%" align=center>';
print '<a class="'.$class.'" href="'. PHPWEBCALENDAR_URL .'">Calendrier</a>'; print '<a class="'.$class.'" href="'. PHPWEBCALENDAR_URL .'">Calendrier</a>';
print '</td>'; print '</td>';

15
htdocs/install/etape1.php
View File

@ -110,13 +110,14 @@ if ($_POST["action"] == "set")
if ($error == 0) if ($error == 0)
{ {
$dir[0] = "$main_data_dir/facture"; $dir[0] = "$main_data_dir/facture";
$dir[1] = "$main_data_dir/propale"; $dir[1] = "$main_data_dir/propale";
$dir[2] = "$main_data_dir/societe"; $dir[2] = "$main_data_dir/societe";
$dir[3] = "$main_data_dir/ficheinter"; $dir[3] = "$main_data_dir/ficheinter";
$dir[4] = "$main_data_dir/produit"; $dir[4] = "$main_data_dir/produit";
$dir[5] = "$main_data_dir/rapport"; $dir[5] = "$main_data_dir/rapport";
$dir[6] = "$main_data_dir/images"; $dir[6] = "$main_data_dir/images";
$dir[7] = "$main_data_dir/rsscache";
if (! is_dir($main_dir)) if (! is_dir($main_dir))
{ {