</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="" />
+ <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="fix #2243 @0:40" />
<ignored path="fwstk.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path="$PROJECT_DIR$/bin/" />
<session id="-183392587">
<usages-collector id="statistics.lifecycle.project">
<counts>
- <entry key="project.closed" value="1" />
+ <entry key="project.closed" value="2" />
+ <entry key="project.open.time.1" value="1" />
<entry key="project.open.time.2" value="1" />
- <entry key="project.opened" value="1" />
+ <entry key="project.opened" value="2" />
+ </counts>
+ </usages-collector>
+ <usages-collector id="statistics.file.extensions.open">
+ <counts>
+ <entry key="java" value="11" />
+ </counts>
+ </usages-collector>
+ <usages-collector id="statistics.file.types.open">
+ <counts>
+ <entry key="JAVA" value="11" />
+ </counts>
+ </usages-collector>
+ <usages-collector id="statistics.file.extensions.edit">
+ <counts>
+ <entry key="java" value="7" />
+ <entry key="txt" value="15" />
+ </counts>
+ </usages-collector>
+ <usages-collector id="statistics.file.types.edit">
+ <counts>
+ <entry key="JAVA" value="7" />
+ <entry key="PLAIN_TEXT" value="15" />
</counts>
</usages-collector>
</session>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="850">
- <caret line="64" column="23" selection-start-line="64" selection-start-column="23" selection-end-line="64" selection-end-column="23" />
+ <state relative-caret-position="748">
+ <caret line="64" column="22" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
</state>
</provider>
</entry>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3536">
+ <state relative-caret-position="-9717">
<caret line="250" column="32" selection-start-line="250" selection-start-column="32" selection-end-line="250" selection-end-column="32" />
</state>
</provider>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1785">
- <caret line="130" column="5" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
+ <state relative-caret-position="833">
+ <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="238">
+ <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+ </state>
+ </provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="313">
- <caret line="27" column="50" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
+ <state relative-caret-position="1547">
+ <caret line="102" column="19" selection-start-line="102" selection-start-column="19" selection-end-line="102" selection-end-column="19" />
+ <folding>
+ <element signature="e#1852#1853#0" expanded="true" />
+ <element signature="e#1871#1872#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+ <state relative-caret-position="348">
+ <caret line="105" column="52" selection-start-line="105" selection-start-column="52" selection-end-line="105" selection-end-column="52" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#2325#2326#0" expanded="true" />
+ <element signature="e#2382#2383#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="5151">
- <caret line="345" column="32" selection-start-line="345" selection-start-column="15" selection-end-line="345" selection-end-column="32" />
+ <state relative-caret-position="833">
+ <caret line="52" column="19" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="19" />
<folding>
- <element signature="e#51764#51765#0" expanded="true" />
- <element signature="e#51820#51821#0" expanded="true" />
- <element signature="e#59179#59180#0" expanded="true" />
- <element signature="e#59223#59224#0" expanded="true" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Word.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3145">
- <caret line="196" column="61" selection-start-line="196" selection-start-column="61" selection-end-line="196" selection-end-column="61" />
+ <state relative-caret-position="51">
+ <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="867">
- <caret line="61" column="34" selection-start-line="61" selection-start-column="34" selection-end-line="61" selection-end-column="34" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="416">
+ <caret line="80" column="53" selection-start-line="80" selection-start-column="53" selection-end-line="80" selection-end-column="53" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="663">
- <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
+ <state relative-caret-position="336">
+ <caret line="59" selection-start-line="59" selection-end-line="59" />
</state>
</provider>
</entry>
<option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java" />
<option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/Link.java" />
<option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" />
- <option value="$PROJECT_DIR$/src/cube/util/StringUtil.java" />
<option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" />
<option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" />
<option value="$PROJECT_DIR$/MANIFEST.MF" />
<option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java" />
<option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" />
<option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java" />
+ <option value="$PROJECT_DIR$/src/cube/util/StringUtil.java" />
</list>
</option>
</component>
<component name="PhpServers">
<servers />
</component>
- <component name="ProjectFrameBounds" extendedState="7">
+ <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-1928" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="fwstk" type="462c0819:PsiDirectoryNode" />
</path>
+ <path>
+ <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
+ <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+ <item name="geom" type="462c0819:PsiDirectoryNode" />
+ </path>
<path>
<item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
<item name="fwstk" type="462c0819:PsiDirectoryNode" />
<select />
</subPane>
</pane>
- <pane id="Scope" />
- <pane id="PackagesPane" />
<pane id="AndroidView" />
+ <pane id="PackagesPane" />
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<workItem from="1522337389921" duration="866000" />
<workItem from="1530632372632" duration="1612000" />
<workItem from="1536915422503" duration="1202000" />
+ <workItem from="1536936327997" duration="1627000" />
</task>
<task id="LOCAL-00001" summary="wip #1111 @0.5">
<created>1487172253077</created>
<option name="project" value="LOCAL" />
<updated>1515508995835</updated>
</task>
- <option name="localTasksCounter" value="8" />
+ <task id="LOCAL-00008" summary="fix #2243 @0:40">
+ <created>1536937362634</created>
+ <option name="number" value="00008" />
+ <option name="presentableId" value="LOCAL-00008" />
+ <option name="project" value="LOCAL" />
+ <updated>1536937362634</updated>
+ </task>
+ <option name="localTasksCounter" value="9" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="78105000" />
+ <option name="totallyTimeSpent" value="79732000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-1928" y="-8" width="1936" height="1176" extended-state="7" />
+ <frame x="-1928" y="-8" width="1936" height="1176" extended-state="6" />
+ <editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1641791" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16577825" />
<window_info id="Palette	" order="1" />
<window_info id="Image Layers" order="2" />
<window_info id="Capture Tool" order="3" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32934782" />
<window_info anchor="bottom" id="Terminal" order="10" weight="0.32934782" />
- <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.48720682" weight="0.32755297" />
- <window_info anchor="bottom" id="File Transfer" order="12" visible="true" weight="0.32851636" />
+ <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.48720682" weight="0.32660902" />
+ <window_info anchor="bottom" id="File Transfer" order="12" visible="true" weight="0.32756963" />
<window_info anchor="right" id="SciView" order="0" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
<MESSAGE value="#811" />
<MESSAGE value="fix #1629 @3" />
<MESSAGE value="wait #1866 @6" />
- <option name="LAST_COMMIT_MESSAGE" value="wait #1866 @6" />
+ <MESSAGE value="fix #2243 @0:40" />
+ <option name="LAST_COMMIT_MESSAGE" value="fix #2243 @0:40" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
- </state>
- </provider>
- </entry>
<entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/lang/Object.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1054">
- <caret line="73" column="25" selection-start-line="73" selection-start-column="25" selection-end-line="73" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
+ <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
- <caret line="24" column="97" selection-start-line="24" selection-start-column="97" selection-end-line="24" selection-end-column="97" />
+ <state relative-caret-position="5151">
+ <caret line="345" column="32" selection-start-line="345" selection-start-column="15" selection-end-line="345" selection-end-column="32" />
<folding>
- <element signature="imports" expanded="true" />
+ <element signature="e#51764#51765#0" expanded="true" />
+ <element signature="e#51820#51821#0" expanded="true" />
+ <element signature="e#59179#59180#0" expanded="true" />
+ <element signature="e#59223#59224#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="136">
+ <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="340">
+ <caret line="27" column="50" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="850">
- <caret line="64" column="23" selection-start-line="64" selection-start-column="23" selection-end-line="64" selection-end-column="23" />
+ <state relative-caret-position="3145">
+ <caret line="196" column="61" selection-start-line="196" selection-start-column="61" selection-end-line="196" selection-end-column="61" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Word.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="51">
+ <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3536">
+ <state relative-caret-position="-9717">
<caret line="250" column="32" selection-start-line="250" selection-start-column="32" selection-end-line="250" selection-end-column="32" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1785">
- <caret line="130" column="5" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
+ <state relative-caret-position="348">
+ <caret line="105" column="52" selection-start-line="105" selection-start-column="52" selection-end-line="105" selection-end-column="52" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#2325#2326#0" expanded="true" />
+ <element signature="e#2382#2383#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="5151">
- <caret line="345" column="32" selection-start-line="345" selection-start-column="15" selection-end-line="345" selection-end-column="32" />
+ <state relative-caret-position="1547">
+ <caret line="102" column="19" selection-start-line="102" selection-start-column="19" selection-end-line="102" selection-end-column="19" />
<folding>
- <element signature="e#51764#51765#0" expanded="true" />
- <element signature="e#51820#51821#0" expanded="true" />
- <element signature="e#59179#59180#0" expanded="true" />
- <element signature="e#59223#59224#0" expanded="true" />
+ <element signature="e#1852#1853#0" expanded="true" />
+ <element signature="e#1871#1872#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3145">
- <caret line="196" column="61" selection-start-line="196" selection-start-column="61" selection-end-line="196" selection-end-column="61" />
+ <state relative-caret-position="238">
+ <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="748">
+ <caret line="64" column="22" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="833">
+ <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="867">
- <caret line="61" column="34" selection-start-line="61" selection-start-column="34" selection-end-line="61" selection-end-column="34" />
+ <state relative-caret-position="833">
+ <caret line="52" column="19" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="663">
- <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
+ <state relative-caret-position="416">
+ <caret line="80" column="53" selection-start-line="80" selection-start-column="53" selection-end-line="80" selection-end-column="53" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="313">
- <caret line="27" column="50" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java">
+ <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+ <state relative-caret-position="336">
+ <caret line="59" selection-start-line="59" selection-end-line="59" />
</state>
</provider>
</entry>
$res .= '<tr><td><strong>' . __('Total') . '</strong></td>';\r
foreach ($annees as $annee) {\r
if (isset($total_annee[$annee])) {\r
- $c = $total_consomme_annee[$annee];\r
- $p = $total_prevu_annee[$annee];\r
+ //$c = $total_consomme_annee[$annee];\r
+ //$p = $total_prevu_annee[$annee];\r
$res .= '<td><strong>' . self::format($total_annee[$annee], true) . '</strong></td>';\r
}\r
}\r
$_SESSION['q'] = $_POST['q'] ? $_POST['q'] : null;\r
} elseif (!isset($_SERVER['HTTP_X_REQUESTED_WITH']) || $_SERVER['HTTP_X_REQUESTED_WITH'] != 'XMLHttpRequest') {\r
$_SESSION['q'] = null;\r
-}\r
-?>
\ No newline at end of file
+}
\ No newline at end of file
foreach ($dirs as $dir) {
cubeFiles::scanRecursiveDir($dir, $files);
$limit = TIME - 7200;
- foreach ($files as $f) {
- if (filemtime($f) < $limit) {
- unlink($f);
+ if(is_array($files)) {
+ foreach ($files as $f) {
+ if (filemtime($f) < $limit) {
+ unlink($f);
+ }
}
}
}
$c = $core->con->openCursor('bourbon_suggestions');
$c->type = $parts[2];
$c->suggestion = $parts[3];
- $c->date = round($parts[1]/1000);
+ $c->date = round($parts[1] / 1000);
$c->from = $from;
$c->page = $parts[0];
$c->insert();
exit;
}
+
+ public static function subscribe()
+ {
+ if (isset($_POST['form'])) {
+ switch ($_POST['form']) {
+ case 'avery':
+ self::_subscribeAvery();
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ public static function _subscribeAvery()
+ {
+ $api = new CubeIT_Services_Mailchimp('5d00b7e601cf1948cb95de06630878ae-us19');
+ $data = [
+ 'email' => $_POST['email'],
+ 'COMPANY' => $_POST['company'],
+ 'ACTIVITY' => $_POST['activity'],
+ 'COUNTRY' => $_POST['country'],
+ 'OPTIN' => $_POST['subscribe'],
+ 'LANGUAGE' => $_POST['locale']
+ ];
+ $api->subscribe('33699982ca', $data);
+
+ }
}
try {
$client = new Zend_Http_Client();
- $client->setAdapter('Zend_Http_Client_Adapter_Curl');
+ $client->setAdapter('Zend_Http_Client_Adapter_Socket');
$client->setEncType(Zend_Http_Client::ENC_FORMDATA);
$client->setMethod(Zend_Http_Client::POST);
$client->setParameterPost(array('reference' => $ref));
}
die('');
}
-
}
$this->forms['archives'] = array('label' => __('Archives'),
'fieldsnames' => array('externalArchives', 'externalArchivesBack', '|', 'archivesLink', 'archivesLabel'));
// .
- $this->fields['form'] = array('type' => 'combo', 'default' => '', 'editable' => true, 'grade' => 5, 'label' => __('Formulaire'), 'datas' => array(__('Aucun') => '', 'Bulle Groupe' => 'bulle', 'Bourbon / Suggestions' => 'bourbon'));
+ $this->fields['form'] = array('type' => 'combo', 'default' => '', 'editable' => true, 'grade' => 5, 'label' => __('Formulaire'), 'datas' =>
+ array(__('Aucun') => '',
+ 'Bulle Groupe' => 'bulle',
+ 'Bourbon / Suggestions' => 'bourbon',
+ 'Avery' => 'avery',
+ )
+ );
$this->forms['form'] = array('label' => __('Formulaire'),
'fieldsnames' => array('form'));
public function resetLog()
{
- unlink($this->log . '/commons.log.gz');
+ $f=$this->log . '/commons.log.gz';
+ if(file_exists($f)) {
+ unlink($f);
+ }
}
public function addToLog($cl, $output = true, $page = null)
<?php
-class wsExporter {
+class wsExporter
+{
public $book_id;
public $dao;
const VINCENT = "paris.cubedesigners.com";
- public function exportCollection($collectionId, $os) {
+ public function exportCollection($collectionId, $os)
+ {
global $core;
$phonegap->addLibrary(array('from' => WS_COMPILE_ASSETS . '/_html5app/_android/res', 'to' => '/res'));
$phonegap->setDistantCompiler(self::VINCENT, 'Vincent', 's77vpo*wu5', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY);
$phonegap->setSourceVariables(array('background' => '0xff' . $collection->settings['couleurD'],
- 'orientation' => $collection->settings['orientation'])
+ 'orientation' => $collection->settings['orientation'])
);
$phonegap->fileDistantReplaceContents('// PLUGIN GRADLE EXTENSIONS START' . "\r\n" . '// PLUGIN GRADLE EXTENSIONS END',
'// PLUGIN GRADLE EXTENSIONS START' . "\r\n" . 'apply from: "fluidbook-dependencies/catalogues-fluidbook.gradle"' . "\r\n" . '// PLUGIN GRADLE EXTENSIONS END',
* @param string $os
* @param wsHTML5AppCompiler $compiler
*/
- protected function _collectionAssets($os, $compiler) {
+ protected function _collectionAssets($os, $compiler)
+ {
if ($os == 'ios') {
$this->_collectionAssetsIOS($os, $compiler);
} else if ($os == 'android') {
}
}
- protected function _collectionAssetsAndroid($os, $compiler) {
+ protected function _collectionAssetsAndroid($os, $compiler)
+ {
$collection = $compiler->collection;
$src = $compiler->wdir . '/' . $collection->theme['icon'];
}
- protected function _collectionAssetsIOS($os, $compiler) {
+ protected function _collectionAssetsIOS($os, $compiler)
+ {
$collection = $compiler->collection;
$src = $compiler->wdir . '/' . $collection->theme['icon'];
// icones
$this->_rsync(WS_COLLECTIONS . '/resources/' . $collection->collection_id . '/' . $os, "/mnt/macbox" . $this->_iosProjectDir($collection->settings['namespace']) . '/' . CubeIT_Text::str2URL($collection->nom) . '/Resources', false);
}
- protected function _testFile($ref, $dest) {
+ protected function _testFile($ref, $dest)
+ {
if (!file_exists($dest)) {
return false;
}
return true;
}
- protected function _createProject($os, $name, $ns) {
+ protected function _createProject($os, $name, $ns)
+ {
if ($os == 'ios') {
$dir = $this->_iosProjectDir($ns);
$sdir = '/mnt/macbox' . $dir;
}
}
- protected function _iosProjectDir($ns) {
+ protected function _iosProjectDir($ns)
+ {
return '/Phonegap/Projects/' . str_replace('.', '/', $ns);
}
- protected function _iosPlugin($dir, $plugin) {
+ protected function _iosPlugin($dir, $plugin)
+ {
// git@github.com:phonegap-build/PushPlugin.git
$cl = new CubeIT_CommandLine('/usr/local/bin/plugman');
$cl->setManualArg(' --platform ios');
$cl->execute();
}
- public function export($book_id, &$x, $action = 'download', $version = 'online', $destinationDir = null, $destinationFile = null) {
+ public function export($book_id, &$x, $action = 'download', $version = 'online', $destinationDir = null, $destinationFile = null)
+ {
global $core;
set_time_limit(0);
}
}
- protected function _haveToZip() {
+ protected function _haveToZip()
+ {
$yes = array('win-exe', 'mac-exe', 'win-cd');
return in_array($this->version, $yes);
}
- protected function _phonegapcollection() {
+ protected function _phonegapcollection()
+ {
$d = '/' . $this->destinationDir;
$packager = new wsPackagerPhonegap($this->book_id, $d, true, false, $this->version);
return $packager->makePackage(false);
}
- protected function _install() {
+ protected function _killFtp($book_id){
+ $kill='pkill -f "^lftp(.*)'.$book_id.'"';
+ `$kill`;
+ }
+
+ protected function _install()
+ {
+ $this->_killFtp($this->book_id);
+
$p = wsPackager::package($this->book_id, $this->version, $this->_haveToZip(), false);
if (strpos($p, '/fluidbook') == 0) {
}
if (stristr($path, 'ftp://')) {
+ $this->_killFtp($this->book_id);
$this->_lftp($p, $path, $this->ftpPassiveMode);
} else {
$this->_rsync($p, $path);
}
}
- protected function _phonegap() {
+ protected function _phonegap()
+ {
$os = $this->action;
if ($this->destinationDir == '') {
$this->_transfertPhonegap($os, $package, $this->destinationDir);
}
- protected function _transfertPhonegap($os, $package, $destination) {
+ protected function _transfertPhonegap($os, $package, $destination)
+ {
if ($os == 'android') {
`sudo /usr/local/bin/remountvincent`;
$this->_rsync($package, '/mnt/vincent/cygdrive/h/Works/Phonegap/Projects/' . $destination, true);
}
}
- protected function _lftp($src, $dest, $passive = false, $erase = false) {
+ protected function _lftp($src, $dest, $passive = false, $erase = false)
+ {
set_time_limit(0);
$u = parse_url($dest);
} else {
$u['dir'] = $u['path'];
}
+ if ($u['dir'] == '') {
+ $u['dir'] = '/';
+ }
$passive = $passive ? 'on' : 'off';
}
}
+ if (!file_exists($src)) {
+ return;
+ }
+
$lftp = new CubeIT_CommandLine('lftp');
$lftp->setArg('u', $u['user'] . ',' . $u['pass']);
$lftp->setArg('p', $u['port']);
$lftp->debug();
}
- protected function _rsync($src, $dest, $erase = false, $chown = null) {
+ protected function _rsync($src, $dest, $erase = false, $chown = null)
+ {
set_time_limit(0);
/*if (is_file($src)) {
$dir = dirname($dest);
}
}
- protected function _download() {
+ protected function _download()
+ {
$r = wsPackager::package($this->book_id, $this->version);
$this->x->addRedirection($r);
}
- protected function _getVersion($version) {
+ protected function _getVersion($version)
+ {
if ($version == 'v2') {
return 'html';
} else if ($version == 'online') {
return $version;
}
- protected function _saveDestination() {
+ protected function _saveDestination()
+ {
$datas = $this->book->exportdatas;
if ($datas == '') {
$datas = array();
$cleanerexpired ||
$originalexpired;
- if ($force) {
- trigger_error('optimizeSVG forced');
- }
- if ($notexists) {
- trigger_error('optimizeSVG not exists');
- }
- if ($cleanerexpired) {
- trigger_error('optimizeSVG cleaner expired');
- }
- if ($originalexpired) {
- trigger_error('optimizeSVG original expired');
- }
-
-
if ($optimize) {
$cmd = "timeout -s 1 20 /usr/local/bin/svgcleaner --allow-bigger-file --paths-coordinates-precision 3 --copy-on-error --stdout $original";
$svg = `$cmd`;
$invalid = false;\r
foreach ($pages as $i => $infos) {\r
$doc = wsDocument::getDir($infos['document_id']) . 'crop.pdf';\r
- if (filemtime($doc) > $fmtime) {\r
+ if (file_exists($doc) && filemtime($doc) > $fmtime) {\r
$invalid = true;\r
}\r
}\r
public $jsFiles = array(
'js/libs/modernizr/modernizr.min.js',
'js/libs/modernizr/tests.js',
+ 'js/libs/cookie.min.js',
'js/libs/cube/fb.js',
'js/libs/cube/util.js',
'js/libs/screenfull.min.js',
$this->config->vectorPages = array_diff(cubeArray::parseRange($this->config->vectorPages), $this->config->rasterizePages);
}
+ protected function populateConfig()
+ {
+ $this->config->numerotation = explode(',', $this->book->numerotation);
+ $this->config->id = $this->book->book_id;
+ $this->config->cid = $this->book->cid;
+ $this->config->cacheDate = TIME;
+ $this->config->width = $this->cssWidth;
+ $this->config->height = $this->cssHeight;
+ $this->config->optimalWidth = $this->optimalWidth;
+ $this->config->optimalHeight = $this->optimalHeight;
+ $this->config->chapters = $this->book->chapters;
+ $this->config->videoFormats = $this->getVideosFormats(false);
+ $this->config->htmlmultimedia = $this->htmlmultimedia;
+ $this->config->phonegap = $this->phonegap;
+ $this->config->retinaResolution = min($this->book->parametres->maxResolution, $this->maxRes);
+ $this->config->pageLabels = $this->pageLabels;
+ $this->config->pageZoomFactor = $this->z;
+ $this->config->multiply = $this->multiply;
+ $this->config->cssScale = $this->cssScale;
+ $this->config->pdfZoomFactor = $this->pdf2htmlRatio;
+ if ($this->home) {
+ $this->config->home = 'http://home';
+ }
+ $this->config->multiApp = $this->multiApp;
+ foreach ($this->additionalConfig as $k => $v) {
+ $this->config->$k = $v;
+ }
+ if ($this->phonegap && ($this->book->parametres->offlineLink == '' || $this->book->parametres->offlineLink == 'http://')) {
+ $this->config->share = false;
+ }
+
+ // We need to be able to reference both navOrder and navOrderH so convert both to arrays
+ // We also make sure there are no empty items in the arrays (see: http://php.net/manual/en/function.array-filter.php#111091)
+ $this->config->navOrder = array_filter(array_map('trim', explode(',', $this->config->navOrder)), 'strlen');
+ $this->config->navOrderH = array_filter(array_map('trim', explode(',', $this->config->navOrderH)), 'strlen');
+
+ $this->config->standalone = $this->standalone;
+ if ($this->config->phonegap) {
+ $this->config->manifest = $this->writeManifest();
+ }
+
+ if ($this->config->form == 'bulle') {
+ $this->addJs('js/libs/fluidbook/forms/fluidbook.form.bulle.js');
+ } else if ($this->config->form == 'bourbon') {
+ $this->addJs('js/libs/parsley.min.js');
+ $this->addJs('js/libs/fluidbook/forms/fluidbook.form.bourbon.js');
+ } else if ($this->config->form == 'avery') {
+ $this->addJs('js/libs/parsley.min.js');
+ $this->addJs('js/libs/fluidbook/forms/fluidbook.form.avery.js');
+ $this->addLess('form/avery');
+ $this->writeCountries();
+ }
+
+ if ($this->config->basket) {
+ $this->addJs('js/libs/fluidbook/fluidbook.cart.js');
+ switch ($this->config->basketManager) {
+ case 'Remarkable':
+ $this->addJs('js/libs/parsley.min.js');
+ $this->addJs('js/libs/jquery/jquery.cookie.js');
+ $this->addJs('js/libs/fluidbook/cart/fluidbook.cart.remarkable.js');
+ break;
+ default:
+ break;
+ }
+
+ if (file_exists($this->config->basketReferences) || CubeIT_Util_Url::isDistant($this->config->basketReferences)) {
+ $referencesFile = $this->config->basketReferences;
+ } else {
+ $referencesFile = $this->wdir . '/commerce/' . $this->config->basketReferences;
+ }
+
+ if (file_exists($referencesFile) || CubeIT_Util_Url::isDistant($referencesFile)) {
+ $ext = CubeIT_Files::getExtension($referencesFile);
+ if ($ext == 'xlsx') {
+ $this->config->basketReferences = wsUtil::excelToArray($referencesFile);
+ if ($this->book->parametres->customLinkClass == 'AtlanticDownloadLink') {
+ $this->config->basketReferences = wsUtil::atlanticReferences($this->config->basketReferences, 'local/', array($this, 'log'), array($this->vdir, "copy"));
+ }
+ }
+ $this->log("Done cart references");
+ }
+ }
+ $this->config->seoArticles = $this->seoArticles;
+ }
+
public function log($step)
{
$currenttime = microtime(true);
$this->log('Images written');
$linksCSS = $this->writeLinks();
$this->log('Links written');
- $this->writeCSS('data/style/style_%d.css', $linksCSS);
- $this->log('CSS written');
$this->writeLangs();
$this->log('Langs written');
$this->writeSEO();
$this->log('SEO written');
- $this->writeIndex();
- $this->log('Index written');
- if ($this->book->parametres->scorm_enable) {
- $this->writeScorm();
- $this->log('SCORM written');
- }
$this->writeWidget();
$this->log('Widget written');
$this->writeSounds();
$this->log('Texts written');
$this->writeExtras();
$this->log('Extras written');
+ $this->populateConfig();
+ $this->writeCSS('data/style/style_%d.css', $linksCSS);
+ $this->log('CSS written');
+ $this->writeIndex();
+ $this->log('Index written');
+ if ($this->book->parametres->scorm_enable) {
+ $this->writeScorm();
+ $this->log('SCORM written');
+ }
$this->writeJs();
$this->log('Js written');
$this->vdir->sync($delete);
/**
* Helper function to add a unique stylesheet entry to the LESS stack for compilation
* Duplicate paths are ignored.
- * @param $path The path of the file relative to the /style folder, without any extension
- * @param $extra_files Optional array of extra files that should be copied across for use during LESS compilation
+ * @param $path string The path of the file relative to the /style folder, without any extension
*/
public function addLess($path)
{
$lang = $daoLang->selectById($this->book->lang);
$langs = $daoLang->selectAll();
- $traductions = (!count($this->book->traductions)) ? $lang->traductions : $this->book->traductions;
+ $traductions = (!is_countable($this->book->traductions) || !count($this->book->traductions)) ? $lang->traductions : $this->book->traductions;
$this->config->l10n = array();
$this->config->l10n['default'] = $traductions;
$tmp = cubeFiles::tempnam();
file_put_contents($tmp, $js);
- unlink($minimized);
+ if (file_exists($minimized)) {
+ unlink($minimized);
+ }
$uglify = new CubeIT_CommandLine('/usr/local/bin/uglifyjs');
$uglify->setArg('o', $minimized);
protected function writeConfig()
{
- $this->config->numerotation = explode(',', $this->book->numerotation);
- $this->config->id = $this->book->book_id;
- $this->config->cid = $this->book->cid;
- $this->config->cacheDate = TIME;
- $this->config->width = $this->cssWidth;
- $this->config->height = $this->cssHeight;
- $this->config->optimalWidth = $this->optimalWidth;
- $this->config->optimalHeight = $this->optimalHeight;
- $this->config->chapters = $this->book->chapters;
- $this->config->videoFormats = $this->getVideosFormats(false);
- $this->config->htmlmultimedia = $this->htmlmultimedia;
- $this->config->phonegap = $this->phonegap;
- $this->config->retinaResolution = min($this->book->parametres->maxResolution, $this->maxRes);
- $this->config->pageLabels = $this->pageLabels;
- $this->config->pageZoomFactor = $this->z;
- $this->config->multiply = $this->multiply;
- $this->config->cssScale = $this->cssScale;
- $this->config->pdfZoomFactor = $this->pdf2htmlRatio;
- if ($this->home) {
- $this->config->home = 'http://home';
- }
- $this->config->multiApp = $this->multiApp;
- foreach ($this->additionalConfig as $k => $v) {
- $this->config->$k = $v;
- }
- if ($this->phonegap && ($this->book->parametres->offlineLink == '' || $this->book->parametres->offlineLink == 'http://')) {
- $this->config->share = false;
- }
-
- // We need to be able to reference both navOrder and navOrderH so convert both to arrays
- // We also make sure there are no empty items in the arrays (see: http://php.net/manual/en/function.array-filter.php#111091)
- $this->config->navOrder = array_filter(array_map('trim', explode(',', $this->config->navOrder)), 'strlen');
- $this->config->navOrderH = array_filter(array_map('trim', explode(',', $this->config->navOrderH)), 'strlen');
-
- $this->config->standalone = $this->standalone;
- if ($this->config->phonegap) {
- $this->config->manifest = $this->writeManifest();
- }
-
- if ($this->config->form == 'bulle') {
- $this->addJs('js/libs/fluidbook/forms/fluidbook.form.bulle.js');
- } else if ($this->config->form == 'bourbon') {
- $this->addJs('js/libs/parsley.min.js');
- $this->addJs('js/libs/fluidbook/forms/fluidbook.form.bourbon.js');
- }
-
- if ($this->config->basket) {
- $this->addJs('js/libs/fluidbook/fluidbook.cart.js');
- switch ($this->config->basketManager) {
- case 'Remarkable':
- $this->addJs('js/libs/parsley.min.js');
- $this->addJs('js/libs/jquery/jquery.cookie.js');
- $this->addJs('js/libs/fluidbook/cart/fluidbook.cart.remarkable.js');
- break;
- default:
- break;
- }
-
-
- if (file_exists($this->config->basketReferences) || CubeIT_Util_Url::isDistant($this->config->basketReferences)) {
- $referencesFile = $this->config->basketReferences;
- } else {
- $referencesFile = $this->wdir . '/commerce/' . $this->config->basketReferences;
- }
-
- if (file_exists($referencesFile) || CubeIT_Util_Url::isDistant($referencesFile)) {
- $ext = CubeIT_Files::getExtension($referencesFile);
- if ($ext == 'xlsx') {
- $this->config->basketReferences = wsUtil::excelToArray($referencesFile);
- if ($this->book->parametres->customLinkClass == 'AtlanticDownloadLink') {
- $this->config->basketReferences = wsUtil::atlanticReferences($this->config->basketReferences, 'local/', array($this, 'log'), array($this->vdir, "copy"));
- }
- }
- $this->log("Done cart references");
- }
- }
- $this->config->seoArticles = $this->seoArticles;
-
return 'var DATAS=' . json_encode($this->config) . ';' . "\n";
}
+ protected function writeCountries()
+ {
+ $c = Zend_Locale::getTranslationList('Territory', $this->book->lang, 2);
+ asort($c);
+ $this->config->countries = $c;
+ }
+
protected function writeManifest()
{
$res = array();
$destination_css = $tmp . '/' . $f . '.css';
if (!file_exists($source_less)) {
+ die($source_less);
continue;
}
$less->execute();
$less->debug();
if (!file_exists($destination_css)) {
- die($less->output);
+ continue;
}
$this->vdir->copy($destination_css, 'style/' . $f . '.css');
if ($f != 'widget') {
}
}
+
+if (!function_exists('is_countable')) {
+
+ function is_countable($c)
+ {
+ return is_array($c) || $c instanceof Countable;
+ }
+
+}
$p->title = ($page == 1) ? $this->compiler->book->parametres->title : $this->_getPageLabel($page);\r
$p->text = $this->getTextContent($infos);\r
$p->description = $this->compiler->book->parametres->seoDescription ? $this->compiler->book->parametres->seoDescription : $this->compiler->book->parametres->title . ' - Powered by Fluidbook';\r
- $p->socialDescription = $this->compiler->parametres->facebook_description || $this->compiler->book->parametres->seoDescription;\r
+ $p->socialDescription = $this->compiler->book->parametres->facebook_description || $this->compiler->book->parametres->seoDescription;\r
$p->keywords = $this->compiler->book->parametres->seoKeywords;\r
$p->robots = $this->compiler->book->parametres->seoRobots ? 'index,follow' : 'noindex,nofollow';\r
\r
break;\r
}\r
\r
- $res = trim(file_get_contents(wsDocument::getDir($infos['document_id']) . $prefix . 'h' . $infos['document_page'] . '.txt'));\r
+ $f = wsDocument::getDir($infos['document_id']) . $prefix . 'h' . $infos['document_page'] . '.txt';\r
+ if (file_exists($f)) {\r
+ $res = trim(file_get_contents($f));\r
+ } else {\r
+ $res = '';\r
+ }\r
+\r
if (strpos($res, '<div>') !== 0) {\r
$res = preg_replace('|\<\/div\>$|', '', $res);\r
}\r
if (trim($chapter->label, "\t\r\n\0\x0B-+") == '') {\r
continue;\r
}\r
- if($chapter->page==''){\r
+ if ($chapter->page == '') {\r
continue;\r
}\r
$p = $this->compiler->virtualToPhysical($chapter->page);\r
<?php
-require_once (dirname(__FILE__) . '/vendor/autoload.php');
+set_exception_handler('exception_handle');
+
+
+function exception_handle(Exception $e)
+{
+ error_log(get_class($e) . ' : ' . $e->getMessage() . ' : ' . $e->getFile() . ' at line ' . $e->getLine());
+}
+
+require_once(dirname(__FILE__) . '/vendor/autoload.php');
require_once(dirname(__FILE__) . '/inc/prepend.php');
ob_start();
projects / cubeextranet.git / commitdiff