Changeset 12189 for extensions/UserAdvManager/trunk/admin

Timestamp:

Sep 19, 2011, 9:48:39 PM (13 years ago)

Author:

Eric

Message:

• Bug 2415 fixed - New feature added : Privacy level can now be set for unvalidated / validated users.
• Small admin panel refactory : Ghost users management and other misc options are splitted.
• Plugin database upgrade : maintain.inc.php and upgradedb.inc.php
• Language files refactory (EN and FR)
• Preparing version 2.30.0 (actually 2.30.0RC1) for compliance with Piwigo 2.3.0

Location:

extensions/UserAdvManager/trunk/admin

Files:

• UAM_admin.php (modified) (3 diffs)
• template/global.tpl (modified) (4 diffs)

extensions/UserAdvManager/trunk/admin/UAM_admin.php

@@ -190 +190 @@
       $_POST['UAM_Stuffs'],
       $_POST['UAM_HidePassw'],
+      (isset($_POST['UAM_No_Valid_Level'])?$_POST['UAM_No_Valid_Level']:''),
+      (isset($_POST['UAM_Valid_Level'])?$_POST['UAM_Valid_Level']:''),
+      (isset($_POST['UAM_Downgrade_Level'])?$_POST['UAM_Downgrade_Level']:''),
       );
 
@@ -382 +385 @@
             );
         }
+
+
+  //Level setting for unvalidated, validated users and downgrade status
+  $level_options[-1] = '------------';
+  $No_Valid_Level = -1;
+  $Valid_Level = -1;
+  $Downgrade_Level = -1;
+
+  // Get unvalidated privacy levels values
+  foreach ($conf['available_permission_levels'] as $level)
+  {
+    $level_options[$level] = l10n(sprintf('Level %d', $level));
+          if (isset($conf_UAM[35]) and $conf_UAM[35] == $level)
+          {
+            $No_Valid_Level = $level;
+          }
+      //Template initialization for unvalidated users level
+      $template->assign(
+        'No_Valid_Level',
+        array(
+                                        'Level_options' => $level_options,
+                                'Level_selected' => $No_Valid_Level
+                                        )
+                        );
+  }
+
+  // Get validated privacy levels values
+  foreach ($conf['available_permission_levels'] as $level)
+  {
+    $level_options[$level] = l10n(sprintf('Level %d', $level));
+          if (isset($conf_UAM[36]) and $conf_UAM[36] == $level)
+          {
+            $Valid_Level = $level;
+          }
+      //Template initialization for unvalidated users level
+      $template->assign(
+        'Valid_Level',
+        array(
+                                        'Level_options' => $level_options,
+                                'Level_selected' => $Valid_Level
+                                        )
+                        );
+  }
+
+  // Get downgrade privacy levels values
+  foreach ($conf['available_permission_levels'] as $level)
+  {
+    $level_options[$level] = l10n(sprintf('Level %d', $level));
+          if (isset($conf_UAM[37]) and $conf_UAM[37] == $level)
+          {
+            $Downgrade_Level = $level;
+          }
+      //Template initialization for unvalidated users level
+      $template->assign(
+        'Downgrade_Level',
+        array(
+                                        'Level_options' => $level_options,
+                                'Level_selected' => $Downgrade_Level
+                                        )
+                        );
+  }
 
   //Save last opened paragraph in configuration tab
@@ -455 +519 @@
     'UAM_HIDEPASSW_TRUE'             => $conf_UAM[34]=='true' ?  'checked="checked"' : '' ,
     'UAM_HIDEPASSW_FALSE'            => $conf_UAM[34]=='false' ?  'checked="checked"' : '' ,
+                'UAM_NO_VALID_LEVEL'             => $conf_UAM[35],
+                'UAM_VALID_LEVEL'                => $conf_UAM[36],
+    'UAM_DOWNGRADE_LEVEL'            => $conf_UAM[37],
                 'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score,
     'UAM_ERROR_REPORTS1'             => $UAM_Exclusionlist_Error,

extensions/UserAdvManager/trunk/admin/template/global.tpl

@@ -389 +389 @@
                   <div id="uam_leftmargin">
                     {html_options name="UAM_Validated_Status" options=$Confirm_Status.Status_options selected=$Confirm_Status.Status_selected}
+                  </div>
+                <br><br>
+                </li>
+              </ul>
+
+              <li>
+                <label class="cluetip" title="{'UAM_confirmlevelTitle'|translate}|{'UAM_confirmlevelTitle_d'|translate}">
+                  {'UAM_Confirm_Level'|@translate}
+                </label>
+              <br><br>
+              </li>
+              
+              <ul>
+                <li>
+                  <label>
+                    {'UAM_No_Valid_Level'|@translate}
+                  </label>
+                <br>
+                  <div id="uam_leftmargin">
+                    {html_options name="UAM_No_Valid_Level" options=$No_Valid_Level.Level_options selected=$No_Valid_Level.Level_selected}
+                  </div>
+                <br><br>
+                </li>
+
+                <li>
+                  <label>
+                    {'UAM_Valid_Level'|@translate}
+                  </label>
+                <br>
+                  <div id="uam_leftmargin">
+                    {html_options name="UAM_Valid_Level" options=$Valid_Level.Level_options selected=$Valid_Level.Level_selected}
                   </div>
                 <br><br>
@@ -536 +567 @@
 
     <div id="config3_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('config3_header', 'Config3')">
-      <span class="cluetip" title="{'UAM_miscTitle'|translate}|{'UAM_miscTitle_d'|translate}">{'UAM_Title3'|@translate}</span>
+      <span class="cluetip" title="{'UAM_GT_MainTitle'|translate}|{'UAM_GT_MainTitle_d'|translate}">{'UAM_Title3'|@translate}</span>
     </div>
   
@@ -630 +661 @@
                         <div id="uam_leftmargin">
                           {html_options name="UAM_Downgrade_Status" options=$Downgrade_Status.Status_options selected=$Downgrade_Status.Status_selected}
+                        </div>
+                      <br><br>
+                      </li>
+
+                      <li>
+                        <label>
+                          {'UAM_Expired_Level'|@translate}
+                        </label>
+                      <br>
+                        <div id="uam_leftmargin">
+                          {html_options name="UAM_Downgrade_Level" options=$Downgrade_Level.Level_options selected=$Downgrade_Level.Level_selected}
                         </div>
                       <br><br>
@@ -660 +702 @@
         </ul>
       </fieldset>
-
+    </div>
+  </div>
+
+  <div id="instructionConfig5" class="instructionBlock" >
+
+    <div id="config5_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('config5_header', 'Config5')">
+      <span class="cluetip" title="{'UAM_miscTitle'|translate}|{'UAM_miscTitle_d'|translate}">{'UAM_Title5'|@translate}</span>
+    </div>
+  
+    <div id="Config5" class="instructionBlockContent" style="display:none">
       <fieldset>
+        <ul>
+          <li>
+            <label><b>{'UAM_MiscOptions'|@translate}</b></label>
+          </li>
+        </ul>
         <fieldset>
           <ul>