[TASK] Set back plain text URL of links

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index 11205a4588d3d0dcb0d0a0a96236bd7e43a10ed0..bb454afe141aa1d60472e6776bdfbf470499c0be 100644 (file)
--- a/index.php
+++ b/index.php
@@ -18,6 +18,7 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */

+session_start();

 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');
 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');


@@ -38,8 +39,6 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php');
 if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
 if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {

-        session_start();
-

         // Logout action
         if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
             session_unset();
         // Logout action
         if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
             session_unset();


@@ -67,13 +66,13 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
                     <td class = "label"><label for = "enter_password">
                     <?php echo t('Upload password') . ':'; ?></label>
                     </td>
                     <td class = "label"><label for = "enter_password">
                     <?php echo t('Upload password') . ':'; ?></label>
                     </td>

+                </tr><tr>

                     <td class = "field"><input type = "password"
                     name = "upload_password" id = "upload_password"
                     size = "40" />
                     </td>
                 </tr>
                 <tr class = "nav">
                     <td class = "field"><input type = "password"
                     name = "upload_password" id = "upload_password"
                     size = "40" />
                     </td>
                 </tr>
                 <tr class = "nav">

-                    <td></td>

                     <td class = "nav next">
                     <input type = "submit" name = "key" value =
                     "<?php echo t('Login'); ?>" />
                     <td class = "nav next">
                     <input type = "submit" name = "key" value =
                     "<?php echo t('Login'); ?>" />


@@ -100,6 +99,8 @@ else {
     <p>
         <a id="upload_link" href=""><?php echo t('Download page') ?></a>
         <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
     <p>
         <a id="upload_link" href=""><?php echo t('Download page') ?></a>
         <a id="upload_link_email" href=""><img id="upload_image_email"/></a>

+    </p><p>
+        <code id=upload_link_text></code>

         <button id="upload_link_button">✂</button>
     </p>
     </div>
         <button id="upload_link_button">✂</button>
     </p>
     </div>


@@ -109,6 +110,8 @@ else {
     <div id="upload_finished_preview">
     <p>
         <a id="preview_link" href=""><?php echo t('View link') ?></a>
     <div id="upload_finished_preview">
     <p>
         <a id="preview_link" href=""><?php echo t('View link') ?></a>

+    </p><p>
+        <code id=preview_link_text></code>

         <button id="preview_link_button">✂</button>
     </p>
     </div>
         <button id="preview_link_button">✂</button>
     </p>
     </div>


@@ -118,6 +121,8 @@ else {
     <div id="upload_direct_download">
     <p>
         <a id="direct_link" href=""><?php echo t('Direct download link') ?></a>
     <div id="upload_direct_download">
     <p>
         <a id="direct_link" href=""><?php echo t('Direct download link') ?></a>

+    </p><p>
+        <code id=direct_link_text></code>

         <button id="direct_link_button">✂</button>
     </p>
     </div>
         <button id="direct_link_button">✂</button>
     </p>
     </div>


@@ -125,6 +130,8 @@ else {
     <div id="upload_delete">
     <p>
         <a id="delete_link" href=""><?php echo t('Delete link') ?></a>
     <div id="upload_delete">
     <p>
         <a id="delete_link" href=""><?php echo t('Delete link') ?></a>

+    </p><p>
+        <code id=delete_link_text></code>

         <button id="delete_link_button">✂</button>
     </p>
     </div>
         <button id="delete_link_button">✂</button>
     </p>
     </div>