]> _ Git - cubeextranet.git/commitdiff
wait #7055 @1
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 3 Sep 2024 18:28:24 +0000 (20:28 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 3 Sep 2024 18:28:24 +0000 (20:28 +0200)
18 files changed:
.idea/dataSources.local.xml
.idea/workspace.xml
editor/src/style/00-import.css [new file with mode: 0644]
editor/src/style/01-vars.css [new file with mode: 0644]
editor/src/style/02-mixins.css [new file with mode: 0644]
fonts/silka-bold.php [new file with mode: 0644]
fonts/silka-bold.z [new file with mode: 0644]
fonts/silka-light.php [new file with mode: 0644]
fonts/silka-light.z [new file with mode: 0644]
fonts/silka-medium.php [new file with mode: 0644]
fonts/silka-medium.z [new file with mode: 0644]
fonts/silka-regular.php [new file with mode: 0644]
fonts/silka-regular.z [new file with mode: 0644]
images/extranet/docs/template.pdf
inc/commons/class.common.tools.php
inc/config.inc.php
inc/cube/externals/_common.php
inc/extranet/Metier/class.extranet.document.php

index 33be3da4d9e2feab33034cbbeb17335f885d00a1..1b4913cf397446b175756020adc5c4b594be4bbd 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-241.18034.62">
+  <component name="dataSourceStorageLocal" created-in="IU-242.21829.142">
     <data-source name="MySQL - extranet@localhost" uuid="dcccbe5a-9bcc-499d-9016-6a2adfb6a5e1">
       <database-info product="MySQL" version="8.0.18-0ubuntu0.19.10.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.46 ( Revision: 9cc87a48e75c2d2e87c1a293b2862ce651cb256e )" dbms="MYSQL" exact-version="8.0.18" exact-driver-version="5.1">
         <extra-name-characters>#@</extra-name-characters>
index 272979099ce4f5b563f96216a8f02b0281d0dd15..308cc59f8acf341d24364495d33325655e11a9a9 100644 (file)
@@ -4,13 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="da697eaa-38c9-4c00-b247-0e8dd83f6bd0" name="Default" comment="wait #6909 @1">
-      <change beforePath="$PROJECT_DIR$/fluidbook/icones/15/interface.svg" beforeDir="false" afterPath="$PROJECT_DIR$/fluidbook/icones/15/interface.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fluidbook/mailer/logs/fb14211.txt" beforeDir="false" afterPath="$PROJECT_DIR$/fluidbook/mailer/logs/fb14211.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fluidbook/mailer/logs/ipglobal.txt" beforeDir="false" afterPath="$PROJECT_DIR$/fluidbook/mailer/logs/ipglobal.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/inc/commons/class.common.page.php" beforeDir="false" afterPath="$PROJECT_DIR$/inc/commons/class.common.page.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/inc/extranet/Controlleur/class.extranet.droits.php" beforeDir="false" afterPath="$PROJECT_DIR$/inc/extranet/Controlleur/class.extranet.droits.php" afterDir="false" />
-    </list>
+    <list default="true" id="da697eaa-38c9-4c00-b247-0e8dd83f6bd0" name="Default" comment="wait #6909 @1" />
     <list id="d8f331a4-bea4-46e3-8325-ec4459697659" name="Clearbricks" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;Shell Script.Docker terminal.executor&quot;: &quot;Run&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Works/fluidbook-hosting-loadbalancer&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;reference.webide.settings.project.settings.php.composer&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "Shell Script.Docker terminal.executor": "Run",
+    "WebServerToolWindowFactoryState": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
+    "WebServerToolWindowPanel.toolwindow.show.date": "false",
+    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
+    "WebServerToolWindowPanel.toolwindow.show.size": "false",
+    "ignore.virus.scanning.warn.message": "true",
+    "ignore_missing_gitignore": "true",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "D:/Works/cubeExtranet/fonts",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "ruby.rails.projectView.checked": "true",
+    "settings.editor.selected.configurable": "reference.webide.settings.project.settings.php.composer",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Works\cubeExtranet\fonts" />
       <recent name="D:\Works\cubeExtranet\.docker\config\ssh" />
       <recent name="D:\Works\cubeExtranet\.docker\images" />
       <recent name="D:\Works\cubeExtranet\.docker\config\httpd" />
       <recent name="D:\Works\cubeExtranet\.docker\config\monit\conf.d" />
-      <recent name="D:\Works\cubeExtranet\.docker" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Works\cubeExtranet\images\extranet\docs" />
       <recent name="D:\Works\cubeExtranet\.docker\config\ssh\user" />
       <recent name="D:\Works\cubeExtranet\.docker\config\cron" />
       <recent name="D:\Works\cubeExtranet\fluidbook\compile\_exehtml\_ffmpeg" />
       <recent name="H:\Works\cubeExtranet\fluidbook\compile\pdfjs" />
-      <recent name="H:\Works\cubeExtranet\fluidbook\compile\pdfjs\web" />
     </key>
   </component>
   <component name="RemoteSynchronizer">
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.18034.62" />
-        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.18034.62" />
+        <option value="bundled-jdk-9823dce3aa75-b114ca120d71-intellij.indexing.shared.core-IU-242.21829.142" />
+        <option value="bundled-js-predefined-d6986cc7102b-7c0b70fcd90d-JavaScript-IU-242.21829.142" />
       </set>
     </attachedChunks>
   </component>
   <component name="SvnFileUrlMappingImpl">
     <option name="myMappingRoots">
       <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\CubeIT" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\CubeIT\swf\_src\com\cubedesigners\cubeit" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\editor" />
-        </SvnCopyRootSimple>
         <SvnCopyRootSimple>
           <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
           <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\compile\_html5" />
           <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
           <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\compile\_html5app" />
         </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\inc\cube" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\inc\ZendFramework" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\swf\_src\com\cubedesigners\extranet" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\swf\_src\com\fluidbook\common" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\swf\_src\com\fluidbook\ws" />
-        </SvnCopyRootSimple>
       </list>
     </option>
     <option name="myMoreRealMappingRoots">
       <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\CubeIT" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\CubeIT\swf\_src\com\cubedesigners\cubeit" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\editor" />
-        </SvnCopyRootSimple>
         <SvnCopyRootSimple>
           <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
           <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\compile\_html5" />
           <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
           <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\compile\_html5app" />
         </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\inc\cube" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\inc\ZendFramework" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\swf\_src\com\cubedesigners\extranet" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\swf\_src\com\fluidbook\common" />
-        </SvnCopyRootSimple>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\Works\cubeExtranet" />
-          <option name="myCopyRoot" value="D:\Works\cubeExtranet\swf\_src\com\fluidbook\ws" />
-        </SvnCopyRootSimple>
       </list>
     </option>
   </component>
       <workItem from="1720692184629" duration="4808000" />
       <workItem from="1721217718330" duration="6133000" />
       <workItem from="1722441238976" duration="1449000" />
+      <workItem from="1722515362920" duration="473000" />
+      <workItem from="1724062746207" duration="255000" />
+      <workItem from="1724063023001" duration="1134000" />
+      <workItem from="1725380310588" duration="1711000" />
+      <workItem from="1725385204484" duration="103000" />
+      <workItem from="1725386519690" duration="1402000" />
     </task>
     <task id="LOCAL-01333" summary="wait #5687 @1">
       <created>1674048129043</created>
diff --git a/editor/src/style/00-import.css b/editor/src/style/00-import.css
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/editor/src/style/01-vars.css b/editor/src/style/01-vars.css
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/editor/src/style/02-mixins.css b/editor/src/style/02-mixins.css
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/fonts/silka-bold.php b/fonts/silka-bold.php
new file mode 100644 (file)
index 0000000..c7c4cea
--- /dev/null
@@ -0,0 +1,25 @@
+<?php
+$type = 'TrueType';
+$name = 'silka-bold';
+$desc = array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>342,'Flags'=>32,'FontBBox'=>'[-176 -243 1113 946]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>568);
+$up = -274;
+$ut = 50;
+$cw = array(
+       chr(0)=>568,chr(1)=>568,chr(2)=>568,chr(3)=>568,chr(4)=>568,chr(5)=>568,chr(6)=>568,chr(7)=>568,chr(8)=>568,chr(9)=>568,chr(10)=>568,chr(11)=>568,chr(12)=>568,chr(13)=>568,chr(14)=>568,chr(15)=>568,chr(16)=>568,chr(17)=>568,chr(18)=>568,chr(19)=>568,chr(20)=>568,chr(21)=>568,
+       chr(22)=>568,chr(23)=>568,chr(24)=>568,chr(25)=>568,chr(26)=>568,chr(27)=>568,chr(28)=>568,chr(29)=>568,chr(30)=>568,chr(31)=>568,' '=>258,'!'=>300,'"'=>464,'#'=>599,'$'=>608,'%'=>836,'&'=>699,'\''=>264,'('=>505,')'=>505,'*'=>465,'+'=>501,
+       ','=>273,'-'=>384,'.'=>274,'/'=>523,'0'=>612,'1'=>464,'2'=>587,'3'=>601,'4'=>642,'5'=>591,'6'=>614,'7'=>560,'8'=>615,'9'=>614,':'=>274,';'=>277,'<'=>532,'='=>501,'>'=>532,'?'=>559,'@'=>894,'A'=>707,
+       'B'=>615,'C'=>802,'D'=>717,'E'=>562,'F'=>552,'G'=>809,'H'=>733,'I'=>296,'J'=>595,'K'=>663,'L'=>537,'M'=>889,'N'=>740,'O'=>823,'P'=>610,'Q'=>825,'R'=>647,'S'=>608,'T'=>604,'U'=>694,'V'=>707,'W'=>996,
+       'X'=>662,'Y'=>668,'Z'=>625,'['=>422,'\\'=>523,']'=>422,'^'=>594,'_'=>653,'`'=>283,'a'=>636,'b'=>653,'c'=>619,'d'=>636,'e'=>608,'f'=>440,'g'=>643,'h'=>604,'i'=>269,'j'=>320,'k'=>594,'l'=>323,'m'=>912,
+       'n'=>600,'o'=>641,'p'=>653,'q'=>643,'r'=>443,'s'=>531,'t'=>444,'u'=>604,'v'=>584,'w'=>875,'x'=>576,'y'=>592,'z'=>526,'{'=>499,'|'=>333,'}'=>499,'~'=>531,chr(127)=>568,chr(128)=>624,chr(129)=>568,chr(130)=>273,chr(131)=>538,
+       chr(132)=>492,chr(133)=>791,chr(134)=>466,chr(135)=>466,chr(136)=>412,chr(137)=>1173,chr(138)=>608,chr(139)=>328,chr(140)=>1108,chr(141)=>568,chr(142)=>625,chr(143)=>568,chr(144)=>568,chr(145)=>275,chr(146)=>275,chr(147)=>486,chr(148)=>486,chr(149)=>464,chr(150)=>649,chr(151)=>901,chr(152)=>440,chr(153)=>866,
+       chr(154)=>531,chr(155)=>328,chr(156)=>1027,chr(157)=>568,chr(158)=>526,chr(159)=>668,chr(160)=>258,chr(161)=>300,chr(162)=>619,chr(163)=>653,chr(164)=>568,chr(165)=>668,chr(166)=>568,chr(167)=>535,chr(168)=>413,chr(169)=>824,chr(170)=>527,chr(171)=>567,chr(172)=>568,chr(173)=>384,chr(174)=>543,chr(175)=>366,
+       chr(176)=>405,chr(177)=>568,chr(178)=>374,chr(179)=>376,chr(180)=>283,chr(181)=>568,chr(182)=>609,chr(183)=>274,chr(184)=>262,chr(185)=>287,chr(186)=>525,chr(187)=>570,chr(188)=>867,chr(189)=>881,chr(190)=>898,chr(191)=>559,chr(192)=>707,chr(193)=>707,chr(194)=>707,chr(195)=>707,chr(196)=>707,chr(197)=>707,
+       chr(198)=>929,chr(199)=>802,chr(200)=>562,chr(201)=>562,chr(202)=>562,chr(203)=>562,chr(204)=>296,chr(205)=>296,chr(206)=>296,chr(207)=>296,chr(208)=>729,chr(209)=>740,chr(210)=>823,chr(211)=>823,chr(212)=>823,chr(213)=>823,chr(214)=>823,chr(215)=>489,chr(216)=>816,chr(217)=>694,chr(218)=>694,chr(219)=>694,
+       chr(220)=>694,chr(221)=>668,chr(222)=>604,chr(223)=>635,chr(224)=>636,chr(225)=>636,chr(226)=>636,chr(227)=>636,chr(228)=>636,chr(229)=>636,chr(230)=>973,chr(231)=>619,chr(232)=>608,chr(233)=>608,chr(234)=>608,chr(235)=>608,chr(236)=>269,chr(237)=>269,chr(238)=>269,chr(239)=>269,chr(240)=>618,chr(241)=>600,
+       chr(242)=>641,chr(243)=>641,chr(244)=>641,chr(245)=>641,chr(246)=>641,chr(247)=>501,chr(248)=>641,chr(249)=>604,chr(250)=>604,chr(251)=>604,chr(252)=>604,chr(253)=>592,chr(254)=>654,chr(255)=>592);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+$file = 'silka-bold.z';
+$originalsize = 40768;
+$subsetted = true;
+?>
diff --git a/fonts/silka-bold.z b/fonts/silka-bold.z
new file mode 100644 (file)
index 0000000..2b0d7b7
Binary files /dev/null and b/fonts/silka-bold.z differ
diff --git a/fonts/silka-light.php b/fonts/silka-light.php
new file mode 100644 (file)
index 0000000..1dab574
--- /dev/null
@@ -0,0 +1,25 @@
+<?php
+$type = 'TrueType';
+$name = 'silka-light';
+$desc = array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>342,'Flags'=>32,'FontBBox'=>'[-138 -243 1093 943]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>568);
+$up = -274;
+$ut = 50;
+$cw = array(
+       chr(0)=>568,chr(1)=>568,chr(2)=>568,chr(3)=>568,chr(4)=>568,chr(5)=>568,chr(6)=>568,chr(7)=>568,chr(8)=>568,chr(9)=>568,chr(10)=>568,chr(11)=>568,chr(12)=>568,chr(13)=>568,chr(14)=>568,chr(15)=>568,chr(16)=>568,chr(17)=>568,chr(18)=>568,chr(19)=>568,chr(20)=>568,chr(21)=>568,
+       chr(22)=>568,chr(23)=>568,chr(24)=>568,chr(25)=>568,chr(26)=>568,chr(27)=>568,chr(28)=>568,chr(29)=>568,chr(30)=>568,chr(31)=>568,' '=>289,'!'=>312,'"'=>356,'#'=>571,'$'=>591,'%'=>807,'&'=>669,'\''=>228,'('=>453,')'=>453,'*'=>500,'+'=>480,
+       ','=>266,'-'=>395,'.'=>273,'/'=>485,'0'=>622,'1'=>448,'2'=>586,'3'=>610,'4'=>608,'5'=>608,'6'=>631,'7'=>554,'8'=>628,'9'=>631,':'=>273,';'=>273,'<'=>553,'='=>480,'>'=>557,'?'=>543,'@'=>915,'A'=>673,
+       'B'=>618,'C'=>792,'D'=>710,'E'=>563,'F'=>553,'G'=>814,'H'=>736,'I'=>281,'J'=>581,'K'=>612,'L'=>532,'M'=>907,'N'=>736,'O'=>825,'P'=>611,'Q'=>825,'R'=>626,'S'=>591,'T'=>567,'U'=>704,'V'=>657,'W'=>929,
+       'X'=>596,'Y'=>623,'Z'=>617,'['=>415,'\\'=>485,']'=>415,'^'=>584,'_'=>670,'`'=>252,'a'=>654,'b'=>664,'c'=>618,'d'=>654,'e'=>610,'f'=>394,'g'=>654,'h'=>619,'i'=>247,'j'=>302,'k'=>529,'l'=>285,'m'=>946,
+       'n'=>614,'o'=>645,'p'=>664,'q'=>654,'r'=>394,'s'=>535,'t'=>426,'u'=>604,'v'=>549,'w'=>861,'x'=>535,'y'=>566,'z'=>519,'{'=>491,'|'=>309,'}'=>491,'~'=>498,chr(127)=>568,chr(128)=>635,chr(129)=>568,chr(130)=>260,chr(131)=>509,
+       chr(132)=>401,chr(133)=>736,chr(134)=>431,chr(135)=>431,chr(136)=>372,chr(137)=>1137,chr(138)=>591,chr(139)=>327,chr(140)=>1099,chr(141)=>568,chr(142)=>617,chr(143)=>568,chr(144)=>568,chr(145)=>246,chr(146)=>246,chr(147)=>386,chr(148)=>386,chr(149)=>464,chr(150)=>658,chr(151)=>923,chr(152)=>420,chr(153)=>820,
+       chr(154)=>535,chr(155)=>327,chr(156)=>1089,chr(157)=>568,chr(158)=>519,chr(159)=>623,chr(160)=>289,chr(161)=>312,chr(162)=>619,chr(163)=>615,chr(164)=>568,chr(165)=>623,chr(166)=>568,chr(167)=>536,chr(168)=>366,chr(169)=>821,chr(170)=>525,chr(171)=>511,chr(172)=>568,chr(173)=>395,chr(174)=>512,chr(175)=>342,
+       chr(176)=>419,chr(177)=>568,chr(178)=>379,chr(179)=>386,chr(180)=>252,chr(181)=>568,chr(182)=>552,chr(183)=>272,chr(184)=>268,chr(185)=>284,chr(186)=>537,chr(187)=>521,chr(188)=>847,chr(189)=>882,chr(190)=>869,chr(191)=>549,chr(192)=>673,chr(193)=>673,chr(194)=>673,chr(195)=>673,chr(196)=>673,chr(197)=>673,
+       chr(198)=>893,chr(199)=>792,chr(200)=>563,chr(201)=>563,chr(202)=>563,chr(203)=>563,chr(204)=>281,chr(205)=>281,chr(206)=>281,chr(207)=>281,chr(208)=>754,chr(209)=>736,chr(210)=>825,chr(211)=>825,chr(212)=>825,chr(213)=>825,chr(214)=>825,chr(215)=>446,chr(216)=>825,chr(217)=>704,chr(218)=>704,chr(219)=>704,
+       chr(220)=>704,chr(221)=>623,chr(222)=>597,chr(223)=>608,chr(224)=>654,chr(225)=>654,chr(226)=>654,chr(227)=>654,chr(228)=>654,chr(229)=>654,chr(230)=>986,chr(231)=>618,chr(232)=>610,chr(233)=>610,chr(234)=>610,chr(235)=>610,chr(236)=>247,chr(237)=>247,chr(238)=>247,chr(239)=>247,chr(240)=>620,chr(241)=>614,
+       chr(242)=>645,chr(243)=>645,chr(244)=>645,chr(245)=>645,chr(246)=>645,chr(247)=>480,chr(248)=>645,chr(249)=>604,chr(250)=>604,chr(251)=>604,chr(252)=>604,chr(253)=>566,chr(254)=>665,chr(255)=>566);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+$file = 'silka-light.z';
+$originalsize = 41456;
+$subsetted = true;
+?>
diff --git a/fonts/silka-light.z b/fonts/silka-light.z
new file mode 100644 (file)
index 0000000..122eed6
Binary files /dev/null and b/fonts/silka-light.z differ
diff --git a/fonts/silka-medium.php b/fonts/silka-medium.php
new file mode 100644 (file)
index 0000000..e937f59
--- /dev/null
@@ -0,0 +1,25 @@
+<?php
+$type = 'TrueType';
+$name = 'silka-medium';
+$desc = array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>342,'Flags'=>32,'FontBBox'=>'[-156 -243 1100 944]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>568);
+$up = -274;
+$ut = 50;
+$cw = array(
+       chr(0)=>568,chr(1)=>568,chr(2)=>568,chr(3)=>568,chr(4)=>568,chr(5)=>568,chr(6)=>568,chr(7)=>568,chr(8)=>568,chr(9)=>568,chr(10)=>568,chr(11)=>568,chr(12)=>568,chr(13)=>568,chr(14)=>568,chr(15)=>568,chr(16)=>568,chr(17)=>568,chr(18)=>568,chr(19)=>568,chr(20)=>568,chr(21)=>568,
+       chr(22)=>568,chr(23)=>568,chr(24)=>568,chr(25)=>568,chr(26)=>568,chr(27)=>568,chr(28)=>568,chr(29)=>568,chr(30)=>568,chr(31)=>568,' '=>272,'!'=>309,'"'=>397,'#'=>581,'$'=>595,'%'=>817,'&'=>685,'\''=>242,'('=>471,')'=>471,'*'=>483,'+'=>487,
+       ','=>268,'-'=>391,'.'=>273,'/'=>499,'0'=>618,'1'=>456,'2'=>586,'3'=>607,'4'=>619,'5'=>602,'6'=>623,'7'=>557,'8'=>623,'9'=>623,':'=>273,';'=>274,'<'=>548,'='=>487,'>'=>548,'?'=>548,'@'=>908,'A'=>685,
+       'B'=>613,'C'=>794,'D'=>712,'E'=>561,'F'=>550,'G'=>812,'H'=>734,'I'=>286,'J'=>585,'K'=>634,'L'=>534,'M'=>900,'N'=>737,'O'=>824,'P'=>607,'Q'=>824,'R'=>634,'S'=>595,'T'=>581,'U'=>699,'V'=>675,'W'=>951,
+       'X'=>618,'Y'=>644,'Z'=>621,'['=>425,'\\'=>499,']'=>425,'^'=>587,'_'=>664,'`'=>263,'a'=>646,'b'=>658,'c'=>615,'d'=>646,'e'=>607,'f'=>416,'g'=>648,'h'=>609,'i'=>256,'j'=>319,'k'=>552,'l'=>302,'m'=>926,
+       'n'=>605,'o'=>642,'p'=>658,'q'=>648,'r'=>415,'s'=>530,'t'=>433,'u'=>600,'v'=>562,'w'=>867,'x'=>547,'y'=>575,'z'=>520,'{'=>500,'|'=>322,'}'=>500,'~'=>521,chr(127)=>568,chr(128)=>627,chr(129)=>568,chr(130)=>268,chr(131)=>518,
+       chr(132)=>438,chr(133)=>755,chr(134)=>443,chr(135)=>443,chr(136)=>386,chr(137)=>1149,chr(138)=>595,chr(139)=>323,chr(140)=>1099,chr(141)=>568,chr(142)=>621,chr(143)=>568,chr(144)=>568,chr(145)=>256,chr(146)=>256,chr(147)=>423,chr(148)=>423,chr(149)=>464,chr(150)=>655,chr(151)=>915,chr(152)=>426,chr(153)=>832,
+       chr(154)=>530,chr(155)=>323,chr(156)=>1055,chr(157)=>568,chr(158)=>520,chr(159)=>644,chr(160)=>272,chr(161)=>309,chr(162)=>616,chr(163)=>628,chr(164)=>568,chr(165)=>644,chr(166)=>568,chr(167)=>536,chr(168)=>382,chr(169)=>819,chr(170)=>526,chr(171)=>530,chr(172)=>568,chr(173)=>391,chr(174)=>523,chr(175)=>350,
+       chr(176)=>410,chr(177)=>568,chr(178)=>377,chr(179)=>383,chr(180)=>263,chr(181)=>568,chr(182)=>576,chr(183)=>273,chr(184)=>264,chr(185)=>288,chr(186)=>529,chr(187)=>538,chr(188)=>859,chr(189)=>880,chr(190)=>876,chr(191)=>548,chr(192)=>685,chr(193)=>685,chr(194)=>685,chr(195)=>685,chr(196)=>685,chr(197)=>685,
+       chr(198)=>909,chr(199)=>794,chr(200)=>561,chr(201)=>561,chr(202)=>561,chr(203)=>561,chr(204)=>286,chr(205)=>286,chr(206)=>286,chr(207)=>286,chr(208)=>741,chr(209)=>737,chr(210)=>824,chr(211)=>824,chr(212)=>824,chr(213)=>824,chr(214)=>824,chr(215)=>461,chr(216)=>821,chr(217)=>699,chr(218)=>699,chr(219)=>699,
+       chr(220)=>699,chr(221)=>644,chr(222)=>591,chr(223)=>613,chr(224)=>646,chr(225)=>646,chr(226)=>646,chr(227)=>646,chr(228)=>646,chr(229)=>646,chr(230)=>972,chr(231)=>615,chr(232)=>607,chr(233)=>607,chr(234)=>607,chr(235)=>607,chr(236)=>256,chr(237)=>256,chr(238)=>256,chr(239)=>256,chr(240)=>617,chr(241)=>605,
+       chr(242)=>642,chr(243)=>642,chr(244)=>642,chr(245)=>642,chr(246)=>642,chr(247)=>487,chr(248)=>642,chr(249)=>600,chr(250)=>600,chr(251)=>600,chr(252)=>600,chr(253)=>575,chr(254)=>659,chr(255)=>575);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+$file = 'silka-medium.z';
+$originalsize = 40996;
+$subsetted = true;
+?>
diff --git a/fonts/silka-medium.z b/fonts/silka-medium.z
new file mode 100644 (file)
index 0000000..f685af2
Binary files /dev/null and b/fonts/silka-medium.z differ
diff --git a/fonts/silka-regular.php b/fonts/silka-regular.php
new file mode 100644 (file)
index 0000000..d45fc7a
--- /dev/null
@@ -0,0 +1,25 @@
+<?php
+$type = 'TrueType';
+$name = 'silka-regular';
+$desc = array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>342,'Flags'=>32,'FontBBox'=>'[-145 -243 1093 943]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>568);
+$up = -274;
+$ut = 50;
+$cw = array(
+       chr(0)=>568,chr(1)=>568,chr(2)=>568,chr(3)=>568,chr(4)=>568,chr(5)=>568,chr(6)=>568,chr(7)=>568,chr(8)=>568,chr(9)=>568,chr(10)=>568,chr(11)=>568,chr(12)=>568,chr(13)=>568,chr(14)=>568,chr(15)=>568,chr(16)=>568,chr(17)=>568,chr(18)=>568,chr(19)=>568,chr(20)=>568,chr(21)=>568,
+       chr(22)=>568,chr(23)=>568,chr(24)=>568,chr(25)=>568,chr(26)=>568,chr(27)=>568,chr(28)=>568,chr(29)=>568,chr(30)=>568,chr(31)=>568,' '=>280,'!'=>313,'"'=>362,'#'=>571,'$'=>588,'%'=>807,'&'=>678,'\''=>230,'('=>453,')'=>453,'*'=>492,'+'=>480,
+       ','=>266,'-'=>395,'.'=>273,'/'=>486,'0'=>622,'1'=>451,'2'=>586,'3'=>610,'4'=>607,'5'=>608,'6'=>628,'7'=>555,'8'=>628,'9'=>628,':'=>273,';'=>273,'<'=>556,'='=>480,'>'=>557,'?'=>542,'@'=>915,'A'=>674,
+       'B'=>612,'C'=>789,'D'=>709,'E'=>560,'F'=>549,'G'=>813,'H'=>734,'I'=>281,'J'=>580,'K'=>618,'L'=>533,'M'=>906,'N'=>735,'O'=>824,'P'=>605,'Q'=>824,'R'=>628,'S'=>588,'T'=>569,'U'=>702,'V'=>659,'W'=>928,
+       'X'=>596,'Y'=>632,'Z'=>619,'['=>427,'\\'=>486,']'=>427,'^'=>584,'_'=>670,'`'=>252,'a'=>651,'b'=>661,'c'=>613,'d'=>651,'e'=>607,'f'=>404,'g'=>651,'h'=>612,'i'=>249,'j'=>318,'k'=>531,'l'=>291,'m'=>934,
+       'n'=>608,'o'=>643,'p'=>661,'q'=>651,'r'=>400,'s'=>529,'t'=>427,'u'=>598,'v'=>551,'w'=>862,'x'=>532,'y'=>566,'z'=>516,'{'=>500,'|'=>316,'}'=>500,'~'=>516,chr(127)=>568,chr(128)=>628,chr(129)=>568,chr(130)=>266,chr(131)=>507,
+       chr(132)=>410,chr(133)=>736,chr(134)=>431,chr(135)=>431,chr(136)=>372,chr(137)=>1137,chr(138)=>588,chr(139)=>321,chr(140)=>1095,chr(141)=>568,chr(142)=>619,chr(143)=>568,chr(144)=>568,chr(145)=>246,chr(146)=>246,chr(147)=>390,chr(148)=>390,chr(149)=>464,chr(150)=>658,chr(151)=>923,chr(152)=>419,chr(153)=>814,
+       chr(154)=>529,chr(155)=>321,chr(156)=>1069,chr(157)=>568,chr(158)=>516,chr(159)=>632,chr(160)=>280,chr(161)=>313,chr(162)=>614,chr(163)=>615,chr(164)=>568,chr(165)=>632,chr(166)=>568,chr(167)=>536,chr(168)=>366,chr(169)=>817,chr(170)=>526,chr(171)=>511,chr(172)=>568,chr(173)=>395,chr(174)=>512,chr(175)=>342,
+       chr(176)=>413,chr(177)=>568,chr(178)=>379,chr(179)=>386,chr(180)=>252,chr(181)=>568,chr(182)=>559,chr(183)=>273,chr(184)=>265,chr(185)=>288,chr(186)=>531,chr(187)=>521,chr(188)=>854,chr(189)=>879,chr(190)=>865,chr(191)=>542,chr(192)=>674,chr(193)=>674,chr(194)=>674,chr(195)=>674,chr(196)=>674,chr(197)=>674,
+       chr(198)=>898,chr(199)=>789,chr(200)=>560,chr(201)=>560,chr(202)=>560,chr(203)=>560,chr(204)=>281,chr(205)=>281,chr(206)=>281,chr(207)=>281,chr(208)=>747,chr(209)=>735,chr(210)=>824,chr(211)=>824,chr(212)=>824,chr(213)=>824,chr(214)=>824,chr(215)=>446,chr(216)=>824,chr(217)=>702,chr(218)=>702,chr(219)=>702,
+       chr(220)=>702,chr(221)=>632,chr(222)=>585,chr(223)=>602,chr(224)=>651,chr(225)=>651,chr(226)=>651,chr(227)=>651,chr(228)=>651,chr(229)=>651,chr(230)=>971,chr(231)=>613,chr(232)=>607,chr(233)=>607,chr(234)=>607,chr(235)=>607,chr(236)=>249,chr(237)=>249,chr(238)=>249,chr(239)=>249,chr(240)=>617,chr(241)=>608,
+       chr(242)=>643,chr(243)=>643,chr(244)=>643,chr(245)=>643,chr(246)=>643,chr(247)=>480,chr(248)=>643,chr(249)=>598,chr(250)=>598,chr(251)=>598,chr(252)=>598,chr(253)=>566,chr(254)=>662,chr(255)=>566);
+$enc = 'cp1252';
+$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+$file = 'silka-regular.z';
+$originalsize = 40964;
+$subsetted = true;
+?>
diff --git a/fonts/silka-regular.z b/fonts/silka-regular.z
new file mode 100644 (file)
index 0000000..2557ae9
Binary files /dev/null and b/fonts/silka-regular.z differ
index 6c2d3243b0a1a6a3ef80986fb0124a84da89de5e..cc7bcfdd28b1fdf477f4313c5fc4e606c863793e 100644 (file)
Binary files a/images/extranet/docs/template.pdf and b/images/extranet/docs/template.pdf differ
index 3e4c685ad02482fe9b55e7d6875e70fe60e9513d..ab44d1ddb0148b428915a2cbce91fe200c472f85 100644 (file)
@@ -368,101 +368,7 @@ class commonTools
 
     public static function webfonts($args)
     {
-        global $core;
-        $res = commonPage::barre();
-        $res .= commonPage::tMain();
-        $res .= commonPage::bh();
-        $res .= '<form action="' . SITE_PATH . 'tools/makeWebfont" method="post" class="notajax" enctype="multipart/form-data">';
-        $res .= '<table class="liste">';
-        $res .= '<tr><th><strong>' . __('Générer un kit webfont') . '</strong></th></tr>';
-        $res .= '<tr><td>' . __('Veuillez charger une police de caractères') . '</td></tr>';
-        $res .= '<tr class="odd"><td><input type="file" name="file[]" multiple="multiple" /></td></tr>';
-        $res .= '<tr><td><label><input type="checkbox" value="1" name="rename" /> Renommer les polices</label></td></tr>';
-        $res .= '<tr><td class="right"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Générer le kit webfont')) . '</a></td></td>';
-        $res .= '</table>';
-        $res .= '</form>';
-        $res .= '</div>';
-        $res .= commonPage::bf();
-        $res .= commonPage::bMain();
-        return $res;
-    }
-
-    public static function makeWebfont()
-    {
-        $tmp = cubeFiles::tempdir();
-        if (!file_exists($tmp)) {
-            mkdir($tmp, 0777, true);
-        }
-
-        $rename = isset($_POST['rename']);
-
-
-        foreach ($_FILES['file']['name'] as $k => $name) {
-            $tmp_name = $_FILES['file']['tmp_name'][$k];
-
-            $ex = explode('.', strtolower($name));
-            $upext = array_pop($ex);
-            $fontName = implode('.', $ex);
-
-            $fontFile = $tmp . '/' . strtolower($name);
-            move_uploaded_file($tmp_name, $fontFile);
-
-            $ext = array('ttf', 'woff', 'woff2', 'eot', 'php');
-
-            foreach ($ext as $e) {
-                $out = $tmp . '/' . $fontName . '.' . $e;
-                if ($e == 'ttf' || $e == 'woff') {
-
-                    $fontforge = new cubeCommandLine('convertrn.pe');
-                    $fontforge->setPath(CONVERTER_PATH);
-                    $fontforge->setArg(null, $fontFile);
-                    $fontforge->setArg(null, $out);
-                    if ($rename) {
-                        $fontforge->setArg(null, $fontName);
-                    }
-                    $fontforge->execute();
-                } else if ($e == 'eot') {
-                    $ttf = $tmp . '/' . $fontName . '.ttf';
-                    `/usr/local/bin/ttf2eot < $ttf > $out`;
-                } else if ($e == 'woff2') {
-                    $ttf = $tmp . '/' . $fontName . '.ttf';
-                    `cat $ttf | ttf2woff2 >> $out`;
-                } else if ($e == 'php') {
-                    $ttf = $tmp . '/' . $fontName . '.ttf';
-                    include ROOT . '/inc/cube/externals/fpdf/makefont/makefont.php';
-                    Makefont($ttf);
-                    rename(ROOT . '/' . $fontName . '.z', $tmp . '/' . $fontName . '.z');
-                    rename(ROOT . '/' . $fontName . '.php', $tmp . '/' . $fontName . '.php');
-                }
-            }
-
-            $css = "@font-face {
-    font-family: '$fontName';
-    src: url('$fontName.eot');
-    src: url('$fontName.eot?#iefix') format('embedded-opentype'),
-         url('$fontName.woff2') format('woff2'),
-         url('$fontName.woff') format('woff'),
-         url('$fontName.ttf') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}";
-
-            file_put_contents($tmp . '/' . $fontName . '.css', $css);
-        }
-
-        $tmpfile = cubeFiles::tempnam() . '.zip';
-
-        $zip = new cubeCommandLine('zip');
-        $zip->cd($tmp);
-        $zip->setArg(null, $tmpfile);
-        $zip->setArg('0');
-        $zip->setArg('u');
-        $zip->setArg('r');
-        $zip->setArg('X');
-        $zip->setArg(null, '.');
-        $zip->execute();
-
-        cubeHTTP::downloadFile($tmpfile, $fontName . '.zip');
+       http::redirect('https://toolbox.fluidbook.com/tools/webfonts');
     }
 
     public static function makeFavicon()
index 5c383d922de2b6e8ea1ab86ddbad297157345db7..5a399ebdfc0ffae11805ef24b472a952c6d933ff 100644 (file)
@@ -1,11 +1,14 @@
 <?php
 
+
+
 define('DB_DRIVER', 'mysql');
 define('DB_ENGINE', 'MyISAM');
 
 $scheme = $_SERVER['HTTP_X_FORWARDED_PROTO'] ?? $_SERVER['REQUEST_SCHEME'] ?? 'http';
 
 define('ROOT', realpath(dirname(__FILE__) . '/..'));
+define('FPDF_FONTPATH', ROOT . '/fonts/');
 
 define('WEBROOT', '');
 define('SITE_PATH', WEBROOT . '/');
index 89cd82878c9393b69243a8829047fe8af78795b8..ca160951f031c8bdd0f4844d20734e17610df27e 100644 (file)
@@ -9,7 +9,9 @@ $__autoload['JSMin'] = dirname(__FILE__) . '/JSMin/jsmin-1.1.1.php';
 $__autoload['FPDF'] = dirname(__FILE__) . '/fpdf/fpdf.php';
 $__autoload['FPDI'] = dirname(__FILE__) . '/fpdf/fpdi.php';
 $__autoload['FPDF_TPL'] = dirname(__FILE__) . '/fpdf/fpdf_tpl.php';
-define('FPDF_FONTPATH', dirname(__FILE__) . '/fpdf/font/');
+if (!defined('FPDF_FONTPATH')) {
+    define('FPDF_FONTPATH', dirname(__FILE__) . '/fpdf/font/');
+}
 // ShapeFile
 $__autoload['ShapeFile'] = dirname(__FILE__) . '/shapefile/ShapeFile.inc.php';
 $__autoload['ShapeRecord'] = dirname(__FILE__) . '/shapefile/ShapeFile.inc.php';
@@ -26,5 +28,4 @@ $__autoload['getID3'] = dirname(__FILE__) . '/getid3/getid3.php';
 $__autoload['TwitterOAuth'] = dirname(__FILE__) . '/twitteroauth/twitteroauth.php';
 // APNS
 $__autoload['APNS'] = dirname(__FILE__) . '/APNS/class_APNS.php';
-$__autoload['DbConnect'] = dirname(__FILE__) . '/APNS/class_DbConnect.php';
-?>
\ No newline at end of file
+$__autoload['DbConnect'] = dirname(__FILE__) . '/APNS/class_DbConnect.php';
\ No newline at end of file
index f8629ac432c1b14b9a409422ba0159597d58ebdc..a2b8ee5c78441ba824c131267e4e6c74f7058d8f 100644 (file)
@@ -33,7 +33,7 @@ abstract class extranetDocument extends cubeMetier
             $displayDescription = true;\r
         }\r
 \r
-        $template = ROOT . '/images/extranet/docs/';\r
+        $template = ROOT . '//images/extranet/docs/';\r
 \r
 \r
         $this->euro = chr(128);\r
@@ -42,10 +42,11 @@ abstract class extranetDocument extends cubeMetier
         $this->pdf->SetAutoPageBreak(false);\r
         $this->pdf->setSourceFile($template . 'template.pdf');\r
 \r
-        $this->pdf->AddFont('KlavikaLight', '', 'klavika-light.php');\r
-        $this->pdf->AddFont('KlavikaLight', 'B', 'klavika-medium.php');\r
-        $this->pdf->AddFont('Klavika', '', 'klavika-regular.php');\r
-        $this->pdf->AddFont('Klavika', 'B', 'klavika-bold.php');\r
+\r
+        $this->pdf->AddFont('FontLight', '', 'silka-light.php');\r
+        $this->pdf->AddFont('FontLight', 'B', 'silka-medium.php');\r
+        $this->pdf->AddFont('Font', '', 'silka-regular.php');\r
+        $this->pdf->AddFont('Font', 'B', 'silka-bold.php');\r
 \r
         $this->getBackground();\r
 \r
@@ -71,10 +72,10 @@ abstract class extranetDocument extends cubeMetier
             $adresse = self::escape(implode("\n", $l));\r
         }\r
         $this->pdf->SetXY(114, 45);\r
-        $this->pdf->SetFont('KlavikaLight', 'B', 12);\r
+        $this->pdf->SetFont('FontLight', 'B', 12);\r
         $this->pdf->MultiCell(80, 8, $client, 0, 2);\r
         $this->pdf->SetX(114);\r
-        $this->pdf->SetFont('KlavikaLight', '', 12);\r
+        $this->pdf->SetFont('FontLight', '', 12);\r
         $this->pdf->MultiCell(80, 6, $adresse);\r
         // Bloc TVA Intra\r
         if ($this instanceof extranetFacture) {\r
@@ -86,7 +87,7 @@ abstract class extranetDocument extends cubeMetier
                 $texte_tva .= $this->texte_complementaire;\r
             }\r
             if ($texte_tva != '') {\r
-                $this->pdf->SetFont('KlavikaLight', '', 8);\r
+                $this->pdf->SetFont('FontLight', '', 8);\r
                 $this->pdf->setXY(114, 90);\r
                 $this->pdf->MultiCell(80, 4, self::escape(trim($texte_tva)));\r
             }\r
@@ -94,11 +95,11 @@ abstract class extranetDocument extends cubeMetier
         // Bloc titre\r
         $this->pdf->SetXY(6, 60);\r
         $titre = $this->documentTitre($this->client->lang);\r
-        $this->pdf->SetFont('KlavikaLight', 'B', 15);\r
+        $this->pdf->SetFont('FontLight', 'B', 14);\r
         $this->pdf->MultiCell(73, 4, self::escape($titre), 0, 'L');\r
 \r
         $this->pdf->SetXY(6, $this->pdf->GetY() + 3);\r
-        $this->pdf->SetFont('KlavikaLight', '', 11);\r
+        $this->pdf->SetFont('FontLight', '', 11);\r
         $titre = '';\r
         if ($this->client->lang == 'fr') {\r
             $titre .= date('d/m/Y', $this->date_creation);\r
@@ -130,7 +131,7 @@ abstract class extranetDocument extends cubeMetier
             $offset = $compactMode ? 1.5 : 4;\r
             $y = $this->pdf->getY() + $offset;\r
 \r
-            $this->pdf->SetFont('Klavika', '', 10);\r
+            $this->pdf->SetFont('Font', '', 10);\r
             // Prix\r
             $this->pdf->SetXY(170, $y);\r
             $ligne['montant'] = trim($ligne['montant']);\r
@@ -145,13 +146,13 @@ abstract class extranetDocument extends cubeMetier
                 $size = 13;\r
             }\r
 \r
-            $this->pdf->SetFont('Klavika', 'B', $size);\r
+            $this->pdf->SetFont('Font', 'B', $size);\r
             $this->pdf->setXY(6, $y);\r
             $this->pdf->Cell(171, 4, self::escape(trim($ligne['titre'], " \t\n\r\0\x0B_")), 0, 1);\r
             // Contenu\r
             if ($displayDescription) {\r
                 $this->pdf->SetXY(6, $this->pdf->getY() + 1);\r
-                $this->pdf->SetFont('Klavika', '', 10);\r
+                $this->pdf->SetFont('Font', '', 10);\r
                 $this->pdf->MultiCell(171, 4, self::escape($ligne['description']));\r
             }\r
         }\r
@@ -170,7 +171,7 @@ abstract class extranetDocument extends cubeMetier
         $ttcf = cubePrices::formatAmount($ttc, $this->client->lang);\r
         $taxes = ($tva > 0) ? cubePrices::formatAmount($ttc - $this->total_ht, $this->client->lang, 2) : '';\r
         // Affichage du montant hors taxes\r
-        $this->pdf->setFont('KlavikaLight', 'B', 10);\r
+        $this->pdf->setFont('FontLight', 'B', 10);\r
         if ($pages == 1) {\r
             //$this->pdf->SetXY(170, 210);\r
             $this->pdf->SetXY(170, 218.5);\r
@@ -181,7 +182,7 @@ abstract class extranetDocument extends cubeMetier
         }\r
         $this->pdf->Cell(32, $space, cubePrices::formatAmount($this->total_ht, $this->client->lang) . ' ' . $this->euro, 0, 1, 'R');\r
         $this->pdf->SetX(170);\r
-        $this->pdf->setFont('KlavikaLight', '', 10);\r
+        $this->pdf->setFont('FontLight', '', 10);\r
         // Affichage du taux de tva et du montant des taxes\r
         $this->pdf->Cell(32, $space, $tva_text, 0, 1, 'R');\r
         $this->pdf->SetX(170);\r
@@ -193,13 +194,13 @@ abstract class extranetDocument extends cubeMetier
         $this->pdf->SetX(170);\r
 \r
         $this->pdf->SetTextColor(255, 255, 255);\r
-        $this->pdf->setFont('KlavikaLight', 'B', 10);\r
+        $this->pdf->setFont('FontLight', 'B', 10);\r
         $this->pdf->Cell(32, $space + 1, $ttcf . ' ' . $this->euro, 0, 1, 'R');\r
 \r
         if (isset($notes)) {\r
             $this->pdf->setXY(8, 268);\r
             $this->pdf->setTextColor(0, 0, 0);\r
-            $this->pdf->setFont('Klavika', '', 8);\r
+            $this->pdf->setFont('Font', '', 8);\r
             $this->pdf->Cell(195, 0, self::escape($notes), 0, 1, 'R');\r
         }\r
         return $this->pdf;\r
@@ -215,10 +216,10 @@ abstract class extranetDocument extends cubeMetier
     protected function testPDF()\r
     {\r
         $pdf = new FPDF('P', 'mm', array(210, 2000));\r
-        $pdf->AddFont('KlavikaLight', '', 'klavika-light.php');\r
-        $pdf->AddFont('KlavikaLight', 'B', 'klavika-medium.php');\r
-        $pdf->AddFont('Klavika', '', 'klavika-regular.php');\r
-        $pdf->AddFont('Klavika', 'B', 'klavika-bold.php');\r
+        $pdf->AddFont('FontLight', '', 'silka-light.php');\r
+        $pdf->AddFont('FontLight', 'B', 'silka-medium.php');\r
+        $pdf->AddFont('Font', '', 'silka-regular.php');\r
+        $pdf->AddFont('Font', 'B', 'silka-bold.php');\r
         $pdf->AddPage();\r
         $pdf->SetAutoPageBreak(false);\r
 \r
@@ -228,7 +229,7 @@ abstract class extranetDocument extends cubeMetier
         foreach ($this->lignes as $i => $ligne) {\r
             $y = $pdf->getY() + 5;\r
 \r
-            $pdf->SetFont('Klavika', 'B', 10);\r
+            $pdf->SetFont('Font', 'B', 10);\r
             // Prix\r
             $pdf->SetXY(170, $y);\r
             $ligne['montant'] = trim($ligne['montant']);\r
@@ -242,7 +243,7 @@ abstract class extranetDocument extends cubeMetier
             $pdf->Cell(151, 4, self::escape(trim($ligne['titre'])), 0, 1);\r
             // Contenu\r
             $pdf->SetX(13);\r
-            $pdf->SetFont('Klavika', '', 10);\r
+            $pdf->SetFont('Font', '', 10);\r
             $pdf->MultiCell(171, 4, self::escape(trim($ligne['description'])));\r
 \r
             $y = $pdf->getY();\r