Better error management

htdocs/core/class/dolprintipp.class.php

@@ -91,7 +91,14 @@ class dolprintIPP
             }
         }
         // Getting Jobs
-        $ipp->getJobs(false,0,'completed',false);
+        try {
+        	$ipp->getJobs(false,0,'completed',false);			// May return errors if setup not correct
+        }
+        catch(Exception $e)
+        {
+			print $e->getMessage();
+        }
+
         print '<table width="100%" class="noborder">';
         print '<tr class="liste_titre">';
         print "<td>Id</td>";
@@ -102,8 +109,10 @@ class dolprintIPP
         print "<td>Cancel</td>";
         print "</tr>\n";
         $jobs = $ipp->jobs_attributes;
-        $var = True;
+        $var = true;
         //print '<pre>'.print_r($jobs,true).'</pre>';
+        if (is_array($jobs))
+        {
 	        foreach ($jobs as $value)
 	        {
 	            $var=!$var;
@@ -116,6 +125,7 @@ class dolprintIPP
 	            print '<td>'.$value->job_uri->_value0.'</td>';
 	            print '</tr>';
 	        }
+        }
         print "</table>";
     }
 

htdocs/core/class/html.form.class.php

@@ -415,7 +415,7 @@ class Form
         if ($direction > 0) {
             $s.='<'.$tag.$paramfortooltipimg;
             if ($tag == 'td') {
-                $s .= ' valign="top" width="14"';
+                $s .= ' valign="middle" width="14"';
             }
             $s.= '>'.$img.'</'.$tag.'>';
         }

htdocs/includes/printipp/BasicIPP.php

@@ -74,7 +74,7 @@ class BasicIPP
     public $ssl = false;
     public $debug_level = 3; // max 3: almost silent
     public $alert_on_end_tag; // debugging purpose: echo "END tag OK" if (1 and  reads while end tag)
-    public $with_exceptions = 0; // compatibility mode for old scripts
+    public $with_exceptions = 1; // compatibility mode for old scripts		// DOL_LDR_CHANGE set this to 1
     public $handle_http_exceptions = 1;
 
     // readables variables
@@ -780,6 +780,8 @@ class BasicIPP
         $this->serveroutput->body = "";
         $http = new http_class;
         if (!$this->unix) {
+        	// DOL_LDR_CHANGE
+        	if (empty($this->host)) $this->host='127.0.0.1';
             $http->host = $this->host;
         }
         else {

htdocs/user/card.php

@@ -868,7 +868,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     // Type
     print '<tr><td>'.$langs->trans("Type").'</td>';
     print '<td>';
-    print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
+    print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2);
     print '</td></tr>';
 
     // Tel
@@ -1275,7 +1275,7 @@ else
             print '<tr><td>'.$langs->trans("Type").'</td><td colspan="2">';
             $type=$langs->trans("Internal");
             if ($object->societe_id) $type=$langs->trans("External");
-            print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
+            print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2);
             if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
             print '</td></tr>'."\n";
 

htdocs/user/home.php

@@ -65,7 +65,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 $var=false;
 print '<form method="post" action="'.DOL_URL_ROOT.'/user/index.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder" width="100%">';
+print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAUser").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("Ref").':</td><td><input class="flat" type="text" name="search_user" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
@@ -79,7 +79,7 @@ if ($canreadperms)
 	$var=false;
 	print '<form method="post" action="'.DOL_URL_ROOT.'/user/group/index.php">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder" width="100%">';
+	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAGroup").'</td></tr>';
 	print '<tr '.$bc[$var].'><td>';
 	print $langs->trans("Ref").':</td><td><input class="flat" type="text" name="search_group" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';