Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…

…evelop
Dolibarr · Oct 15, 2015 · 577776b · 577776b
2 parents e2478ee + 7fe92bd
commit 577776b
Show file tree

Hide file tree

Showing 9 changed files with 542 additions and 535 deletions.
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
@@ -86,7 +86,7 @@
 		if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type=='mysqli' || $dolibarr_main_db_type=='mysql')) $dolibarr_main_db_port='3306'; // For backward compatibility
 
 		// Clean parameters
-    	$dolibarr_main_data_root        =isset($dolibarr_main_data_root)?trim($dolibarr_main_data_root):'';
+		$dolibarr_main_data_root        =isset($dolibarr_main_data_root)?trim($dolibarr_main_data_root):DOL_DOCUMENT_ROOT . '/../documents';
     	$dolibarr_main_url_root         =isset($dolibarr_main_url_root)?trim($dolibarr_main_url_root):'';
     	$dolibarr_main_url_root_alt     =isset($dolibarr_main_url_root_alt)?trim($dolibarr_main_url_root_alt):'';
     	$dolibarr_main_document_root    =isset($dolibarr_main_document_root)?trim($dolibarr_main_document_root):'';
@@ -133,7 +133,7 @@
 define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:''));
 
 define('DOL_CLASS_PATH', 'class/');                             // Filsystem path to class dir
-define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:''));
+define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:DOL_DOCUMENT_ROOT . '/../documents'));
 define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root)?$dolibarr_main_url_root:''));           // URL relative root
 $uri=preg_replace('/^http(s?):\/\//i','',constant('DOL_MAIN_URL_ROOT'));  // $uri contains url without http*
 $suburi = strstr($uri, '/');       // $suburi contains url without domain

diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
@@ -66,62 +66,70 @@
 if (($object->id != $user->id) && (! $user->rights->user->user->lire))
   accessforbidden();
 
-
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('usercard','globalcard'));
 
 /*
  * Actions
  */
-if ($actionsave)
-{
-    $db->begin();
-
-	$i=1; $errorsaved=0;
-	$error=0;
-	$tabparam=array();
-
-	// Save agendas
-	while ($i <= $MAXAGENDA)
-	{
-		$name=trim(GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$i,'alpha'));
-		$src=trim(GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$i,'alpha'));
-		$offsettz=trim(GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$i,'alpha'));
-		$color=trim(GETPOST('AGENDA_EXT_COLOR_'.$id.'_'.$i,'alpha'));
-		if ($color=='-1') $color='';
-		$enabled=trim(GETPOST('AGENDA_EXT_ENABLED_'.$id.'_'.$i,'alpha'));
-
-		if (! empty($src) && ! dol_is_url($src))
-		{
-			setEventMessage($langs->trans("ErrorParamMustBeAnUrl"),'errors');
-			$error++;
-			$errorsaved++;
-			break;
-		}
-
-		$tabparam['AGENDA_EXT_NAME_'.$id.'_'.$i]=$name;
-		$tabparam['AGENDA_EXT_SRC_'.$id.'_'.$i]=$src;
-		$tabparam['AGENDA_EXT_OFFSETTZ_'.$id.'_'.$i]=$offsettz;
-		$tabparam['AGENDA_EXT_COLOR_'.$id.'_'.$i]=$color;
-		$tabparam['AGENDA_EXT_ENABLED_'.$id.'_'.$i]=$enabled;
 
-		$i++;
-	}
+$parameters=array('id'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) {
+	if ($actionsave) {
+		$db->begin();
+
+		$i = 1;
+		$errorsaved = 0;
+		$error = 0;
+		$tabparam = array();
+
+		// Save agendas
+		while ($i <= $MAXAGENDA) {
+			$name = trim(GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$i, 'alpha'));
+			$src = trim(GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$i, 'alpha'));
+			$offsettz = trim(GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$i, 'alpha'));
+			$color = trim(GETPOST('AGENDA_EXT_COLOR_'.$id.'_'.$i, 'alpha'));
+			if ($color == '-1') {
+				$color = '';
+			}
+			$enabled = trim(GETPOST('AGENDA_EXT_ENABLED_'.$id.'_'.$i, 'alpha'));
+
+			if (!empty($src) && !dol_is_url($src)) {
+				setEventMessage($langs->trans("ErrorParamMustBeAnUrl"), 'errors');
+				$error ++;
+				$errorsaved ++;
+				break;
+			}
 
 	if (! $error)
 	{
 		$result=dol_set_user_param($db, $conf, $object, $tabparam);
 		if (! $result > 0) $error++;
 	}
 
-    if (! $error)
-    {
-        $db->commit();
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        $db->rollback();
-        if (empty($errorsaved))	setEventMessage($langs->trans("Error"),'errors');
-    }
+			$i ++;
+		}
+
+		if (!$error) {
+			$result = dol_set_user_param($db, $conf, $fuser, $tabparam);
+			if (!$result > 0) {
+				$error ++;
+			}
+		}
+
+		if (!$error) {
+			$db->commit();
+			setEventMessage($langs->trans("SetupSaved"));
+		} else {
+			$db->rollback();
+			if (empty($errorsaved)) {
+				setEventMessage($langs->trans("Error"), 'errors');
+			}
+		}
+	}
 }
 
 /*