Browse Source

Pulling imapConnection var. Still causes segfaults which cannot be tracked down.

stevetruckstuff 19 years ago
parent
commit
c3b7076e7d

+ 1 - 1
src/left_main.php

@@ -191,7 +191,7 @@ $oTemplate->assign('mailboxes', $mailbox_structure);
  * globals, which are dirty, filthy things in templates. :)
  * globals, which are dirty, filthy things in templates. :)
  */
  */
 $settings = array();
 $settings = array();
-$settings['imapConnection'] = $imapConnection;
+#$settings['imapConnection'] = $imapConnection;
 $settings['iconThemePath'] = $icon_theme_path;
 $settings['iconThemePath'] = $icon_theme_path;
 $settings['templateDirectory'] = $sTplDir;
 $settings['templateDirectory'] = $sTplDir;
 $settings['unreadNotificationEnabled'] = $unseen_notify!=1;
 $settings['unreadNotificationEnabled'] = $unseen_notify!=1;

+ 7 - 2
templates/default/left_main.tpl

@@ -8,8 +8,6 @@
  *      $clock           - formatted string containing last refresh
  *      $clock           - formatted string containing last refresh
  *      $settings        - Array containing user perferences needed by this
  *      $settings        - Array containing user perferences needed by this
  *                         template.  Indexes are as follows:
  *                         template.  Indexes are as follows:
- *          $settings['imapConnection'] - IMAP connection handle.  Needed to
- *                         allow plugins to read the mailbox.
  *          $settings['iconThemePath'] - Path to the desired icon theme.  If
  *          $settings['iconThemePath'] - Path to the desired icon theme.  If
  *                         the user has disabled icons, this will be NULL.
  *                         the user has disabled icons, this will be NULL.
  *          $settings['templateDirectory'] - contains the path to the current
  *          $settings['templateDirectory'] - contains the path to the current
@@ -225,10 +223,17 @@ function buildMailboxTree ($box, $settings, $indent_factor=0) {
         $spanend = '</span>';
         $spanend = '</span>';
     }
     }
 
 
+/********
+ * Pulling imapConnection due to segfaults that cannot be tracked down.  Best
+ * we can determine,its some combination of this var and >= 4 plugins enabled.
+ * No further clue from anyone.
+ ********
+    
     // let plugins fiddle with end of line
     // let plugins fiddle with end of line
     $end .= concat_hook_function('left_main_after_each_folder',
     $end .= concat_hook_function('left_main_after_each_folder',
             array(isset($numMessages) ? $numMessages : '',
             array(isset($numMessages) ? $numMessages : '',
             $box['MailboxFullName'], $settings['imapConnection']));
             $box['MailboxFullName'], $settings['imapConnection']));
+*/
 
 
     $end .= '</span>';
     $end .= '</span>';
 
 

+ 0 - 2
templates/default_advanced/left_main.tpl

@@ -12,8 +12,6 @@
  *      $clock           - formatted string containing last refresh
  *      $clock           - formatted string containing last refresh
  *      $settings        - Array containing user perferences needed by this
  *      $settings        - Array containing user perferences needed by this
  *                         template.  Indexes are as follows:
  *                         template.  Indexes are as follows:
- *          $settings['imapConnection'] - IMAP connection handle.  Needed to
- *                         allow plugins to read the mailbox.
  *          $settings['iconThemePath'] - Path to the desired icon theme.  If
  *          $settings['iconThemePath'] - Path to the desired icon theme.  If
  *                         the user has disabled icons, this will be NULL.
  *                         the user has disabled icons, this will be NULL.
  *          $settings['templateDirectory'] - contains the path to the current
  *          $settings['templateDirectory'] - contains the path to the current