lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error management

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-30 16:14:54 +02:00
parent 7f352e5b24
commit bfe85cbf37
5 changed files with 188 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/core/class/dolprintipp.class.php
View File

@ -91,7 +91,14 @@ class dolprintIPP
} }
} }
// Getting Jobs // 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 '<table width="100%" class="noborder">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print "<td>Id</td>"; print "<td>Id</td>";
@ -102,19 +109,22 @@ class dolprintIPP
print "<td>Cancel</td>"; print "<td>Cancel</td>";
print "</tr>\n"; print "</tr>\n";
$jobs = $ipp->jobs_attributes; $jobs = $ipp->jobs_attributes;
$var = True; $var = true;
//print '<pre>'.print_r($jobs,true).'</pre>'; //print '<pre>'.print_r($jobs,true).'</pre>';
foreach ($jobs as $value ) if (is_array($jobs))
{ {
$var=!$var; foreach ($jobs as $value)
print "<tr ".$bc[$var].">"; {
print '<td>'.$value->job_id->_value0.'</td>'; $var=!$var;
print '<td>'.$value->job_originating_user_name->_value0.'</td>'; print "<tr ".$bc[$var].">";
print '<td>'.$value->printer_uri->_value0.'</td>'; print '<td>'.$value->job_id->_value0.'</td>';
print '<td>'.$value->job_name->_value0.'</td>'; print '<td>'.$value->job_originating_user_name->_value0.'</td>';
print '<td>'.$value->job_state->_value0.'</td>'; print '<td>'.$value->printer_uri->_value0.'</td>';
print '<td>'.$value->job_uri->_value0.'</td>'; print '<td>'.$value->job_name->_value0.'</td>';
print '</tr>'; print '<td>'.$value->job_state->_value0.'</td>';
print '<td>'.$value->job_uri->_value0.'</td>';
print '</tr>';
}
} }
print "</table>"; print "</table>";
} }

2
htdocs/core/class/html.form.class.php
View File

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

6
htdocs/includes/printipp/BasicIPP.php
View File

@ -74,7 +74,7 @@ class BasicIPP
public $ssl = false; public $ssl = false;
public $debug_level = 3; // max 3: almost silent 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 $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; public $handle_http_exceptions = 1;
// readables variables // readables variables
@ -780,6 +780,8 @@ class BasicIPP
$this->serveroutput->body = ""; $this->serveroutput->body = "";
$http = new http_class; $http = new http_class;
if (!$this->unix) { if (!$this->unix) {
// DOL_LDR_CHANGE
if (empty($this->host)) $this->host='127.0.0.1';
$http->host = $this->host; $http->host = $this->host;
} }
else { else {
@ -846,7 +848,7 @@ class BasicIPP
} }
else else
{ {
$success = $http->Open($arguments); $success = $http->Open($arguments);
} }
if ($success[0] == true) if ($success[0] == true)
{ {

4
htdocs/user/card.php
View File

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

4
htdocs/user/home.php
View File

@ -65,7 +65,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
$var=false; $var=false;
print '<form method="post" action="'.DOL_URL_ROOT.'/user/index.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/user/index.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; 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 class="liste_titre"><td colspan="3">'.$langs->trans("SearchAUser").'</td></tr>';
print '<tr '.$bc[$var].'><td>'; 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>'; 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; $var=false;
print '<form method="post" action="'.DOL_URL_ROOT.'/user/group/index.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/user/group/index.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; 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 class="liste_titre"><td colspan="3">'.$langs->trans("SearchAGroup").'</td></tr>';
print '<tr '.$bc[$var].'><td>'; 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>'; 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>';