From: vincent@cubedesigners.com Date: Fri, 20 Jun 2014 12:02:39 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3d47417ab5bec5d2abd52daa4f947c4d4e4f0c0f;p=cubeextranet.git --- diff --git a/.htaccess b/.htaccess index e559b86a5..3c6a832d3 100644 --- a/.htaccess +++ b/.htaccess @@ -17,11 +17,11 @@ AddCharset UTF-8 log SetOutputFilter DEFLATE SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png|swf|zip|exe|mp3|f4v|ogv|ogg|ogm|webm|mp4|flv|gz|pdf|swc)$ no-gzip dont-vary - + Header append Vary User-Agent - + BrowserMatch ^Mozilla/4 gzip-only-text/html BrowserMatch ^Mozilla/4\.0[678] no-gzip BrowserMatch \bMSIE !no-gzip !gzip-only-text/html @@ -45,6 +45,8 @@ AddCharset UTF-8 log RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L] RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L] RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L] + RewriteRule ^factures$ index.php/$1 [L] + RewriteRule ^devis$ index.php/$1 [L] RewriteRule ^([-,_a-zA-Z0-9/]+)$ index.php/$1 [L] RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer/$1_$2_$3/index [L] @@ -70,10 +72,10 @@ AddCharset UTF-8 log RewriteRule ^viewerh/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L] - RewriteRule ^viewerhu/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/js/(.+)$ fluidbook/compile/_html5/js/$4 [L] + RewriteRule ^viewerhu/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/js/(.+)$ fluidbook/compile/_html5/js/$4 [L] RewriteRule ^viewerhu/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L] - RewriteRule ^viewerht/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/js/(.+)$ fluidbook/compile/_html5/js/$4 [L] + RewriteRule ^viewerht/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/js/(.+)$ fluidbook/compile/_html5/js/$4 [L] RewriteRule ^viewerht/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L] RewriteRule ^viewerh([ai])/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5$1/$2/$5 [L] diff --git a/importWs.php b/importWs.php deleted file mode 100644 index ff0326d1e..000000000 --- a/importWs.php +++ /dev/null @@ -1,456 +0,0 @@ -dbSync(); - cubeDb::mysqlConvert($core->con); - - $grades = array(0 => 1, 0.4 => 1, '0.4' => 1, 0.5 => 1, '0.5' => 1, 1 => 1, 2 => 2, 3 => 3, 4 => 5); - - $tables = array('books', 'book_pages', 'dashboard', 'devis', 'documents', 'entreprises', 'factures', 'icones', 'langues', 'projets', 'signatures', 'taches', 'themes', 'timereport', 'utilisateurs'/*, 'themes_droits'*/); - foreach($tables as $t) { - $core->con->execute('ALTER TABLE ' . $t . ' DISABLE KEYS'); - } - // Copie des dossiers - `/bin/cp /home/extranet/_www/devis/* /home/extranet/www/devis/`; - `/bin/cp /home/extranet/_www/factures/* /home/extranet/www/factures/`; - `/bin/cp -r /home/ws/www/themes/* /home/extranet/www/fluidbook/themes/`; - `/bin/rm -rf /home/extranet/www/fluidbook/docs`; - - $core->con->execute('UPDATE entreprises SET ws_grade=0, ws_admin=1'); - - if ($utilisateurs) { - // Importe les entreprises - // Contrôle des entreprises déjà dans la base extranet - $entreprises = array(); - $entreprise_id = 0; - $r = $core->con->select('SELECT entreprise_id,nom FROM entreprises'); - while ($r->fetch()) { - $nom = mb_strtolower(trim($r->nom)); - $nom = cubeText::str2URL($nom); - $entreprises[$nom] = $r->entreprise_id; - $entreprise_id = max($entreprise_id, $r->entreprise_id); - } - - $utilisateurs_entreprises = array(); - $r = $core->con->select('SELECT entreprise,utilisateur_id FROM utilisateurs'); - while ($r->fetch()) { - $utilisateurs_entreprises[$r->utilisateur_id] = $r->entreprise; - } - - $entreprise_id++; - // Obtient les emails des utilisateurs - $utilisateur_id = 0; - $utilisateurs = array(); - $r = $core->con->select('SELECT utilisateur_id,email FROM utilisateurs'); - while ($r->fetch()) { - $utilisateur_id = max($r->utilisateur_id, $utilisateur_id); - $utilisateurs[trim(mb_strtolower($r->email))] = $r->utilisateur_id; - } - $utilisateur_id++; - // Importe les entreprises et utilisateurs du WS dont les membres n'ont pas été reliés à l'extranet - $r = $core->con->select('SELECT * FROM ws.user WHERE extranet=0 AND (uid IN (SELECT uid FROM ws.book) OR grade>=3) ORDER BY rs'); - $ws2ext = array(); - while ($r->fetch()) { - // On s'occupe de l'entreprise - $email = trim(mb_strtolower($r->email)); - - $rs = trim($r->rs); - if ($rs == '') { - $rs = trim($r->prenom . ' ' . $r->nom); - } - $nom = mb_strtolower($rs); - - $nom = cubeText::str2URL($nom); - - if (isset($utilisateurs[$email])) { - $newid = $utilisateurs[$email]; - $e = $utilisateurs_entreprises[$newid]; - $update = true; - } elseif (isset($entreprises[$nom])) { - $e = $entreprises[$nom]; - $update = true; - } else { - $c = $core->con->openCursor('entreprises'); - $c->entreprise_id = $entreprise_id; - $c->nom = $rs; - $c->adresse = $r->adresse; - $c->code_postal = $r->code_postal; - $c->ville = $r->ville; - $c->pays = $r->pays; - $c->date_creation = $r->date; - $c->ws_grade = $grades[$r->grade]; - $c->insert(); - $e = $entreprises[$nom] = $entreprise_id; - $entreprise_id++; - $update = false; - } - - if ($update) { - $c = $core->con->openCursor('entreprises'); - $c->ws_grade = $grades[$r->grade]; - $c->update('WHERE entreprise_id=\'' . $e . '\''); - } - // Puis de l'utilisateur - if (isset($utilisateurs[$email])) { - $c = $core->con->openCursor('utilisateurs'); - $c->ws_password = $r->password; - $c->ws_id = $r->uid; - $c->update('WHERE utilisateur_id=\'' . $utilisateurs[$email] . '\''); - $ws2ext[$r->uid] = $utilisateurs[$email]; - $utilisateurs_entreprises[$utilisateurs[$email]] = $e; - } else { - $c = $core->con->openCursor('utilisateurs'); - $c->utilisateur_id = $utilisateur_id; - $c->entreprise = $e; - $c->nom = $r->nom; - $c->prenom = $r->prenom; - $c->email = $r->email; - $c->password = $r->password; - $c->adresse = $r->adresse; - $c->code_postal = $r->code_postal; - $c->ville = $r->ville; - $c->pays = $r->pays; - $c->lang = $r->lang; - $c->telephone = $r->telephone; - $c->date_creation = $r->date; - $c->notes = 'Inséré à la migration du Fluidbook Workshop'; - $c->ws_password = $r->password; - $c->ws_id = $r->uid; - $c->insert(); - $ws2ext[$r->uid] = $utilisateur_id; - $utilisateurs_entreprises[$utilisateur_id] = $e; - $utilisateur_id++; - } - } - - $lastuid = 1; - - for($i = 4;$i >= 1;$i--) { - $c = $core->con->openCursor('entreprises'); - $c->nom = 'Entreprise Test - Grade ' . $i; - $c->ws_grade = $i; - $c->ws_admin = $lastuid; - $c->entreprise_id = $entreprise_id; - $c->pays = 'FR'; - $c->insert(); - - $c = $core->con->openCursor('utilisateurs'); - $c->prenom = 'Utilisateur Test'; - $c->nom = 'Grade ' . $i; - $c->email = 'grade' . $i . "@fluidbook.com"; - $c->password = 'atacama'; - $c->utilisateur_id = $utilisateur_id; - $c->entreprise = $entreprise_id; - - $c->lang = 'fr'; - $c->insert(); - - $lastuid = $utilisateur_id; - - $entreprise_id++; - $utilisateur_id++; - } - // Mets à jour les utilisateurs reliés à l'extranet - $r = $core->con->select('SELECT * FROM ws.user WHERE extranet!=0'); - while ($r->fetch()) { - $rr = $core->con->select('SELECT entreprise FROM utilisateurs WHERE utilisateur_id=\'' . $r->extranet . '\''); - $e = $rr->entreprise; - - $c = $core->con->openCursor('utilisateurs'); - $c->ws_password = $r->password; - $c->ws_id = $r->uid; - $c->update('WHERE utilisateur_id=\'' . $r->extranet . '\''); - - $c = $core->con->openCursor('entreprises'); - $c->ws_grade = $grades[$r->grade]; - $c->ws_admin = 1; - $c->update('WHERE entreprise_id=' . $e); - - $utilisateurs_entreprises[$r->extranet] = $e; - $ws2ext[$r->uid] = $r->extranet; - } - // Mets à jour les liens revendeur->client - $r = $core->con->select('SELECT * FROM ws.user u ORDER BY grade DESC,date ASC'); - while ($r->fetch()) { - if (!isset($ws2ext[$r->uid])) { - continue; - } - - if (!isset($ws2ext[$r->admin])) { - $ws2ext[$r->admin] = 1; - } - $c = $core->con->openCursor('entreprises'); - $c->ws_admin = $ws2ext[$r->admin]; - $c->update('WHERE entreprise_id=\'' . $utilisateurs_entreprises[$ws2ext[$r->uid]] . '\''); - } - // Set cubedesigners AS admin - $core->con->execute('UPDATE entreprises SET ws_grade=5, ws_admin=1 WHERE entreprise_id=7'); - // Some entreprises are themeselves revendeurs. It's not normal - $core->con->execute('UPDATE entreprises e SET ws_admin=1 WHERE ws_admin IN (SELECT utilisateur_id FROM utilisateurs u WHERE e.entreprise_id=u.entreprise)'); - } else { - $ws2ext = array(); - $r = $core->con->select('SELECT ws_id,utilisateur_id,entreprise FROM utilisateurs WHERE ws_id IS NOT NULL'); - while ($r->fetch()) { - $ws2ext[$r->ws_id] = $r->utilisateur_id; - $utilisateurs_entreprises[$r->utilisateur_id] = $r->entreprise; - } - } - - if ($themes) { - // Importe les signatures - $r = $core->con->select('SELECT * FROM ws.signature'); - while ($r->fetch()) { - $c = $core->con->openCursor('signatures'); - $c->signature_id = $r->sigid; - $c->nom = $r->titre; - $c->fbcredit = $r->fbcredit; - $c->fblink = $r->fblink; - $c->partnercredit = $r->partnercredit; - $c->partnerlink = $r->partnerlink; - $c->insert(); - } - // Importe les jeux d'icones - for($i = 1;$i <= 2;$i++) { - $c = $core->con->openCursor('icones'); - $c->icone_id = $i; - $c->nom = 'Vectoriel'; - $c->date = TIME; - $c->proprietaire = getWsUser(5); - $c->insert(); - } - // Import des thèmes - $r = $core->con->select('SELECT * FROM ws.theme'); - $theme = new wsTheme(); - while ($r->fetch()) { - $c = $core->con->openCursor('themes'); - $c->theme_id = $r->tid; - $c->proprietaire = getWsUser($r->proprietaire); - $c->date = $r->date; - $c->nom = $r->titre; - - $parametres = new wsThemeParametres($theme); - $parametres->fromRecord($r); - $c->icones = oldIconesToColor($r->iid, $parametres); - $c->parametres = serialize($parametres); - $c->insert(); - - $signatures[$r->tid] = $r->sigid; - } - $r = $core->con->select('SELECT * FROM ws.theme_user'); - $c = $core->con->openCursor('themes_droits'); - while ($r->fetch()) { - $c->utilisateur_id = $r->uid; - $c->theme_id = $r->tid; - try { - $c->insert(); - } - catch(Exception $e) { - } - } - } - if ($langues) { - // Importe les langues - $allTrads = array(); - $trad = array(); - $r = $core->con->select('SELECT * FROM ws.lang_trad,ws.lang_ord WHERE lang_trad.idlt=lang_ord.idlt'); - while ($r->fetch()) { - $idl = getLangCode($r->idl); - if (!isset($trad[$idl])) { - $trad[$idl] = array(); - } - $trad[$idl][$r->ord] = $r->text; - } - - $r = $core->con->select('SELECT * FROM ws.lang'); - while ($r->fetch()) { - $idl = getLangCode($r->idl); - ksort($trad[$idl]); - - $traductions = wsLang::getTraductionWithId($trad[$idl]); - $allTrads[$idl] = $traductions; - - if (strlen($idl) > 2) { - continue; - } - - $c = $core->con->openCursor('langues'); - $c->lang_id = $idl; - $c->charset = 'Latin1'; - $c->font = 'Fluidbook.otf'; - $c->traductions = json_encode($traductions); - $c->insert(); - } - } - $docs = array(); - if ($documents) { - // Importe les documents - $r = $core->con->select('SELECT * FROM ws.document ORDER BY did'); - while ($r->fetch()) { - $c = $core->con->openCursor('documents'); - $c->document_id = $r->did; - $c->pages = $r->pages; - $c->version = 1; - $c->insert(); - // TODO Copie des fichiers - $docs[$r->did] = true; - /*if (!file_exists(dirname(__FILE__) . '/docs/' . $r->did)) { - mkdir(dirname(__FILE__) . '/docs/' . $r->did, 0777, true); - }*/ - } - // Importe les pages des documents - } else { - $r = $core->con->select('SELECT document_id FROM documents'); - while ($r->fetch()) { - $docs[$r->document_id] = true; - } - } - - if ($books) { - // Importe les fluidbooks - $r = $core->con->select('SELECT * FROM ws.book ORDER BY bid'); - if ($r->count() == 0) { - break; - } - // . - $books_proprietaires = array(); - while ($r->fetch()) { - $c = $core->con->openCursor('books'); - $c->book_id = $r->bid; - $c->nom = $r->titre; - $c->lang = substr(getLangCode($r->lang), 0, 2); - $c->theme = $r->tid; - if (strlen($r->lang) > 2) { - $c->traductions = json_encode($allTrads[mb_strtolower($r->lang)]); - } else { - $c->traductions = ''; - } - $books_proprietaires[$r->bid] = $c->proprietaire = getWsUser($r->uid); - $c->status = $r->status; - $c->date_status = $r->date_status; - $c->hash = $r->code; - $c->compteur_visites = 20; - $c->date = $r->date; - $parametres = new wsBookParametres(new stdClass()); - $parametres->fromRecord($r); - - $xml = @simplexml_load_string('' . $r->extras . ''); - if ($xml !== false) { - $parametres->fromXML($xml); - } else { - fb('error on extras (Fluidbook # ' . $r->bid); - } - - $n = array(); - // Pages sans numéro - $offset = $r->first_page_nr-1; - for($i = 0;$i < $offset;$i++) { - $n[] = ''; - } - // Pages avec numero - for($j = 1;$j + $offset <= $r->pages;$j++) { - $n[] = $j; - } - $c->numerotation = implode(',', $n); - - $parametres->signature = $signatures[$r->tid]; - $parametres->title = $r->titre; - $parametres->visualisationMode = '0'; - $c->parametres = serialize($parametres); - $c->insert(); - } - // Importe les pages des fluidbooks - $r = $core->con->select('SELECT bid,did FROM ws.book_pages GROUP BY did'); - while ($r->fetch()) { - if (!isset($docs[$r->did])) { - $c = $core->con->openCursor('documents'); - $c->proprietaire = $books_proprietaires[$r->bid]; - $c->insert(); - $docs[$r->did] = true; - } - } - - $core->con->execute('INSERT INTO book_pages (book_id,book_page,document_id,document_page) SELECT bid,bpid,did,dpid FROM ws.book_pages'); - } - - $core->refreshWSUsersTree(); - - foreach($tables as $t) { - $core->con->execute('ALTER TABLE ' . $t . ' ENABLE KEYS'); - } -} -catch(Exception $e) { - print_r($e); - fb($e); -} - -function oldIconesToColor($iid, &$parametres) -{ - global $oldIconesColors; - if (!isset($oldIconesColors)) { - $oldIconesColors = array(); - $fp = fopen(dirname(__FILE__).'/icones.csv', 'rb'); - $i = 1; - while ($line = fgetcsv($fp, 1000, ';', '"')) { - $oldIconesColors[$i] = array('color' => trim($line[0]), 'iid' => trim($line[1])); - $i++; - } - } - $line = $oldIconesColors[$iid]; - if ($line['iid'] != '') { - $parametres->iconSet = $line['iid']; - $parametres->iconsHMargin = $line['iid'] == 1?20:0; - $parametres->menuHeight=39; - $parametres->colorizeIcons = false; - $parametres->couleurI = 'ffffff'; - return $line['iid']; - } - $parametres->iconSet = 1; - $parametres->colorizeIcons = 1; - $parametres->iconsHMargin = 20; - $parametres->menuHeight=39; - $parametres->couleurI = $line['color']; - - return 1; -} - -function getLangCode($lang) -{ - $lang = strtolower($lang); - if ($lang == 'cz') { - $lang = 'cs'; - } - return $lang; -} - -function getWsUser($oldid) -{ - global $ws2ext; - if (!isset($ws2ext[$oldid])) { - $ws2ext[$oldid] = 5; - } - return $ws2ext[$oldid]; -} - -?> \ No newline at end of file diff --git a/inc/config.inc.php b/inc/config.inc.php index 0476a8b05..a69aad61a 100644 --- a/inc/config.inc.php +++ b/inc/config.inc.php @@ -16,6 +16,7 @@ define('MXMLC_PATH_3', '/usr/local/flex_sdk_3.6/bin/mxmlc'); define('AS3_SOURCES', '/home/as/sources/as/as3'); define('AS3_FLUIDBOOK_SOURCES', '/home/as/sources/fluidbook'); define('PHONEGAP_PLUGINS', '/home/as/sources/phonegap-plugins'); +define('SSH_KEY', '/home/extranet/.ssh/id_rsa'); define('MONITOR_PERFS', true); diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php index b4725a8db..dfcd39586 100644 --- a/inc/extranet/Controlleur/class.extranet.ajax.php +++ b/inc/extranet/Controlleur/class.extranet.ajax.php @@ -320,7 +320,7 @@ class extranetAjax { global $core; $dao = new extranetDAODevis($core->con); $dao->supprime($args[1]); - @unlink(ROOT . '/devis/' . $args[1] . '.pdf'); + @unlink(ROOT . '/docs/devis/' . $args[1] . '.pdf'); $x->addContent('listeDevis', extranetUrl::listeDevis()); $x->addContent('listeDevis', extranetUrl::listeDevis()); @@ -379,7 +379,7 @@ class extranetAjax { $mail->to = $devis->client->getEmail(); $mail->subject = $devis->email['sujet']; $mail->body = $devis->email['corps'] . "\r\n\r\n" . $devis->createur->getSignature(); - $mail->addFile('Devis.pdf', ROOT . '/devis/' . $devis->devis_id . '.pdf'); + $mail->addFile('Devis.pdf', ROOT . '/docs/devis/' . $devis->devis_id . '.pdf'); $mail->send(); } // On marque le devis comme envoyé @@ -419,7 +419,7 @@ class extranetAjax { global $core; $dao = new extranetDAOFacture($core->con); $dao->supprime($args[1]); - @unlink(ROOT . '/facture/' . $args[1] . '.pdf'); + @unlink(ROOT . '/docs/facture/' . $args[1] . '.pdf'); $x->addContent('listeFactures', extranetUrl::listeFactures()); } @@ -427,7 +427,7 @@ class extranetAjax { public static function valideFacture($args, &$x) { global $core; $dao = new extranetDAOFacture($core->con); - $id=$dao->valide($args[1]); + $id = $dao->valide($args[1]); $x->addTruePopup('/voirfacture/' . $id); $x->addRedirection(SITE_PATH . 'factures'); @@ -490,12 +490,12 @@ class extranetAjax { $liste = array(); foreach ($factures as $f) { - if (file_exists(ROOT . '/factures/' . $f . '.pdf')) { - $liste[] = ROOT . '/factures/' . $f . '.pdf'; + if (file_exists(ROOT . '/docs/factures/' . $f . '.pdf')) { + $liste[] = ROOT . '/docs/factures/' . $f . '.pdf'; } } $liste[] = 'output'; - $liste[] = ROOT . '/factures/print_' . $core->user->utilisateur_id . '_' . TIME . '.pdf'; + $liste[] = ROOT . '/docs/factures/print_' . $core->user->utilisateur_id . '_' . TIME . '.pdf'; $pdftk = new cubeCommandLine('pdftk'); $pdftk->setManualArg(implode(' ', $liste)); diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php index 97c89dfae..a7144638e 100644 --- a/inc/extranet/Controlleur/class.extranet.url.php +++ b/inc/extranet/Controlleur/class.extranet.url.php @@ -939,7 +939,7 @@ class extranetUrl { if ($forceDownload) { cubeHTTP::forceDownload('Devis_' . $args[1] . '.pdf'); } - cubeHTTP::relayNoCache(ROOT . '/devis/' . $args[1] . '.pdf'); + cubeHTTP::relayNoCache(ROOT . '/docs/devis/' . $args[1] . '.pdf'); } public static function editedevis($args) { @@ -1199,13 +1199,13 @@ class extranetUrl { $res .= ''; } } elseif ($facture->status >= 1) { - if ($facture->status < 3 || $facture->status==5) { + if ($facture->status < 3 || $facture->status == 5) { if ($droits) { $res .= '' . $core->factures_status[$facture->status] . ''; } else { $res .= '' . $core->factures_status[$facture->status] . ''; } - } else{ + } else { $title = $facture->status == 3 ? __("Voir l'avoir correspondant") : __("Voir la facture annulée correspondante"); $res .= '' . $core->factures_status[$facture->status] . ''; } @@ -1299,7 +1299,7 @@ class extranetUrl { // Vérification des droits de l'utilisateur extranetDroits::facture($facture, 'r', true); - cubeHTTP::relayNoCache(ROOT . '/factures/' . $args[1] . '.pdf'); + cubeHTTP::relayNoCache(ROOT . '/docs/factures/' . $args[1] . '.pdf'); } public static function editefacture($args) { diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php index 1d9aa21bc..6a4f12eff 100644 --- a/inc/extranet/DAO/class.extranet.dao.devis.php +++ b/inc/extranet/DAO/class.extranet.dao.devis.php @@ -1,6 +1,7 @@ devis_id = $r->devis_id; $devis->nom = $r->nom; @@ -36,8 +36,7 @@ class extranetDAODevis extends commonDAO { * * @return extranetDevis */ - public function cree() - { + public function cree() { $devis = new extranetDevis(); $devis->devis_id = 'new'; $devis->nom = ''; @@ -61,8 +60,7 @@ class extranetDAODevis extends commonDAO { * * @return integer */ - protected function getNextId() - { + protected function getNextId() { $r = $this->con->select('SELECT MAX(devis_id) AS devis_id FROM devis'); return $r->devis_id + 1; } @@ -75,8 +73,7 @@ class extranetDAODevis extends commonDAO { * @param integer $devis_id * @return extranetDevis */ - public function duplique($devis_id, $createur) - { + public function duplique($devis_id, $createur) { $devis = $this->selectById($devis_id); $c = $this->con->openCursor('devis'); @@ -103,8 +100,7 @@ class extranetDAODevis extends commonDAO { * @param integer $id * @return extranetDevis */ - public function selectById($devis_id = null) - { + public function selectById($devis_id = null) { if (is_null($devis_id)) { return $this->cree(); } @@ -126,8 +122,7 @@ class extranetDAODevis extends commonDAO { * @param boolean $search_id * @return array */ - public function getListe($orderby = null, $sens = null, $limit = null) - { + public function getListe($orderby = null, $sens = null, $limit = null) { global $core; if (!is_null($this->q)) { $where = ''; @@ -140,31 +135,28 @@ class extranetDAODevis extends commonDAO { $where = $this->makeWhereFromFiltres(); } - $orderby = is_null($orderby)?'devis_id':$orderby; - $sens = is_null($sens)?'DESC':$sens; - $limit = is_null($limit)?'':$this->con->limit($limit[0], $limit[1]); + $orderby = is_null($orderby) ? 'devis_id' : $orderby; + $sens = is_null($sens) ? 'DESC' : $sens; + $limit = is_null($limit) ? '' : $this->con->limit($limit[0], $limit[1]); $sql = 'SELECT * FROM devis_vue WHERE ' . $where . ' ORDER BY ' . $orderby . ' ' . $sens . ' ' . $limit; $r = $this->con->select($sql); return $this->factory($r); } - public function getListeValidesLibres($except) - { + public function getListeValidesLibres($except) { $sql = 'SELECT * FROM devis_vue WHERE devis_id NOT IN (SELECT devis FROM projets WHERE projet_id!=\'' . $except . '\') AND status=2'; $r = $this->con->select($sql); return $this->factory($r); } - public function getListeForClient($client_id, $orderby, $sens) - { + public function getListeForClient($client_id, $orderby, $sens) { $sql = 'SELECT * FROM devis_vue WHERE client_id=\'' . $this->con->escape($client_id) . '\' AND status>0 ORDER BY ' . $orderby . ' ' . $sens; $r = $this->con->select($sql); return $this->factory($r); } - public function getListeForEntreprise($entreprise_id, $orderby, $sens) - { + public function getListeForEntreprise($entreprise_id, $orderby, $sens) { $sql = 'SELECT * FROM devis_vue WHERE client_id IN (SELECT utilisateur_id FROM utilisateurs WHERE entreprise=\'' . $this->con->escape($entreprise_id) . '\') AND status>0 ORDER BY ' . $orderby . ' ' . $sens; $r = $this->con->select($sql); return $this->factory($r); @@ -179,12 +171,11 @@ class extranetDAODevis extends commonDAO { * @param array $data * @return extranetDevis */ - public function sauve($createur, $data) - { + public function sauve($createur, $data) { global $core; $lignes = array(); - foreach($data['montant'] as $i => $montant) { + foreach ($data['montant'] as $i => $montant) { $ligne = array('titre' => $data['titre'][$i], 'description' => $data['description'][$i], 'montant' => $data['montant'][$i]); if ($ligne['titre'] == '' && $ligne['description'] == '' && $ligne['montant'] == '') { continue; @@ -201,8 +192,8 @@ class extranetDAODevis extends commonDAO { $c->date_creation = time(); $c->total_ht = 0; $c->adresse = $data['adresse']; - foreach($lignes as $d) { - $c->total_ht += (float)$d['montant']; + foreach ($lignes as $d) { + $c->total_ht += (float) $d['montant']; } if ($data['devis_id'] == 'new' || $data['devis_id'] == '') { @@ -217,25 +208,7 @@ class extranetDAODevis extends commonDAO { return $this->selectById($devis_id); } - public function saveAsPdf($devis_id) - { - /* - $facture = $this->selectById($facture_id); - $daoUtilisateur = new commonDAOUtilisateur($this->con); - $facture->client = $daoUtilisateur->selectById($facture->client_id); - $facture->createur = $daoUtilisateur->selectById($facture->createur_id); - if ($facture->status == 4) { - $facture->avoir = $this->selectById($facture->avoir); - } - // Chargement des paramètres de la langue du client - cubeLang::set($facture->client->lang); - $pdf = $facture->saveAsPDF(); - if (file_exists(ROOT . '/factures/' . $facture->facture_id . '.pdf')) { - rename(ROOT . '/factures/' . $facture->facture_id . '.pdf', ROOT . '/factures/' . $facture->facture_id . '_' . filemtime(ROOT . '/factures/' . $facture->facture_id . '.pdf') . '.pdf'); - } - $pdf->Output(ROOT . '/factures/' . $facture->facture_id . '.pdf'); - */ - + public function saveAsPdf($devis_id) { $devis = $this->selectById($devis_id); $daoUtilisateur = new commonDAOUtilisateur($this->con); @@ -244,10 +217,10 @@ class extranetDAODevis extends commonDAO { // Chargement des paramètres de la langue du client cubeLang::set($devis->client->lang); $pdf = $devis->saveAsPDF(); - if (file_exists(ROOT . '/devis/' . $devis->devis_id . '.pdf')) { - rename(ROOT . '/devis/' . $devis->devis_id . '.pdf', ROOT . '/devis/' . $devis->devis_id . '_' . filemtime(ROOT . '/devis/' . $devis->devis_id . '.pdf') . '.pdf'); + if (file_exists(ROOT . '/docs/devis/' . $devis->devis_id . '.pdf')) { + rename(ROOT . '/docs/devis/' . $devis->devis_id . '.pdf', ROOT . '/docs/devis/' . $devis->devis_id . '_' . filemtime(ROOT . '/docs/devis/' . $devis->devis_id . '.pdf') . '.pdf'); } - $pdf->Output(ROOT . '/devis/' . $devis->devis_id . '.pdf'); + $pdf->Output(ROOT . '/docs/devis/' . $devis->devis_id . '.pdf'); // Restaure les paramètres de langue de l'utilisateur global $core; cubeLang::set($core->user->lang); @@ -261,8 +234,7 @@ class extranetDAODevis extends commonDAO { * @param integer $devis_id * @return boolean */ - public function changeStatus($devis_id, $status = 'next') - { + public function changeStatus($devis_id, $status = 'next') { if (!$status) { return; } @@ -282,8 +254,7 @@ class extranetDAODevis extends commonDAO { * @param integer $devis_id * @return boolean */ - public function supprime($devis_id) - { + public function supprime($devis_id) { return $this->con->execute('DELETE FROM devis WHERE devis_id=\'' . $this->con->escape($devis_id) . '\''); } @@ -294,20 +265,18 @@ class extranetDAODevis extends commonDAO { * * @return integer */ - public function count() - { - $filters=$this->makeWhereFromFiltres(); - if($filters=='1=1'){ - $table='devis'; - }else{ - $table='devis_vue'; + public function count() { + $filters = $this->makeWhereFromFiltres(); + if ($filters == '1=1') { + $table = 'devis'; + } else { + $table = 'devis_vue'; } - $r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $filters); + $r = $this->con->select('SELECT COUNT(*) AS nb FROM ' . $table . ' WHERE ' . $filters); return $r->nb; } - protected function makeWhereFromFiltres() - { + protected function makeWhereFromFiltres() { if (!is_null($this->filtres)) { $w = array('1=1'); if (commonFiltre::test('annee_facture', $this->filtres)) { @@ -324,6 +293,7 @@ class extranetDAODevis extends commonDAO { return '1=1'; } } + } ?> \ No newline at end of file diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php index 03719ec66..888f2965e 100644 --- a/inc/extranet/DAO/class.extranet.dao.facture.php +++ b/inc/extranet/DAO/class.extranet.dao.facture.php @@ -158,7 +158,7 @@ class extranetDAOFacture extends commonDAO { if (!$r->count()) { return 'A'; } else { - return++$r->facture_id; + return ++$r->facture_id; } } else { $r = $this->con->select('SELECT MAX(CAST(facture_id AS SIGNED)) AS facture_id FROM factures WHERE status>0'); @@ -264,10 +264,10 @@ class extranetDAOFacture extends commonDAO { // Chargement des paramètres de la langue du client cubeLang::set($facture->client->lang); $pdf = $facture->saveAsPDF(); - if (file_exists(ROOT . '/factures/' . $facture->facture_id . '.pdf')) { - rename(ROOT . '/factures/' . $facture->facture_id . '.pdf', ROOT . '/factures/' . $facture->facture_id . '_' . filemtime(ROOT . '/factures/' . $facture->facture_id . '.pdf') . '.pdf'); + if (file_exists(ROOT . '/docs/factures/' . $facture->facture_id . '.pdf')) { + rename(ROOT . '/docs/factures/' . $facture->facture_id . '.pdf', ROOT . '/docs/factures/' . $facture->facture_id . '_' . filemtime(ROOT . '/docs/factures/' . $facture->facture_id . '.pdf') . '.pdf'); } - $pdf->Output(ROOT . '/factures/' . $facture->facture_id . '.pdf'); + $pdf->Output(ROOT . '/docs/factures/' . $facture->facture_id . '.pdf'); } public function savePaiement($data) { @@ -324,8 +324,8 @@ class extranetDAOFacture extends commonDAO { $c->facture_id = $this->getNextId(false); $c->status = 1; $c->update('WHERE facture_id=\'' . $this->con->escape($facture_id) . '\''); - if (file_exists(ROOT . '/factures/' . $facture_id . '.pdf')) { - @unlink(ROOT . '/factures/' . $facture_id . '.pdf'); + if (file_exists(ROOT . '/docs/factures/' . $facture_id . '.pdf')) { + @unlink(ROOT . '/docs/factures/' . $facture_id . '.pdf'); } $this->saveAsPDF($c->facture_id); return $c->facture_id; diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php index 7ba4c55bd..0b0f9cce3 100644 --- a/inc/ws/Util/class.ws.exporter.php +++ b/inc/ws/Util/class.ws.exporter.php @@ -53,12 +53,12 @@ class wsExporter { } $phonegap->setWWWDirectory($dir); if ($os == 'ios') { - $phonegap->setDistantCompiler('paris.cubedesigners.com', 'vincent', 'iquique', '/Phonegap/Projects/' . $d, '/mnt/macbox/Phonegap/Projects/' . $d, 22022); + $phonegap->setDistantCompiler('paris.cubedesigners.com', 'vincent', 'iquique', '/Phonegap/Projects/' . $d, '/mnt/macbox/Phonegap/Projects/' . $d, 22022, SSH_KEY); } else if ($os == 'android') { $manifestType = $collection->settings['offline'] ? 'Offline' : 'Online'; $phonegap->setManifest(WS_COMPILE_ASSETS . '/_html5app/_android/AndroidManifest' . $manifestType . '.xml'); $phonegap->setMain(WS_COMPILE_ASSETS . '/_html5app/_android/Main' . $manifestType . '.java'); - $phonegap->setDistantCompiler('paris.cubedesigners.com', 'Vincent', 'iquique', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322); + $phonegap->setDistantCompiler('paris.cubedesigners.com', 'Vincent', 'iquique', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY); } $phonegap->setPreference('orientation', CubeIT_Mobile_Phonegap::ORIENTATION_PORTRAIT); $phonegap->setPreference('target-device', CubeIT_Mobile_Phonegap::TARGET_TABLET);