From 691d8fa3ee782a6b8667859f17689e42ed44edfd Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 22 Jun 2010 12:40:52 +0000 Subject: [PATCH] --- .../Controlleur/class.extranet.core.php | 5 ++-- inc/ws/Controlleur/class.ws.flash.php | 12 +++++++-- inc/ws/DAO/class.ws.dao.book.php | 23 ++++++++++++++++-- inc/ws/Metier/class.ws.book.php | 1 + swf/_src/wsComposer.fla | Bin 664064 -> 664064 bytes 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php index 55a0e7bb1..ae7ecd333 100644 --- a/inc/extranet/Controlleur/class.extranet.core.php +++ b/inc/extranet/Controlleur/class.extranet.core.php @@ -339,8 +339,9 @@ class extranetCore extends cubeCore { $db->books->status('integer', 0, false); $db->books->date_status('integer', 0, false); $db->books->parametres('text', 0, false); - $db->books->chapters('text',0,false); - $db->books->links('text',0,false); + $db->books->chapters('text', 0, false); + $db->books->links('text', 0, false); + $db->books->rulers('text', 0, false); $db->books->date('integer', 0, false); // Clés $db->books->primary('pk_books', 'book_id'); diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index 2d04cf3ce..9baa625a0 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -60,8 +60,8 @@ class wsFlash extends cubeFlashGateway { } $fname = cubeFiles::tidyName($infos['name']); $dir = '/books/working/' . $this->args['book_id'] . '/' ; - if (!file_exists(ROOT.$dir)) { - mkdir(ROOT.$dir, 0777, true); + if (!file_exists(ROOT . $dir)) { + mkdir(ROOT . $dir, 0777, true); } $dest = $dir . $fname; move_uploaded_file($infos['tmp_name'], ROOT . $dest); @@ -333,9 +333,17 @@ class wsFlash extends cubeFlashGateway { $this->xml->addChild('width', $size[0]); $this->xml->addChild('height', $size[1]); + $this->xml->addChild('rulers', json_encode($book->rulers)); fb($book->links); } + public function saveLinks() + { + global $core; + $dao = new wsDAOBook($core->con); + $dao->setLinksAndRulers($this->args['book_id'], $this->args['links'], $this->args['rulers']); + } + public function formatSize($val) { $str = files::size($val); diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php index 9fab5d2d9..a6307ad1f 100644 --- a/inc/ws/DAO/class.ws.dao.book.php +++ b/inc/ws/DAO/class.ws.dao.book.php @@ -29,6 +29,12 @@ class wsDAOBook extends extranetDAO { $book->links = json_decode($r->links, false); } + if ($r->rulers = '') { + $book->rulers = array(); + } else { + $book->rulers = json_decode($r->rulers, false); + } + $p = unserialize($r->parametres); if (!$p || $p->isEmpty()) { $p = new wsBookParametres($book); @@ -255,8 +261,17 @@ class wsDAOBook extends extranetDAO { $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\''); } + public function setLinksAndRulers($book_id, $links, $rulers) + { + $c = $this->con->openCursor('books'); + $c->links = json_encode(json_decode($links, false)); + $c->rulers = json_encode(json_decode($rulers, false)); + $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\''); + } + public function getLinksFromCSV($book_id) { + $booleans = array('video_loop', 'video_auto_start', 'video_controls', 'video_sound_on'); $pages = $this->getPagesOfBook($book_id); $res = array(); foreach($pages as $page => $p) { @@ -274,11 +289,15 @@ class wsDAOBook extends extranetDAO { continue; } $link = array(); - $cols = array('page' => '', 'type' => '', 'to' => '','left'=>'', 'top' => '', 'width' => '', 'height' => '', 'target' => '_blank', 'video_loop' => '1', 'video_auto_start' => '1', 'video_controls' => '1', 'video_sound_on' => '1'); + $cols = array('page' => '', 'type' => '', 'to' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true); $k = 0; foreach($cols as $col => $default) { if (isset($line[$k])) { - $link[$col] = $line[$k]; + if (in_array($k, $booleans)) { + $link[$col] = ($line[$k] == '1'); + } else { + $link[$col] = $line[$k]; + } } else { $link[$col] = $default; } diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php index 5ca097864..3b88d422d 100644 --- a/inc/ws/Metier/class.ws.book.php +++ b/inc/ws/Metier/class.ws.book.php @@ -27,6 +27,7 @@ class wsBook extends cubeMetier { protected $chapters; protected $links; + protected $rulers; } ?> \ No newline at end of file diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla index da95cbb3847dfd3ebec1ba017b03c3b1636c2740..9fdbc363a9c10a210a87e944283002016cc08ed0 100644 GIT binary patch delta 2050 zcmY*adrXs86z`=y2MVQ7N(Dq(1+ly;&kCX_-~-bw;>_meHsfQu#c4$LR-^dHm|5a{ z)Ot)7qW&|pESvEWyDc$hu{;V4C=YQNJ_^gCV4M2!= zY804Ewl>J8*bpCk*vcDRLy$l%t+1FvK3-^4=9af|FPD3wjLs!v1=+P|q{c3&qzlQI zNoiet`dBBtMxUD_mbZ06HvQ>`RkY6!J7{(y7Smck&*k``n3{SahT{BuH{NA?M>}8% zE$V<;st!Y`yMbm2J8cX=303t#wwR;#8@f5@kADWYuuwvfqjUHmo_f03jZ@vQkgB_3 z4YgU=gKz-yD5V>6J*&|{{w}c4zwHrNzYKt0HQNw?*>rRikQ@Oh6**MnV{H9>9PP_} zu$*S}K?VKZ3-f59jH{b%ew~O08t4V{lvJdvS*V{}uj*w$b|+$j`wUeHhwA>behz$9 zki$LG$#yUHLz?Fnn&{Pju+yUe`~F3%iiMQ|0kDY~>bZx*JiB2SUROS)G=G@4pH{LY z-RE1AXy7I?Y0nU&pE(3M^v@up_1z%2 z=rN$fQ;zA91?+nsogZWD?srD~l2Gm(fDfr^fDy~`J{tz3j<$_*KF8CRmI z(7d1thr*(mLJF&G{hYw)+l#wBwJ1T5f=m*4_j2b8Ow$$VOL2;oS(u zm;l-IrWTh`)+o$p)FlhLf_#X@Wujf}9NectNL5HzBWBZuL1xMLJyv5D9q539|Me#= zirguz9S?(TLL6aOui8jGFWMlgqYVX&bg{C zW$5E$e3z6d%f`y#7}P9T$2jUwbXZH@$8pXjJKoWuiFwU9R+2@BHYLt|Op=I-ohl(^ ztq4S6hWD(%C_y^~7Abr(QIj5#)(JE#I!GbA;5%3rCeH)3Q{@QrLh;Gd&NwM7Va`}R zO_)Y+4^B{Kl1@|TYV$LgXQJ`_h~%8n_=d<=fgeUJq=SfaJh2LM6-~9op+P@yl1q;O zUBWJTa@~m2Cz;i*f}nOOFgIgiuJKvdQxMtLL`$g;B@zIbt&$1bvF7{ zk8vWCOoH$DRFCCUtH**2*ff#HVY850WrtMR1PKRCOw#4lPH(4h# zEoXefDzu&P1}hiKcJ6Pi|Jk>5Jz@QBxSa7HtHktjZ8q`k5_)V_Uego&*>biE1hBQS zf|z_D<`