From: vincent@cubedesigners.com Date: Fri, 24 May 2013 09:25:38 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=44ad7a5cb29ebae7a706b3c06fc91a53ddee86df;p=cubeextranet.git --- diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index d6f94fc68..12f11cfae 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -529,19 +529,20 @@ class wsServices extends cubeFlashGateway { public function wescoRef() { global $core; - $r = $core->con->select('SELECT url FROM wescoref WHERE ref="' . $core->con->escape($this->args['ref']) . '"'); + + $ref = ltrim(substr($this->args['ref'], 4), '0'); + + $r = $core->con->select('SELECT url FROM wescoref WHERE ref="' . $core->con->escape($ref) . '"'); if ($r->count()) { header('Location: ' . $r->url); exit; } - - $cache = ROOT . '/cache/wesco/' . $this->args['ref']; if (file_exists($cache)) { header('Location: ' . file_get_contents($cache)); exit; } - $url = 'http://www.wesco-eshop.fr/catalogsearch/result/?q=' . $this->args['ref']; + $url = 'http://www.wesco-eshop.fr/catalogsearch/result/?q=' . $ref; $doc = new DOMDocument(); $doc->loadHTML(file_get_contents($url)); $x = simplexml_import_dom($doc); diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php index cc0495aed..9f1959a95 100644 --- a/inc/ws/Util/class.ws.exporter.php +++ b/inc/ws/Util/class.ws.exporter.php @@ -113,7 +113,7 @@ class wsExporter { protected function _transfertPhonegap($os, $package, $destination) { if ($os == 'android') { - $this->_rsync($package, '/home/dev/Works/Phonegap/Projects/' . $destination, true); + $this->_rsync($package, '/home/dev/Phonegap/Projects/' . $destination, true); `/usr/local/bin/updatephonegapandroid`; } else if ($os == 'ios') { `sudo /usr/local/bin/remountmac`;