Changeset 10343 for extensions/UserAdvManager/branches/2.20/admin

Timestamp:

Apr 12, 2011, 10:44:12 PM (13 years ago)

Author:

Eric

Message:

r10342 merged from trunk to branch 2.20

Location:

extensions/UserAdvManager/branches/2.20/admin

Files:

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

extensions/UserAdvManager/branches/2.20/admin/UAM_admin.php

@@ -34 +34 @@
 $UAM_Exclusionlist_Error = false;
 
+$dump_download = '';
 
 // +-----------------------------------------------------------------------+
@@ -223 +224 @@
   }
 
+  // Saving UAM tables and configuration settings
+  if (isset($_POST['save']))
+  {
+    $dump_download = (isset($_POST['dump_download'])) ? 'true' : 'false';
+    
+    if(uam_dump($dump_download) and $dump_download == 'false')
+    {
+      array_push($page['infos'], l10n('UAM_Dump_OK'));
+    }
+    else
+    {
+      array_push($page['errors'], l10n('UAM_Dump_NOK'));
+    }
+  }
 
   //Testing password enforcement
@@ -372 +387 @@
     'UAM_VERSION'                    => $version,
     'UAM_PATH'                       => UAM_PATH,
+    'UAM_DUMP_DOWNLOAD'              => $dump_download,
                 'UAM_MAIL_INFO_TRUE'             => $conf_UAM[0]=='true' ?  'checked="checked"' : '' ,
                 'UAM_MAIL_INFO_FALSE'            => $conf_UAM[0]=='false' ?  'checked="checked"' : '' ,

extensions/UserAdvManager/branches/2.20/admin/template/global.tpl

@@ -703 +703 @@
 </form>
 
+
+<div id="instructionTips" class="instructionBlock" >
+  <div id="Backup_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Backup_header', 'Backup')">
+    <span class="cluetip" title="{'UAM_DumpTitle'|translate}|{'UAM_DumpTitle_d'|translate}">{'UAM_DumpTxt'|@translate}</span>
+  </div>
+  
+  <div id="Backup" class="instructionBlockContent" style="display:none">
+<fieldset>
+<form method="post" action="" class="general">
+  <p>
+    {'UAM_Dump_Download'|@translate}&nbsp;
+      <input type="checkbox" name="dump_download" value="true" {$UAM_DUMP_DOWNLOAD}>
+  <br><br>
+      <input class="submit" type="submit" value="{'UAM_Save'|@translate}" name="save" {$TAG_INPUT_ENABLED}>
+  </p>
+</form>
+</fieldset>
+  </div>
+
+</div>
+
+
 <div id="instructionTips" class="instructionBlock" >
   <div id="Tips_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Tips_header', 'Tips')">
@@ -734 +756 @@
 </div>
 
+
 <fieldset>
   {'UAM_Support_txt'|@translate}