Ticket #1169: emailadmin_flexible_max_folders.patch

expresso/emailadmin/templates/default/

@@ -273 +273 @@
                                         <input type="checkbox" name="imapsettings[2][imapoldcclient]" {selected_imapoldcclient} value="yes">
                                 </td>
                         </tr>
+
+                        <tr class="row_off">
+                                <td class="td_left">{lang_imap_max_folders}:</td>
+                                <td class="td_right">
+                                        <input name="imapsettings[2][imapMaxFolders]" maxlength="5" size="5" value="{value_imapMaxFolders}">
+                                </td>
+                        </tr>
+
                 </table>
         </div>
         
@@ -332 +340 @@
                                         <input type="checkbox" name="imapsettings[3][imapoldcclient]" {selected_imapoldcclient} value="yes">
                                 </td>
                         </tr>
+
+                        <tr class="row_off">
+                                <td class="td_left">{lang_imap_max_folders}:</td>
+                                <td class="td_right">
+                                        <input name="imapsettings[3][imapMaxFolders]" maxlength="5" size="5" value="{value_imapMaxFolders}">
+                                </td>
+                        </tr>
+
                 </table>
                 <table>
                         <tr>

expresso/emailadmin/setup/tables_current.

@@ -45 +45 @@
                                 'userDefinedAccounts' => array('type' => 'varchar','precision' => '3'),
                                 'imapCreateSpamFolder' => array('type' => 'varchar','precision' => '3'),
                                 'imapCyrusUserPostSpam' => array('type' => 'varchar','precision' => '30'),
-                                'imapoldcclient' => array('type' => 'varchar','precision' => '3')
+                                'imapoldcclient' => array('type' => 'varchar','precision' => '3'),
+                                'imapMaxFolders' => array('type' => 'varchar','precision' => '5')
                         ),
                         'pk' => array('profileID'),
                         'fk' => array(),

expresso/emailadmin/setup/tables_update.

@@ -109 +109 @@
       $GLOBALS['setup_info']['emailadmin']['currentver'] = '2.2.000';
       return $GLOBALS['setup_info']['emailadmin']['currentver'];
    }
+   $test[] = '2.2.000';
+   function emailadmin_upgrade2_2000()
+        {
+      $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_emailadmin','imapmaxfolders', array('type' => 'varchar', 'precision' => 5));
+      $GLOBALS['setup_info']['emailadmin']['currentver'] = '2.2.001';
+      return $GLOBALS['setup_info']['emailadmin']['currentver'];
+   }
 ?>
+ No newline at end of file

expresso/emailadmin/setup/setup.

@@ -13 +13 @@
 
         $setup_info['emailadmin']['name']      = 'emailadmin';
         $setup_info['emailadmin']['title']     = 'EMailAdmin';
-        $setup_info['emailadmin']['version']   = '2.2.000';
+        $setup_info['emailadmin']['version']   = '2.2.001';
         $setup_info['emailadmin']['app_order'] = 10;
         $setup_info['emailadmin']['enable']    = 2;
 

expresso/emailadmin/setup/

@@ -28 +28 @@
 imap admin password     admin   pt-br   Senha do administrador IMAP
 imap admin user admin   pt-br   Usuário administrador do IMAP
 imap c-client version < 2001    emailadmin      pt-br   IMAP C-Cliente Versão < 2001
+imap max folders        emailadmin      pt-br   Exibição máxima de pastas IMAP
 imap/pop3 server name   emailadmin      pt-br   Nome do servidor IMAP/POP3
 imap server hostname or ip address      emailadmin      pt-br   Nome ou IP do servidor IMAP
 imap server logintyp    emailadmin      pt-br   Tipo de login do servidor IMAP

expresso/expressoMail1_2/inc/class.imap_functions.

@@ -27 +27 @@
         var $imap_sentfolder;
 
         function imap_functions (){
-                $this->foldersLimit = 200; //Limit of folders (mailboxes) user can see
+                $this->foldersLimit = $_SESSION['phpgw_info']['expressomail']['email_server']['imapMaxFolders'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapMaxFolders'] : 200 ;
                 $this->username           = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
                 $this->password           = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
                 $this->imap_server        = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];