From a5c74a7d959cdb3ad3824450a6ddab51e0584696 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Apr 2015 11:59:58 +0200
Subject: [PATCH] Clean code

---
 htdocs/core/class/dolprintipp.class.php | 95 +------------------------
 htdocs/printing/index.php               |  4 +-
 2 files changed, 3 insertions(+), 96 deletions(-)

diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
index 252b742cc9d..4b934b331f3 100644
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@@ -18,7 +18,7 @@
 
 /**
  *  \file           htdocs/core/class/dolprintipp.class.php
- *  \brief          A set of functions for using printIPP
+ *  \brief          List jobs printed with driver printipp
  */
 
 /**
@@ -57,78 +57,6 @@ class dolprintIPP
     }
 
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return array                list of printers
-     */
-    function getlist_available_printers()
-    {
-        global $conf,$db;
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-        $ipp->getPrinters();
-        return $ipp->available_printers;
-    }
-
-    /**
-     *  Print selected file
-     *
-     * @param   string      $file       file
-     * @param   string      $module     module
-     *
-     * @return 	string					'' if OK, Error message if KO
-     */
-    function print_file($file, $module)
-    {
-        global $conf,$db;
-
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setJobName($file,true);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-
-        // select printer uri for module order, propal,...
-        $sql = 'SELECT rowid,printer_uri,copy FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                $ipp->setPrinterURI($obj->printer_uri);
-            }
-            else
-            {
-            	if (! empty($conf->global->PRINTIPP_URI_DEFAULT))
-            	{
-                	$ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
-            	}
-            	else
-            	{
-            		return 'NoDefaultPrinterDefined';
-            	}
-            }
-        }
-
-        // Set number of copy
-        $ipp->setCopies($obj->copy);
-        $ipp->setData(DOL_DATA_ROOT.'/'.$module.'/'.$file);
-        $ipp->printJob();
-
-        return '';
-    }
-
     /**
      *  List jobs print
      *
@@ -191,25 +119,4 @@ class dolprintIPP
         print "</table>";
     }
 
-    /**
-     *  Get printer detail
-     *
-     *	@param	string	$uri	URI
-     *	@return	array			List of attributes
-     */
-    function get_printer_detail($uri)
-    {
-        global $conf,$db;
-
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-        $ipp->setPrinterURI($uri);
-        $ipp->getPrinterAttributes();
-        return $ipp->printer_attributes;
-    }
 }
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index e8669f44585..48795fbab4c 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -30,8 +30,8 @@ llxHeader("",$langs->trans("Printing"));
 print_fiche_titre($langs->trans("Printing"));
 
 // List Jobs from printing modules
-//$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
-//$printer->list_jobs('commande');
+$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
+$printer->list_jobs('commande');
 
 llxFooter();