From 162cddb34b693a1d0878dbedb823e7afb1d33ba1 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 21 Oct 2011 12:43:50 +0000 Subject: [PATCH] --- fluidbook/icones/4/nav-2d.png | Bin 0 -> 1241 bytes fluidbook/icones/4/nav-3d.png | Bin 0 -> 1253 bytes fluidbook/icones/4/nav-archives.png | Bin 0 -> 2893 bytes fluidbook/icones/4/nav-basket.png | Bin 0 -> 1120 bytes fluidbook/icones/4/nav-bookmark.png | Bin 0 -> 2935 bytes fluidbook/icones/4/nav-friend.png | Bin 0 -> 1194 bytes fluidbook/icones/4/nav-fullscreen.png | Bin 0 -> 2961 bytes fluidbook/icones/4/nav-help.png | Bin 0 -> 1142 bytes fluidbook/icones/4/nav-index.png | Bin 0 -> 2938 bytes fluidbook/icones/4/nav-normal.png | Bin 0 -> 2944 bytes fluidbook/icones/4/nav-normalscreen.png | Bin 0 -> 2955 bytes fluidbook/icones/4/nav-print.png | Bin 0 -> 2939 bytes fluidbook/icones/4/nav-save.png | Bin 0 -> 2921 bytes fluidbook/icones/4/nav-sommaire.png | Bin 0 -> 2885 bytes fluidbook/icones/4/nav-soundoff.png | Bin 0 -> 1078 bytes fluidbook/icones/4/nav-soundon.png | Bin 0 -> 1264 bytes fluidbook/icones/4/nav-zoomin.png | Bin 0 -> 3158 bytes fluidbook/icones/4/nav-zoomout.png | Bin 0 -> 3136 bytes inc/commons/class.common.core.php | 11 +- inc/extranet/_common.php | 2 +- inc/extranet/prepend.php | 4 + inc/prepend.php | 1 + inc/ws/Controlleur/class.ws.flash.php | 3 + inc/ws/DAO/class.ws.dao.document.php | 189 ++---------------------- inc/ws/Util/_common.php | 1 + inc/ws/Util/class.ws.links.php | 185 +++++++++++++++++++++++ inc/ws/_common.php | 18 --- inc/ws/prepend.php | 22 +++ js/ws.js | 2 +- 29 files changed, 233 insertions(+), 205 deletions(-) create mode 100644 fluidbook/icones/4/nav-2d.png create mode 100644 fluidbook/icones/4/nav-3d.png create mode 100644 fluidbook/icones/4/nav-archives.png create mode 100644 fluidbook/icones/4/nav-basket.png create mode 100644 fluidbook/icones/4/nav-bookmark.png create mode 100644 fluidbook/icones/4/nav-friend.png create mode 100644 fluidbook/icones/4/nav-fullscreen.png create mode 100644 fluidbook/icones/4/nav-help.png create mode 100644 fluidbook/icones/4/nav-index.png create mode 100644 fluidbook/icones/4/nav-normal.png create mode 100644 fluidbook/icones/4/nav-normalscreen.png create mode 100644 fluidbook/icones/4/nav-print.png create mode 100644 fluidbook/icones/4/nav-save.png create mode 100644 fluidbook/icones/4/nav-sommaire.png create mode 100644 fluidbook/icones/4/nav-soundoff.png create mode 100644 fluidbook/icones/4/nav-soundon.png create mode 100644 fluidbook/icones/4/nav-zoomin.png create mode 100644 fluidbook/icones/4/nav-zoomout.png create mode 100644 inc/extranet/prepend.php create mode 100644 inc/ws/Util/class.ws.links.php create mode 100644 inc/ws/prepend.php diff --git a/fluidbook/icones/4/nav-2d.png b/fluidbook/icones/4/nav-2d.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ba6d73bd64adcbd5cc699ac66e723c3abe09bc GIT binary patch literal 1241 zcmaJ>ZD<>H9KN(Jb=|VXZi}=|{Cjh?(_HQ)Z_UxHO>#{e>a|^((G)+pd-v)KsJ(`#v*Fa=G(!%0brqrYFhjsi)H zqvK(gV6_x1N`rGc9Ge@?33F3IOhkK6f*y;u1!QP)z>=pGgSO)6wk~b&oogHg+Yoaq zj^0Ts&yIqWszVSC5STzj2oNCyWH1zsM*V;yNCGD)oTM-^N(U*LAi&Op+R=2eKxdis zPAvNrM~kMZ(Kuczl>((;K-DL4G8T(D8We@u2+WvOOwPg-<5*pRfrg+cZ(?(QZguvk@AUjTm(s7ii5waj-e1ixocC02&adN4 zx<&!z-11D7{qDCue=EH7$X5%c;(_DEQfdeWsAJLe5>sodb4eBzxVA> yCcW~hKey;vNe8U}fi7AzZCsS=07?>3@Ln2Bde0{8v^Ko2Tt~skz|cV7z)0WFNY~KZ%Gk)tz(4^Clz_GsrKDK}xwt{?0`hE?GD=Dctn~HE z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1?ON>h49S0l>G8y zuxejlE6=>*lEl2^R8JRMC7^!2%*+%kM{_ebV`EnfV*_(XLqk^sOJ@sHATl&?GH^3B zHMNB4b;(aI%}vcKf$2>_=(WVD7nBfk3xGDeq!wkCrKY$Q<>xAZJ#3YU+bw1|&4cPq z!R;1voO<~>XsXxk=OkLgmSnslLU7VCE*Y`4%#TbI&M`g`&6p;cyg9>2 z;5^GC9~Hwig@0^Uw=lK4ie?-P=~Xdjob7sJgMh&Q#;jSMOI*7=imDSI`B+@y;1_t# z@KH}8jqTBXhdm7^zI^5DJj<56;X!~7%aO?we;jqFnd8yDFG2Xo)5Y-)f0#P&a~z3s zi8|ub<*MMV(s)BYOH)HQTsTuuT~qAf0ktIx#>$tJGII`cZ1!LZ@o*^ApY|iEL5(BH zfluhS&NihNaweYtTGB$i73Q@~33>k5iU z<@=;UQAdS0Ek{GU7tEY6!|5we$X>~+XUD_kJDEPdP7M5bk%fUpf?@5%-){G%m+S!* NJf5z8F6*2UngE&{srCQ> literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-archives.png b/fluidbook/icones/4/nav-archives.png new file mode 100644 index 0000000000000000000000000000000000000000..a7d293a596756aaf98ba5612f0962c6d3baafd42 GIT binary patch literal 2893 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 literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-basket.png b/fluidbook/icones/4/nav-basket.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c4baa9d3b9772d2899f7a52f658adcbf815226 GIT binary patch literal 1120 zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gy!3HEdYt9+~DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49p6dArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XP}#GU}m6TW~gUq zY+`P1uA^XNU}&IkV5Dzoq-$tyWo%?+V4wg6Nh+i#(Mch>H3D2mX;thjEr=FDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz zEwNPsx)kDt+yc06!V;*iRM zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf^)E`LU?9gN`84U zShcUOm1kaYNn&1ds;7&s5>UThW@d_&rMZ!dlbN%#v8$Pzp`ojRrLn7vtD~v8k)^4L zrICRPOs`9Ra%paAUI|QZ3PP_7PQ9RnkXrz>*(J3ovn(~mttdZN0qkL`Ox$j9#AzN> zZwhX=IN{W*4|I$^C|Z%C872fwJ0K=J(E>T}WS^P`OzTC!MD3^${uY=au6epRhE&{2 z`t$$4J+m%@uwYh6V}-atJ;S4LhdqKFp&YN6c1rMKVBv_o&wY0<)$$Hk8=3i!n;u-{E+f6tL=3sgS+ zdo(dwO{9{|;m<4krwk%115Y?A_C6`~Vo(>zR%AaKsr9UP^9ivAW?+$ExZde~O1ojxZcv{0boFyt=akR{0QVkmvH$=8 literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-bookmark.png b/fluidbook/icones/4/nav-bookmark.png new file mode 100644 index 0000000000000000000000000000000000000000..111b08bfb972fcf2d1b6c849ee2d9894f2c0ef1d GIT binary patch literal 2935 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 literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-friend.png b/fluidbook/icones/4/nav-friend.png new file mode 100644 index 0000000000000000000000000000000000000000..23885ce687c121f81dfd7c1aee47f889fffbc692 GIT binary patch literal 1194 zcmaJ>ZD<>19KWP2+e*9H&9OJN4_Ab3H20FEO>-p8+coykYik-?w%KZ zzu*7u$GtPq_gr)1kwy%|nz>#!i`FO6yMLDteb3MMub}0y)swddwW3uP42UHqtpEY1 z2qQ2H1!;188AdUz0m!+$mFHhzL`@+C7em;Jj@TF$joZ2)jzS9*;E1fo@LxZ@h67oO z;U_zIir3SyB==4kaB!+GCr*uu5ebiXgQ(3Q0R>tDu$3{@Wb7Eesmq|fdrjhC6Jm|V z@JC7I`2mpD3yKYPQuBSZIodtXs0C0#{Ke zXcJZpN0~k0Zb>yD&;LJEQMS>hm4%P<{ZC;tH>pE13r%gp z5Yga@ZEh%?NgGhGG$W^JW3?_0lr&2-OPUVSgB{?ctV&wh+(h#{!>Ohvs3PRp7>@Xa zEK5wFD?_E&bTE_5q-eT_N~ObHNj4bl>d0hLR611SvYI%dK-H>orN`V*U9M{cMMsfY zXvn9alrb~~Y!=MO^>d-?>TPkQ`nd$^a!Hg7>5lbZW3F8x@3`A-)1t$+?V*aiZXi>i z`}kZdhIs(TCUf@pg^g-8-r%{u_lxgNuXjHY_N;2!`b*EvnNS9-c`k!qtdpZdZ5dvHB{>_Tez F%s)q?lgR)8 literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-fullscreen.png b/fluidbook/icones/4/nav-fullscreen.png new file mode 100644 index 0000000000000000000000000000000000000000..9b80abeec7708eb1926f0c6fdfb20999f0d3987a GIT binary patch literal 2961 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 Hu0mjf+tYk^ literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-help.png b/fluidbook/icones/4/nav-help.png new file mode 100644 index 0000000000000000000000000000000000000000..a45edc9f5826a313d3831e8591e28f97fd2916e4 GIT binary patch literal 1142 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 BfocE% literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-print.png b/fluidbook/icones/4/nav-print.png new file mode 100644 index 0000000000000000000000000000000000000000..215e57a82b1aec1a0afb10fd702891d06a466512 GIT binary patch literal 2939 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 literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-save.png b/fluidbook/icones/4/nav-save.png new file mode 100644 index 0000000000000000000000000000000000000000..40f87f69f0f8c2ead4503b761b52a3c220f54115 GIT binary patch literal 2921 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 T+DugQ00000NkvXXu0mjfUQcW( literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-sommaire.png b/fluidbook/icones/4/nav-sommaire.png new file mode 100644 index 0000000000000000000000000000000000000000..ecd58a9fc29d2086c7aaba3a2ebe37a80c646dbe GIT binary patch literal 2885 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 j;@4Ju&IF|9G-Pq6GZuw;Q4p3 zj-s4E&2-?7WI~XU=8BqN7aM$&)08gpejMS-JfKWMg;b% z%|j+^8*0hOLw#~Uq3c7SE+-HH4Ppu8w0_+ZazT1sS0HQqn4!Ts1os8$4O1P-6o?=b z0>6iK%WMq`YB&$)JHqpPHSn?=%dlRC^SU`+@OcH61)CpDqM1s!kQQT`vB)k+_hM`a z43o`fJz1XznLP{_2n1{muh&fwZfj7-QqHYgRe1#wTC%AcSVcOp6{RjTfP*w~x{-or zY{}}@W|>IAn4DxVoQJhj$^(G+@f);<~HsP=*jO zp@fl{L8w1p#Z)iC$m&G~h_v}ZyQ(WFYptV`Ng=LVSkh$}7lSn6dsI~sIMElW_4{jm zEZ@j+Q8vu^xG?W$Yh&SXjQ2 z7WPt8P;Zl~6!yXwEYq3PAGBh^(_%1v*{Hx;5 zmGbvHzEypmxv{(T8KUMcPERCar{@-2V5VrXY55r7$M>I|99SrEwqE_>xc;MRAI#i( eG5%nlD%wdsavgG2o_ZqNFF77<5uZ19j{E^Im|FAz literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-soundon.png b/fluidbook/icones/4/nav-soundon.png new file mode 100644 index 0000000000000000000000000000000000000000..47bc01982c11d35c55f356e4cca47f6d00e32bcb GIT binary patch literal 1264 zcmeAS@N?(olHy`uVBq!ia0vp^(m*W2!3HF2n%o+Ilw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6H#24;oKkcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gtf;oFf&jvGt@IQ zHZeCh*HJJsFf`CNFw!?P(ls=F! zNq_$Tw`bnVAUyT#XXZ!e9b&vXQ-vIABs%<)CML5bWopc3@4DT1L&#ZGLxM9wRAJwD zdBzJ*&6z&REAX{^DtEkkmmw)FWowI$5!<8Z{{tC!&C*-(BYnl;C5=DSLv*G^obFl3 z_D4NIQd(esMP_42>_WfO{Ls7~4=BP9RC*)QevkBdCa zA1nVoX4~QPNF~Hh_|=2$0sGi}c-LLgaB-Oz->QuduJ2d94FpFBZo?t-HF1)lfW zPW^A2_oXnAdC8OR^G1Fu$Mu@J&NhD9J|QS(CG$sTrfCPgy7@0W@)BIR34%9h-CL$qT)Lm{78rCXI5 cHv<{9 literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-zoomin.png b/fluidbook/icones/4/nav-zoomin.png new file mode 100644 index 0000000000000000000000000000000000000000..c2effa4b00adc22941e5003971c10f843ba6c5c3 GIT binary patch literal 3158 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 literal 0 HcmV?d00001 diff --git a/fluidbook/icones/4/nav-zoomout.png b/fluidbook/icones/4/nav-zoomout.png new file mode 100644 index 0000000000000000000000000000000000000000..bc05b8afa33ec2ebe46eb7ee017c20ab7ee60cb1 GIT binary patch literal 3136 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 z;2hWiRz39zF#n@C?{e@&C!qMdocument_links->document_id('integer', 0, false); - $db->document_links->document_page('integer', 0, false); $db->document_links->links('text', 0, false); - $db->document_links->nb_links('integer', 0, false); $db->document_links->rulers('text', 0, false); - $db->document_links->nb_rulers('integer', 0, false); - $db->document_links->update('integer', 0, false); // Clés - $db->document_links->primary('pk_document_links', 'document_id', 'document_page', 'update'); - $db->document_links->index('index_document_links_date', 'BTREE', 'update'); - $db->document_links->index('index_document_links_document_id', 'BTREE', 'document_id'); + $db->document_links->primary('pk_document_links', 'document_id'); + // . // Tables versions des liens $db->document_links_versions->document_id('integer', 0, false); $db->document_links_versions->links('text', 0, false); $db->document_links_versions->rulers('text', 0, false); - $db->document_links_versions->comments('varchar', 64, false); + $db->document_links_versions->comments('varchar', 128, false); $db->document_links_versions->user('integer', 0, false); $db->document_links_versions->update('integer', 0, false); // . diff --git a/inc/extranet/_common.php b/inc/extranet/_common.php index 5eb1cbfeb..2bbaa6729 100644 --- a/inc/extranet/_common.php +++ b/inc/extranet/_common.php @@ -6,6 +6,6 @@ require_once(dirname(__FILE__) . '/DAO/_common.php'); $GLOBALS['ajaxClasses'][] = 'extranetAjax'; -$core->url->register('cleanDownload', 'cleanDownload', '^cleanDownload$', array('extranetUrl', 'cleanDownload')); + ?> \ No newline at end of file diff --git a/inc/extranet/prepend.php b/inc/extranet/prepend.php new file mode 100644 index 000000000..2f04b3dd5 --- /dev/null +++ b/inc/extranet/prepend.php @@ -0,0 +1,4 @@ +url->register('cleanDownload', 'cleanDownload', '^cleanDownload$', array('extranetUrl', 'cleanDownload')); +?> diff --git a/inc/prepend.php b/inc/prepend.php index a2b544c6c..ffbd910d6 100644 --- a/inc/prepend.php +++ b/inc/prepend.php @@ -37,6 +37,7 @@ if ($ws) { $GLOBALS['ajaxClasses'][] = 'commonAjax'; require_once(dirname(__FILE__) . '/' . MODE . '/_common.php'); +require_once(dirname(__FILE__) . '/' . MODE . '/prepend.php'); if (isset($_POST['q'])) { $_SESSION['q'] = $_POST['q']?$_POST['q']:null; diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index d12254a27..650239b3d 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -438,6 +438,9 @@ class wsFlash extends cubeFlashGateway { public function getLinks() { global $core; + + set_time_limit(0); + $dao = new wsDAOBook($core->con); $book = $dao->selectById($this->args['book_id']); diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php index f894effe9..2fd63fc6e 100644 --- a/inc/ws/DAO/class.ws.dao.document.php +++ b/inc/ws/DAO/class.ws.dao.document.php @@ -43,8 +43,11 @@ class wsDAODocument extends commonDAO { $docs[] = $infos['document_id']; } - $sql = 'INSERT INTO document_links_versions (document_id,links,rulers,`update`,comments,user) SELECT document_id,links,rulers,' . TIME . ',\'Links from a previous version\',' . $user . ' FROM document_links_versions WHERE `update`=' . $update . ' AND document_id IN (' . implode(',', $docs) . ')'; - $this->con->execute($sql); + $r = $this->con->select('SELECT document_id,links,rulers FROM document_links_versions WHERE `update`=' . $update . ' AND document_id IN (' . implode(',', $docs) . ')'); + + while ($r->fetch()) { + wsLinks::setDocumentLinks($r->document_id, $r->links, $r->rulers, $user, 'Links restored from ' . date('Y-m-d H:i:s', $update) . ' version', TIME); + } } public function putLinksFromCSV($document_id) { @@ -55,10 +58,6 @@ class wsDAODocument extends commonDAO { $links = array(); - $c = $this->con->openCursor('document_links_versions'); - $c->document_id = $document->document_id; - $c->update = TIME; - for ($page = 1; $page <= $document->generalInfos['pages']; $page++) { $links[$page] = array(); @@ -105,10 +104,7 @@ class wsDAODocument extends commonDAO { $log[] = 'Added ' . count($links) . ' links'; } - $c->links = json_encode($links); - $c->comments = 'Links imported from PDF'; - $c->rulers = json_encode(array()); - $c->insert(); + wsLinks::setDocumentLinks($document_id, json_encode($links), json_encode(array()), 0, 'Links imported from PDF', TIME); return implode("\n", $log); } @@ -139,7 +135,7 @@ class wsDAODocument extends commonDAO { $rulers = array(); foreach ($t as $page => $tt) { - if(!is_int($page)){ + if (!is_int($page)) { continue; } $infos = $pages[$page]; @@ -164,16 +160,8 @@ class wsDAODocument extends commonDAO { } } - $c = $this->con->openCursor('document_links_versions'); - $c->update = TIME; - foreach ($links as $document_id => $dummy) { - $c->document_id = $document_id; - $c->links = json_encode($links[$document_id]); - $c->rulers = json_encode($rulers[$document_id]); - $c->comments = $comments; - $c->user = $user; - $c->insert(); + wsLinks::setDocumentLinks($document_id, json_encode($links[$document_id]), json_encode($rulers[$document_id]), $user, $comments, TIME); } $c = $this->con->openCursor('books'); @@ -265,17 +253,10 @@ class wsDAODocument extends commonDAO { } } - $c = $this->con->openCursor('document_links_versions'); - $c->update = TIME; - krsort($links); - foreach ($links as $document_id => $l) { - $c->document_id = $document_id; - $c->links = json_encode($l); - $c->rulers = json_encode(array()); - $c->insert(); - } + + wsLinks::setDocumentLinks($document_id, json_encode($l), json_encode(array()), 0, 'Import from Fluidbook V1', TIME); $c = $this->con->openCursor('books'); $c->changedate = TIME; @@ -283,66 +264,7 @@ class wsDAODocument extends commonDAO { } public function getLinksAndRulers($book_id, &$links, &$rulers, $time=null) { - - if (is_null($time)) { - $timeQuery = 'ORDER BY `update` DESC LIMIT 1'; - } else { - $timeQuery = 'AND `update`=' . $time; - } - - $daoBook = new wsDAOBook($this->con); - $pages = $daoBook->getPagesOfBookAt($book_id, $time); - - foreach ($pages as $p => $infos) { - $documents[] = $infos['document_id']; - } - $documents = array_unique($documents); - - $tlinks = array(); - $trulers = array(); - - $links = array(); - $rulers = array(); - - foreach ($documents as $d) { - $r = $this->con->select('SELECT * FROM document_links_versions WHERE document_id=' . $d . ' ' . $timeQuery); - - if (mb_substr($r->links, 1, 1) == ':') { - $ll = unserialize($r->links); - $rr = unserialize($r->rulers); - } else { - $ll = json_decode($r->links, true); - $rr = json_decode($r->rulers, true); - } - $tlinks[$d] = $ll; - $trulers[$d] = $rr; - } - - $i = 1; - foreach ($pages as $p => $infos) { - if (isset($tlinks[$infos['document_id']][$infos['document_page']])) { - $l = $tlinks[$infos['document_id']][$infos['document_page']]; - foreach ($l as $link) { - $link = (array) $link; - $link['page'] = $p; - $link['id'] = $i; - $links[] = $link; - } - } - if (isset($trulers[$infos['document_id']][$infos['document_page']])) { - $ru = $trulers[$infos['document_id']][$infos['document_page']]; - foreach ($ru as $ruler) { - $ruler['page'] = $p; - $rulers[] = $ruler; - } - } - } - - $daoBook = new wsDAOBook($this->con); - $book = $daoBook->selectById($book_id); - - $rulers = array_merge($rulers, $book->specialRulers); - $links = array_merge($links, $book->specialLinks); + return wsLinks::getLinksAndRulers($book_id, $links, $rulers, $time); } public function getLinksVersions($book_id) { @@ -466,94 +388,7 @@ class wsDAODocument extends commonDAO { } public function getLinksAsExcel($links, $rulers) { - $cols = array('document_id' => __('Document'), 'document_page' => __('Page du document'), - 'page' => __('Page de la publication'), 'left' => __('x'), 'top' => __('y'), 'width' => __('Largeur'), 'height' => __('Hauteur'), - 'type' => __('Type'), 'to' => __('Destination'), 'target' => __('Cible'), - 'infobulle' => __('Infobulle'), 'numerotation' => __('Numérotation'), - 'display_area' => __('Activer la surbrillance'), - 'video_loop' => __('Video : boucle'), 'video_auto_start' => __('Video : démarrage automatique'), 'video_controls' => __('Vidéo : afficher les contrôles'), 'video_sound_on' => __('Vidéo : activer le son'), - 'inline' => __('Vidéo : afficher dans la page'), 'video_width' => __('Vidéo : Largeur du popup'), 'video_height' => __('Vidéo : Hauteur du popup'), - 'interactive' => __('Interactivité'), 'video_service' => __('Webvideo : service'), - 'display_area' => __('Afficher le lien au rollover'), - 'extra' => __('Paramètre supplémentaire') - ); - - $xls = new PHPExcel(); - $s = $xls->setActiveSheetIndex(0); - $s->setTitle('Links'); - - // Labels - $i = 0; - foreach ($cols as $id => $label) { - $s->setCellValueByColumnAndRow($i, 1, $id); - $s->getColumnDimensionByColumn($i)->setAutoSize(true); - $s->getStyleByColumnAndRow($i, 1)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER); - $i++; - } - // Links - $j = 2; - foreach ($links as $l) { - $i = 0; - foreach ($cols as $id => $label) { - if ($id == 'document_id' || $id == 'document_page') { - $infos = $pages[$l['page']]; - $value = $infos[$id]; - } else { - if (is_bool($l[$id])) { - $l[$id] = $l[$id] ? 1 : 0; - } - if ($id == 'numerotation') { - if ($l[$id] == 'false') { - $l[$id] = 'physical'; - } - } else if ($id == 'display_area') { - if ($l[$id] == '') { - $l[$id] = '1'; - } - } - $value = $l[$id]; - } - - $s->setCellValueByColumnAndRow($i, $j, $value); - $s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); - $i++; - } - $j++; - } - // Rulers - $s = $xls->createSheet(); - $s->setTitle('Rulers'); - - $rcols = array('document_id', 'document_page', 'page', 'type', 'pos'); - $i = 0; - // Labels - foreach ($rcols as $id) { - $s->setCellValueByColumnAndRow($i, 1, $id); - $s->getColumnDimensionByColumn($i)->setAutoSize(true); - $s->getStyleByColumnAndRow($i, 1)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER); - $i++; - } - - // Contents - $j = 2; - foreach ($rulers as $r) { - $i = 0; - foreach ($rcols as $id) { - if ($id == 'document_id' || $id == 'document_page') { - $infos = $pages[$r['page']]; - $value = $infos[$id]; - } else { - $value = $r[$id]; - } - $s->setCellValueByColumnAndRow($i, $j, $value); - $s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); - $i++; - } - $j++; - } - - $xls->setActiveSheetIndex(0); - return $xls; + return wsLinks::linksToExcel($links, $rulers); } } diff --git a/inc/ws/Util/_common.php b/inc/ws/Util/_common.php index 0b86df328..45a1b6dd8 100644 --- a/inc/ws/Util/_common.php +++ b/inc/ws/Util/_common.php @@ -14,4 +14,5 @@ $__autoload['wsHTML5Link'] = dirname(__FILE__) . '/html5/class.ws.html5.links.ph $__autoload['wsPDFFontExtractor'] = dirname(__FILE__) . '/fontextractor/class.ws.pdf.fontextractor.php'; $__autoload['wsPDFFont'] = dirname(__FILE__) . '/fontextractor/class.ws.pdf.font.php'; $__autoload['wsSVN'] = dirname(__FILE__) . '/class.ws.svn.php'; +$__autoload['wsLinks'] = dirname(__FILE__) . '/class.ws.links.php'; ?> \ No newline at end of file diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php new file mode 100644 index 000000000..a257aa9bc --- /dev/null +++ b/inc/ws/Util/class.ws.links.php @@ -0,0 +1,185 @@ + __('Document'), 'document_page' => __('Page du document'), + 'page' => __('Page de la publication'), 'left' => __('x'), 'top' => __('y'), 'width' => __('Largeur'), 'height' => __('Hauteur'), + 'type' => __('Type'), 'to' => __('Destination'), 'target' => __('Cible'), + 'infobulle' => __('Infobulle'), 'numerotation' => __('Numérotation'), + 'display_area' => __('Activer la surbrillance'), + 'video_loop' => __('Video : boucle'), 'video_auto_start' => __('Video : démarrage automatique'), 'video_controls' => __('Vidéo : afficher les contrôles'), 'video_sound_on' => __('Vidéo : activer le son'), + 'inline' => __('Vidéo : afficher dans la page'), 'video_width' => __('Vidéo : Largeur du popup'), 'video_height' => __('Vidéo : Hauteur du popup'), + 'interactive' => __('Interactivité'), 'video_service' => __('Webvideo : service'), + 'display_area' => __('Afficher le lien au rollover'), + 'extra' => __('Paramètre supplémentaire') + ); + + $xls = new PHPExcel(); + $s = $xls->setActiveSheetIndex(0); + $s->setTitle('Links'); + + // Labels + $i = 0; + foreach ($cols as $id => $label) { + $s->setCellValueByColumnAndRow($i, 1, $id); + $s->getColumnDimensionByColumn($i)->setAutoSize(true); + $s->getStyleByColumnAndRow($i, 1)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER); + $i++; + } + // Links + $j = 2; + foreach ($links as $l) { + $i = 0; + foreach ($cols as $id => $label) { + if (!is_null($pages) && ($id == 'document_id' || $id == 'document_page')) { + $infos = $pages[$l['page']]; + $value = $infos[$id]; + } else { + if (is_bool($l[$id])) { + $l[$id] = $l[$id] ? 1 : 0; + } + if ($id == 'numerotation') { + if ($l[$id] == 'false') { + $l[$id] = 'physical'; + } + } + $value = $l[$id]; + } + + $s->setCellValueByColumnAndRow($i, $j, $value); + $s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); + $i++; + } + $j++; + } + // Rulers + $s = $xls->createSheet(); + $s->setTitle('Rulers'); + + $rcols = array('document_id', 'document_page', 'page', 'type', 'pos'); + $i = 0; + // Labels + foreach ($rcols as $id) { + $s->setCellValueByColumnAndRow($i, 1, $id); + $s->getColumnDimensionByColumn($i)->setAutoSize(true); + $s->getStyleByColumnAndRow($i, 1)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER); + $i++; + } + + // Contents + $j = 2; + foreach ($rulers as $r) { + $i = 0; + foreach ($rcols as $id) { + if (!is_null($pages) && ($id == 'document_id' || $id == 'document_page')) { + $infos = $pages[$r['page']]; + $value = $infos[$id]; + } else { + $value = $r[$id]; + } + $s->setCellValueByColumnAndRow($i, $j, $value); + $s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); + $i++; + } + $j++; + } + + $xls->setActiveSheetIndex(0); + return $xls; + } + + public static function setDocumentLinks($document_id, $links, $rulers, $user, $comments, $time) { + global $core; + $c = $core->con->openCursor('document_links_versions'); + $c1 = $core->con->openCursor('document_links'); + $c1->document_id=$c->document_id=$document_id; + $c1->links = $c->links = $links; + $c1->rulers = $c->rulers = $rulers; + $c->comments = $comments; + $c->user = $user; + $c->update = $time; + $c->insert(); + + $core->con->execute('DELETE FROM document_links WHERE document_id=' . $document_id); + $c1->insert(); + } + + public static function getLinksAndRulers($book_id, &$links, &$rulers, $time=null) { + + global $core; + + if (is_null($time)) { + $timeQuery = 'ORDER BY `update` DESC LIMIT 1'; + } else { + $timeQuery = 'AND `update`=' . $time; + } + + $daoBook = new wsDAOBook($core->con); + $pages = $daoBook->getPagesOfBookAt($book_id, $time); + + foreach ($pages as $p => $infos) { + $documents[] = $infos['document_id']; + } + $documents = array_unique($documents); + + $tlinks = array(); + $trulers = array(); + + $links = array(); + $rulers = array(); + + foreach ($documents as $d) { + $r = $core->con->select('SELECT * FROM document_links_versions WHERE document_id=' . $d . ' ' . $timeQuery); + + if (mb_substr($r->links, 1, 1) == ':') { + $ll = unserialize($r->links); + $rr = unserialize($r->rulers); + } else { + $ll = json_decode($r->links, true); + $rr = json_decode($r->rulers, true); + } + $tlinks[$d] = $ll; + $trulers[$d] = $rr; + } + + $i = 1; + foreach ($pages as $p => $infos) { + if (isset($tlinks[$infos['document_id']][$infos['document_page']])) { + $l = $tlinks[$infos['document_id']][$infos['document_page']]; + foreach ($l as $link) { + $link = (array) $link; + $link['page'] = $p; + $link['id'] = $i; + $links[] = $link; + } + } + if (isset($trulers[$infos['document_id']][$infos['document_page']])) { + $ru = $trulers[$infos['document_id']][$infos['document_page']]; + foreach ($ru as $ruler) { + $ruler['page'] = $p; + $rulers[] = $ruler; + } + } + } + + $daoBook = new wsDAOBook($core->con); + $book = $daoBook->selectById($book_id); + + $rulers = array_merge($rulers, $book->specialRulers); + $links = array_merge($links, $book->specialLinks); + } + +} + +?> diff --git a/inc/ws/_common.php b/inc/ws/_common.php index e66a211d4..16e1a2ccb 100644 --- a/inc/ws/_common.php +++ b/inc/ws/_common.php @@ -8,23 +8,5 @@ require_once(dirname(__FILE__) . '/Util/_common.php'); $GLOBALS['ajaxClasses'][] = 'wsAjax'; -$core->url->register('flash', 'flash', '^flash(.*)$', array('wsFlash', 'in')); -$core->url->register('services', 'services', '^services(.*)$', array('wsServices', 'in')); -$core->url->register('maintenance', 'maintenance', '^maintenance(.*)$', array('wsMaintenance', 'in')); -$core->url->register('editor', 'editor', '^editor/(.*)$', array('wsUrl', 'editor')); -$core->url->register('restoreLinks', 'restoreLinks', '^restoreLinks/(.*)$', array('wsUrl', 'restoreLinks')); -$core->url->register('viewer', 'viewer', '^viewer/(.*)$', array('wsUrl', 'viewer')); -$core->url->register('vieweru', 'vieweru', '^vieweru/(.*)$', array('wsUrl', 'vieweru')); -$core->url->register('viewerp', 'viewerp', '^viewerp/(.*)$', array('wsUrl', 'viewerp')); -$core->url->register('viewerh', 'viewerh', '^viewerh/(.*)$', array('wsUrl', 'viewerh')); -$core->url->register('viewerhu', 'viewerhu', '^viewerhu/(.*)$', array('wsUrl', 'viewerhu')); -$core->url->register('viewerht', 'viewerht', '^viewerht/(.*)$', array('wsUrl', 'viewerht')); -if (DEV) { - $tools = ROOT . '/../inc/tools/'; - cubePHP::appendEnv('PATH', $tools); - cubePHP::appendEnv('PATH', $tools . 'gs8.70/bin/'); - cubePHP::appendEnv('PATH', $tools . 'gs8.70/lib/'); - cubePHP::setEnv('GS_FONTPATH', FONT_PATH); -} ?> \ No newline at end of file diff --git a/inc/ws/prepend.php b/inc/ws/prepend.php new file mode 100644 index 000000000..2df598ad6 --- /dev/null +++ b/inc/ws/prepend.php @@ -0,0 +1,22 @@ +url->register('flash', 'flash', '^flash(.*)$', array('wsFlash', 'in')); +$core->url->register('services', 'services', '^services(.*)$', array('wsServices', 'in')); +$core->url->register('maintenance', 'maintenance', '^maintenance(.*)$', array('wsMaintenance', 'in')); +$core->url->register('editor', 'editor', '^editor/(.*)$', array('wsUrl', 'editor')); +$core->url->register('restoreLinks', 'restoreLinks', '^restoreLinks/(.*)$', array('wsUrl', 'restoreLinks')); +$core->url->register('viewer', 'viewer', '^viewer/(.*)$', array('wsUrl', 'viewer')); +$core->url->register('vieweru', 'vieweru', '^vieweru/(.*)$', array('wsUrl', 'vieweru')); +$core->url->register('viewerp', 'viewerp', '^viewerp/(.*)$', array('wsUrl', 'viewerp')); +$core->url->register('viewerh', 'viewerh', '^viewerh/(.*)$', array('wsUrl', 'viewerh')); +$core->url->register('viewerhu', 'viewerhu', '^viewerhu/(.*)$', array('wsUrl', 'viewerhu')); +$core->url->register('viewerht', 'viewerht', '^viewerht/(.*)$', array('wsUrl', 'viewerht')); + +if (DEV) { + $tools = ROOT . '/../inc/tools/'; + cubePHP::appendEnv('PATH', $tools); + cubePHP::appendEnv('PATH', $tools . 'gs8.70/bin/'); + cubePHP::appendEnv('PATH', $tools . 'gs8.70/lib/'); + cubePHP::setEnv('GS_FONTPATH', FONT_PATH); +} +?> diff --git a/js/ws.js b/js/ws.js index 431c9727f..b2a7f5ff2 100644 --- a/js/ws.js +++ b/js/ws.js @@ -36,7 +36,7 @@ function load_ws(){ url : SITE_PATH+'ajax/'+$(this).attr('action'), success : function(data){ window.opener.document.getElementById("composerSwf").reloadLinks(); - //window.close(); + window.close(); } }); return false; -- 2.39.5