Closes #4 Remove block feature

[jirafeau_mojo42.git] / admin.php

diff --git a/admin.php b/admin.php
old mode 100755 (executable)
new mode 100644 (file)
index 56db0e5..a91d529
--- a/admin.php
+++ b/admin.php
@@ -32,19 +32,8 @@ if (file_exists (JIRAFEAU_ROOT . 'install.php')
     exit;
 }
 
     exit;
 }
 

-/* Check if the install.php script is still in the directory. */
-if (file_exists (JIRAFEAU_ROOT . 'install.php'))
-{
-    require (JIRAFEAU_ROOT . 'lib/template/header.php');
-    echo '<div class="error"><p>'.
-         t('Installer script still present') .
-         '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
-    exit;
-}
-

 /* Disable admin interface if we have a empty admin password. */
 /* Disable admin interface if we have a empty admin password. */

-if (!$cfg['admin_password'])
+if (empty($cfg['admin_password']))

 {
     require (JIRAFEAU_ROOT . 'lib/template/header.php');
     echo '<div class="error"><p>'.
 {
     require (JIRAFEAU_ROOT . 'lib/template/header.php');
     echo '<div class="error"><p>'.


@@ -110,7 +99,9 @@ elseif (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
 /* Operations may take a long time.
  * Be sure PHP's safe mode is off.
  */
 /* Operations may take a long time.
  * Be sure PHP's safe mode is off.
  */

- set_time_limit(0);
+@set_time_limit(0);
+/* Remove errors. */
+@error_reporting(0);

 
 /* Admin interface. */
 require (JIRAFEAU_ROOT . 'lib/template/header.php');
 
 /* Admin interface. */
 require (JIRAFEAU_ROOT . 'lib/template/header.php');


@@ -145,26 +136,6 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php');
             </td>
         </tr>
         </form>
             </td>
         </tr>
         </form>

-       <?php
-        if ($cfg['enable_blocks'])
-        {
-        ?>
-        <form action = "<?php echo basename(__FILE__); ?>" method = "post">
-        <tr>
-            <input type = "hidden" name = "action" value = "clean_block"/>
-            <td class = "info">
-                <?php echo t('Clean unused blocks'); ?>
-            </td>
-            <td></td>
-            <td>
-                <input type = "submit" value = "<?php echo t('Clean'); ?>" />
-            </td>
-        </tr>
-        </form>
-        <?php
-        }
-        ?>
-

         <form action = "<?php echo basename(__FILE__); ?>" method = "post">
         <tr>
             <input type = "hidden" name = "action" value = "list"/>
         <form action = "<?php echo basename(__FILE__); ?>" method = "post">
         <tr>
             <input type = "hidden" name = "action" value = "list"/>


@@ -246,14 +217,6 @@ if (isset ($_POST['action']))
         echo t('Number of cleaned files') . ' : ' . $total;
         echo '</p></div>';
     }
         echo t('Number of cleaned files') . ' : ' . $total;
         echo '</p></div>';
     }

-    elseif (strcmp ($_POST['action'], 'clean_block') == 0)
-    {
-        $total = jirafeau_admin_clean_block ();
-        echo '<div class="message">' . NL;
-        echo '<p>';
-        echo t('Number of cleaned files') . ' : ' . $total;
-        echo '</p></div>';
-    }

     elseif (strcmp ($_POST['action'], 'list') == 0)
     {
         jirafeau_admin_list ("", "", "");
     elseif (strcmp ($_POST['action'], 'list') == 0)
     {
         jirafeau_admin_list ("", "", "");