From: vincent@cubedesigners.com Date: Thu, 29 Sep 2016 15:33:55 +0000 (+0000) Subject: done #762 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=81a7235ffd2f2c5a12c5357105fa822901cba6ae;p=cubeextranet.git done #762 @1.5 --- diff --git a/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml b/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml new file mode 100644 index 000000000..e0d3bc3a6 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml @@ -0,0 +1,14 @@ + + + $PROJECT_DIR$/out/artifacts/fwstk_jar + + + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/compiler.xml b/fluidbook/tools/fwstk/.idea/compiler.xml new file mode 100644 index 000000000..96cc43efa --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/copyright/profiles_settings.xml b/fluidbook/tools/fwstk/.idea/copyright/profiles_settings.xml new file mode 100644 index 000000000..c7d1c5a83 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/deployment.xml b/fluidbook/tools/fwstk/.idea/deployment.xml new file mode 100644 index 000000000..2970b573d --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/deployment.xml @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/libraries/avalon_framework_4_1_4.xml b/fluidbook/tools/fwstk/.idea/libraries/avalon_framework_4_1_4.xml new file mode 100644 index 000000000..914c28660 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/avalon_framework_4_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_6.xml b/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_6.xml new file mode 100644 index 000000000..2f071134c --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_6.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_6.xml b/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_6.xml new file mode 100644 index 000000000..8f5924e99 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_6.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_6.xml b/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_6.xml new file mode 100644 index 000000000..ec05f3d97 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_6.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/misc.xml b/fluidbook/tools/fwstk/.idea/misc.xml new file mode 100644 index 000000000..5b6c4cb34 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/misc.xml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + Abstraction issuesJava + + + Android Lint + + + Class metricsJava + + + Code StylePHP + + + Code maturity issuesJava + + + Code style issuesJava + + + CoffeeScript + + + Concurrency annotation issuesJava + + + Control flow issuesJava + + + Cucumber + + + DOM issuesJavaScript + + + Declaration redundancyJava + + + DeclarationGroovy + + + Django + + + General + + + GeneralCoffeeScript + + + GeneralJavaScript + + + Google Web Toolkit issues + + + Groovy + + + Initialization issuesJava + + + Internationalization issues + + + Internationalization issuesJava + + + J2ME issuesJava + + + JPA issues + + + Java + + + Java language level issuesJava + + + Java language level migration aidsJava + + + JavaScript + + + Javadoc issuesJava + + + Memory issuesJava + + + Method metricsJava + + + PHP + + + Packaging issuesJava + + + Performance issuesJava + + + Plugin DevKit + + + Portability issuesJava + + + Probable bugsCoffeeScript + + + Probable bugsGroovy + + + Probable bugsJava + + + Probable bugsJavaScript + + + RELAX NG + + + SQL + + + Security issuesJava + + + Serialization issuesJava + + + Spring + + + Spring CoreSpring + + + Struts + + + Struts 2Struts + + + Threading issuesGroovy + + + Threading issuesJava + + + Visibility issuesJava + + + XMLSpring CoreSpring + + + + + Android + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/modules.xml b/fluidbook/tools/fwstk/.idea/modules.xml new file mode 100644 index 000000000..e37fec04c --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/vcs.xml b/fluidbook/tools/fwstk/.idea/vcs.xml new file mode 100644 index 000000000..45cf85c20 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml new file mode 100644 index 000000000..4fecb1074 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/workspace.xml @@ -0,0 +1,1313 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + project + + + true + + + + DIRECTORY + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + C:\Users\Vincent\AppData\Roaming\Subversion + 125 + + + + + + + + + 1474367534851 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + fwstk:jar + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.8 + + + + + + + + fwstk + + + + + + + + 1.8 + + + + + + + + avalon-framework-4.1.4 + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/avalon-framework-4.1.4.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/avalon-framework-4.1.4.jar new file mode 100644 index 000000000..0abf0b953 Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/avalon-framework-4.1.4.jar differ diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/bcmail-jdk16-146.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/bcmail-jdk16-146.jar new file mode 100644 index 000000000..6bd6765c2 Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/bcmail-jdk16-146.jar differ diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/bcprov-jdk16-146.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/bcprov-jdk16-146.jar new file mode 100644 index 000000000..27d3481e6 Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/bcprov-jdk16-146.jar differ diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.4.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.4.jar new file mode 100644 index 000000000..90035a4fe Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.4.jar differ diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.1.1.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.1.1.jar new file mode 100644 index 000000000..8758a96b7 Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.1.1.jar differ diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.6.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.6.jar new file mode 100644 index 000000000..1b0608704 Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.6.jar differ diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar new file mode 100644 index 000000000..7dd972505 Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.6.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.6.jar new file mode 100644 index 000000000..e3109dcae Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.6.jar differ diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.6.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.6.jar new file mode 100644 index 000000000..495dfdb53 Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.6.jar differ diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index 87a88a37c..e803b072a 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -743,7 +743,7 @@ class wsServices extends cubeFlashGateway { $r = $core->con->select('SELECT url FROM flfref WHERE ref="' . $core->con->escape($this->args['ref']) . '"'); if ($r->count()) { - header('Location: http://www.flf.fr' . $r->url . '?tkpub=ecatalogue-general-2016'); + header('Location: http://www.flf.fr' . $r->url . '?tkpub=ecatalogue-general-2017'); exit; } $q = 'site:http://www.flf.fr/formation-professionnelle/ "Code stage : ' . $this->args['ref'] . '"';