You can subscribe to this list here.
2003 |
Jan
|
Feb
(8) |
Mar
(163) |
Apr
(396) |
May
(111) |
Jun
(301) |
Jul
(245) |
Aug
(161) |
Sep
(367) |
Oct
(933) |
Nov
(698) |
Dec
(198) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(45) |
Feb
(160) |
Mar
(76) |
Apr
(654) |
May
(105) |
Jun
(49) |
Jul
(62) |
Aug
(2) |
Sep
(82) |
Oct
(9) |
Nov
(37) |
Dec
(42) |
2005 |
Jan
(29) |
Feb
(23) |
Mar
(21) |
Apr
(30) |
May
(5) |
Jun
(1) |
Jul
(1) |
Aug
(24) |
Sep
(40) |
Oct
|
Nov
(38) |
Dec
(18) |
2006 |
Jan
(35) |
Feb
(24) |
Mar
(6) |
Apr
(49) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
2007 |
Jan
(14) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Jim W. <spi...@us...> - 2007-06-06 00:33:21
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4840 Modified Files: readmessage_inc.php Log Message: Finally something that parses the attachments out of Apple Mail formatted emails even if the Apple Mail user doesn't select the Windows-Friendly option. Essentially this patch fully parses multipart/appledouble and passes the embedded attachments to the main email attachment array for proper display. The "applefile" resource fork parts are ignored. Index: readmessage_inc.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/readmessage_inc.php,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** readmessage_inc.php 22 Jan 2007 23:15:31 -0000 1.75 --- readmessage_inc.php 6 Jun 2007 00:33:18 -0000 1.76 *************** *** 294,297 **** --- 294,298 ---- if ($ctype_full=="multipart/alternative" || $ctype_full=="multipart/mixed" || + $ctype_full=="multipart/appledouble" || $ctype_full=="multipart/related") { $both_parts_key = get_both_html_and_plain_version_key($part); *************** *** 302,305 **** --- 303,309 ---- list($tmp_body_show,$tmp_result)=make_emailbox_array($party); $my_body_show.=$tmp_body_show; + if (count($tmp_result[11])>0) { + $mail_attachments[] = $tmp_result[11][0]; + } } } elseif ($ctype_full=="message/rfc822") { |
From: Jim W. <spi...@us...> - 2007-06-06 00:24:40
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc/pear/Mail In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4394 Modified Files: mimedecode.php Log Message: Fix a bug in the Apple Mail parsing. Index: mimedecode.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/pear/Mail/mimedecode.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mimedecode.php 6 Oct 2006 01:58:34 -0000 1.11 --- mimedecode.php 6 Jun 2007 00:24:31 -0000 1.12 *************** *** 350,354 **** // skip applefile (macintosh resource entry) if (!stristr(substr($this->_input,$body_start + $parts[$i][0] + $part_header_start,$part_body_start - $part_header_start),"application/applefile")) { ! $part = $this->_decode($body_start + $parts[$i][0] + $part_header_start, $body_start + $parts[$i][0] + $part_body_start, $body_start + $parts[$i][0] + $parts[$i][1], $default_ctype); if($part === false) $part = $this->raiseError($this->_error); --- 350,354 ---- // skip applefile (macintosh resource entry) if (!stristr(substr($this->_input,$body_start + $parts[$i][0] + $part_header_start,$part_body_start - $part_header_start),"application/applefile")) { ! $part = $this->_decode_part($body_start + $parts[$i][0],$parts[$i][1], $default_ctype); if($part === false) $part = $this->raiseError($this->_error); |
From: Jim W. <spi...@us...> - 2007-01-30 17:32:48
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/lang In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13220 Modified Files: webmail2.de.lang Log Message: Submitted By: Thomas Knorr - tarmink webmail2 DE language fixes Added some missing translations, replaced existing umlaut implementations with html &(a)uml; parts. Why? Because if your emloyees travel around the world, and they do have to use localized browser versions english, frensh or others, like when they have to use internet cafes to connect, They will get funny characters displayed for umlauts. On the other side, this is the correct and only suitable way to write HTML. Index: webmail2.de.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/lang/webmail2.de.lang,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** webmail2.de.lang 26 Apr 2005 20:24:31 -0000 1.70 --- webmail2.de.lang 30 Jan 2007 17:32:25 -0000 1.71 *************** *** 1,12 **** ! ###tree_sidebar_add_2 = hinzufügen #tree_sidebar_add_2 = * ! attachments_add_to_list = zur Liste hinzufügen ! attachments_attaches = vorhandene Anhänge attachments_compose_a_new_mail = Eine neue E-Mail schreiben ! attachments_delete_attachment = lösche Anhang ! attachments_funcs_back = Zurück attachments_funcs_upload_failed = Upload fehlgeschlagen !! ! attachments_go_back = <- gehe zurück ! change_filter = Filter ändern compose_companies = Firmen compose_contact_groups = Kontaktgruppen --- 1,12 ---- ! ###tree_sidebar_add_2 = hinzufügen #tree_sidebar_add_2 = * ! attachments_add_to_list = zur Liste hinzufügen ! attachments_attaches = vorhandene Anhänge attachments_compose_a_new_mail = Eine neue E-Mail schreiben ! attachments_delete_attachment = lösche Anhang ! attachments_funcs_back = Zurück attachments_funcs_upload_failed = Upload fehlgeschlagen !! ! attachments_go_back = <- gehe zurück ! change_filter = Filter ändern compose_companies = Firmen compose_contact_groups = Kontaktgruppen *************** *** 15,27 **** compose_users = Benutzer create_filter = Einen neuen Filter anlegen ! default_account = Standard-Konto für ausgehende E-Mails ! download_filename_disabled = Dateiname: aus Sicherheitsgründen abgeschaltet ! download_given_attachment_cant_be_located = Das angegebene Attachment ist nicht im Dateisystem oder nicht lesbar: ! download_given_attachment_isnt_in_email = Das angegebene Attachment ist nicht im in der E-Mail gefunden worden: download_number_in_db = Nr. in der Datenbank: message_id= edit_webmail2 = Admin Settings exporttoword = Nach Word exportieren ! fetchmail_att_dir_does_not_exist = Das Verzeichnis für Anhänge existiert nicht oder hat keine Schreibberechtigung !! ! fetchmail_att_temp_dir_does_not_exist = Das temporäre Verzeichnis für Anhänge existiert nicht oder hat keine Schreibberechtigung !! fetchmail_disabled = deaktiviert fetchmail_error_email_empty = Fehler !!! Die E-Mail ist leer !! --- 15,27 ---- compose_users = Benutzer create_filter = Einen neuen Filter anlegen ! default_account = Standard-Konto für ausgehende E-Mails ! download_filename_disabled = Dateiname: aus Sicherheitsgründen abgeschaltet ! download_given_attachment_cant_be_located = Der angegebene Anhang ist nicht im Dateisystem oder nicht lesbar: ! download_given_attachment_isnt_in_email = Der angegebene Anhang ist nicht in der E-Mail gefunden worden: download_number_in_db = Nr. in der Datenbank: message_id= edit_webmail2 = Admin Settings exporttoword = Nach Word exportieren ! fetchmail_att_dir_does_not_exist = Das Verzeichnis für Anhänge existiert nicht oder hat keine Schreibberechtigung !! ! fetchmail_att_temp_dir_does_not_exist = Das temporäre Verzeichnis für Anhänge existiert nicht oder hat keine Schreibberechtigung !! fetchmail_disabled = deaktiviert fetchmail_error_email_empty = Fehler !!! Die E-Mail ist leer !! *************** *** 31,37 **** fetchmail_fetching3 = E-Mails ... fetchmail_fetching_mail_wait = Die E-Mails werden abgeholt ... bitte warten ... ! fetchmail_left_on_server = (Nachrichten bleiben auf dem Server.) fetchmail_name_of_mailbox = Name der Mailbox ! fetchmail_no_account = Kein Account. fetchmail_processed = Verarbeitet: fetchmail_processeing = Verarbeite --- 31,37 ---- fetchmail_fetching3 = E-Mails ... fetchmail_fetching_mail_wait = Die E-Mails werden abgeholt ... bitte warten ... ! fetchmail_left_on_server = (Nachrichten bleiben auf dem Server) fetchmail_name_of_mailbox = Name der Mailbox ! fetchmail_no_account = Kein Account fetchmail_processed = Verarbeitet: fetchmail_processeing = Verarbeite *************** *** 39,43 **** fetchmail_starting_with = ab fetchmail_status = Status ! fetchmail_were_oversize = waren zu groß fetchmail_were_spam = waren Spam filter_action = Aktion --- 39,43 ---- fetchmail_starting_with = ab fetchmail_status = Status ! fetchmail_were_oversize = waren zu groß fetchmail_were_spam = waren Spam filter_action = Aktion *************** *** 46,72 **** filter_copy_to_folder = Kopiere in Ordner filter_copy_to_user = Kopiere zu Benutzer ! filter_delete_message_from_inbox = Nachricht aus Inbox löschen filter_mark_as_flagged = Mit Flagge markieren filter_mark_as_read = Als gelesen markieren ! filter_match = Überprüfe ! filter_really_delete = Wirklich löschen ? filter_use_spam_flag = Spam-Flag benutzen ! filter_validate = Es muss mindestens eine Aktion ausgewählt sein und das Überprüfen-Feld darf nicht leer sein. (Ausser wenn das Spam-Flag gesetzt ist). ! index_att_dir_does_not_exist = Das Verzeichnis für Anhänge existiert nicht oder hat keine Schreibberechtigung !! ! index_att_temp_dir_does_not_exist = Das temporäre Verzeichnis für Anhänge existiert nicht oder hat keine Schreibberechtigung !! mail_000 = Normale E-Mail mail_001 = Beantwortete E-Mail mail_010 = Weitergeleitete E-Mail mail_011 = Beantwortete und Weitergeleitete E-Mail ! mail_100 = Normale E-Mail mit Anhängen ! mail_101 = Beantwortete E-Mail mit Anhängen ! mail_110 = Weitergeleitete E-Mail mit Anhängen ! mail_111 = Beantwortete und Weitergeleitete E-Mail mit Anhängen maillist_account = E-Mail Konto ! maillist_attach_gif = Diese E-Mail hat einen oder mehrere Dateianhänge maillist_copy_messages_to = kopiere Nachrichten nach maillist_date = Datum ! maillist_delete = löschen ! maillist_delete_confirm = Sind Sie sicher, dass Sie diese E-Mail(s) löschen wollen ? maillist_empty_account = <leer> maillist_flagged2_gif = Die Nachricht als gelesen / ungelesen markieren --- 46,72 ---- filter_copy_to_folder = Kopiere in Ordner filter_copy_to_user = Kopiere zu Benutzer ! filter_delete_message_from_inbox = Nachricht aus Inbox löschen filter_mark_as_flagged = Mit Flagge markieren filter_mark_as_read = Als gelesen markieren ! filter_match = Überprüfe ! filter_really_delete = Wirklich löschen ? filter_use_spam_flag = Spam-Flag benutzen ! filter_validate = Es muss mindestens eine Aktion ausgewählt sein und das Überprüfen-Feld darf nicht leer sein. (Ausser wenn das Spam-Flag gesetzt ist). ! index_att_dir_does_not_exist = Das Verzeichnis für Anhänge existiert nicht oder hat keine Schreibberechtigung !! ! index_att_temp_dir_does_not_exist = Das temporäre Verzeichnis für Anhänge existiert nicht oder hat keine Schreibberechtigung !! mail_000 = Normale E-Mail mail_001 = Beantwortete E-Mail mail_010 = Weitergeleitete E-Mail mail_011 = Beantwortete und Weitergeleitete E-Mail ! mail_100 = Normale E-Mail mit Anhängen ! mail_101 = Beantwortete E-Mail mit Anhängen ! mail_110 = Weitergeleitete E-Mail mit Anhängen ! mail_111 = Beantwortete und Weitergeleitete E-Mail mit Anhängen maillist_account = E-Mail Konto ! maillist_attach_gif = Diese E-Mail hat einen oder mehrere Dateianhänge maillist_copy_messages_to = kopiere Nachrichten nach maillist_date = Datum ! maillist_delete = löschen ! maillist_delete_confirm = Sind Sie sicher, dass Sie diese E-Mail(s) löschen wollen ? maillist_empty_account = <leer> maillist_flagged2_gif = Die Nachricht als gelesen / ungelesen markieren *************** *** 82,112 **** maillist_nomailwasmarked = Keine E-Mail in der Ansicht markiert ! maillist_ok = OK ! maillist_previous = Zurück maillist_replied_gif = Diese E-Mail wurde beantwortet maillist_search_for = Suche nach maillist_search_local_folder = lokalen Ordnern ! maillist_search_public_folder = öffentlichen Ordnern maillist_search_result = Suchergebnis maillist_search_this_folder = diesem Ordner ! maillist_size = Grösse maillist_subject = Betreff maillist_to = An ! make_default_account = Zum Standard-Konto für ausgehende E-Mails machen ! myfolders_addtosidebar = Zur Sidebar hinzufügen ! myfolders_delete = Löschen ! myfolders_delete_confirm_delete = Löschen von Ordnern bestätigen ! myfolders_delete_folder = Wirklich löschen ? myfolders_delete_no = Nein myfolders_delete_yes = Ja ! myfolders_folder_cant_delete = Der Ordner kann nicht gelöscht werden ! myfolders_folder_cant_rename = Der Ordner kann nicht umbenannt werden ! myfolders_folder_create = Ordner erstellen : myfolders_folder_exists = Der Ordner existiert bereits ! ! myfolders_folder_has_subfolders = Der Ordner kann nicht gelöscht werden, da noch Unterordner vorhanden sind ! myfolders_folders = Ordner myfolders_messages = Nachrichten myfolders_new = Neuen myfolders_noright_create_folder = Sie haben keine Berechtigung zum Erzeugen eines Unterordners. ! myfolders_noright_delete_folder = Sie haben keine Berechtigung, diesen Ordner zu löschen. myfolders_noright_rename_folder = Sie haben keine Berechtigung, diesen Ordner umzubenennen. myfolders_noright_trashfiles = Sie haben keine Berechtigung, Dateien in den Papierkorb zu verschieben. --- 82,112 ---- maillist_nomailwasmarked = Keine E-Mail in der Ansicht markiert ! maillist_ok = OK ! maillist_previous = Zurück maillist_replied_gif = Diese E-Mail wurde beantwortet maillist_search_for = Suche nach maillist_search_local_folder = lokalen Ordnern ! maillist_search_public_folder = öffentlichen Ordnern maillist_search_result = Suchergebnis maillist_search_this_folder = diesem Ordner ! maillist_size = Grösse maillist_subject = Betreff maillist_to = An ! make_default_account = Zum Standard-Konto für ausgehende E-Mails machen ! myfolders_addtosidebar = Zur Sidebar hinzufügen ! myfolders_delete = Löschen ! myfolders_delete_confirm_delete = Löschen von Ordnern bestätigen ! myfolders_delete_folder = Wirklich löschen ? myfolders_delete_no = Nein myfolders_delete_yes = Ja ! myfolders_folder_cant_delete = Der Ordner kann nicht gelöscht werden ! myfolders_folder_cant_rename = Der Ordner kann nicht umbenannt werden ! myfolders_folder_create = Ordner erstellen : myfolders_folder_exists = Der Ordner existiert bereits ! ! myfolders_folder_has_subfolders = Der Ordner kann nicht gelöscht werden, da noch Unterordner vorhanden sind ! myfolders_folders = Ordner myfolders_messages = Nachrichten myfolders_new = Neuen myfolders_noright_create_folder = Sie haben keine Berechtigung zum Erzeugen eines Unterordners. ! myfolders_noright_delete_folder = Sie haben keine Berechtigung, diesen Ordner zu löschen. myfolders_noright_rename_folder = Sie haben keine Berechtigung, diesen Ordner umzubenennen. myfolders_noright_trashfiles = Sie haben keine Berechtigung, Dateien in den Papierkorb zu verschieben. *************** *** 120,145 **** notify_text = Ihre Nachricht notify_text2 = wurde gelesen am ! notify_text3 = Empfangsbestätigung ! properties_contains = Enthält properties_created = Erstellt properties_created_by = Erstellt von ! properties_disk_size = Größe der Festplatte ! properties_email_folder = E-Mailverzeichnis ! properties_size = Größe properties_type = Typ properties_unknown = unbekannt ! publicfolders_delete_confirm_delete = Löschen von Öffentlichen Ordnern bestätigen ! publicfolders_delete_shall_folder = Soll der öffentliche Ordner ! publicfolders_folders = Öffentliche Ordner readmessage_activate_inline = Inline aktivieren ! readmessage_copy_to_calendar = Termin zum Kalender hinzufügen / Vorschau readmessage_copy_to_files_module = Attachment in das File-Modul kopieren readmessage_corrupted_message_fetch_again = Die E-Mail ist fehlerhaft, bitte erneut abholen. ! readmessage_delete_message = Nachricht löschen readmessage_disabled_ext = Der Download dieser Datei ist nicht erlaubt. readmessage_disactivate_inline = Inline deaktivieren readmessage_email_not_found = Die angegebene Mail ist nicht im Dateisystem oder nicht lesbar: ! readmessage_email_source_warning = Falls im Webmail-Modul Probleme mit der Darstellung der E-Mail auftreten,\nhaben Sie hier die Möglichkeit die E-Mail direkt mit Ihrem Browser zu lesen (mhtml).\n\nBitte speichern Sie diese Datei nicht auf Ihrem System,\nsie wird dann unter Umständen nicht mehr mit Ihrem Browser,\nsondern mit Outlook Express o.ä. geöffnet !\n\nV I R E N G E F A H R ! ! !\n\n\nWeiter ? (Unter Umständen kann Ihr System auch über den Browser mit Viren infiziert werden. Im Zweifelsfall klicken Sie hier NICHT weiter.) ! readmessage_filename_disabled = Dateiname: aus Sicherheitsgründen abgeschaltet readmessage_forward_complete = Weiterleiten (komplett) readmessage_forward_inline = Weiterleiten (inline) --- 120,145 ---- notify_text = Ihre Nachricht notify_text2 = wurde gelesen am ! notify_text3 = Empfangsbestätigung ! properties_contains = Enthält properties_created = Erstellt properties_created_by = Erstellt von ! properties_disk_size = Größe der Festplatte ! properties_email_folder = E-Mail-Verzeichnis ! properties_size = Größe properties_type = Typ properties_unknown = unbekannt ! publicfolders_delete_confirm_delete = Löschen von öffentlichen Ordnern bestätigen ! publicfolders_delete_shall_folder = Soll der öffentliche Ordner ! publicfolders_folders = Öffentliche Ordner readmessage_activate_inline = Inline aktivieren ! readmessage_copy_to_calendar = Termin zum Kalender hinzufügen / Vorschau readmessage_copy_to_files_module = Attachment in das File-Modul kopieren readmessage_corrupted_message_fetch_again = Die E-Mail ist fehlerhaft, bitte erneut abholen. ! readmessage_delete_message = Nachricht löschen readmessage_disabled_ext = Der Download dieser Datei ist nicht erlaubt. readmessage_disactivate_inline = Inline deaktivieren readmessage_email_not_found = Die angegebene Mail ist nicht im Dateisystem oder nicht lesbar: ! readmessage_email_source_warning = Falls im Webmail-Modul Probleme mit der Darstellung der E-Mail auftreten,\nhaben Sie hier die Möglichkeit die E-Mail direkt mit Ihrem Browser zu lesen (mhtml).\n\nBitte speichern Sie diese Datei nicht auf Ihrem System,\nsie wird dann unter Umständen nicht mehr mit Ihrem Browser,\nsondern mit Outlook Express o.ä. geöffnet !\n\nV I R E N G E F A H R ! ! !\n\n\nWeiter ? (Unter Umständen kann Ihr System auch über den Browser mit Viren infiziert werden. Im Zweifelsfall klicken Sie hier NICHT weiter.) ! readmessage_filename_disabled = Dateiname: aus Sicherheitsgründen abgeschaltet readmessage_forward_complete = Weiterleiten (komplett) readmessage_forward_inline = Weiterleiten (inline) *************** *** 148,157 **** readmessage_reply = Antworten really_notify = Soll der Absender benachrichtigt werden ? ! sendmail_add_signature = Signatur an Mail anhängen ! sendmail_attachments = Dateianhänge sendmail_bcc = BCC sendmail_cc = CC sendmail_email_not_found = Die angegebene Mail ist nicht im Dateisystem oder nicht lesbar: ! sendmail_filename_disabled = Dateiname: aus Sicherheitsgründen abgeschaltet sendmail_forward_message = Weitergeleitete Nachricht sendmail_forwarding = Weiterleitung: --- 148,157 ---- readmessage_reply = Antworten really_notify = Soll der Absender benachrichtigt werden ? ! sendmail_add_signature = Signatur an Mail anhängen ! sendmail_attachments = Dateianhänge sendmail_bcc = BCC sendmail_cc = CC sendmail_email_not_found = Die angegebene Mail ist nicht im Dateisystem oder nicht lesbar: ! sendmail_filename_disabled = Dateiname: aus Sicherheitsgründen abgeschaltet sendmail_forward_message = Weitergeleitete Nachricht sendmail_forwarding = Weiterleitung: *************** *** 159,163 **** sendmail_fromform = Von sendmail_high = hoch ! sendmail_highest = höchste sendmail_less = weniger sendmail_low = niedrig --- 159,163 ---- sendmail_fromform = Von sendmail_high = hoch ! sendmail_highest = höchste sendmail_less = weniger sendmail_low = niedrig *************** *** 165,169 **** sendmail_more = mehr sendmail_normal = normal ! sendmail_notification = Empfangsbestätigung sendmail_number_in_db = Nr. in der Datenbank: message_id= sendmail_popbeforesmtpfailed_failedbuild_mail = Fehler beim erzeugen der E-Mail --- 165,169 ---- sendmail_more = mehr sendmail_normal = normal ! sendmail_notification = Empfangsbestätigung sendmail_number_in_db = Nr. in der Datenbank: message_id= sendmail_popbeforesmtpfailed_failedbuild_mail = Fehler beim erzeugen der E-Mail *************** *** 173,180 **** sendmail_post_error = Fehler beim Versenden der E-Mail sendmail_post_successfully_sent = Die E-Mail wurde erfolgreich versandt an: ! sendmail_priority = Priorität: ! sendmail_reply_message = Ursprüngliche Nachricht sendmail_reply_toall = An alle antworten ! sendmail_reset = Zurücksetzen sendmail_save_as_draft = Als Entwurf speichern sendmail_search = Suchen --- 173,180 ---- sendmail_post_error = Fehler beim Versenden der E-Mail sendmail_post_successfully_sent = Die E-Mail wurde erfolgreich versandt an: ! sendmail_priority = Priorität: ! sendmail_reply_message = Ursprüngliche Nachricht sendmail_reply_toall = An alle antworten ! sendmail_reset = Zurücksetzen sendmail_save_as_draft = Als Entwurf speichern sendmail_search = Suchen *************** *** 199,208 **** sidebar_links = Links sidebar_webmail = Webmail ! smenu_choose_a_folder = Ordner auswählen top_cancel = Beenden top_copy = Kopiere ! top_delete = Löschen top_forward = Weiterleiten ! top_forward_compl = Weiterleiten (komplett mit Dateianhängen) top_go = Gehe top_logout = LOGOUT --- 199,209 ---- sidebar_links = Links sidebar_webmail = Webmail ! smenu_choose_a_folder = Ordner auswählen top_cancel = Beenden top_copy = Kopiere ! top_delete = Löschen top_forward = Weiterleiten ! top_forward_compl = Weiterleiten (komplett mit Dateianhängen) ! top_forward_as_attach = Weiterleiten (als Anhang) top_go = Gehe top_logout = LOGOUT *************** *** 222,226 **** top_settings = Einstellungen top_to = nach ! translate = Übersetzen tree_close = Schliessen tree_copy = Kopieren --- 223,227 ---- top_settings = Einstellungen top_to = nach ! translate = Übersetzen tree_close = Schliessen tree_copy = Kopieren *************** *** 228,232 **** tree_create_new_link = Erzeuge neuen Link: tree_cut = Ausschneiden ! tree_delete = Löschen tree_desc = Beschr. tree_edit_link = Link editieren: --- 229,233 ---- tree_create_new_link = Erzeuge neuen Link: tree_cut = Ausschneiden ! tree_delete = Löschen tree_desc = Beschr. tree_edit_link = Link editieren: *************** *** 238,247 **** tree_new_folder = Ordner erstellen tree_new_link = Neuer Link ! tree_open = Öffnen ! tree_paste = Einfügen tree_properties = Eigenschaften tree_reload = Aktual. tree_rename = Umbenennen ! tree_rights = * Rights tree_sidebar_add_1 = Zur Sidebar tree_sidebar_rem_1 = Aus der Sidebar --- 239,248 ---- tree_new_folder = Ordner erstellen tree_new_link = Neuer Link ! tree_open = Öffnen ! tree_paste = Einfügen tree_properties = Eigenschaften tree_reload = Aktual. tree_rename = Umbenennen ! tree_rights = Berechtigungen tree_sidebar_add_1 = Zur Sidebar tree_sidebar_rem_1 = Aus der Sidebar *************** *** 258,266 **** virusscan_virus_found = Es wurde mindestens 1 Virus gefunden !! webmail2_diagnostics = Diagnose ! webmail2_disable_create_accounts = Don't allow users to create new accounts webmail2_disable_local_send = Lokales senden von E-Mails ausschalten ! webmail2_disable_public_folders = Disable public folders ! webmail2_dontshowtoptext = Nur Icons in der Menuleiste anzeigen ! webmail2_flags = Flags ändern webmail2_func_blindcopyto = Bcc webmail2_func_copyto = Cc --- 259,267 ---- virusscan_virus_found = Es wurde mindestens 1 Virus gefunden !! webmail2_diagnostics = Diagnose ! webmail2_disable_create_accounts = Benutzern das Anlegen neuer e-Mail Accounts verbieten webmail2_disable_local_send = Lokales senden von E-Mails ausschalten ! webmail2_disable_public_folders = Die Anzeige öffenlicher Ordner unterdrücken ! webmail2_dontshowtoptext = Nur Icons in der Menüleiste anzeigen ! webmail2_flags = Flags ändern webmail2_func_blindcopyto = Bcc webmail2_func_copyto = Cc *************** *** 280,285 **** webmail2_func_trash = Papierkorb webmail2_func_unwished = Unerwünscht ! webmail2_func_virus1 = Diese Datei könnte einen VIRUS enthalten ! ! webmail2_func_virus2 = Diese Datei könnte einen VIRUS enthalten !\nNach dem Download sollte diese Datei einem VIREN-SCAN unterzogen werden, bevor sie betrachtet/ausgeführt wird !! webmail2_funcs_forwarded = Weitergeleitet webmail2_funcs_replied = Beantwortet --- 281,286 ---- webmail2_func_trash = Papierkorb webmail2_func_unwished = Unerwünscht ! webmail2_func_virus1 = Diese Datei könnte einen VIRUS enthalten ! ! webmail2_func_virus2 = Diese Datei könnte einen VIRUS enthalten !\nNach dem Download sollte diese Datei einem VIREN-SCAN unterzogen werden, bevor sie betrachtet/ausgeführt wird !! webmail2_funcs_forwarded = Weitergeleitet webmail2_funcs_replied = Beantwortet *************** *** 287,292 **** webmail2_maillist_flagged = mit / ohne Flagge webmail2_maillist_important = Wichtig ! webmail2_maillist_later = später ! webmail2_maillist_personal = persönlich webmail2_maillist_todo = zu tun webmail2_maillist_work = Arbeit --- 288,293 ---- webmail2_maillist_flagged = mit / ohne Flagge webmail2_maillist_important = Wichtig ! webmail2_maillist_later = später ! webmail2_maillist_personal = persönlich webmail2_maillist_todo = zu tun webmail2_maillist_work = Arbeit *************** *** 296,300 **** webmail2_settings_activate_account = Account aktiviert webmail2_settings_activated = Aktiviert ! webmail2_settings_addsignature = Signatur bei neuen E-Mails immer hinzufügen webmail2_settings_always_hide_sidebar = Sidebar immer verstecken webmail2_settings_always_recache = E-Mails immer neu cachen (langsamer) --- 297,301 ---- webmail2_settings_activate_account = Account aktiviert webmail2_settings_activated = Aktiviert ! webmail2_settings_addsignature = Signatur bei neuen E-Mails immer hinzufügen webmail2_settings_always_hide_sidebar = Sidebar immer verstecken webmail2_settings_always_recache = E-Mails immer neu cachen (langsamer) *************** *** 302,309 **** webmail2_settings_always_showhtml = E-Mail immer in Html schreiben webmail2_settings_antispam = AntiSpam (Absender) ! webmail2_settings_antispam_admin = Anti-Spam Funktion (Lösch-Regel für E-Mail-Adresse des Absenders) webmail2_settings_antispam_handbook = (pro Eintrag eine Zeile)<br><br>Beispiel:<br><b>name@domain</b> blockt den betreffenden Absender<br><b>%@domain</b> blockt alle Mailabsender aus "domain"<br><b>%domain</b> blockt alle Absender und Subdomains aus "domain" webmail2_settings_antispam_subject = Anti-Spam (Betreff) ! webmail2_settings_antispam_subject_admin = Anti-Spam Funktion (Lösch-Regel für Betreff) webmail2_settings_antispam_subject_handbook = (pro Eintrag eine Zeile)<br><br>Beispiel:<br><b>porn</b> blockiert alle Mails, die "porn" im Betreff haben webmail2_settings_antivirusprog = Systempfad des Viren-Scanners --- 303,310 ---- webmail2_settings_always_showhtml = E-Mail immer in Html schreiben webmail2_settings_antispam = AntiSpam (Absender) ! webmail2_settings_antispam_admin = Anti-Spam Funktion (Lösch-Regel für E-Mail-Adresse des Absenders) webmail2_settings_antispam_handbook = (pro Eintrag eine Zeile)<br><br>Beispiel:<br><b>name@domain</b> blockt den betreffenden Absender<br><b>%@domain</b> blockt alle Mailabsender aus "domain"<br><b>%domain</b> blockt alle Absender und Subdomains aus "domain" webmail2_settings_antispam_subject = Anti-Spam (Betreff) ! webmail2_settings_antispam_subject_admin = Anti-Spam Funktion (Lösch-Regel für Betreff) webmail2_settings_antispam_subject_handbook = (pro Eintrag eine Zeile)<br><br>Beispiel:<br><b>porn</b> blockiert alle Mails, die "porn" im Betreff haben webmail2_settings_antivirusprog = Systempfad des Viren-Scanners *************** *** 312,323 **** webmail2_settings_auto_open_unread_folders = Ordner mit ungelesenen E-Mails automatisch aufklappen webmail2_settings_compose_font = Standard Schriftart ! webmail2_settings_compose_font_size = Standard Schriftgröße webmail2_settings_copyfoldername = Beim Abholen eine Kopie jeder E-Mail ablegen in ! webmail2_settings_delete = Löschen ! webmail2_settings_delete_confirm = Soll dieses Konto wirklich gelöscht werden ? webmail2_settings_disable_ext = Deaktivierte Dateierweiterungen webmail2_settings_disable_ext_handbook = Alle Dateierweiterungen, die hier aufgelistet sind, werden beim Download eines Dateianhangs geblockt.<br>Alle Werte werden durch Kommas getrennt. (z.B. pif, vbs, exe, dll) webmail2_settings_dontdownloadobjects = Externe Grafiken nicht herunterladen ! webmail2_settings_edit = Ändern webmail2_settings_edit_account = Konto bearbeiten webmail2_settings_emailsperpage = Anzahl der Emails auf einer Seite --- 313,324 ---- webmail2_settings_auto_open_unread_folders = Ordner mit ungelesenen E-Mails automatisch aufklappen webmail2_settings_compose_font = Standard Schriftart ! webmail2_settings_compose_font_size = Standard Schriftgröße webmail2_settings_copyfoldername = Beim Abholen eine Kopie jeder E-Mail ablegen in ! webmail2_settings_delete = Löschen ! webmail2_settings_delete_confirm = Soll dieses Konto wirklich gelöscht werden ? webmail2_settings_disable_ext = Deaktivierte Dateierweiterungen webmail2_settings_disable_ext_handbook = Alle Dateierweiterungen, die hier aufgelistet sind, werden beim Download eines Dateianhangs geblockt.<br>Alle Werte werden durch Kommas getrennt. (z.B. pif, vbs, exe, dll) webmail2_settings_dontdownloadobjects = Externe Grafiken nicht herunterladen ! webmail2_settings_edit = Ändern webmail2_settings_edit_account = Konto bearbeiten webmail2_settings_emailsperpage = Anzahl der Emails auf einer Seite *************** *** 325,333 **** webmail2_settings_enable_ssl = SSL benutzen webmail2_settings_enable_ssl_smtp = SMTP mit SSL benutzen ! webmail2_settings_enablecal2_popup = Popup-Fenster für Terminanhänge ! webmail2_settings_enabledownload = Den Download einer E-Mail als .eml ermöglichen ! webmail2_settings_enablefetchnotify = Benachrichtigen, sobald neue E-Mails verfügbar sind webmail2_settings_enableinline = Bilder, txt.Dateien, usw direkt in der E-Mail anzeigen ! webmail2_settings_fetch_limit = Keine E-Mails abholen die größer sind als [Größe in kb] webmail2_settings_fetchnotifytime = Zeit in Sekunden, um nach neuen E-Mails zu suchen webmail2_settings_filters = Nachrichtenfilter --- 326,334 ---- webmail2_settings_enable_ssl = SSL benutzen webmail2_settings_enable_ssl_smtp = SMTP mit SSL benutzen ! webmail2_settings_enablecal2_popup = Popup-Fenster für Terminanhänge ! webmail2_settings_enabledownload = Den Download einer E-Mail als .eml ermöglichen ! webmail2_settings_enablefetchnotify = Benachrichtigen, sobald neue E-Mails verfügbar sind webmail2_settings_enableinline = Bilder, txt.Dateien, usw direkt in der E-Mail anzeigen ! webmail2_settings_fetch_limit = Keine E-Mails abholen die größer sind als [Größe in kb] webmail2_settings_fetchnotifytime = Zeit in Sekunden, um nach neuen E-Mails zu suchen webmail2_settings_filters = Nachrichtenfilter *************** *** 341,373 **** webmail2_settings_gpg_secring = Systempfad von secring.gpg webmail2_settings_gpg_use = Benutze GPG ! webmail2_settings_height_top = Höhe des obersten-Frames [pixel]<br>(Für 800x600 Wert 104 geeignet) webmail2_settings_imap_list_all = Alle Ordner auflisten (auch die die nicht abonniert sind) webmail2_settings_imap_show_numbers = Anzahl der gelesenen/ungelesenen Mails im Baum anzeigen ! webmail2_settings_leave_messages_on_server = Nachrichten auf dem Server belassen<br>(Bitte für IMAP unbedingt auswählen !!) webmail2_settings_leave_messages_on_server2 = Nachrichten auf dem Server belassen webmail2_settings_list_of_accounts = Liste der Konten webmail2_settings_mailboxname_exists_or_is_empty = Der Mailboxname existiert bereits oder ist leer. webmail2_settings_mailserver = Name/IP des POP3/Imap-Servers webmail2_settings_mailserver_type = Typ des Mail-Servers webmail2_settings_new_account = Neues Konto webmail2_settings_none = keiner ! webmail2_settings_openallfolders = Alle Ordner im Baum öffnen webmail2_settings_password = Passwort ! webmail2_settings_perform_test = Test ausführen ! webmail2_settings_performvirusscan = Alle kritischen E-Mail-Anhänge auf Viren überprüfen ! webmail2_settings_popbeforesmtp = Pop-before-smtp<br>(vor dem senden eine pop3-connection öffnen) webmail2_settings_popbeforesmtp2 = Pop-before-smtp webmail2_settings_preserve_state = Zustand des Baums in einem Cookie speichern ! webmail2_settings_pwdshow = Passwörter anzeigen ! webmail2_settings_pwdshow_no = Passwörter nicht anzeigen webmail2_settings_replyto = Absender-Adresse ! webmail2_settings_return_receipt = Immer Empfangsbestätigung anfordern webmail2_settings_reverse_contacts = Nachnamen zuerst beim Schreiben einer E-Mail anzeigen webmail2_settings_save = Speichern webmail2_settings_securehtmlmails = HTML-Mails absichern webmail2_settings_show_emoticons = Emoticons als Grafik anzeigen ! webmail2_settings_show_size_in_maillist = Die Größe der E-Mails in der Mail-Liste anzeigen webmail2_settings_showhotlist = Hotlist immer anzeigen ! webmail2_settings_showshort_from_to = Kurze Ansicht für die Spalten Von / An in der Mail-Liste webmail2_settings_showstructure = Die Struktur der E-Mail anzeigen webmail2_settings_signature = Signatur --- 342,375 ---- webmail2_settings_gpg_secring = Systempfad von secring.gpg webmail2_settings_gpg_use = Benutze GPG ! webmail2_settings_height_top = Höhe des obersten-Frames [pixel]<br>(Für 800x600 Wert 104 geeignet) webmail2_settings_imap_list_all = Alle Ordner auflisten (auch die die nicht abonniert sind) webmail2_settings_imap_show_numbers = Anzahl der gelesenen/ungelesenen Mails im Baum anzeigen ! webmail2_settings_leave_messages_on_server = Nachrichten auf dem Server belassen<br>(Bitte für IMAP unbedingt auswählen !!) webmail2_settings_leave_messages_on_server2 = Nachrichten auf dem Server belassen webmail2_settings_list_of_accounts = Liste der Konten webmail2_settings_mailboxname_exists_or_is_empty = Der Mailboxname existiert bereits oder ist leer. webmail2_settings_mailserver = Name/IP des POP3/Imap-Servers + webmail2_settings_mailserver_imaponly = Imap Server webmail2_settings_mailserver_type = Typ des Mail-Servers webmail2_settings_new_account = Neues Konto webmail2_settings_none = keiner ! webmail2_settings_openallfolders = Alle Ordner im Baum öffnen webmail2_settings_password = Passwort ! webmail2_settings_perform_test = Test ausführen ! webmail2_settings_performvirusscan = Alle kritischen E-Mail-Anhänge auf Viren überprüfen ! webmail2_settings_popbeforesmtp = Pop-before-smtp<br>(vor dem senden eine pop3-connection öffnen) webmail2_settings_popbeforesmtp2 = Pop-before-smtp webmail2_settings_preserve_state = Zustand des Baums in einem Cookie speichern ! webmail2_settings_pwdshow = Passwörter anzeigen ! webmail2_settings_pwdshow_no = Passwörter nicht anzeigen webmail2_settings_replyto = Absender-Adresse ! webmail2_settings_return_receipt = Immer Empfangsbestätigung anfordern webmail2_settings_reverse_contacts = Nachnamen zuerst beim Schreiben einer E-Mail anzeigen webmail2_settings_save = Speichern webmail2_settings_securehtmlmails = HTML-Mails absichern webmail2_settings_show_emoticons = Emoticons als Grafik anzeigen ! webmail2_settings_show_size_in_maillist = Die Größe der E-Mails in der Mail-Liste anzeigen webmail2_settings_showhotlist = Hotlist immer anzeigen ! webmail2_settings_showshort_from_to = Kurze Ansicht für die Spalten Von / An in der Mail-Liste webmail2_settings_showstructure = Die Struktur der E-Mail anzeigen webmail2_settings_signature = Signatur *************** *** 375,379 **** webmail2_settings_smtp_auth = SMTP-Server erfordert Authentifizierung<br>(Bitte Username + Passwort eintragen) webmail2_settings_smtp_auth_2 = SMTP Auth. ! webmail2_settings_smtp_auth_use_pop3 = Authentifizierung über Pop3/Imap Benutzerdaten<br>(SMTP-Username + Passwort nicht notwendig) webmail2_settings_smtp_auth_use_pop3_2 = SMTP benutzt Pop/Imap Einstellungen webmail2_settings_smtp_host = Name/IP des SMTP-Servers --- 377,381 ---- webmail2_settings_smtp_auth = SMTP-Server erfordert Authentifizierung<br>(Bitte Username + Passwort eintragen) webmail2_settings_smtp_auth_2 = SMTP Auth. ! webmail2_settings_smtp_auth_use_pop3 = Authentifizierung über Pop3/Imap Benutzerdaten<br>(SMTP-Username + Passwort nicht notwendig) webmail2_settings_smtp_auth_use_pop3_2 = SMTP benutzt Pop/Imap Einstellungen webmail2_settings_smtp_host = Name/IP des SMTP-Servers *************** *** 382,387 **** webmail2_settings_smtp_username = SMTP Benutzername webmail2_settings_smtptrace = SMTP Test ! webmail2_settings_smtptrace_back = Zurück ! webmail2_settings_smtptrace_checking = Überprüfe webmail2_settings_smtptrace_end = Ende. webmail2_settings_smtptrace_error = FEHLER --- 384,389 ---- webmail2_settings_smtp_username = SMTP Benutzername webmail2_settings_smtptrace = SMTP Test ! webmail2_settings_smtptrace_back = Zurück ! webmail2_settings_smtptrace_checking = Überprüfe webmail2_settings_smtptrace_end = Ende. webmail2_settings_smtptrace_error = FEHLER *************** *** 389,398 **** webmail2_settings_smtptrace_ok = Ok webmail2_settings_smtptrace_password = Passwort: <hidden> ! webmail2_settings_smtptrace_popbefore_smtp = Ausführen von Pop-before-smtp ... webmail2_settings_smtptrace_settings_not_ok = Die Einstellungen sind NICHT OK. webmail2_settings_smtptrace_settings_ok = Die Einstellungen sind OK. webmail2_settings_smtptrace_username = Benutzername: webmail2_settings_some_default_signature = Some default Signature ! webmail2_settings_sort = Sortierung der emails webmail2_settings_sort_account = E-Mail Konto webmail2_settings_sort_date = Datum --- 391,400 ---- webmail2_settings_smtptrace_ok = Ok webmail2_settings_smtptrace_password = Passwort: <hidden> ! webmail2_settings_smtptrace_popbefore_smtp = Ausführen von Pop-before-smtp ... webmail2_settings_smtptrace_settings_not_ok = Die Einstellungen sind NICHT OK. webmail2_settings_smtptrace_settings_ok = Die Einstellungen sind OK. webmail2_settings_smtptrace_username = Benutzername: webmail2_settings_some_default_signature = Some default Signature ! webmail2_settings_sort = Sortierung der E-Mails webmail2_settings_sort_account = E-Mail Konto webmail2_settings_sort_date = Datum *************** *** 403,409 **** webmail2_settings_sortbyaccount = Nach E-Mail Konto sortieren ? webmail2_settings_unzip = Systempfad von Unzip / Unzip.exe webmail2_settings_use_mail_function = Die Mail()-Funktion verwenden ! webmail2_settings_user_can_edit = Der Benutzer darf dieses Konto ändern ! webmail2_settings_user_can_edit2 = Der Benutzer darf ändern webmail2_settings_username = Benutzername webmail2_settings_waittime = Wartezeit nach dem Abholen / Senden der Nachrichten --- 405,413 ---- webmail2_settings_sortbyaccount = Nach E-Mail Konto sortieren ? webmail2_settings_unzip = Systempfad von Unzip / Unzip.exe + webmail2_settings_use_local_sent = Lokalen "Gesendet" Ordner verwenden + webmail2_settings_use_local_trash = Lokalen "Papierkorb" verwenden webmail2_settings_use_mail_function = Die Mail()-Funktion verwenden ! webmail2_settings_user_can_edit = Der Benutzer darf dieses Konto ändern ! webmail2_settings_user_can_edit2 = Der Benutzer darf ändern webmail2_settings_username = Benutzername webmail2_settings_waittime = Wartezeit nach dem Abholen / Senden der Nachrichten *************** *** 414,428 **** webmail2_top_read_unread = gelesen/ungelesen webmail2_virus_scanner_not_found = Der Viren-Scanner konnte nicht gefunden werden. ! sendmail_convertplain = Change plain / html * webmail2_settings_soft_quota = Software Quota Einstellungen webmail2_enable_soft_quota = Software Quota aktivieren webmail2_default_soft_quota = Software Quota Voreinstellung (MB) ! webmail2_quota_overlimit = Die Speicherkapazität ihres Postfaches ist überschritten ! webmail2_quota_no_download_possible = Nachrichten können nicht herruntergeladen werden webmail2_warn_not_admin = Nur der admin user hat die Berechtigung ! you have new mail = You have new mail ! webmail2_settings_delete_local_remote = Delete messages on server when deleting locally (POP3 only) ! webmail2_settings_mailserverport = Non default pop3/imap port to connect to * ! webmail2_settings_smtp_port = Non default smtp port to connect to * ! webmail2_settings_target_folder = Target folder * ! in = in * --- 418,433 ---- webmail2_top_read_unread = gelesen/ungelesen webmail2_virus_scanner_not_found = Der Viren-Scanner konnte nicht gefunden werden. ! sendmail_convertplain = Nur Text / HTML webmail2_settings_soft_quota = Software Quota Einstellungen webmail2_enable_soft_quota = Software Quota aktivieren webmail2_default_soft_quota = Software Quota Voreinstellung (MB) ! webmail2_quota_overlimit = Die Speicherkapazität ihres Postfaches ist überschritten ! webmail2_quota_no_download_possible = Nachrichten können nicht herruntergeladen werden webmail2_warn_not_admin = Nur der admin user hat die Berechtigung ! you have new mail = Sie haben neue Nachrichten erhalten ! webmail2_settings_delete_local_remote = Nachrichten vom Server löschen wenn sie lokal gelöscht werden (POP3 only) ! webmail2_settings_mailserverport = Nicht-Standard-POP-Port für die Verbindung ! webmail2_settings_mailserverport_imaponly = Nicht-Standard IMAP Port für die Verbindung ! webmail2_settings_smtp_port = Nicht-Standard-SMTP-Port für die Verbindung ! webmail2_settings_target_folder = Zielordner ! in = in |
From: Jim W. <spi...@us...> - 2007-01-22 23:15:37
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32528/inc Modified Files: readmessage_inc.php Log Message: Removing a lot of unused code both to reduce confusion and reduce memory usage. Also reduced the size of cache files by eliminating and variable not required. Not sure if I like the way caching is done (dynamically written php include files!). Not just memory usage, but some fixes for handling very large plain text email parts are in this patch. It should now be possible to read multiple megabyte text/plain and un-mimed messages. Still much to be done in terms of streamlining memory usage. The webmail2 module is still grossly out of control. Also some attachment forwarding issues need to be handled in a more graceful way. Index: readmessage_inc.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/readmessage_inc.php,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** readmessage_inc.php 6 Jan 2007 05:52:25 -0000 1.74 --- readmessage_inc.php 22 Jan 2007 23:15:31 -0000 1.75 *************** *** 121,168 **** } - //function quotedPrintableDecode($input) - //{ - // // Remove soft line breaks - // $input = preg_replace("/=\r?\n/", '', $input); - // - // // Replace encoded characters - // if (preg_match_all('/=[a-f0-9]{2}/i', $input, $matches)) { - // $matches = array_unique($matches[0]); - // foreach ($matches as $value) { - // $input = str_replace($value, chr(hexdec(substr($value,1))), $input); - // } - // } - // return $input; - //} - - //function findboundary2($line,$boundarys) { - // $length = strlen($line); - // $result = false; - // if ($length>10) { // and $length<81 - // if (substr($line,0,2)=="--") { - // $line = str_replace("\r","",$line); - // foreach ($boundarys as $boundary) { - // if ($boundary!="" and ("--".$boundary==$line or "--".$boundary."--"==$line)) { - // $result = true; - // break; - // } - // } - // } - // } - // return $result; - //} - - //function make_proto2($line) { - // global $filename; - // if ($line == "") { $line = "@leer@"; } - // echo htmlspecialchars($line); - // if (strlen($line)<8) { - // for ($i=0;$i < strlen($line);$i++) { - // echo ord($line[$i]).","; - // } - // } - // if ($filename != "") {echo " - ".$filename."<br>\n";} else { echo "<br>\n"; } - //} - function create_filename($filename, $account, $msg_no, $partno) { global $msg_cache, $mime_types, $username, $message_id; --- 121,124 ---- *************** *** 198,206 **** global $account, $msg_no; - $my_body_plain=""; $my_body_show=""; $mail_attachments=array(); $mail_structure=array(); if (isset($structure->headers["disposition-notification-to"]) and $structure->headers["disposition-notification-to"]!="") $notify = true; --- 154,162 ---- global $account, $msg_no; $my_body_show=""; $mail_attachments=array(); $mail_structure=array(); + if (isset($structure->headers["disposition-notification-to"]) and $structure->headers["disposition-notification-to"]!="") $notify = true; *************** *** 265,273 **** if (!isset($gpg_decrypt)) $gpg_decrypt = array(); - // if just plain text, then there are no parts, we then create one - // if (!isset($structure->parts)) { - // TTT - // $structure->parts[0]=$structure; - // } if (!isset($structure->parts)) { if (isset($structure->headers)) { --- 221,224 ---- *************** *** 299,303 **** // end of code to remove text part when html and text parts are there - $partno=0; foreach ($structure->parts as $part) { --- 250,253 ---- *************** *** 340,345 **** $dispo2 = " ($name)"; $mail_structure[] = $ctype_full.$dispo.$dispo2." ".$partno; ! ! if ($ctype_full=="multipart/alternative" || $ctype_full=="multipart/mixed") { $both_parts_key = get_both_html_and_plain_version_key($part); if ($both_parts_key > 0) { --- 290,298 ---- $dispo2 = " ($name)"; $mail_structure[] = $ctype_full.$dispo.$dispo2." ".$partno; ! // TODO: multipart/related is being treated the same as alt and mixed ! // since CID (content-id) processing isn't really being done anyway. ! if ($ctype_full=="multipart/alternative" || ! $ctype_full=="multipart/mixed" || ! $ctype_full=="multipart/related") { $both_parts_key = get_both_html_and_plain_version_key($part); if ($both_parts_key > 0) { *************** *** 347,360 **** } foreach ($part->parts as $party) { ! list($tmp_body_plain,$tmp_body_show,$tmp_result)=make_emailbox_array($party); $my_body_show.=$tmp_body_show; - $my_body_plain.=$tmp_body_plain; } } elseif ($ctype_full=="message/rfc822") { foreach ($part->parts as $party) { ! list($tmp_body_plain,$tmp_body_show,$tmp_result)=make_emailbox_array($party); $my_body_show.=make_emailbox_html($tmp_result); $my_body_show.=$tmp_body_show; - $my_body_plain.=$tmp_body_plain; } // only save if an attachment --- 300,311 ---- } foreach ($part->parts as $party) { ! list($tmp_body_show,$tmp_result)=make_emailbox_array($party); $my_body_show.=$tmp_body_show; } } elseif ($ctype_full=="message/rfc822") { foreach ($part->parts as $party) { ! list($tmp_body_show,$tmp_result)=make_emailbox_array($party); $my_body_show.=make_emailbox_html($tmp_result); $my_body_show.=$tmp_body_show; } // only save if an attachment *************** *** 400,408 **** } $my_body_show .= modify_html(trim($part->body))."<br>"; - $text = strip_tags(str_replace("<br>","#mybr#",trim($part->body))); - $text = preg_replace("/(\015\012)|(\015)|(\012)/","",$text); - $text = str_replace("#mybr#","\r\n",$text); - $text = my_decodeHTML($text); - $my_body_plain .= $text; } elseif ($ctype_full=="text/plain" || $ctype_full=="application/pgp-signature") { if (isset($MGW->settings["wm2_gpg_use"]) and $MGW->settings["wm2_gpg_use"] and (strpos(substr($body2,0,100),"BEGIN PGP MESSAGE") or --- 351,354 ---- *************** *** 425,431 **** } } - if (isset($part->body)) { - $my_body_plain .= $part->body; - } } else { // default: show it --- 371,374 ---- *************** *** 435,442 **** } $my_body_show .= modify_text(htmlspecialchars(trim($part->body)))."<br>"; - $text = strip_tags(str_replace("<br>","#mybr#",trim($part->body))); - $text = preg_replace("/(\015\012)|(\015)|(\012)/","",$text); $text = str_replace("#mybr#","\r\n",$text); - $text = my_decodeHTML($text); - $my_body_plain .= $text; } } --- 378,381 ---- *************** *** 444,448 **** } // end foreach $emailbox_array=array($from,$subject,$date,$cc,$bcc,$to,$replyto,0,$priority,$mail_structure,'',$mail_attachments,$gpg_signature,$gpg_decrypt); ! $result=array($my_body_plain,$my_body_show,$emailbox_array); return $result; } --- 383,387 ---- } // end foreach $emailbox_array=array($from,$subject,$date,$cc,$bcc,$to,$replyto,0,$priority,$mail_structure,'',$mail_attachments,$gpg_signature,$gpg_decrypt); ! $result=array($my_body_show,$emailbox_array); return $result; } *************** *** 556,560 **** $Mail_RFC822->validate=false; $from2 = $Mail_RFC822->parseAddressList(strtolower($from1)." (abc)", '', TRUE); - // $from2 = explode(" ",str_replace(">","",str_replace("<","",$from))); if (PEAR::isError($from2)) { --- 495,498 ---- *************** *** 573,578 **** $to1 = str_replace(array(""",">","<"),array("\"",">","<"),$to); $to2 = $Mail_RFC822->parseAddressList(strtolower($to1)." (abc)", '', FALSE); - // $to2 = explode(" ",str_replace(">","",str_replace("<","",$to))); - // if (count($settings_replyto) > 1 or count($settings_replyto) < 1 or (count($settings_replyto)==1 and !in_array(strtolower($to2[0]),$settings_replyto))) { if (count($settings_replyto) != 1 or (count($settings_replyto)==1 and !in_array(strtolower($to2[0]->mailbox."@".$to2[0]->host),$settings_replyto))) { --- 511,514 ---- *************** *** 839,874 **** if ($MGW->settings["wm2_securehtmlmails"]) $text = clean_html($text); - /* - $i = 0; - $start = 0; - $len = strlen($text); - - // echo strlen($text)."<br>"; - - while ($len>=0) { - - $step = 10000; - $subtext[$i] = substr($text,$start,$step); - $start = $start + $step; - $len = $len - $step; - - $pattern = '=(.*)<a.[^>]*href\=[ ]*[\'"]([^#"]*)[\'"][^>]*>(.*)</a>(.*)=msiU'; - $subtext[$i] = preg_replace_callback($pattern, "modify_my_callback", $subtext[$i]); - - $pattern = '=(.*)<img(.*)src\=[ ]*[\'"]([^"]*)[\'"](.*)>(.*)=msiU'; - $repl = '\\1<img\\2\\4 src="noimg.php?download='.$MGW->settings["wm2_dontdownloadobjects"].'&url=\\3">\\5'; - $subtext[$i] = preg_replace($pattern, $repl, $subtext[$i]); - $pattern = '=(.*)background(.*)src\=[ ]*[\'"]([^"]*)[\'"](.*)>(.*)=msiU'; - $repl = '\\1<img\\2 src="noimg.php?download='.$MGW->settings["wm2_dontdownloadobjects"].'&url=\\3"\\4>\\5'; - $subtext[$i] = preg_replace($pattern, $repl, $subtext[$i]); - $i++; - } - - $text = ""; - for ($i2=0;$i2<$i;$i2++) { - $text .= $subtext[$i2]; - } - */ $pattern = '=(.*)<a.[^>]*href\=\s*[\'"]([^#"]*)[\'"][^>]*>(.*)</a>(.*)=msiU'; $text = preg_replace_callback($pattern, "modify_my_callback", $text); --- 775,779 ---- *************** *** 881,895 **** $text = preg_replace($pattern, $repl, $text); - /* - $text = substr($text,0,15000); - - $pattern = '=(.*)<a.*href\=[ ]*[\'"]([^#"]*)[\'"][^>]*>(.*)</a>(.*)=msiU'; - $repl = '\\1<a target="_blank" href="norefer.php?url=\\2">\\3</a>\\4'; - $text = preg_replace_callback($pattern, "modify_my_callback", $text); - - $pattern = '=(.*)<img(.*)src\=[ ]*[\'"]([^"]*)[\'"][^>](.*)>(.*)=msiU'; - $repl = '\\1<img\\2\\4 src="noimg.php?download='.$MGW->settings["wm2_dontdownloadobjects"].'&url=\\3">\\5'; - $text = preg_replace($pattern, $repl, $text); - */ return $text; } --- 786,789 ---- *************** *** 909,915 **** global $MGW; ! //$text = ereg_replace("([_]+){2,}","<hr size=\"1\">",$text); ! // $text = preg_replace("/(\012)/","",$text); ! $text = preg_replace("/(\015\012)|(\015)|(\012)/","<br>\n",$text); $text = wordwrap($text,130,"<br>",1); $text = str_replace("<<br>br>","<br>",$text); --- 803,825 ---- global $MGW; ! // If the text part is over 1 mb this is not a normal email. Treat it ! // as preformatted bulk text. ! if (strlen($text) > 1048576) { ! return "<PRE>" . $text . "</PRE>"; ! } ! ! // for performance sake, lets assume server (or remote client) is ! // sending one type of line ending. ! if (strstr($text,"\r\n")) { ! // msdos line endings ! $text = str_replace("\r\n","<br>\n",$text); ! } else if (strstr($text,"\n")) { ! // unix newline line endings ! $text = str_replace("\n","<br>\n",$text); ! } else if (strstr($text,"\r")) { ! // carriage return only line endings ! $text = str_replace("\r","<br>\n",$text); ! } ! $text = wordwrap($text,130,"<br>",1); $text = str_replace("<<br>br>","<br>",$text); *************** *** 918,922 **** $text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]","<a target=\"_blank\" href=\"norefer.php?url=\\0\">\\0</a>", $text); $text = ereg_replace("([A-Za-z0-9_.\-]+\@[A-Za-z0-9_\.\-]+[.]+[a-zA-Z]+)","<a target='rightframe' href=\"sendmail.php?to=\\1\">\\1</a>",$text); - // $text = ereg_replace("([A-Za-z0-9_.\-]+\@[A-Za-z0-9_\-\.]+[.]+[a-zA-Z]+)","<a target='rightframe' href=\"sendmail.php?to=\\1\">\\1</a>",$text); if ($MGW->settings["wm2_show_emoticons"]) { --- 828,831 ---- *************** *** 936,951 **** } - function modify_text2($text) { - - $text = preg_replace("/(\015\012)|(\015)|(\012)/","<br>\n",$text); - $text = wordwrap($text,130,"<br>",1); - $text = str_replace("<<br>br>","<br>",$text); - $text = str_replace("<b<br>r>","<br>",$text); - $text = str_replace("<br<br>>","<br>",$text); - $text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]","<a target=\"_blank\" href=\"norefer.php?url=\\0\">\\0</a>", $text); - $text = ereg_replace("([A-Za-z0-9_.\-]+\@[A-Za-z0-9_\.\-]+[.]+[a-zA-Z]+)","<a target='rightframe' href=\"sendmail.php?to=\\1\">\\1</a>",$text); - - return $text; - } - ?> --- 845,847 ---- |
From: Jim W. <spi...@us...> - 2007-01-22 23:15:35
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2 In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32528 Modified Files: readmessage.php Log Message: Removing a lot of unused code both to reduce confusion and reduce memory usage. Also reduced the size of cache files by eliminating and variable not required. Not sure if I like the way caching is done (dynamically written php include files!). Not just memory usage, but some fixes for handling very large plain text email parts are in this patch. It should now be possible to read multiple megabyte text/plain and un-mimed messages. Still much to be done in terms of streamlining memory usage. The webmail2 module is still grossly out of control. Also some attachment forwarding issues need to be handled in a more graceful way. Index: readmessage.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/readmessage.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** readmessage.php 18 Sep 2005 11:29:07 -0000 1.100 --- readmessage.php 22 Jan 2007 23:15:31 -0000 1.101 *************** *** 200,213 **** if (file_exists($emailsource_mini)) { ! include $emailsource_mini; ! ! if ($MGW->settings["wm2_enableinline"]) { $wm2_enableinline = "checked"; } else { $wm2_enableinline = ""; } ! if ($MGW->settings["wm2_securehtmlmails"]) { $wm2_securehtmlmails = "checked"; } else { $wm2_securehtmlmails = ""; } ! if (!isset($cache_version)) {$cache_version = "0";} ! if ($cache_version2 == $cache_version_now2 ! and $inline2 == $wm2_enableinline ! and $secure2 == $wm2_securehtmlmails ! ) { $recache = false; } ! } if ($MGW->settings["wm2_always_recache"]) { --- 200,239 ---- if (file_exists($emailsource_mini)) { ! ! // if the cached file is over 2mb don't bother ! if (filesize($emailsource_mini) < 2097153) { ! include $emailsource_mini; ! ! if ($MGW->settings["wm2_enableinline"]) { ! $wm2_enableinline = "checked"; ! } else { ! $wm2_enableinline = ""; ! } ! ! if ($MGW->settings["wm2_securehtmlmails"]) { ! $wm2_securehtmlmails = "checked"; ! } else { ! $wm2_securehtmlmails = ""; ! } ! ! if (!isset($cache_version)) { ! $cache_version = "0"; ! } ! ! if ($cache_version2 == $cache_version_now2 ! and $inline2 == $wm2_enableinline ! and $secure2 == $wm2_securehtmlmails) { ! $recache = false; ! } ! ! if (!isset($body_show)) { ! $recache = true; ! } else if (strlen($body_show) < 1) { ! $recache = true; ! } ! ! } ! ! } if ($MGW->settings["wm2_always_recache"]) { *************** *** 225,229 **** $webmails = ""; - $body_plain = ""; $body_show = ""; $notify = false; --- 251,254 ---- *************** *** 249,271 **** } ! // if no parts, we add one because we only loop through the parts ! // if (!isset($structure->parts)) { ! // $structure->parts[0]->headers=$structure->headers; ! // if (isset($structure->ctype_primary)) { ! // $structure->parts[0]->ctype_primary=$structure->ctype_primary; ! // } ! // if (isset($structure->ctype_secondary)) { ! // $structure->parts[0]->ctype_secondary=$structure->ctype_secondary; ! // } ! // if (isset($structure->ctype_parameters)) { ! // $structure->parts[0]->ctype_parameters=$structure->ctype_parameters; ! // } ! // if (isset($structure->body)) { ! // $structure->parts[0]->body=$structure->body; ! // } ! // $structure->parts[0]->parts=array(); ! // } ! ! list($body_plain,$body_show,$emailbox) = make_emailbox_array($structure); unset($structure); --- 274,278 ---- } ! list($body_show,$emailbox) = make_emailbox_array($structure); unset($structure); *************** *** 293,302 **** fwrite($fp,"\$secure2=\"".$wm2_securehtmlmails."\";\n"); - $body_plain = str_replace(""","\"",$body_plain); - - fwrite($fp,"\$body_plain=\""); - fwrite($fp,addcslashes($body_plain,"\$\\\"")); - fwrite($fp,"\";\n"); - if (count($emailbox)!=0) { fwrite($fp,"\$emailbox="); --- 300,303 ---- *************** *** 305,312 **** fwrite($fp,"\$emailbox=array();\n"); } ! ! fwrite($fp,"\$body_show=\""); ! fwrite($fp,addcslashes($body_show,"\$\\\"")); ! fwrite($fp,"\";\n"); fwrite($fp,"?>\n"); --- 306,316 ---- fwrite($fp,"\$emailbox=array();\n"); } ! ! // only cache 3 mb or less of text... ! if (strlen($body_show) < 3145729) { ! fwrite($fp,"\$body_show=\""); ! fwrite($fp,addcslashes($body_show,"\$\\\"")); ! fwrite($fp,"\";\n"); ! } fwrite($fp,"?>\n"); |
From: Jim W. <spi...@us...> - 2007-01-22 22:13:04
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2 In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31392 Modified Files: sendmail_mapper.php Log Message: Just removed some unused code Index: sendmail_mapper.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/sendmail_mapper.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** sendmail_mapper.php 21 Feb 2006 20:46:48 -0000 1.32 --- sendmail_mapper.php 22 Jan 2007 22:13:00 -0000 1.33 *************** *** 100,107 **** $priority = $cache_flaggedbit; - // $msgbody = htmlspecialchars($body_plain); - // $msgbody = preg_replace("/(\015\012)|(\015)|(\012)/","<br>",$msgbody); - - //foreach ($attachments2 as $attachment) { foreach ($emailbox[11] as $attachment) { $ext = strtolower(substr($attachment[0],-strpos(strrev($attachment[0]),'.'))); --- 100,103 ---- |
From: Jim W. <spi...@us...> - 2007-01-22 22:13:04
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31392/inc Modified Files: sendmail_inc.php Log Message: Just removed some unused code Index: sendmail_inc.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/sendmail_inc.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** sendmail_inc.php 11 Apr 2005 19:21:42 -0000 1.30 --- sendmail_inc.php 22 Jan 2007 22:13:00 -0000 1.31 *************** *** 227,243 **** function get_format_sendmail_msgbody ($body) { - // $msg_body = htmlspecialchars($body_plain); - // $msg_body = $seperator.preg_replace("/(\015\012)|(\015)|(\012)/","\n".$seperator,wordwrap($msg_body,72,"\n",true)); - // echo stripslashes($body_show[0][1]); - - // $msg_body = ""; - // foreach ($body_show as $key=>$key2) { - // if (is_array($key2) and count($key2)>1 and ($key2[0]=="text" or $key2[0]=="html")) { - // // don't do too much stripslashes ... - // //$msg_body .= stripslashes($key2[1]); - // $msg_body .= $key2[1]; - // } - // } - $msg_body = str_replace(array("sendmail.php?to=","norefer.php?url=","noimg.php?download=0&url=","noimg.php?download=1&url="),array("mailto:","","#","#"),$body); $msg_body = preg_replace("'<img[^>]*?>'si","",$msg_body); --- 227,230 ---- |
From: Jim W. <spi...@us...> - 2007-01-22 16:27:54
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2 In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18375 Modified Files: tree.php Log Message: Eliminate warning message. Index: tree.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/tree.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** tree.php 9 Jan 2007 16:20:47 -0000 1.41 --- tree.php 22 Jan 2007 16:27:30 -0000 1.42 *************** *** 621,626 **** if ($force_imap_reload) { $smarty->assign("reload_sidebar", "yes"); ! if ($force_imap_maillist_reload) { ! $smarty->assign("reload_maillist", "yes"); } } else { --- 621,628 ---- if ($force_imap_reload) { $smarty->assign("reload_sidebar", "yes"); ! if (isset($force_imap_maillist_reload)) { ! if ($force_imap_maillist_reload) { ! $smarty->assign("reload_maillist", "yes"); ! } } } else { |
From: Jim W. <spi...@us...> - 2007-01-09 16:36:31
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25377 Modified Files: webmail2_settings_listaccounts.php Log Message: It makes sense to list accounts in order they were created. This opens the possibility to manipulate the sort sequence without changing the Account name. Index: webmail2_settings_listaccounts.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/webmail2_settings_listaccounts.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** webmail2_settings_listaccounts.php 27 Dec 2005 19:38:20 -0000 1.22 --- webmail2_settings_listaccounts.php 9 Jan 2007 16:36:27 -0000 1.23 *************** *** 70,74 **** $adminmode = true; } else { ! $sql = "select * from mgw_webmail2_accounts where user_id=".(int)$user_id." order by mailboxname"; $adminmode = false; } --- 70,74 ---- $adminmode = true; } else { ! $sql = "select * from mgw_webmail2_accounts where user_id=".(int)$user_id." order by id"; $adminmode = false; } |
From: Jim W. <spi...@us...> - 2007-01-09 16:20:54
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2 In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19949 Modified Files: tree.php Log Message: Define some order for display of accounts in the tree view. Index: tree.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/tree.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** tree.php 9 Jan 2007 15:02:36 -0000 1.40 --- tree.php 9 Jan 2007 16:20:47 -0000 1.41 *************** *** 580,584 **** } ! $sql = "select * from mgw_webmail2_accounts where mailboxname!='' and activated='checked' and servertype='wm2_servertype_imap_only' and user_id=".(int)$user_id; if(!$res = $conn->Execute($sql)) die(showSQLerror($sql, $conn->ErrorMsg(), __LINE__,__FILE__)); --- 580,584 ---- } ! $sql = "select * from mgw_webmail2_accounts where mailboxname!='' and activated='checked' and servertype='wm2_servertype_imap_only' and user_id=".(int)$user_id ." order by id"; if(!$res = $conn->Execute($sql)) die(showSQLerror($sql, $conn->ErrorMsg(), __LINE__,__FILE__)); |
From: Jim W. <spi...@us...> - 2007-01-09 15:02:44
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/templates/default/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19466/templates/default/html Modified Files: tree.tpl Log Message: Fix a problem where either the wrong email would get moved, copied, or deleted or an error message would pop up if the move, copy, or delete was done immediately following a folder operation, such as creating, renaming, or deleting a folder. This is a serious bug that could result in the loss of email messages for imap users. The root of the issue has how we are identifying folders. ID Numbers are assigned folders based on the sorted sequence of folder names. In other words they are numbered on the fly. For now what the program will do is number prior to sorting. This makes it so that adding new folders won't cause other folders to be renumbered because they'll be at the end of the list. Further testing is being done with other imap servers. Rename folder and Delete folder operations will now cause a refresh of the right side mail view window, so that if the folder ID's have been renumbered, the interface will display the mail in the folder that is now the "current" folder. Both of these fixes are weak and in the end the program will either have to cache folder id's or somehow have the "tree" module keep track of the "current" folder by name, not number. Index: tree.tpl =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/templates/default/html/tree.tpl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tree.tpl 24 Apr 2005 21:16:53 -0000 1.21 --- tree.tpl 9 Jan 2007 15:02:37 -0000 1.22 *************** *** 38,43 **** {if $reload_sidebar eq "yes"} parent.mailfolders.location="folders.php?"+session; - // if (parent.frames["rightframe"].frames["mailview"]) parent.rightframe.maillist.location.reload(); {/if} --- 38,46 ---- {if $reload_sidebar eq "yes"} + {if $reload_maillist eq "yes"} + if (parent.frames["rightframe"].frames["mailview"]) + parent.rightframe.maillist.location.reload(); + {/if} parent.mailfolders.location="folders.php?"+session; {/if} |
From: Jim W. <spi...@us...> - 2007-01-09 15:02:41
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2 In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19466 Modified Files: tree.php Log Message: Fix a problem where either the wrong email would get moved, copied, or deleted or an error message would pop up if the move, copy, or delete was done immediately following a folder operation, such as creating, renaming, or deleting a folder. This is a serious bug that could result in the loss of email messages for imap users. The root of the issue has how we are identifying folders. ID Numbers are assigned folders based on the sorted sequence of folder names. In other words they are numbered on the fly. For now what the program will do is number prior to sorting. This makes it so that adding new folders won't cause other folders to be renumbered because they'll be at the end of the list. Further testing is being done with other imap servers. Rename folder and Delete folder operations will now cause a refresh of the right side mail view window, so that if the folder ID's have been renumbered, the interface will display the mail in the folder that is now the "current" folder. Both of these fixes are weak and in the end the program will either have to cache folder id's or somehow have the "tree" module keep track of the "current" folder by name, not number. Index: tree.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/tree.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** tree.php 24 Apr 2005 05:42:03 -0000 1.39 --- tree.php 9 Jan 2007 15:02:36 -0000 1.40 *************** *** 100,103 **** --- 100,104 ---- if(!$res = $conn->Execute($sql)) die(showSQLerror($sql, $conn->ErrorMsg(), __LINE__,__FILE__)); $force_imap_reload = true; + $force_imap_maillist_reload = true; } } else { *************** *** 282,285 **** --- 283,287 ---- $force_imap_reload = true; + $force_imap_maillist_reload = true; } } *************** *** 299,302 **** --- 301,305 ---- $force_imap_reload = true; + $force_imap_maillist_reload = true; } else { echo "<script>alert('".addslashes(Lang::getLanguageString("myfolders_folder_cant_delete"))."');</script>"; *************** *** 305,308 **** --- 308,312 ---- sqimap_mailbox_myrename( $email, $mbox_id_name, $trash_name.$delimiter.$mboxname ); $force_imap_reload = true; + $force_imap_maillist_reload = true; $sql = "update mgw_webmail2_sidebar set mboxname='".$trash_name.$delimiter.$mboxname."' where account=".(int)$account." and mboxname='".$mbox_id_name."'"; *************** *** 614,619 **** --- 618,627 ---- } + $smarty->assign("reload_maillist","no"); if ($force_imap_reload) { $smarty->assign("reload_sidebar", "yes"); + if ($force_imap_maillist_reload) { + $smarty->assign("reload_maillist", "yes"); + } } else { $smarty->assign("reload_sidebar", "no"); |
From: Jim W. <spi...@us...> - 2007-01-09 15:02:41
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc/imap In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19466/inc/imap Modified Files: imap_mailbox.php Log Message: Fix a problem where either the wrong email would get moved, copied, or deleted or an error message would pop up if the move, copy, or delete was done immediately following a folder operation, such as creating, renaming, or deleting a folder. This is a serious bug that could result in the loss of email messages for imap users. The root of the issue has how we are identifying folders. ID Numbers are assigned folders based on the sorted sequence of folder names. In other words they are numbered on the fly. For now what the program will do is number prior to sorting. This makes it so that adding new folders won't cause other folders to be renumbered because they'll be at the end of the list. Further testing is being done with other imap servers. Rename folder and Delete folder operations will now cause a refresh of the right side mail view window, so that if the folder ID's have been renumbered, the interface will display the mail in the folder that is now the "current" folder. Both of these fixes are weak and in the end the program will either have to cache folder id's or somehow have the "tree" module keep track of the "current" folder by name, not number. Index: imap_mailbox.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/imap/imap_mailbox.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** imap_mailbox.php 6 Jan 2007 06:17:56 -0000 1.22 --- imap_mailbox.php 9 Jan 2007 15:02:37 -0000 1.23 *************** *** 42,45 **** --- 42,49 ---- /** * imap_mailbox.php + * $Id$ + * $Id$ + * $Id$ + * $Id$ * * Copyright (c) 1999-2002 The SquirrelMail Project Team *************** *** 445,449 **** * unformatted-disp - unformatted without $folder_prefix */ ! function sqimap_mailbox_parse ($line, $line_lsub) { global $delimiter; --- 449,453 ---- * unformatted-disp - unformatted without $folder_prefix */ ! function sqimap_mailbox_parse ($line, $line_lsub, $id_array) { global $delimiter; *************** *** 503,509 **** } $boxesall[$g]['unformatted-disp'] = $mailbox; ! $boxesall[$g]['id'] = $g; ! $boxesall[$g]['flags'] = array(); if (isset($line[$g])) { ereg("\(([^)]*)\)",$line[$g],$regs); --- 507,521 ---- } $boxesall[$g]['unformatted-disp'] = $mailbox; ! foreach($id_array as $id_ary) { ! if ($boxesall[$g]['raw'] == $id_ary['mailbox']) { ! $boxesall[$g]['id'] = $id_ary['id']; ! } ! } ! if (strtoupper($boxesall[$g]['unformatted']) == 'INBOX') { ! $boxesall[$g]['id'] = 32767; ! } ! ! $boxesall[$g]['flags'] = array(); if (isset($line[$g])) { ereg("\(([^)]*)\)",$line[$g],$regs); *************** *** 595,601 **** if ($imap_list_all) { $cmd = "LIST \"$folder_prefix\" \"*\""; ! } else { ! $cmd = "LSUB \"$folder_prefix\" \"*\""; ! } $lsub_ary = sqimap_run_command ($imap_stream, $cmd, true, $response, $message); --- 607,613 ---- if ($imap_list_all) { $cmd = "LIST \"$folder_prefix\" \"*\""; ! } else { ! $cmd = "LSUB \"$folder_prefix\" \"*\""; ! } $lsub_ary = sqimap_run_command ($imap_stream, $cmd, true, $response, $message); *************** *** 625,631 **** --- 637,646 ---- $new_ary = array(); + $id_ary = array(); for ($i=0; $i < count($sorted_lsub_ary); $i++) { if (!in_array($sorted_lsub_ary[$i], $new_ary)) { $new_ary[] = $sorted_lsub_ary[$i]; + $ary = array('mailbox' => $sorted_lsub_ary[$i], 'id' => $i); + $id_ary[] = $ary; } } *************** *** 689,693 **** } ! $boxesall = sqimap_mailbox_parse ($sorted_lsub_ary, $sorted_lsub_ary); $boxesnew = array(); $boxesnew2 = array(); --- 704,708 ---- } ! $boxesall = sqimap_mailbox_parse ($sorted_lsub_ary, $sorted_lsub_ary, $id_ary); $boxesnew = array(); $boxesnew2 = array(); |
From: Jim W. <spi...@us...> - 2007-01-06 06:17:59
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc/imap In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29592 Modified Files: imap_mailbox.php Log Message: Oops, meant to cancel that one after realizing I wasn't done yet. Index: imap_mailbox.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/imap/imap_mailbox.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** imap_mailbox.php 6 Jan 2007 06:11:13 -0000 1.21 --- imap_mailbox.php 6 Jan 2007 06:17:56 -0000 1.22 *************** *** 505,512 **** $boxesall[$g]['id'] = $g; - if (strtoupper($boxesall[$g]['unformatted']) == 'INBOX') { - $boxesall[$g]['id'] = 32767; - } - $boxesall[$g]['flags'] = array(); if (isset($line[$g])) { --- 505,508 ---- |
From: Jim W. <spi...@us...> - 2007-01-06 06:11:16
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc/imap In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20326 Modified Files: imap_mailbox.php Log Message: Fix a bug with imap accounts where adding a New Folder and moving a message to it causes an error or moves an email from the wrong email. The underlying cause is the INBOX folder "id" number is dynamic and was being assigned to a value one higher than the highest "id" of all the other folders for the email account. This was particularly noticable with the wu-imap server that doesn't automatically list an "inbox" folder. Adding a folder causes the tree to refresh (for obvious reasons) but doing so made the mailbox id of the messages in the Maillist out of sync. One solution would have been to refresh the Maillist, but that would have just made Webmail2 less buggy and harder to use. Instead I'm just forcing the inbox to have an id of 32767 so that it becomes unlikely it would be increased by a new folder addition. BTW, the selection of the number 32767 has nothing to do with 16 bit signed integers. Index: imap_mailbox.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/imap/imap_mailbox.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** imap_mailbox.php 24 Apr 2005 05:42:04 -0000 1.20 --- imap_mailbox.php 6 Jan 2007 06:11:13 -0000 1.21 *************** *** 505,508 **** --- 505,512 ---- $boxesall[$g]['id'] = $g; + if (strtoupper($boxesall[$g]['unformatted']) == 'INBOX') { + $boxesall[$g]['id'] = 32767; + } + $boxesall[$g]['flags'] = array(); if (isset($line[$g])) { |
From: Jim W. <spi...@us...> - 2007-01-06 05:52:32
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15906 Modified Files: readmessage_inc.php Log Message: Try to pick out message parts that are simply text/plain and test/html versions of the same information. Only display the html version. Making this follow a webmail2 setting for display html or not would not be a difficult addition, but I am fixing the bug before thinking about making changes to the data. It might be useful to actually compare the text between the pair of parts in question before deleting one of them from memory. Index: readmessage_inc.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/readmessage_inc.php,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** readmessage_inc.php 16 Feb 2006 14:12:49 -0000 1.73 --- readmessage_inc.php 6 Jan 2007 05:52:25 -0000 1.74 *************** *** 271,275 **** // } if (!isset($structure->parts)) { ! $structure->parts[0]->headers=$structure->headers; if (isset($structure->ctype_primary)) { $structure->parts[0]->ctype_primary=$structure->ctype_primary; --- 271,277 ---- // } if (!isset($structure->parts)) { ! if (isset($structure->headers)) { ! $structure->parts[0]->headers=$structure->headers; ! } if (isset($structure->ctype_primary)) { $structure->parts[0]->ctype_primary=$structure->ctype_primary; *************** *** 290,317 **** // the next couple of lines are to remove text parts when both // text and html versions are available - $html_found=0; - $text_found=0; - $text_index=0; - $html_index=0; - foreach ($structure->parts as $key=>$part) { - $ctype_full=""; - if (isset($part->ctype_primary) && isset($part->ctype_secondary)) { - $ctype_full=strtolower($part->ctype_primary)."/".strtolower($part->ctype_secondary); - } - if ($ctype_full=="text/plain") { - $text_found=1; - $text_index=$key; - } - if ($ctype_full=="text/html") { - $html_found=1; - $html_index=$key; - } - } - - // for multipart/alternative, we use only the html part // don't we need to check the preferences here? ! if ($structure->ctype_primary=="multipart" && $structure->ctype_secondary=="alternative" && ! $html_found && $text_found) { ! unset($structure->parts[$text_index]); } // end of code to remove text part when html and text parts are there --- 292,299 ---- // the next couple of lines are to remove text parts when both // text and html versions are available // don't we need to check the preferences here? ! $both_parts_key = get_both_html_and_plain_version_key($structure); ! if ($both_parts_key > 0) { ! unset($structure->parts[$both_parts_key]); } // end of code to remove text part when html and text parts are there *************** *** 320,337 **** $partno=0; foreach ($structure->parts as $part) { - // the next happens when you send mail both as text and html - // and with attachments - // sometimes there is a parts[2] as well, but for now I'll leave this - if (isset($part->parts) && isset($part->parts[1]) && isset($part->parts[2]) && strtolower($part->parts[2]->ctype_primary)=="text" && (strtolower($part->parts[2]->ctype_secondary)=="html" || strtolower($part->parts[2]->ctype_secondary)=="enriched")) { - $part = $part->parts[2]; - } else if (isset($part->parts) && isset($part->parts[1])) { - if (strtolower($part->parts[1]->ctype_primary)=="text" && (strtolower($part->parts[1]->ctype_secondary)=="html" || strtolower($part->parts[1]->ctype_secondary)=="enriched")) { - $part = $part->parts[1]; - } else if (empty($part->parts[0]->body)) { - $part = $part->parts[1]; - } else { - $part = $part->parts[0]; - } - } if (isset($part->ctype_primary) && isset($part->ctype_secondary)) { --- 302,305 ---- *************** *** 374,377 **** --- 342,349 ---- if ($ctype_full=="multipart/alternative" || $ctype_full=="multipart/mixed") { + $both_parts_key = get_both_html_and_plain_version_key($part); + if ($both_parts_key > 0) { + unset($part->parts[$both_parts_key]); + } foreach ($part->parts as $party) { list($tmp_body_plain,$tmp_body_show,$tmp_result)=make_emailbox_array($party); *************** *** 476,479 **** --- 448,483 ---- } + function get_both_html_and_plain_version_key($structure) { + // test for this message (or subpart) contains both a plain + // and html version of the same message. currently this will + // return -1 if no duplicate assumed or the key to the part to + // be deleted, which is currently always the text/plain one. + $html_found=0; + $text_found=0; + $text_index=0; + $html_index=0; + foreach ($structure->parts as $key=>$part) { + $ctype_full=""; + if (isset($part->ctype_primary) && isset($part->ctype_secondary)) { + $ctype_full=strtolower($part->ctype_primary)."/".strtolower($part->ctype_secondary); + } + if ($ctype_full=="text/plain" && strlen($part->body) > 10) { + $text_found=1; + $text_index=$key; + if ($html_found) return $text_index; + } + if ($ctype_full=="text/html" || $ctype_full=="text/enriched") { + // if disposition is set assume it is an attachment or insert, + // not a message part. + if (!isset($part->disposition)) { + $html_found=1; + $html_index=$key; + if ($text_found) return $text_index; + } + } + } + return -1; + } + function make_emailbox_html($thearray) { global $msg_no,$settings_replyto,$settings_fullname,$print,$emailsourcelink,$inline,$MGW,$webmails2,$mysize,$word_export,$mbox_id,$global_row; |
From: Jim W. <spi...@us...> - 2006-10-06 01:58:39
|
Update of /cvsroot/moregroupware/mgw/modules/webmail2/inc/pear/Mail In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2260 Modified Files: mimedecode.php Log Message: Looks like Thunderbird puts parens in it's boundaries Index: mimedecode.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/webmail2/inc/pear/Mail/mimedecode.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mimedecode.php 18 Feb 2006 21:15:34 -0000 1.10 --- mimedecode.php 6 Oct 2006 01:58:34 -0000 1.11 *************** *** 279,283 **** case 'content-type': $content_type = $this->_parseHeaderValue($headers[$key]['value']); - if (preg_match('/([0-9a-z+.-]+)\/([0-9a-z+.-]+)/i', $content_type['value'], $regs)) { $return->ctype_primary = $regs[1]; --- 279,282 ---- *************** *** 568,573 **** $tmp = preg_split('/--' . ! str_replace(array('/','+','^','?','[',']','{','}','*'), ! array('\/','\+','\^','\?','\[','\]','\{','\}','\*'),$boundary) . '/', $input,-1,PREG_SPLIT_OFFSET_CAPTURE); --- 567,572 ---- $tmp = preg_split('/--' . ! str_replace(array('/','+','^','?','[',']','{','}','*','(',')'), ! array('\/','\+','\^','\?','\[','\]','\{','\}','\*','\(','\)'),$boundary) . '/', $input,-1,PREG_SPLIT_OFFSET_CAPTURE); |
From: Karsten D. <k-...@us...> - 2006-04-27 12:05:38
|
Update of /cvsroot/moregroupware/mgw/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7928/include Modified Files: version.inc.php Log Message: Index: version.inc.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/include/version.inc.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** version.inc.php 27 Apr 2006 12:01:01 -0000 1.29 --- version.inc.php 27 Apr 2006 12:05:34 -0000 1.30 *************** *** 2,9 **** /* $Id$ */ // Version and Name of Groupware ! $gwversion_number = "0.7.4"; ! $gwversion_name = "not2early"; $gwversion = "$gwversion_number - $gwversion_name"; $gwtitle = "moregroupware"; ! $gwreleasedate = "20060427"; ?> \ No newline at end of file --- 2,9 ---- /* $Id$ */ // Version and Name of Groupware ! $gwversion_number = "0.7.5"; ! $gwversion_name = "dev"; $gwversion = "$gwversion_number - $gwversion_name"; $gwtitle = "moregroupware"; ! $gwreleasedate = "2006xxxx"; ?> \ No newline at end of file |
From: Karsten D. <k-...@us...> - 2006-04-27 12:04:29
|
Update of /cvsroot/moregroupware/mgw/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6990 Added Files: NEWS-0.7.4 Log Message: --- NEW FILE: NEWS-0.7.4 --- This files describes changes done between releases, in a more terse format. For details, see the ChangeLog file. Release 0.7.4, released 2006-04-27 ----------------------------------------------------------------- - This release fixes a ton of bugs, as usual. - updated bundled libraries: ADOdb, Smarty, JPGraph If you start with this system, please use calendar1 instead of calendar2, it has a somewhat unclear future. The admin3 is not finished yet, don't use it, or READ THE DOCS if you really want to try it! ----------------------------------------------------------------- moregroupware-core is the core system. It contains the core modules that are needed and base modules that carry the basic functionality. It is released under the X11 license. moregroupware-scripts provides some (shell) scripts that may or may not be helpful for you. Covered by the X11 license and the GPL (look into the files). moregroupware-modules somewhat replaces the 'insecure modules' package. It still has modules that are labeled 'insecure', but we'll probably change that to 'experimental' in the future. Now have fun! |
From: Karsten D. <k-...@us...> - 2006-04-27 12:01:08
|
Update of /cvsroot/moregroupware/mgw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1860 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/moregroupware/mgw/ChangeLog,v retrieving revision 1.593 retrieving revision 1.594 diff -C2 -d -r1.593 -r1.594 *** ChangeLog 16 Apr 2006 16:03:25 -0000 1.593 --- ChangeLog 27 Apr 2006 12:01:01 -0000 1.594 *************** *** 1,3 **** --- 1,13 ---- + 2006-04-27 Karsten Dambekalns <k.d...@fi...> + + * *** Released 0.7.4 "not2early" *** + * Updated Smarty to 2.6.13, ADOdb to 4.80. + * Updated JPGraph to 2.1.1 and 1.20.3 + * Included switch to use the right jpgraph lib for the running PHP version and introduced new constant JPGRAPHPATH + * Added JPGRAPHPATH to calendar2, tts and projects module + * Comitted some other rather old changes still lying around in my harddrive + 2006-04-16 Matthieu Paineau <mat...@wa...> + * some minor updates before release * modules/calendar : mysql5 compatibility modifications *************** *** 21,24 **** --- 31,35 ---- 2006-01-15 Matthieu Paineau <mat...@wa...> + * include\mSelectBox.class.php modules\files\inc\files_func.inc.php *************** *** 55,58 **** --- 66,70 ---- 2006-01-09 Matthieu Paineau <mat...@wa...> + * modules\calendar\inc\calendar_func.inc.php modules\calendar\inc\dayview.inc.php *************** *** 66,73 **** --- 78,87 ---- 2006-01-03 Karsten Dambekalns <k.d...@fi...> + * Added a patch that fixes a problem when editing account settings as user. Thanks to Thomas Knorr 2005-12-24 Matthieu Paineau <mat...@wa...> + * setup/index.php, setup/inc/setup_2.inc, *************** *** 78,87 **** --- 92,104 ---- 2005-12-24 Karsten Dambekalns <k.d...@fi...> + * Update to Smarty 2.6.11, ADOdb 4.68 and FPDF 1.53. 2005-11-17 Karsten Dambekalns <k.d...@fi...> + * Updated spanish translation, thanks to Jenaro Centeno Gomez! 2005-09-13 Franky Van Liedekerke <lie...@pa...> + (again long overdue changelog) * many changes and cleanups to the webmail2 code: |
From: Karsten D. <k-...@us...> - 2006-04-27 12:01:05
|
Update of /cvsroot/moregroupware/mgw/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1860/include Modified Files: version.inc.php Log Message: Index: version.inc.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/include/version.inc.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** version.inc.php 10 Dec 2004 10:25:41 -0000 1.28 --- version.inc.php 27 Apr 2006 12:01:01 -0000 1.29 *************** *** 3,9 **** // Version and Name of Groupware $gwversion_number = "0.7.4"; ! $gwversion_name = "dev"; $gwversion = "$gwversion_number - $gwversion_name"; $gwtitle = "moregroupware"; ! $gwreleasedate = "20050xxx"; ?> \ No newline at end of file --- 3,9 ---- // Version and Name of Groupware $gwversion_number = "0.7.4"; ! $gwversion_name = "not2early"; $gwversion = "$gwversion_number - $gwversion_name"; $gwtitle = "moregroupware"; ! $gwreleasedate = "20060427"; ?> \ No newline at end of file |
Update of /cvsroot/moregroupware/mgw/modules/admin/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32207/modules/admin/lang Modified Files: admin.bg.lang admin.cs.lang admin.da.lang admin.de.lang admin.en.lang admin.fi.lang admin.fr.lang admin.it.lang admin.ja.lang admin.lt.lang admin.nb.lang admin.nl.lang admin.pt_br.lang admin.pt_pt.lang admin.ro.lang admin.sk.lang admin.tr.lang admin.vi.lang admin.zh_cn.lang admin.zh_tw.lang Log Message: Sort capability for workplaces Index: admin.zh_tw.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.zh_tw.lang,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin.zh_tw.lang 5 Apr 2004 16:36:58 -0000 1.14 --- admin.zh_tw.lang 27 Apr 2006 11:57:00 -0000 1.15 *************** *** 107,108 **** --- 107,109 ---- sexf = ¤k sexm = ¨k + sortorder = Sort order Index: admin.cs.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.cs.lang,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** admin.cs.lang 21 Feb 2004 21:55:45 -0000 1.29 --- admin.cs.lang 27 Apr 2006 11:57:00 -0000 1.30 *************** *** 111,114 **** --- 111,115 ---- sexm = mu¾ skipped = Vynechávám + sortorder = Sort order sysconfedit = Upravit nastavení systému sysinfo = Systémové informace Index: admin.ro.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.ro.lang,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin.ro.lang 4 Mar 2004 18:58:52 -0000 1.1 --- admin.ro.lang 27 Apr 2006 11:57:00 -0000 1.2 *************** *** 101,103 **** confignotwritable = Configuration file not writable, editing not possible. insecure = Insecure Modules ! secure = Secure Modules \ No newline at end of file --- 101,104 ---- confignotwritable = Configuration file not writable, editing not possible. insecure = Insecure Modules ! secure = Secure Modules ! sortorder = Sort order \ No newline at end of file Index: admin.it.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.it.lang,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** admin.it.lang 21 Apr 2004 15:09:00 -0000 1.18 --- admin.it.lang 27 Apr 2006 11:57:00 -0000 1.19 *************** *** 111,114 **** --- 111,115 ---- sexm = Maschio skipped = Skipping * + sortorder = Sort order sysconfedit = Modifica la configurazione del sistema sysinfo = Informazioni sul sistema Index: admin.zh_cn.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.zh_cn.lang,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin.zh_cn.lang 21 Feb 2004 21:55:45 -0000 1.14 --- admin.zh_cn.lang 27 Apr 2006 11:57:00 -0000 1.15 *************** *** 111,114 **** --- 111,115 ---- sexm = Male * skipped = ÂÔ¹ý * + sortorder = Sort order sysconfedit = Edit system configuration * sysinfo = System information * Index: admin.sk.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.sk.lang,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin.sk.lang 21 Feb 2004 21:55:45 -0000 1.13 --- admin.sk.lang 27 Apr 2006 11:57:00 -0000 1.14 *************** *** 111,114 **** --- 111,115 ---- sexm = Male * skipped = Skipping * + sortorder = Sort order sysconfedit = Edit system configuration * sysinfo = System information * Index: admin.bg.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.bg.lang,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin.bg.lang 21 Feb 2004 21:55:34 -0000 1.15 --- admin.bg.lang 27 Apr 2006 11:57:00 -0000 1.16 *************** *** 111,114 **** --- 111,115 ---- sexm = Male * skipped = Skipping * + sortorder = Sort order sysconfedit = Edit system configuration * sysinfo = System information * Index: admin.vi.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.vi.lang,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin.vi.lang 21 Sep 2004 10:45:25 -0000 1.1 --- admin.vi.lang 27 Apr 2006 11:57:00 -0000 1.2 *************** *** 113,116 **** --- 113,117 ---- sexm = Nam skipped = Bá» qua + sortorder = Sort order sysconfedit = Chá»nh cấu hình há» thá»ng sysinfo = Thông tin há» thá»ng Index: admin.pt_pt.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.pt_pt.lang,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** admin.pt_pt.lang 21 Feb 2004 21:55:45 -0000 1.16 --- admin.pt_pt.lang 27 Apr 2006 11:57:00 -0000 1.17 *************** *** 111,114 **** --- 111,115 ---- sexm = Masculino skipped = Desnecessário + sortorder = Sort order sysconfedit = Editar ficheiro de configuração sysinfo = Informações do sistema Index: admin.fi.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.fi.lang,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin.fi.lang 21 Feb 2004 21:55:45 -0000 1.13 --- admin.fi.lang 27 Apr 2006 11:57:00 -0000 1.14 *************** *** 111,114 **** --- 111,115 ---- sexm = Male * skipped = Skipping * + sortorder = Sort order sysconfedit = Edit system configuration * sysinfo = System information * Index: admin.lt.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.lt.lang,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin.lt.lang 21 Feb 2004 21:55:45 -0000 1.2 --- admin.lt.lang 27 Apr 2006 11:57:00 -0000 1.3 *************** *** 111,114 **** --- 111,115 ---- sexm = Male * skipped = Skipping * + sortorder = Sort order sysconfedit = Edit system configuration * sysinfo = System information * Index: admin.ja.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.ja.lang,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** admin.ja.lang 15 Jul 2004 19:40:32 -0000 1.18 --- admin.ja.lang 27 Apr 2006 11:57:00 -0000 1.19 *************** *** 111,114 **** --- 111,115 ---- sexm = ç· skipped = ã¹ããã + sortorder = Sort order sysconfedit = ã·ã¹ãã è¨å®ã®ç·¨é sysinfo = ã·ã¹ãã æ å ± Index: admin.en.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.en.lang,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** admin.en.lang 21 Feb 2004 21:55:45 -0000 1.35 --- admin.en.lang 27 Apr 2006 11:57:00 -0000 1.36 *************** *** 111,114 **** --- 111,115 ---- sexm = Male skipped = Skipping + sortorder = Sort order sysconfedit = Edit system configuration sysinfo = System information Index: admin.fr.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.fr.lang,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** admin.fr.lang 21 Feb 2004 21:55:45 -0000 1.29 --- admin.fr.lang 27 Apr 2006 11:57:00 -0000 1.30 *************** *** 111,114 **** --- 111,115 ---- sexm = Masculin skipped = Ignoré + sortorder = Sort order sysconfedit = Editer la configuration système sysinfo = Informations système Index: admin.tr.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.tr.lang,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin.tr.lang 21 Feb 2004 21:55:45 -0000 1.11 --- admin.tr.lang 27 Apr 2006 11:57:00 -0000 1.12 *************** *** 111,114 **** --- 111,115 ---- sexm = Male * skipped = Skipping * + sortorder = Sort order sysconfedit = Edit system configuration * sysinfo = System information * Index: admin.de.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.de.lang,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** admin.de.lang 21 Feb 2004 21:55:45 -0000 1.33 --- admin.de.lang 27 Apr 2006 11:57:00 -0000 1.34 *************** *** 112,115 **** --- 112,116 ---- sexm = Male * skipped = Überspringe + sortorder = Sort order sysconfedit = System-Konfiguration bearbeiten sysinfo = System information * Index: admin.da.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.da.lang,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** admin.da.lang 21 Feb 2004 21:55:45 -0000 1.18 --- admin.da.lang 27 Apr 2006 11:57:00 -0000 1.19 *************** *** 111,114 **** --- 111,115 ---- sexm = Male * skipped = Skipping * + sortorder = Sort order sysconfedit = Edit system configuration * sysinfo = System information * Index: admin.nb.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.nb.lang,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** admin.nb.lang 7 Sep 2004 16:13:51 -0000 1.20 --- admin.nb.lang 27 Apr 2006 11:57:00 -0000 1.21 *************** *** 111,114 **** --- 111,115 ---- sexm = Mann skipped = Hopper over + sortorder = Sort order sysconfedit = Rediger systemkonfigurasjon sysinfo = System informasjon Index: admin.nl.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.nl.lang,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** admin.nl.lang 20 Apr 2004 09:03:13 -0000 1.19 --- admin.nl.lang 27 Apr 2006 11:57:00 -0000 1.20 *************** *** 111,114 **** --- 111,115 ---- sexm = Man skipped = Overslaan + sortorder = Sort order sysconfedit = Wijzig systeem configuratie sysinfo = Systeem informatie Index: admin.pt_br.lang =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/lang/admin.pt_br.lang,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** admin.pt_br.lang 8 Sep 2004 09:55:29 -0000 1.29 --- admin.pt_br.lang 27 Apr 2006 11:57:00 -0000 1.30 *************** *** 111,114 **** --- 111,115 ---- sexm = Masculino skipped = Pulando + sortorder = Sort order sysconfedit = Editar configuração do sistema sysinfo = Informações do sistema |
From: Karsten D. <k-...@us...> - 2006-04-27 11:57:11
|
Update of /cvsroot/moregroupware/mgw/modules/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32207/modules/admin Modified Files: workplacemanager.php Log Message: Sort capability for workplaces Index: workplacemanager.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/workplacemanager.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** workplacemanager.php 18 Nov 2003 19:41:40 -0000 1.1 --- workplacemanager.php 27 Apr 2006 11:57:00 -0000 1.2 *************** *** 33,38 **** $gname = $conn->QMagic($_POST["worklocname"]); $gdesc = $conn->QMagic($_POST["description"]); ! $sql="INSERT INTO mgw_workplace (id, name, description, lu_user, lu_date) VALUES ($id, $gname, $gdesc, ".$_SESSION["MGW"]->userid.", ".$conn->DBTimeStamp(time()).")"; if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); --- 33,48 ---- $gname = $conn->QMagic($_POST["worklocname"]); $gdesc = $conn->QMagic($_POST["description"]); + $gsort = (int)$_POST["sort_order"]; ! // find max sort order ! $sql="select max(sort_order) from mgw_workplace"; ! $max_sort = $conn->GetOne($sql); ! if ($max_sort === FALSE) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); ! if ($gsort < 1 || $gsort > $max_sort) $gsort = $max_sort + 1; ! else { ! $sql = "UPDATE mgw_workplace SET sort_order=sort_order+1 WHERE sort_order >= $gsort"; ! if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); ! } ! $sql="INSERT INTO mgw_workplace (id, name, description, sort_order, lu_user, lu_date) VALUES ($id, $gname, $gdesc, $gsort, ".$_SESSION["MGW"]->userid.", ".$conn->DBTimeStamp(time()).")"; if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); *************** *** 70,75 **** $gname = $conn->QMagic($_POST["worklocname"]); $gdesc = $conn->QMagic($_POST["description"]); ! ! $sql="update mgw_workplace set name=$gname, description=$gdesc, lu_user=".$_SESSION["MGW"]->userid.", lu_date=". $conn->DBTimeStamp(time()). " WHERE id=$id"; if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); } --- 80,119 ---- $gname = $conn->QMagic($_POST["worklocname"]); $gdesc = $conn->QMagic($_POST["description"]); ! $gsort = (int)$_POST["sort_order"]; ! // adjust sort orders ! // find original sort order and highest sort order ! $sql="select sort_order from mgw_workplace where id=$id"; ! $orig_sort = $conn->GetOne($sql); ! if ($orig_sort === FALSE) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); ! $sql="select max(sort_order) from mgw_workplace"; ! $max_sort = $conn->GetOne($sql); ! if ($max_sort === FALSE) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); ! // if max_sort is null, establish sort order ! if ($max_sort < 1 || $orig_sort < 1) { ! $max_sort = 0; ! $sql = "SELECT id FROM mgw_workplace"; ! if(!$workplace_ids = $conn->GetCol($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); ! foreach ($workplace_ids as $workplace_id) { ! $max_sort++; ! $sql = "UPDATE mgw_workplace SET sort_order=$max_sort WHERE id=$workplace_id"; ! if (!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); ! // prevent resorting ! if ($workplace_id == $id) $gsort = $orig_sort = $max_sort; ! } ! } ! // if new > highest, new = highest ! if ($gsort > $max_sort) $gsort = $max_sort; ! if ($gsort < 1) $gsort = $orig_sort; ! // if original == new, do nothing ! if ($gsort > $orig_sort) { ! // if new > original, adjust -1 original to new ! $sql = "update mgw_workplace set sort_order=sort_order-1 where sort_order <= $gsort and sort_order > $orig_sort"; ! if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); ! } elseif ($gsort < $orig_sort) { ! // if new < original, adjust +1 new to original ! $sql = "update mgw_workplace set sort_order=sort_order+1 where sort_order >= $gsort and sort_order < $orig_sort"; ! if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); ! } ! $sql="update mgw_workplace set name=$gname, description=$gdesc, sort_order=$gsort, lu_user=".$_SESSION["MGW"]->userid.", lu_date=". $conn->DBTimeStamp(time()). " WHERE id=$id"; if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); } *************** *** 80,85 **** --- 124,137 ---- if (isset($_GET["view"]) && $_GET["view"] == "delete"){ $id = (int) $_GET["id"]; + // get sort order + $sql = "SELECT sort_order FROM mgw_workplace WHERE id=$id"; + $sort_order = $conn->GetOne($sql); + if ($sort_order === FALSE) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); + // delete entry $sql = "DELETE FROM mgw_workplace WHERE id=$id"; if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); + // realign sort order + $sql = "UPDATE mgw_workplace SET sort_order=sort_order-1 WHERE sort_order>$sort_order"; + if(!$conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); } *************** *** 122,126 **** $icons = getIconStrings(); ! $sql = "SELECT a.id, a.name, a.description, a.lu_date, b.username AS lu_user from mgw_workplace a LEFT JOIN mgw_users b ON a.lu_user = b.id"; if(!$res = $conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); while($row = $res->FetchRow()){ --- 174,178 ---- $icons = getIconStrings(); ! $sql = "SELECT a.id, a.name, a.description, a.sort_order, a.lu_date, b.username AS lu_user from mgw_workplace a LEFT JOIN mgw_users b ON a.lu_user = b.id ORDER BY a.sort_order"; if(!$res = $conn->Execute($sql)) exit(showSQLerror($sql, $conn->ErrorMsg(), __LINE__, __FILE__)); while($row = $res->FetchRow()){ |
From: Karsten D. <k-...@us...> - 2006-04-27 11:57:11
|
Update of /cvsroot/moregroupware/mgw/modules/admin/templates/default/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32207/modules/admin/templates/default/html Modified Files: workplacemanager_edit.tpl workplacemanager_list.tpl Log Message: Sort capability for workplaces Index: workplacemanager_edit.tpl =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/templates/default/html/workplacemanager_edit.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** workplacemanager_edit.tpl 21 Nov 2003 15:40:10 -0000 1.2 --- workplacemanager_edit.tpl 27 Apr 2006 11:57:00 -0000 1.3 *************** *** 34,37 **** --- 34,44 ---- </tr> + <tr><td class="lines" height="1" width="1" colspan="3"><img src="{$imgpathmaster}/space.gif" alt="" width="1" height="1"></td></tr> + <tr align="left"> + <td class="tab" height="40"><img src="{$imgpathmaster}/space.gif" alt="" width="60" height="1"></td> + <td class="formhead">{$hashmap.sortorder}:</td> + <td class="formhead"><input type="text" name="sort_order" size="3" maxlength="8" value="{$td.sort_order|escape:"html"}"></td> + </tr> + <tr><td class="lines2" height="1" width="1" colspan="3"><img src="{$imgpathmaster}/space.gif" alt="" width="1" height="1"></td></tr> <tr align="left"> Index: workplacemanager_list.tpl =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/admin/templates/default/html/workplacemanager_list.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** workplacemanager_list.tpl 12 May 2004 08:38:23 -0000 1.2 --- workplacemanager_list.tpl 27 Apr 2006 11:57:00 -0000 1.3 *************** *** 13,20 **** {* TABLE START *} ! {include file="$gentemplates/_th7.tpl" r1= "id" r2=$worklocname r3=$description r4=$lastchg r5=$by r6=$action} {section name=inhalt1 loop=$td} {assign var="frm_date" value=$td[inhalt1].lu_date|mgw_datetime} ! {include file="$gentemplates/_tr7.tpl" r1=$td[inhalt1].id r2=$td[inhalt1].name r3=$td[inhalt1].description r4=$frm_date r5=$td[inhalt1].lu_user r6=$td[inhalt1].action|smarty:nodefaults} {/section} {include file="$gentemplates/_tfx.tpl"} --- 13,20 ---- {* TABLE START *} ! {include file="$gentemplates/_th7.tpl" r1= "id" r2=$worklocname r3=$description r4=$sortorder r5=$lastchg r6=$by r7=$action} {section name=inhalt1 loop=$td} {assign var="frm_date" value=$td[inhalt1].lu_date|mgw_datetime} ! {include file="$gentemplates/_tr7.tpl" r1=$td[inhalt1].id r2=$td[inhalt1].name r3=$td[inhalt1].description r4=$td[inhalt1].sort_order|smarty:nodefaults r5=$frm_date r6=$td[inhalt1].lu_user r7=$td[inhalt1].action|smarty:nodefaults} {/section} {include file="$gentemplates/_tfx.tpl"} |
From: Karsten D. <k-...@us...> - 2006-04-27 11:54:10
|
Update of /cvsroot/moregroupware/mgw/modules/todo/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29834/modules/todo/inc Modified Files: todo.class.php Log Message: Removing deleted users from selector drop-down Index: todo.class.php =================================================================== RCS file: /cvsroot/moregroupware/mgw/modules/todo/inc/todo.class.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** todo.class.php 15 Apr 2004 17:01:49 -0000 1.41 --- todo.class.php 27 Apr 2006 11:54:07 -0000 1.42 *************** *** 95,99 **** $sb5->setSQLcontent("name"); $concat=$conn->Concat("lastname", "', '", "firstname"); ! $sb5->addContent("SELECT *, $concat AS name FROM mgw_users WHERE id <> ".$_SESSION["MGW"]->userid." ORDER BY lastname"); $sb5->addOption("0",Lang::getLanguageString("nodelegation"), "pre"); $smarty->assign("delegade", $sb5->draw()); --- 95,99 ---- $sb5->setSQLcontent("name"); $concat=$conn->Concat("lastname", "', '", "firstname"); ! $sb5->addContent("SELECT *, $concat AS name FROM mgw_users WHERE id <> ".$_SESSION["MGW"]->userid." AND NOT(level=0) ORDER BY lastname"); $sb5->addOption("0",Lang::getLanguageString("nodelegation"), "pre"); $smarty->assign("delegade", $sb5->draw()); *************** *** 168,172 **** $sb5->setSQLcontent("name"); $concat=$conn->Concat("lastname", "', '", "firstname"); ! $sb5->addContent("SELECT *, $concat AS name FROM mgw_users WHERE id <> '".$_SESSION["MGW"]->userid."' ORDER BY lastname"); $sb5->addOption("0",Lang::getLanguageString("nodelegation"), "pre"); if($row["fromuserid"] == 0) $smarty->assign("delegade", $sb5->draw()); --- 168,172 ---- $sb5->setSQLcontent("name"); $concat=$conn->Concat("lastname", "', '", "firstname"); ! $sb5->addContent("SELECT *, $concat AS name FROM mgw_users WHERE id <> '".$_SESSION["MGW"]->userid."' AND NOT(level=0) ORDER BY lastname"); $sb5->addOption("0",Lang::getLanguageString("nodelegation"), "pre"); if($row["fromuserid"] == 0) $smarty->assign("delegade", $sb5->draw()); |