Changeset 8131 for trunk

Timestamp:

Dec 14, 2010, 3:36:20 PM (13 years ago)

Author:

patdenice

Message:

feature 2060: Remove adviser from db structure.
Remove adviser from user_list page and some db queries.

Location:

trunk

Files:

• admin/cat_list.php (modified) (1 diff)
• admin/themes/default/default-colors.css (modified) (1 diff)
• admin/themes/default/template/extend_for_templates.tpl (modified) (1 diff)
• admin/themes/default/template/user_list.tpl (modified) (1 diff)
• admin/user_list.php (modified) (5 diffs)
• include/functions_mail.inc.php (modified) (1 diff)
• install/db/91-database.php (modified) (1 diff)
• install/piwigo_structure-mysql.sql (modified) (1 diff)
• install/piwigo_structure-pdo-sqlite.sql (modified) (1 diff)
• install/piwigo_structure-pgsql.sql (modified) (1 diff)
• install/piwigo_structure-sqlite.sql (modified) (1 diff)
• password.php (modified) (1 diff)
• themes/default/theme.css (modified) (1 diff)

trunk/admin/cat_list.php

@@ -103 +103 @@
 // |                    virtual categories management                      |
 // +-----------------------------------------------------------------------+
-// request to delete a virtual category / not for an adviser
+// request to delete a virtual category
 if (isset($_GET['delete']) and is_numeric($_GET['delete']))
 {

trunk/admin/themes/default/default-colors.css

@@ -30 +30 @@
 
 /**
- * Header message like upgrade or adviser mode
+ * Header message like upgrade
  */
 .header_msgs {

trunk/admin/themes/default/template/extend_for_templates.tpl

@@ -29 +29 @@
     {/foreach}
   </table>
-  {if !is_adviser()}
   <p>
     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
   </p>
-  {/if}
 </form>
 {/if}

trunk/admin/themes/default/template/user_list.tpl

@@ -121 +121 @@
       </td>
     </tr>
-
-    {if isset($adviser)}
-    <tr>
-      <td>{'Adviser'|@translate}</td>
-      <td>
-        <label><input type="radio" name="adviser" value="leave" checked="checked"> {'leave'|@translate}</label>
-        / {'set to'|@translate}
-        <label><input type="radio" name="adviser" value="true">{'Yes'|@translate}</label>
-        <label><input type="radio" name="adviser" value="false">{'No'|@translate}</label>
-      </td>
-    </tr>
-    {/if}
-
   </table>
 </fieldset>

trunk/admin/user_list.php

@@ -87 +87 @@
                 u.'.$conf['user_fields']['email'].' AS email,
                 ui.status,
-                ui.adviser,
                 ui.enabled_high,
                 ui.level
@@ -393 +392 @@
   $true_false_fields = array('expand', 'show_nb_comments',
                        'show_nb_hits', 'enabled_high');
-  if ($conf['allow_adviser'])
-  {
-    array_push($formfields, 'adviser');
-    array_push($true_false_fields, 'adviser');
-  }
 
   foreach ($formfields as $formfield)
@@ -459 +453 @@
           }
         }
-
-        // could not be adivser
-        if (isset($data['adviser']))
-        {
-          $data['adviser'] = 'false';
-        }
       }
 
@@ -523 +511 @@
     'F_FILTER_ACTION' => get_root_url().'admin.php'
     ));
-
-// Hide radio-button if not allow to assign adviser
-if ($conf['allow_adviser'])
-{
-  $template->assign('adviser', true);
-}
 
 // Display or Hide double password type
@@ -708 +690 @@
         .($local_user['id'] == $conf['default_user_id']
           ? '<br>['.l10n('default values').']' : ''),
-      'STATUS' => l10n('user_status_'.
-        $local_user['status']).(($local_user['adviser'] == 'true')
-        ? '<br>['.l10n('Adviser').']' : ''),
+      'STATUS' => l10n('user_status_'.$local_user['status']),
       'EMAIL' => get_email_address_as_display_text($local_user['email']),
       'GROUPS' => $groups_string,

trunk/include/functions_mail.inc.php

@@ -305 +305 @@
   I.user_id =  U.'.$conf['user_fields']['id'].' and
   I.status in (\'webmaster\',  \'admin\') and
-  I.adviser = \'false\' and
   '.$conf['user_fields']['email'].' is not null and
   I.user_id <> '.$user['id'].'

trunk/install/db/91-database.php

@@ -33 +33 @@
 UPDATE ".USER_INFOS_TABLE."
 SET status = 'normal'
-WHERE (status = 'webmaster' OR status = 'admin')
+WHERE status IN ('webmaster', 'admin')
   AND adviser = 'true'
 ;";

trunk/install/piwigo_structure-mysql.sql

@@ -405 +405 @@
   `nb_line_page` tinyint(3) unsigned NOT NULL default '3',
   `status` enum('webmaster','admin','normal','generic','guest') NOT NULL default 'guest',
-  `adviser` enum('true','false') NOT NULL default 'false',
   `language` varchar(50) NOT NULL default 'en_UK',
   `maxwidth` smallint(6) default NULL,

trunk/install/piwigo_structure-pdo-sqlite.sql

@@ -468 +468 @@
   "nb_line_page" INTEGER default 3 NOT NULL,
   "status" VARCHAR(50) default 'guest',
-  "adviser" BOOLEAN default false,
   "language" VARCHAR(50) default 'en_UK' NOT NULL,
   "maxwidth" INTEGER,

trunk/install/piwigo_structure-pgsql.sql

@@ -569 +569 @@
   "nb_line_page" INTEGER default 3 NOT NULL,
   "status" USER_INFOS_STATUS default 'guest'::USER_INFOS_STATUS,
-  "adviser" BOOLEAN default false,
   "language" VARCHAR(50) default 'en_UK' NOT NULL,
   "maxwidth" INTEGER,

trunk/install/piwigo_structure-sqlite.sql

@@ -468 +468 @@
   "nb_line_page" INTEGER default 3 NOT NULL,
   "status" VARCHAR(50) default 'guest',
-  "adviser" BOOLEAN default false,
   "language" VARCHAR(50) default 'en_UK' NOT NULL,
   "maxwidth" INTEGER,

trunk/password.php

@@ -66 +66 @@
   INNER JOIN '.USER_INFOS_TABLE.' AS ui
       ON u.'.$conf['user_fields']['id'].' = ui.user_id
-WHERE '
-  .$conf['user_fields']['email'].' = \''.$mail_address.'\' AND
-  (
-    ui.status = \'normal\' OR
-    (ui.status in (\'admin\', \'webmaster\') AND ui.adviser = \'true\')
-  )
+WHERE '.$conf['user_fields']['email'].' = \''.$mail_address.'\'
+  AND ui.status = \'normal\'
 ;';
     $result = pwg_query($query);

trunk/themes/default/theme.css

@@ -776 +776 @@
 }
 
-/* Header message like upgrade or adviser mode */
+/* Header message like upgrade*/
 .header_msgs {
         text-align:center;