NEW option MAIN_ACTIVATE_FILECACHE to cache widgets

htdocs/admin/boxes.php

@@ -439,6 +439,7 @@ print load_fiche_titre($langs->trans("Other"), '', '');
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="addconst">';
+print '<input type="hidden" name="page_y" value="">';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
@@ -452,22 +453,20 @@ print '<td>';
 print $langs->trans("MaxNbOfLinesForBoxes");
 print '</td>'."\n";
 print '<td>';
-print '<input type="text" class="flat" size="6" name="MAIN_BOXES_MAXLINES" value="'.(!empty($conf->global->MAIN_BOXES_MAXLINES) ? $conf->global->MAIN_BOXES_MAXLINES : '').'">';
+print '<input type="text" class="flat" size="6" name="MAIN_BOXES_MAXLINES" value="'.(getDolGlobalString('MAIN_BOXES_MAXLINES')).'">';
 print '</td>';
 print '</tr>';
 
-// Activate FileCache - Developement
+// Activate FileCache (so content of file boxes are stored into a cache file int boxes/temp for 3600 seconds)
-if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+print '<tr class="oddeven"><td>'.$langs->trans("EnableFileCache").'</td><td>';
-	print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
+print $form->selectyesno('MAIN_ACTIVATE_FILECACHE', getDolGlobalInt('MAIN_ACTIVATE_FILECACHE', 0), 1);
-	print $form->selectyesno('MAIN_ACTIVATE_FILECACHE', (!empty($conf->global->MAIN_ACTIVATE_FILECACHE) ? $conf->global->MAIN_ACTIVATE_FILECACHE : 0), 1);
+print '</td>';
-	print '</td>';
+print '</tr>';
-	print '</tr>';
-}
 
 print '</table>';
 print '</div>';
 
-print $form->buttonsSaveCancel("Save", '');
+print $form->buttonsSaveCancel("Save", '', array(), 0, 'reposition');
 
 print '</form>';
 print "\n".'<!-- End Other Const -->'."\n";

htdocs/core/boxes/box_actions_future.php

@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/core/boxes/box_actions.php
+ *	\file       htdocs/core/boxes/box_actions_future.php
  *	\ingroup    actions
  *	\brief      Module to build boxe for events
  */

htdocs/core/boxes/box_activity.php

@@ -86,12 +86,14 @@ class box_activity extends ModeleBoxes
 		$now = dol_now();
 		$nbofperiod = 3;
 
-		$cachetime = 3600;
+		// Force use of cache for this box as it has very bad performances
-		$fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'-r'.($user->hasRight("societe", "client", "voir") ? '1' : '0').'.cache';
+		$savMAIN_ACTIVATE_FILECACHE = getDolGlobalInt('MAIN_ACTIVATE_FILECACHE');
+		$conf->global->MAIN_ACTIVATE_FILECACHE = 1;
 
 		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) {
 			$nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
 		}
+
 		$textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
 		$this->info_box_head = array(
 			'text' => $textHead,
@@ -107,11 +109,8 @@ class box_activity extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propalstatic = new Propal($this->db);
 
-			$cachedir = DOL_DATA_ROOT.'/propale/temp';
-			$filename = '/boxactivity-propal'.$fileid;
-			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 			$data = array();
-			if ($refresh) {
+
 			$sql = "SELECT p.fk_statut, SUM(p.total_ttc) as Mnttot, COUNT(*) as nb";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
@@ -141,16 +140,11 @@ class box_activity extends ModeleBoxes
 
 					$line++;
 				}
-					if (getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')) {
+
-						dol_filecache($cachedir, $filename, $data);
-					}
 				$this->db->free($result);
 			} else {
 				dol_print_error($this->db);
 			}
-			} else {
-				$data = dol_readcachefile($cachedir, $filename);
-			}
 
 			if (!empty($data)) {
 				$j = 0;
@@ -204,12 +198,8 @@ class box_activity extends ModeleBoxes
 
 			$langs->load("orders");
 
-			$cachedir = DOL_DATA_ROOT.'/commande/temp';
-			$filename = '/boxactivity-order'.$fileid;
-			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 			$data = array();
 
-			if ($refresh) {
 			$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
@@ -236,16 +226,11 @@ class box_activity extends ModeleBoxes
 					$data[$j] = $this->db->fetch_object($result);
 					$j++;
 				}
-					if (getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')) {
+
-						dol_filecache($cachedir, $filename, $data);
-					}
 				$this->db->free($result);
 			} else {
 				dol_print_error($this->db);
 			}
-			} else {
-				$data = dol_readcachefile($cachedir, $filename);
-			}
 
 			if (!empty($data)) {
 				$j = 0;
@@ -299,12 +284,7 @@ class box_activity extends ModeleBoxes
 			$facturestatic = new Facture($this->db);
 
 			// part 1
-			$cachedir = DOL_DATA_ROOT.'/facture/temp';
-			$filename = '/boxactivity-invoice'.$fileid;
-
-			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 			$data = array();
-			if ($refresh) {
 			$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
@@ -331,16 +311,11 @@ class box_activity extends ModeleBoxes
 					$data[$j] = $this->db->fetch_object($result);
 					$j++;
 				}
-					if (getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')) {
+
-						dol_filecache($cachedir, $filename, $data);
-					}
 				$this->db->free($result);
 			} else {
 				dol_print_error($this->db);
 			}
-			} else {
-				$data = dol_readcachefile($cachedir, $filename);
-			}
 
 			if (!empty($data)) {
 				$j = 0;
@@ -390,13 +365,7 @@ class box_activity extends ModeleBoxes
 			}
 
 			// part 2
-			$cachedir = DOL_DATA_ROOT.'/facture/temp';
-			$filename = '/boxactivity-invoice2'.$fileid;
-
-			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-
 			$data = array();
-			if ($refresh) {
 			$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 			$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
@@ -413,16 +382,11 @@ class box_activity extends ModeleBoxes
 					$data[$j] = $this->db->fetch_object($result);
 					$j++;
 				}
-					if (getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')) {
+
-						dol_filecache($cachedir, $filename, $data);
-					}
 				$this->db->free($result);
 			} else {
 				dol_print_error($this->db);
 			}
-			} else {
-				$data = dol_readcachefile($cachedir, $filename);
-			}
 
 			if (!empty($data)) {
 				$alreadypaid = -1;
@@ -476,6 +440,8 @@ class box_activity extends ModeleBoxes
 		$this->info_box_contents[$line][2] = array('td' => 'class="liste_total right" ', 'text' => $totalnb);
 		$this->info_box_contents[$line][3] = array('td' => 'class="liste_total right" ', 'text' => '');
 		$this->info_box_contents[$line][4] = array('td' => 'class="liste_total right" ', 'text' => "");
+
+		$conf->global->MAIN_ACTIVATE_FILECACHE = $savMAIN_ACTIVATE_FILECACHE;
 	}
 
 

htdocs/core/boxes/box_birthdays.php

@@ -74,27 +74,19 @@ class box_birthdays extends ModeleBoxes
 		global $conf, $user, $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+		$userstatic = new User($this->db);
+
 
 		$langs->load("boxes");
 
 		$this->max = $max;
 
-		$cachetime = 3600;
-		$fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'.cache';
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-		$userstatic = new User($this->db);
-
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleUserBirthdaysOfMonth"));
 
 		if ($user->hasRight('user', 'user', 'lire')) {
-			$cachedir = DOL_DATA_ROOT.'/users/temp';
-			$filename = '/boxbirthdays-'.$fileid;
-			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 			$data = array();
-			if ($refresh) {
+
 			$tmparray = dol_getdate(dol_now(), true);
 
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth as datea, date_format(u.birth, '%d') as daya, 'birth' as typea, u.email, u.statut as status";
@@ -123,15 +115,8 @@ class box_birthdays extends ModeleBoxes
 					$line++;
 				}
 
-					if (getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')) {
-						dol_filecache($cachedir, $filename, $data);
-					}
-
 				$this->db->free($resql);
 			}
-			} else {
-				$data = dol_readcachefile($cachedir, $filename);
-			}
 
 			if (!empty($data)) {
 				$j = 0;

htdocs/core/boxes/box_birthdays_members.php

@@ -74,27 +74,18 @@ class box_birthdays_members extends ModeleBoxes
 		global $conf, $user, $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$memberstatic = new Adherent($this->db);
 
 		$langs->load("boxes");
 
 		$this->max = $max;
 
-		$cachetime = 3600;
-		$fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'.cache';
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-		$memberstatic = new Adherent($this->db);
-
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleMemberNextBirthdays"));
 
 		if ($user->hasRight('adherent', 'lire')) {
-			$cachedir = DOL_DATA_ROOT.'/users/temp';
-			$filename = '/boxbirthdays-members'.$fileid;
-			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 			$data = array();
-			if ($refresh) {
+
 			$tmparray = dol_getdate(dol_now(), true);
 
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.societe, u.birth, date_format(u.birth, '%d') as daya, u.email, u.statut as status, u.datefin";
@@ -117,15 +108,8 @@ class box_birthdays_members extends ModeleBoxes
 					$line++;
 				}
 
-					if (getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')) {
-						dol_filecache($cachedir, $filename, $data);
-					}
-
 				$this->db->free($resql);
 			}
-			} else {
-				$data = dol_readcachefile($cachedir, $filename);
-			}
 
 			if (!empty($data)) {
 				$j = 0;

htdocs/core/boxes/box_project.php

@@ -21,7 +21,7 @@
 
 /**
  *  \file       htdocs/core/boxes/box_project.php
- *  \ingroup    projet
+ *  \ingroup    project
  *  \brief      Module to show Projet activity of the current Year
  */
 include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";

htdocs/core/boxes/box_validated_projects.php

@@ -22,7 +22,7 @@
 
 /**
  *  \file       htdocs/core/boxes/box_validated_projects.php
- *  \ingroup    projet
+ *  \ingroup    project
  *  \brief      Module to show validated projects whose tasks are assigned to the connected person, without any time entered by the connected person
  */
 include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";

htdocs/core/modules/modProjet.class.php

@@ -127,10 +127,11 @@ class modProjet extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-			0=>array('file'=>'box_project.php', 'enabledbydefaulton'=>'Home'),
+			0=>array('file'=>'box_project.php', 'enabledbydefaulton'=>'Home'),	// open projects
-			1=>array('file'=>'box_task.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_project_opportunities.php', 'enabledbydefaulton'=>'Home'),	// open opportunities
-			2=>array('file'=>'box_validated_projects.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_task.php', 'enabledbydefaulton'=>'Home'),
-			3=>array('file'=>'box_funnel_of_prospection.php', 'enabledbydefaulton'=>'Home'),
+			3=>array('file'=>'box_validated_projects.php', 'enabledbydefaulton'=>'Home'),	// task without timespent
+			4=>array('file'=>'box_funnel_of_prospection.php', 'enabledbydefaulton'=>'Home'),
 		);
 
 		// Permissions

htdocs/langs/en_US/projects.lang

@@ -33,6 +33,7 @@ DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Open projects
+OpenedProjectsOpportunities=Open opportunities
 OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
 OpportunitiesStatusForProjects=Leads amount of projects by status