feature 2060: Remove adviser mode.

First commit: only php files. git-svn-id: http://piwigo.org/svn/trunk@8126 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Dec 14, 2010 · 731f888 · 731f888
1 parent bf1aa6f
commit 731f888
Show file tree

Hide file tree

Showing 28 changed files with 120 additions and 161 deletions.
diff --git a/admin/cat_list.php b/admin/cat_list.php
@@ -103,7 +103,7 @@ function save_categories_order($categories)
 // |                    virtual categories management                      |
 // +-----------------------------------------------------------------------+
 // request to delete a virtual category / not for an adviser
-if (isset($_GET['delete']) and is_numeric($_GET['delete']) and !is_adviser())
+if (isset($_GET['delete']) and is_numeric($_GET['delete']))
 {
   delete_categories(array($_GET['delete']));
   array_push($page['infos'], l10n('Virtual album deleted'));

diff --git a/admin/comments.php b/admin/comments.php
@@ -37,7 +37,7 @@
 // |                                actions                                |
 // +-----------------------------------------------------------------------+
 
-if (!empty($_POST) and !is_adviser())
+if (!empty($_POST))
 {
   if (empty($_POST['comments']))
   {

diff --git a/admin/configuration.php b/admin/configuration.php
@@ -106,7 +106,7 @@
   );
 
 //------------------------------ verification and registration of modifications
-if (isset($_POST['submit']) and !is_adviser())
+if (isset($_POST['submit']))
 {
   $int_pattern = '/^\d+$/';
 
@@ -323,14 +323,11 @@
     include_once(PHPWG_ROOT_PATH.'profile.php');
 
     $errors = array();
-    if ( !is_adviser() )
+    if (save_profile_from_post($edit_user, $errors))
     {
-      if (save_profile_from_post($edit_user, $errors))
-      {
-        // Reload user
-        $edit_user = build_user($conf['guest_id'], false);
-        array_push($page['infos'], l10n('Information data registered in database'));
-      }
+      // Reload user
+      $edit_user = build_user($conf['guest_id'], false);
+      array_push($page['infos'], l10n('Information data registered in database'));
     }
     $page['errors'] = array_merge($page['errors'], $errors);
 

diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php
@@ -117,7 +117,7 @@
 // |                            selected templates                         |
 // +-----------------------------------------------------------------------+
 
-if (isset($_POST['submit']) and !is_adviser())
+if (isset($_POST['submit']))
 {
   $replacements = array();
   $i = 0;

diff --git a/admin/group_list.php b/admin/group_list.php
@@ -42,7 +42,7 @@
 // |                             delete a group                            |
 // +-----------------------------------------------------------------------+
 
-if (isset($_GET['delete']) and is_numeric($_GET['delete']) and !is_adviser())
+if (isset($_GET['delete']) and is_numeric($_GET['delete']))
 {
   // destruction of the access linked to the group
   $query = '
@@ -85,7 +85,7 @@
 // |                              add a group                              |
 // +-----------------------------------------------------------------------+
 
-if (isset($_POST['submit_add']) and !is_adviser())
+if (isset($_POST['submit_add']))
 {
   if (empty($_POST['groupname']))
   {
@@ -127,7 +127,7 @@
 // | toggle is default group property                                      |
 // +-----------------------------------------------------------------------+
 
-if (isset($_GET['toggle_is_default']) and is_numeric($_GET['toggle_is_default']) and !is_adviser())
+if (isset($_GET['toggle_is_default']) and is_numeric($_GET['toggle_is_default']))
 {
   $query = '
 SELECT name, is_default

diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php
@@ -77,80 +77,77 @@ function check()
     }
 
     // Treatments
-    if (!is_adviser())
+    if (isset($_POST['c13y_submit_correction']) and isset($_POST['c13y_selection']))
     {
-      if (isset($_POST['c13y_submit_correction']) and isset($_POST['c13y_selection']))
-      {
-        $corrected_count = 0;
-        $not_corrected_count = 0;
+      $corrected_count = 0;
+      $not_corrected_count = 0;
 
-        foreach ($this->retrieve_list as $i => $c13y)
+      foreach ($this->retrieve_list as $i => $c13y)
+      {
+        if (!empty($c13y['correction_fct']) and
+            $c13y['is_callable'] and
+            in_array($c13y['id'], $_POST['c13y_selection']))
         {
-          if (!empty($c13y['correction_fct']) and
-              $c13y['is_callable'] and
-              in_array($c13y['id'], $_POST['c13y_selection']))
+          if (is_array($c13y['correction_fct_args']))
           {
-            if (is_array($c13y['correction_fct_args']))
-            {
-              $args = $c13y['correction_fct_args'];
-            }
-            else
-            if (!is_null($c13y['correction_fct_args']))
-            {
-              $args = array($c13y['correction_fct_args']);
-            }
-            else
-            {
-              $args = array();
-            }
-            $this->retrieve_list[$i]['corrected'] = call_user_func_array($c13y['correction_fct'], $args);
+            $args = $c13y['correction_fct_args'];
+          }
+          else
+          if (!is_null($c13y['correction_fct_args']))
+          {
+            $args = array($c13y['correction_fct_args']);
+          }
+          else
+          {
+            $args = array();
+          }
+          $this->retrieve_list[$i]['corrected'] = call_user_func_array($c13y['correction_fct'], $args);
 
-            if ($this->retrieve_list[$i]['corrected'])
-            {
-              $corrected_count += 1;
-            }
-            else
-            {
-              $not_corrected_count += 1;
-            }
+          if ($this->retrieve_list[$i]['corrected'])
+          {
+            $corrected_count += 1;
+          }
+          else
+          {
+            $not_corrected_count += 1;
           }
         }
+      }
 
-        if ($corrected_count > 0)
-        {
-          $page['infos'][] =
-            l10n_dec('%d anomaly has been corrected.', '%d anomalies have been detected corrected.',
-              $corrected_count);
-        }
-        if ($not_corrected_count > 0)
-        {
-          $page['errors'][] =
-            l10n_dec('%d anomaly has not been corrected.', '%d anomalies have not been corrected.',
-              $not_corrected_count);
-        }
+      if ($corrected_count > 0)
+      {
+        $page['infos'][] =
+          l10n_dec('%d anomaly has been corrected.', '%d anomalies have been detected corrected.',
+            $corrected_count);
       }
-      else
+      if ($not_corrected_count > 0)
       {
-        if (isset($_POST['c13y_submit_ignore']) and isset($_POST['c13y_selection']))
-        {
-          $ignored_count = 0;
+        $page['errors'][] =
+          l10n_dec('%d anomaly has not been corrected.', '%d anomalies have not been corrected.',
+            $not_corrected_count);
+      }
+    }
+    else
+    {
+      if (isset($_POST['c13y_submit_ignore']) and isset($_POST['c13y_selection']))
+      {
+        $ignored_count = 0;
 
-          foreach ($this->retrieve_list as $i => $c13y)
+        foreach ($this->retrieve_list as $i => $c13y)
+        {
+          if (in_array($c13y['id'], $_POST['c13y_selection']))
           {
-            if (in_array($c13y['id'], $_POST['c13y_selection']))
-            {
-              $this->build_ignore_list[] = $c13y['id'];
-              $this->retrieve_list[$i]['ignored'] = true;
-              $ignored_count += 1;
-            }
+            $this->build_ignore_list[] = $c13y['id'];
+            $this->retrieve_list[$i]['ignored'] = true;
+            $ignored_count += 1;
           }
+        }
 
-          if ($ignored_count > 0)
-          {
-            $page['infos'][] =
-              l10n_dec('%d anomaly has been ignored.', '%d anomalies have been ignored.',
-                $ignored_count);
-          }
+        if ($ignored_count > 0)
+        {
+          $page['infos'][] =
+            l10n_dec('%d anomaly has been ignored.', '%d anomalies have been ignored.',
+              $ignored_count);
         }
       }
     }

diff --git a/admin/languages_installed.php b/admin/languages_installed.php
@@ -37,7 +37,7 @@
 $languages->set_tabsheet($page['page']);
 
 //--------------------------------------------------perform requested actions
-if (isset($_GET['action']) and isset($_GET['language']) and !is_adviser())
+if (isset($_GET['action']) and isset($_GET['language']))
 {
   $page['errors'] = $languages->perform_action($_GET['action'], $_GET['language']);
 

diff --git a/admin/languages_new.php b/admin/languages_new.php
@@ -56,7 +56,7 @@
 // |                       perform installation                            |
 // +-----------------------------------------------------------------------+
 
-if (isset($_GET['revision']) and !is_adviser())
+if (isset($_GET['revision']))
 {
   if (!is_webmaster())
   {

diff --git a/admin/maintenance.php b/admin/maintenance.php
@@ -37,7 +37,7 @@
 // |                                actions                                |
 // +-----------------------------------------------------------------------+
 
-$action = (isset($_GET['action']) and !is_adviser()) ? $_GET['action'] : '';
+$action = isset($_GET['action']) ? $_GET['action'] : '';
 
 switch ($action)
 {

diff --git a/admin/menubar.php b/admin/menubar.php
@@ -64,7 +64,7 @@ function make_consecutive( &$orders, $step=50 )
     unset($mb_conf[$id]);
 }
 
-if ( isset($_POST['reset']) and !is_adviser())
+if ( isset($_POST['reset']))
 {
   $mb_conf = array();
   $query = '
@@ -85,7 +85,7 @@ function make_consecutive( &$orders, $step=50 )
 }
 
 
-if ( isset($_POST['submit']) and !is_adviser() )
+if ( isset($_POST['submit']) )
 {
   foreach ( $mb_conf as $id => $pos )
   {

diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
@@ -506,7 +506,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
 {
   case 'param' :
   {
-    if (isset($_POST['param_submit']) and !is_adviser())
+    if (isset($_POST['param_submit']))
     {
       $updated_param_count = 0;
       // Update param
@@ -539,26 +539,23 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
   }
   case 'subscribe' :
   {
-    if (!is_adviser())
+    if (isset($_POST['falsify']) and isset($_POST['cat_true']))
     {
-      if (isset($_POST['falsify']) and isset($_POST['cat_true']))
-      {
-        $check_key_treated = unsubscribe_notification_by_mail(true, $_POST['cat_true']);
-        do_timeout_treatment('cat_true', $check_key_treated);
-      }
-      else
-      if (isset($_POST['trueify']) and isset($_POST['cat_false']))
-      {
-        $check_key_treated = subscribe_notification_by_mail(true, $_POST['cat_false']);
-        do_timeout_treatment('cat_false', $check_key_treated);
-      }
+      $check_key_treated = unsubscribe_notification_by_mail(true, $_POST['cat_true']);
+      do_timeout_treatment('cat_true', $check_key_treated);
+    }
+    else
+    if (isset($_POST['trueify']) and isset($_POST['cat_false']))
+    {
+      $check_key_treated = subscribe_notification_by_mail(true, $_POST['cat_false']);
+      do_timeout_treatment('cat_false', $check_key_treated);
     }
     break;
   }
 
   case 'send' :
   {
-    if (isset($_POST['send_submit']) and isset($_POST['send_selection']) and isset($_POST['send_customize_mail_content']) and !is_adviser())
+    if (isset($_POST['send_submit']) and isset($_POST['send_selection']) and isset($_POST['send_customize_mail_content']))
     {
       $check_key_treated = do_action_send_mail_notification('send', $_POST['send_selection'], stripslashes($_POST['send_customize_mail_content']));
       do_timeout_treatment('send_selection', $check_key_treated);

diff --git a/admin/permalinks.php b/admin/permalinks.php
@@ -83,7 +83,7 @@ function parse_sort_variables(
 include_once(PHPWG_ROOT_PATH.'admin/include/functions_permalinks.php');
 
 $selected_cat = array();
-if ( isset($_POST['set_permalink']) and $_POST['cat_id']>0 and !is_adviser() )
+if ( isset($_POST['set_permalink']) and $_POST['cat_id']>0 )
 {
   $permalink = $_POST['permalink'];
   if ( empty($permalink) )
@@ -92,7 +92,7 @@ function parse_sort_variables(
     set_cat_permalink($_POST['cat_id'], $permalink, isset($_POST['save']) );
   $selected_cat = array( $_POST['cat_id'] );
 }
-elseif ( isset($_GET['delete_permanent']) and !is_adviser() )
+elseif ( isset($_GET['delete_permanent']) )
 {
   $query = '
 DELETE FROM '.OLD_PERMALINKS_TABLE.'

diff --git a/admin/picture_modify.php b/admin/picture_modify.php
@@ -40,7 +40,7 @@
 // |                          synchronize metadata                         |
 // +-----------------------------------------------------------------------+
 
-if (isset($_GET['sync_metadata']) and !is_adviser())
+if (isset($_GET['sync_metadata']))
 {
   $query = '
 SELECT path
@@ -70,7 +70,7 @@
   }
 }
 
-if (isset($_POST['submit']) and count($page['errors']) == 0 and !is_adviser())
+if (isset($_POST['submit']) and count($page['errors']) == 0)
 {
   $data = array();
   $data{'id'} = $_GET['image_id'];
@@ -124,7 +124,6 @@
 if (isset($_POST['associate'])
     and isset($_POST['cat_dissociated'])
     and count($_POST['cat_dissociated']) > 0
-    and !is_adviser()
   )
 {
   associate_images_to_categories(
@@ -136,7 +135,6 @@
 if (isset($_POST['dissociate'])
     and isset($_POST['cat_associated'])
     and count($_POST['cat_associated']) > 0
-    and !is_adviser()
   )
 {
   $query = '
@@ -152,7 +150,6 @@
 if (isset($_POST['elect'])
     and isset($_POST['cat_dismissed'])
     and count($_POST['cat_dismissed']) > 0
-    and !is_adviser()
   )
 {
   $datas = array();
@@ -170,7 +167,6 @@
 if (isset($_POST['dismiss'])
     and isset($_POST['cat_elected'])
     and count($_POST['cat_elected']) > 0
-    and !is_adviser()
   )
 {
   set_random_representant($_POST['cat_elected']);

diff --git a/admin/plugins_list.php b/admin/plugins_list.php
@@ -36,7 +36,7 @@
 $plugins = new plugins();
 
 //--------------------------------------------------perform requested actions
-if (isset($_GET['action']) and isset($_GET['plugin']) and !is_adviser())
+if (isset($_GET['action']) and isset($_GET['plugin']))
 {
   check_pwg_token();
 

diff --git a/admin/plugins_update.php b/admin/plugins_update.php
@@ -35,7 +35,7 @@
 $plugins = new plugins();
 
 //-----------------------------------------------------------automatic upgrade
-if (isset($_GET['plugin']) and isset($_GET['revision']) and !is_adviser())
+if (isset($_GET['plugin']) and isset($_GET['revision']))
 {
   if (!is_webmaster())
   {