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

htdocs/adherents/index.php

@@ -55,7 +55,7 @@ $AdherentsResilies=array();
 
 $AdherentType=array();
 
-// Liste les adherents
+// Members list
 $sql = "SELECT t.rowid, t.libelle as label, t.subscription,";
 $sql.= " d.statut, count(d.rowid) as somme";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
@@ -92,7 +92,7 @@ if ($result)
 
 $now=dol_now();
 
-// List members up to date
+// Members up to date list
 // current rule: uptodate = the end date is in future whatever is type
 // old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future)
 $sql = "SELECT count(*) as somme , d.fk_adherent_type";
@@ -140,7 +140,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     	foreach($listofsearchfields as $key => $value)
     	{
     		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
+    		print '<tr class="oddeven">';
     		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
     		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
     		print '</tr>';

htdocs/api/class/api_documents.class.php

@@ -103,7 +103,7 @@ class Documents extends DolibarrApi
 		}
 
 		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
+		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64' );
 	}
 
 
@@ -224,10 +224,9 @@ class Documents extends DolibarrApi
 		}
 
 		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
+		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64' );
 	}
 
-
 	/**
 	 * Return the list of documents of a dedicated element (from its ID or Ref)
 	 *

htdocs/contact/list.php

@@ -321,6 +321,7 @@ if (strlen($search_twitter))        $sql.= natural_search('p.twitter', $search_t
 if (strlen($search_facebook))       $sql.= natural_search('p.facebook', $search_facebook);
 if (strlen($search_email))          $sql.= natural_search('p.email', $search_email);
 if (strlen($search_zip))   			$sql.= natural_search("p.zip",$search_zip);
+if (strlen($search_town))   		$sql.= natural_search("p.town",$search_town);
 if ($search_status != '' && $search_status >= 0) $sql.= " AND p.statut = ".$db->escape($search_status);
 if ($search_import_key)             $sql.= natural_search("p.import_key",$search_import_key);
 if ($type == "o")        // filtre sur type

htdocs/core/class/html.formfile.class.php

@@ -1219,9 +1219,13 @@ class FormFile
 							if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
 							//print $file['path'].'/'.$minifile.'<br>';
 
-							$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 0, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
+							$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
-							if (empty($urlforhref)) $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+							if (empty($urlforhref)) {
+								$urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
 								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+							} else {
+								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+							}
 							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
 							print '</a>';
 						}

htdocs/core/js/lib_head.js.php

@@ -918,7 +918,7 @@ function document_preview(file, type, title)
 		{
 			optionsbuttons = {
 			    "<?php echo dol_escape_js($langs->transnoentitiesnoconv("OriginalSize")); ?>": function() { console.log("Click on original size"); jQuery(".ui-dialog-content.ui-widget-content > object").css({ "max-height": "none" }); },
-				"<?php echo dol_escape_js($langs->transnoentitiesnoconv("Close")); ?>": function() { $( this ).dialog( "close" ); }
+				"<?php echo dol_escape_js($langs->transnoentitiesnoconv("CloseWindow")); ?>": function() { $( this ).dialog( "close" ); }
 				};
 		}
 

htdocs/fichinter/card.php

@@ -7,6 +7,7 @@
  * Copyright (C) 2014-2018  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2014-2018  Charlene Benke          <charlies@patas-monkey.com>
  * Copyright (C) 2015-2016  Abbes Bahfir            <bafbes@gmail.com>
+ * Copyright (C) 2018 		Philippe Grand       	<philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1646,10 +1647,12 @@ else if ($id > 0 || ! empty($ref))
 					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendMail').'</a></div>';
 				}
 
-		    		// create interventional model
+		    	// create intervention model
 				if ($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
 					print '<div class="inline-block divButAction">';
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableInterventional").'</a>';
+					// This feature is not yet implemented
+					//print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
+					print '<a class="butAction" title="'.$langs->trans("ChangeIntoRepeatableIntervention").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("not yet implemented").'</a>';
 					print '</div>';
 				}
 

htdocs/langs/en_US/interventions.lang

@@ -4,6 +4,7 @@ Interventions=Interventions
 InterventionCard=Intervention card
 NewIntervention=New intervention
 AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
 ListOfInterventions=List of interventions
 ActionsOnFicheInter=Actions on intervention
 LastInterventions=Latest %s interventions

htdocs/main.inc.php

@@ -1382,7 +1382,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                     }
                     else
                     {
-                        if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
                         print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
                     }
                 }

htdocs/product/class/api_products.class.php

@@ -52,12 +52,15 @@ class Products extends DolibarrApi
     }
 
     /**
-     * Get properties of a product object
+     * Get properties of a product object (from its ID, Ref, Ref_ext or Barcode)
      *
      * Return an array with product information.
      * TODO implement getting a product by ref or by $ref_ext
      *
      * @param  int    $id               ID of product
+     * @param  string $ref              Ref of element
+     * @param  string $ref_ext          Ref ext of element
+     * @param  string $barcode          Barcode of element
      * @param  int    $includestockdata Load also information about stock (slower)
      * @return array|mixed                 Data without useless information
      *
@@ -65,23 +68,28 @@ class Products extends DolibarrApi
      * @throws 403
      * @throws 404
      */
-    function get($id, $includestockdata=0)
+    function get($id, $ref='', $ref_ext='', $barcode='', $includestockdata=0)
     {
+        if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
+            throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
+        }
+
+        $id = (empty($id)?0:$id);
+        
         if(! DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(403);
         }
 
-        $result = $this->product->fetch($id);
+        $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
-        if( ! $result ) {
+        if(! $result ) {
             throw new RestException(404, 'Product not found');
         }
         
-		if( ! DolibarrApi::_checkAccessToResource('product',$this->product->id)) {
+        if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-		if ($includestockdata)
+        if ($includestockdata) {
-		{
                $this->product->load_stock();
         }
 
@@ -112,26 +120,24 @@ class Products extends DolibarrApi
 
         $sql = "SELECT t.rowid, t.ref, t.ref_ext";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as t";
-        if ($category > 0)
+        if ($category > 0) {
-        {
             $sql.= ", ".MAIN_DB_PREFIX."categorie_product as c";
         }
         $sql.= ' WHERE t.entity IN ('.getEntity('product').')';
         // Select products of given category
-        if ($category > 0)
+        if ($category > 0) {
-        {
             $sql.= " AND c.fk_categorie = ".$db->escape($category);
             $sql.= " AND c.fk_product = t.rowid ";
         }
         // Show products
-        if ($mode == 1) $sql.= " AND t.fk_product_type = 0";
+        if ($mode == 1) { $sql.= " AND t.fk_product_type = 0";
+        }
         // Show services
-        if ($mode == 2) $sql.= " AND t.fk_product_type = 1";
+        if ($mode == 2) { $sql.= " AND t.fk_product_type = 1";
+        }
         // Add sql filters
-        if ($sqlfilters)
+        if ($sqlfilters) {
-        {
+            if (! DolibarrApi::_checkFilters($sqlfilters)) {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
             $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -140,8 +146,7 @@ class Products extends DolibarrApi
 
         $sql.= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
+            if ($page < 0) {
-            {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -150,8 +155,7 @@ class Products extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
+        if ($result) {
-        {
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
@@ -167,7 +171,7 @@ class Products extends DolibarrApi
         else {
             throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if(! count($obj_ret)) {
             throw new RestException(404, 'No product found');
         }
         return $obj_ret;
@@ -218,57 +222,61 @@ class Products extends DolibarrApi
         }
 
         $result = $this->product->fetch($id);
-        if( ! $result ) {
+        if(! $result ) {
             throw new RestException(404, 'Product not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('product',$this->product->id)) {
+        if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
         $oldproduct = dol_clone($this->product, 0);
 
         foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
+            if ($field == 'id') { continue;
+            }
             $this->product->$field = $value;
         }
 
         $result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update');
 
         // If price mode is 1 price per product
-        if ($result > 0 && ! empty($conf->global->PRODUCT_PRICE_UNIQ))
+        if ($result > 0 && ! empty($conf->global->PRODUCT_PRICE_UNIQ)) {
-        {
             // We update price only if it was changed
             $pricemodified = false;
-        	if ($this->product->price_base_type != $oldproduct->price_base_type) $pricemodified = true;
+            if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
-        	else
+            } else
             {
-        		if ($this->product->tva_tx != $oldproduct->tva_tx) $pricemodified = true;
+                if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
-        		if ($this->product->tva_npr != $oldproduct->tva_npr) $pricemodified = true;
+                }
-        		if ($this->product->default_vat_code != $oldproduct->default_vat_code) $pricemodified = true;
+                if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
+                }
+                if ($this->product->default_vat_code != $oldproduct->default_vat_code) { $pricemodified = true;
+                }
 
-        		if ($this->product->price_base_type == 'TTC')
+                if ($this->product->price_base_type == 'TTC') {
-	        	{
+                    if ($this->product->price_ttc != $oldproduct->price_ttc) { $pricemodified = true;
-	        		if ($this->product->price_ttc != $oldproduct->price_ttc) $pricemodified = true;
+                    }
-	        		if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) $pricemodified = true;
+                    if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
+                    }
                 }
                 else
                 {
-	        		if ($this->product->price != $oldproduct->price) $pricemodified = true;
+                    if ($this->product->price != $oldproduct->price) { $pricemodified = true;
-	        		if ($this->product->price_min != $oldproduct->price_min) $pricemodified = true;
+                    }
+                    if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
+                    }
                 }
             }
 
-        	if ($pricemodified)
+            if ($pricemodified) {
-        	{
                 $newvat = $this->product->tva_tx;
                 $newnpr = $this->product->tva_npr;
                 $newvatsrccode = $this->product->default_vat_code;
 
                 $newprice = $this->product->price;
                 $newpricemin = $this->product->price_min;
-        		if ($this->product->price_base_type == 'TTC')
+                if ($this->product->price_base_type == 'TTC') {
-        		{
                     $newprice = $this->product->price_ttc;
                     $newpricemin = $this->product->price_min_ttc;
                 }
@@ -277,8 +285,7 @@ class Products extends DolibarrApi
             }
         }
 
-        if ($result <= 0)
+        if ($result <= 0) {
-        {
             throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
         }
 
@@ -297,11 +304,11 @@ class Products extends DolibarrApi
             throw new RestException(401);
         }
         $result = $this->product->fetch($id);
-        if( ! $result ) {
+        if(! $result ) {
             throw new RestException(404, 'Product not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('product',$this->product->id)) {
+        if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
@@ -364,13 +371,12 @@ class Products extends DolibarrApi
             throw new RestException(401);
         }
 
-    	if (empty($conf->global->PRODUIT_MULTIPRICES))
+        if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-    	{
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
 
         $result = $this->product->fetch($id);
-    	if ( ! $result ) {
+        if (! $result ) {
             throw new RestException(404, 'Product not found');
         }
 
@@ -406,13 +412,12 @@ class Products extends DolibarrApi
             throw new RestException(401);
         }
 
-    	if (empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+        if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-    	{
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
 
         $result = $this->product->fetch($id);
-    	if ( ! $result ) {
+        if (! $result ) {
             throw new RestException(404, 'Product not found');
         }
 
@@ -441,13 +446,12 @@ class Products extends DolibarrApi
             throw new RestException(401);
         }
 
-    	if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+        if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
-    	{
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
 
         $result = $this->product->fetch($id);
-    	if ( ! $result ) {
+        if (! $result ) {
             throw new RestException(404, 'Product not found');
         }
 
@@ -500,8 +504,9 @@ class Products extends DolibarrApi
     {
         $product = array();
         foreach (Products::$FIELDS as $field) {
-            if (!isset($data[$field]))
+            if (!isset($data[$field])) {
                 throw new RestException(400, "$field field missing");
+            }
             $product[$field] = $data[$field];
         }
         return $product;

htdocs/stripe/payment.php

@@ -8,7 +8,7 @@
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014       Teddy Andreotti         <125155@supinfo.com>
  * Copyright (C) 2015       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2018       ThibaultFOUCART         <support@ptibogxiv.net>
+ * Copyright (C) 2018       Thibault FOUCART         <support@ptibogxiv.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -63,21 +63,6 @@ $addwarning=0;
 $multicurrency_amounts=array();
 $multicurrency_amountsresttopay=array();
 
-if (! empty($conf->stripe->enabled))
-{
-	$service = 'StripeTest';
-	$servicestatus = 0;
-	if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
-	{
-		$service = 'StripeLive';
-		$servicestatus = 0;
-	}
-
-	$stripe = new Stripe($db);
-	$stripeacc = $stripe->getStripeAccount($service);								// Stripe OAuth connect account of dolibarr user (no network access here)
-	$stripecu = $stripe->getStripeCustomerAccount($object->id, $servicestatus);		// Get thirdparty cu_...
-}
-
 // Security check
 $socid=0;
 if ($user->societe_id > 0)
@@ -93,6 +78,20 @@ if ($facid > 0)
 	$ret=$object->fetch($facid);
 }
 
+if (! empty($conf->stripe->enabled))
+{
+	$service = 'StripeTest';
+	$servicestatus = 0;
+	if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
+	{
+		$service = 'StripeLive';
+		$servicestatus = 0;
+	}
+     
+$stripe=new Stripe($db); 
+$stripeacc = $stripe->getStripeAccount($service);								// Stripe OAuth connect account of dolibarr user (no network access here)
+}
+
 // Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('paiementcard','globalcard'));
 
@@ -308,11 +307,15 @@ if (empty($reshook))
 			}
 		}
     
+    
+
 		$societe = new Societe($db);
 		$societe->fetch($facture->socid);
 		dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');  
     
-		$charge=$stripe->CreatePaymentStripe($stripeamount,"EUR","invoice",$facid,$source,$customer->id,$stripe->getStripeAccount($conf->entity));
+    $stripecu = $stripe->getStripeCustomerAccount($societe->id, $servicestatus);		// Get thirdparty cu_...
+
+		$charge=$stripe->createPaymentStripe($stripeamount,$facture->multicurrency_code,"invoice",$facid,$source,$stripecu,$stripeacc,$servicestatus);
 
 		if (!$error)
 		{
@@ -324,6 +327,8 @@ if (empty($reshook))
 			$paiement->paiementid   = dol_getIdFromCode($db,$paiementcode,'c_paiement');
 			$paiement->num_paiement = $charge->message;
 			$paiement->note         = GETPOST('comment');
+			$paiement->ext_payment_id = $charge->id;
+			$paiement->ext_payment_site = $service;
 		}
 
 		if (! $error)
@@ -389,7 +394,7 @@ if (empty($reshook))
 		}
 		else
 		{                                                                                                               
-			$loc = DOL_URL_ROOT.'/stripeconnect/payment.php?facid='.$facid.'&action=create&error='.$e->getMessage();
+			$loc = DOL_URL_ROOT.'/stripe/payment.php?facid='.$facid.'&action=create&error='.$charge->message;
 			$db->rollback();
 
 			header('Location: '.$loc);

htdocs/ticket/class/actions_ticket.class.php

@@ -827,6 +827,7 @@ class ActionsTicket
 
         global $mysoc, $conf, $langs;
 
+        $object = new Ticket($this->db);
         $error = 0;
         $ret = $object->fetch('', '', GETPOST('track_id','alpha'));
         $object->socid = $object->fk_soc;
@@ -1203,15 +1204,14 @@ class ActionsTicket
     public function viewTicketMessages($show_private, $show_user = true)
     {
         global $conf, $langs, $user;
-		global $object;
 
         // Load logs in cache
-        $ret = $object->loadCacheMsgsTicket();
+        $ret = $this->dao->loadCacheMsgsTicket();
         $action = GETPOST('action');
 
         $this->viewTicketOriginalMessage($user, $action);
 
-        if (is_array($object->cache_msgs_ticket) && count($object->cache_msgs_ticket) > 0) {
+        if (is_array($this->dao->cache_msgs_ticket) && count($this->dao->cache_msgs_ticket) > 0) {
             print_titre($langs->trans('TicketMailExchanges'));
 
             print '<table class="border" style="width:100%;">';
@@ -1228,7 +1228,7 @@ class ActionsTicket
                 print '</td>';
             }
 
-            foreach ($object->cache_msgs_ticket as $id => $arraymsgs) {
+            foreach ($this->dao->cache_msgs_ticket as $id => $arraymsgs) {
                 if (!$arraymsgs['private']
                     || ($arraymsgs['private'] == "1" && $show_private)
                 ) {