Merge branch 'marcFixApiPath' into 'master'

fix Api path and move hashPassword.php

See merge request !165

Documentation/Manual.rst

@@ -135,7 +135,7 @@ Different browser prints the same page in different variations. To prevent this,
 
 Provide a `print this page`-link (replace 'current pageId' )::
 
-  <a href="typo3conf/ext/qfq/Classes/api/print.php?id={current pageId}">Print this page</a>
+  <a href="typo3conf/ext/qfq/Classes/Api/print.php?id={current pageId}">Print this page</a>
 
 Any parameter specified after `print.php` will be delivered to `wkhtmltopdf` as part of the URL.
 
@@ -143,7 +143,7 @@ Typoscript code to implement a print link on every page::
 
   10 = TEXT
   10 {
-    wrap = <a href="typo3conf/ext/qfq/Classes/api/print.php?id=|&type=99"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> Printview</a>
+    wrap = <a href="typo3conf/ext/qfq/Classes/Api/print.php?id=|&type=99"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> Printview</a>
     data = page:uid
   }
 
@@ -186,7 +186,7 @@ Setup
 * Copy/rename the file *<site path>/typo3conf/ext/qfq/config.example.qfq.php* to *<site path>/typo3conf/config.qfq.php*.
   Configure the necessary settings `configuration`_
   The configuration file is outside of the extension directory, to not loose it during de-install and install again.
-* When the QFQ Extension is called the first time on the Typo3 frontend, the file *<ext_dir>/qfq/sql/formEditor.sql* will
+* When the QFQ Extension is called the first time on the Typo3 frontend, the file *<ext_dir>/Classes/Sql/formEditor.sql* will
   played and fills the database with the *Form editor* records. This also happens automatically after each update of QFQ.
 * Configure Typoscript to include Bootstrap, jQuery, QFQ javascript and CSS files.
 
@@ -5116,7 +5116,7 @@ form:
 Installation:
 
 * Play (do all sql statements on your QFQ database, e.g. via `mysql <dbname> < copyFormFromExt.sql` or `phpMyAdmin`) the
-  file  *<ext_dir>/qfq/sql/copyFormFromExt.sql*.
+  file  *<ext_dir>/Classes/Sql/copyFormFromExt.sql*.
 * Insert a link/button 'Copy form from ExtForm' to open the import/merge form. A good place is the list of all forms (see `form-editor`_).
   E.g.: ::
 
@@ -5776,11 +5776,11 @@ Link Examples
 +-----------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
 | SELECT "p:form_person|C:green" AS _link                               | <a href="?form_person"><img alttext="Check" src="typo3conf/ext/qfq/Resources/Public/icons/checked-green.gif"></a>                       |
 +-----------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| SELECT "U:form=Person&r=123|x|D" as _link                             | <a href="typo3conf/ext/qfq/Classes/api/delete.php?s=badcaffee1234"><span class="glyphicon glyphicon-trash" ></span>"></a>                |
+| SELECT "U:form=Person&r=123|x|D" as _link                             | <a href="typo3conf/ext/qfq/Classes/Api/delete.php?s=badcaffee1234"><span class="glyphicon glyphicon-trash" ></span>"></a>                |
 +-----------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| SELECT "U:form=Person&r=123|x|t:Delete" as _link                      | <a href="typo3conf/ext/qfq/Classes/api/delete.php?s=badcaffee1234">Delete</a>                                                            |
+| SELECT "U:form=Person&r=123|x|t:Delete" as _link                      | <a href="typo3conf/ext/qfq/Classes/Api/delete.php?s=badcaffee1234">Delete</a>                                                            |
 +-----------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-| SELECT "s:1|d:full.pdf|M:pdf|p:id=det1&r=12|p:id=det2|F:cv.pdf|       | <a href="typo3conf/ext/qfq/Classes/api/download.php?s=badcaffee1234">Download</a>                                                        |
+| SELECT "s:1|d:full.pdf|M:pdf|p:id=det1&r=12|p:id=det2|F:cv.pdf|       | <a href="typo3conf/ext/qfq/Classes/Api/download.php?s=badcaffee1234">Download</a>                                                        |
 |         t:Download|a:Create complete PDF - please wait" as _link      |                                                                                                                                         |
 +-----------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
 | SELECT  "y:iatae3Ieem0jeet|t:Password|o:Clipboard|b" AS _link         | <button class="btn btn-info" onClick="new QfqNS.Clipboard({text: 'iatae3Ieem0jeet'});" title='Copy to clipboard'>Password</button>      |
@@ -7016,7 +7016,7 @@ element. Such HTML element:
 
 A `<div>` example HTML output (HTML send to the browser): ::
 
-    <div class="qfq-dnd-sort" data-dnd-api="typo3conf/ext/qfq/Classes/api/dragAndDrop.php?s=badcaffee1234">
+    <div class="qfq-dnd-sort" data-dnd-api="typo3conf/ext/qfq/Classes/Api/dragAndDrop.php?s=badcaffee1234">
         <div class="anyClass" id="<uniq1>" data-dnd-id="55">
             Numbero Uno
         </div>
@@ -7046,7 +7046,7 @@ A `<table>` based setup is also possible. Note the attribute  `data-columns="3"`
 which is the same column width as the outer table. ::
 
     <table>
-        <tbody class="qfq-dnd-sort" data-dnd-api="typo3conf/ext/qfq/Classes/api/dragAndDrop.php?s=badcaffee1234" data-columns="3">
+        <tbody class="qfq-dnd-sort" data-dnd-api="typo3conf/ext/qfq/Classes/Api/dragAndDrop.php?s=badcaffee1234" data-columns="3">
             <tr> class="anyClass" id="<uniq1>" data-dnd-id="55">
                 <td>Numbero Uno</td><td>Numbero Uno.2</td><td>Numbero Uno.3</td>
             </tr>

docker/run_qfq_docker.sh

@@ -151,7 +151,7 @@ fi
 ### Set Typo3 Admin Pass ###
 
 if [[ "${T3_ADMINO_PASSWORD}" ]]; then
-    T3_ADMINO_PASSWORD_HASH=$(curl http://127.0.0.1:${T3_PORT}/typo3conf/ext/qfq/Source/api/hashPassword.php?pw=${T3_ADMINO_PASSWORD})
+    T3_ADMINO_PASSWORD_HASH=$(curl http://127.0.0.1:${T3_PORT}/typo3conf/ext/qfq/Classes/Api/hashPassword.php?pw=${T3_ADMINO_PASSWORD})
 	mysql -u root --password=${MYSQL_ROOT_PASSWORD} --port=${DB_PORT} -h 127.0.0.1 -D ${T3_DATABASE} \
 	    -e "UPDATE be_users SET password='${T3_ADMINO_PASSWORD_HASH}' WHERE username='admino';"
 fi

extension/Classes/Api/hashPassword.php

+<?php
+
+namespace qfq;
+
+use qfq;
+
+require_once(__DIR__ . '/../Core/typo3/Password.php');
+
+echo Password::getHash($_GET["pw"]);
\ No newline at end of file

extension/Source/api/hashPassword.php

-<?php
-
-namespace qfq;
-
-use qfq;
-
-require_once(__DIR__ . '/../core/typo3/Password.php');
-
-echo Password::getHash($_GET["pw"]);
\ No newline at end of file