Merge remote-tracking branch 'origin/3.4' into develop

Conflicts: htdocs/core/class/html.formfile.class.php
2013-07-24 00:42:28 +02:00 · 2013-07-24 00:42:28 +02:00 · 644f5149e4
commit 644f5149e4
parent 68d83dd653 15c4c5d6b9
6 changed files with 46 additions and 38 deletions
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@ -93,15 +93,15 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 */

 $form = new Form($db);
-$member=new Adherent($db);
+$object=new Adherent($db);
 $membert=new AdherentType($db);

 llxHeader();

 if ($id > 0)
 {
-    $result=$member->fetch($id);
-    $result=$membert->fetch($member->typeid);
+    $result=$object->fetch($id);
+    $result=$membert->fetch($object->typeid);
 	if ($result > 0)
 	{
 		/*
@ -110,7 +110,7 @@ if ($id > 0)
 		if (! empty($conf->notification->enabled))
 			$langs->load("mails");

-		$head = member_prepare_head($member);
+		$head = member_prepare_head($object);

 		$form=new Form($db);

@ -133,19 +133,19 @@ if ($id > 0)
        // Ref
        print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
        print '<td class="valeur">';
-        print $form->showrefnav($member, 'rowid', $linkback);
+        print $form->showrefnav($object, 'rowid', $linkback);
        print '</td></tr>';

        // Login
        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
        {
-            print '<tr><td>'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$member->login.'&nbsp;</td></tr>';
+            print '<tr><td>'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
        }

        // Morphy
-        print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$member->getmorphylib().'</td>';
+        print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
        /*print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
-        print $form->showphoto('memberphoto',$member);
+        print $form->showphoto('memberphoto',$object);
        print '</td>';*/
        print '</tr>';

@ -153,22 +153,22 @@ if ($id > 0)
        print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$membert->getNomUrl(1)."</td></tr>\n";

        // Company
-        print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$member->societe.'</td></tr>';
+        print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';

        // Civility
-        print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$member->getCivilityLabel().'&nbsp;</td>';
+        print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
        print '</tr>';

        // Lastname
-        print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$member->lastname.'&nbsp;</td>';
+        print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
        print '</tr>';

        // Firstname
-        print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$member->firstname.'&nbsp;</td>';
+        print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td>';
        print '</tr>';

        // Status
-        print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$member->getLibStatut(4).'</td></tr>';
+        print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';

    	// Nbre fichiers
 		print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
@ -185,18 +185,18 @@ if ($id > 0)
 		 */
 		if ($action == 'delete')
 		{
-			$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$member->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+			$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
 			if ($ret == 'html') print '<br>';
 		}


 		// Affiche formulaire upload
 		$formfile=new FormFile($db);
-		$formfile->form_attach_new_file(DOL_URL_ROOT.'/adherents/document.php?id='.$member->id,'',0,0,$user->rights->adherent->creer,50,$object);
+		$formfile->form_attach_new_file(DOL_URL_ROOT.'/adherents/document.php?id='.$object->id,'',0,0,$user->rights->adherent->creer,50,$object);


 		// List of document
-		$formfile->list_of_documents($filearray,$member,'member','', 0, get_exdir($member->id,2,0,1).'/'.$member->id.'/');
+		$formfile->list_of_documents($filearray,$object,'member','', 0, get_exdir($object->id,2,0,1).'/'.$object->id.'/');

 		print "<br><br>";
 	}
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@ -931,7 +931,11 @@ class ExtraFields
 				else if (in_array($key_type,array('checkbox')))
 				{
 					$value_arr=GETPOST("options_".$key);
-					$value_key=implode($value_arr,',');
+					if (!empty($value_arr)) {
+						$value_key=implode($value_arr,',');
+					}else {
+						$value_key='';
+					}
 				}
 				else if (in_array($key_type,array('price','double')))
 				{
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@ -546,22 +546,25 @@ class FormFile
 						}
                        $out.='</td>';
                    }
+
                    if (is_object($hookmanager))
                    {
            			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
                    	$res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
-                        if(!$res) {
-                            $out .= $hookmanager->resPrint;
+                        if (empty($res))
+                        {
+                            $out .= $hookmanager->resPrint;		// Complete line
+                            $out.= '</tr>';
                        }
-                    }
-                	$out.= '</tr>';
+                        else $out = $hookmanager->resPrint;		// Replace line
+              		}
 				}

-			 	if (count($file_list) == 0)  
+			 	if (count($file_list) == 0)
 	            {
    	        	$out.='<tr><td colspan="3">'.$langs->trans("None").'</td></tr>';
        	    }
-				
+
                $this->numoffiles++;
            }
        }
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@ -924,7 +924,7 @@ a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print

 div.tabs {
 	margin: 0px 0px 0px 6px;
-	padding: 0px 6px 1px 0px;
+	padding: 0px 6px 0px 0px;
 	clear:both;
 	height:100%;
 }
@ -962,7 +962,7 @@ a.tabTitle img {
 }

 a.tab {
-	padding: 5px 12px 2px;
+	padding: 5px 12px 3px;
 	margin: 0em 0.2em;
 	background-color:rgba(0,0,0,.2);
 	color:#666666;
@ -1177,9 +1177,9 @@ table.noborder, div.noborder {
 	padding:0px;
 	margin:3px 0px 8px;
 	border-spacing:0px;
-	-moz-box-shadow:2px 4px 2px #cccccc;
-	-webkit-box-shadow:2px 4px 2px #cccccc;
-	box-shadow:2px 4px 2px #cccccc;
+	-moz-box-shadow: 2px 2px 2px #cccccc;
+	-webkit-box-shadow: 2px 2px 2px #cccccc;
+	box-shadow: 2px 2px 2px #cccccc;
 }

 table.noborder tr, div.noborder form {}
@ -1317,9 +1317,9 @@ tr.impair table.nobordernopadding td, tr.pair table.nobordernopadding td { paddi
 }

 .boxtable {
-	-moz-box-shadow:2px 4px 2px #cccccc;
-	-webkit-box-shadow:2px 4px 2px #cccccc;
-	box-shadow:2px 4px 2px #cccccc;
+	-moz-box-shadow: 2px 2px 2px #cccccc;
+	-webkit-box-shadow: 2px 2px 2px #cccccc;
+	box-shadow: 2px 2px 2px #cccccc;
 	/*white-space:nowrap;*/
 }

@ -1541,9 +1541,9 @@ table.dp {
 	background-color:#ffffff;
 	border:1px solid #bbbbbb;
 	border-spacing:0px;
-	-moz-box-shadow:2px 4px 2px #cccccc;
-	-webkit-box-shadow:2px 4px 2px #cccccc;
-	box-shadow:2px 4px 2px #cccccc;
+	-moz-box-shadow: 2px 2px 2px #cccccc;
+	-webkit-box-shadow: 2px 2px 2px #cccccc;
+	box-shadow: 2px 2px 2px #cccccc;
 }

 .dp td, .tpHour td, .tpMinute td {
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@ -260,6 +260,7 @@ td.showDragHandle {
 #id-container {
  display: table;
  table-layout: fixed;
+  margin-top: 6px;
 }
 #id-right, #id-left {
  display: table-cell;
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@ -116,7 +116,7 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14';
 // Eldy colors
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-	$conf->global->THEME_ELDY_TOPMENU_BACK1='200,216,246';    // topmenu
+	$conf->global->THEME_ELDY_TOPMENU_BACK1=($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10)?'230,232,232':'200,216,246';    // topmenu
    $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,236';
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
    $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232';   // vmenu (not menu)
@ -1359,7 +1359,7 @@ div.tabBar {
 	background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
 	background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
 <?php } else { ?>
-	background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;
+	background: rgb(<?php echo $colorbacktabcard1; ?>) repeat-x;
 <?php } ?>
 <?php if (empty($dol_optimize_smallscreen)) { ?>
    -moz-box-shadow: 4px 4px 4px #DDD;
@ -1417,7 +1417,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
    background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
 <?php } else { ?>
-	background: #dee7ec;
+	background: #ffffff;
 <?php } ?>
 }

@ -1426,7 +1426,7 @@ a.tab#active {
    border-bottom: 1px solid rgb(<?php echo $colorbacktabactive; ?>) !important;
 	background-color: rgb(<?php echo $colorbacktabactive; ?>) !important;
 <?php } else { ?>
-	background: #ffffff;
+	background: rgb(<?php echo $colorbacktabcard1; ?>);
 <?php } ?>
 	background-image: none !important;
 }