merge from head

git-svn-id: svn://10.0.0.236/branches/SUPERWIN@53740 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/webshell/tests/viewer/Makefile.in

@@ -0,0 +1,197 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH			= ../../..
+topsrcdir		= @top_srcdir@
+srcdir			= @srcdir@
+VPATH			= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS			= public
+
+PROGRAM			= viewer
+
+CPPSRCS			= \
+			$(TOOLKIT_CPPSRCS) \
+			nsBaseDialog.cpp \
+			nsFindDialog.cpp \
+			nsXPBaseWindow.cpp \
+			nsTableInspectorDialog.cpp \
+			nsImageInspectorDialog.cpp \
+			nsPrintSetupDialog.cpp \
+			nsBrowserWindow.cpp \
+			nsEditorMode.cpp \
+			nsSetupRegistry.cpp \
+			nsThrobber.cpp \
+			nsViewerApp.cpp \
+			nsWebCrawler.cpp \
+			$(NULL)
+
+EXPORT_RESOURCE_SAMPLES	:= \
+			$(wildcard $(srcdir)/samples/test*.html) \
+			$(wildcard $(srcdir)/samples/toolbarTest*.xul) \
+			$(wildcard $(srcdir)/samples/treeTest*.xul) \
+			$(wildcard $(srcdir)/samples/treeTest*.css) \
+			$(wildcard $(srcdir)/samples/slider*.xul) \
+			$(wildcard $(srcdir)/samples/scrollbar*.xul) \
+			$(srcdir)/resources/find.html \
+			$(srcdir)/resources/printsetup.html \
+			$(srcdir)/resources/image_props.html \
+			$(srcdir)/samples/aform.css \
+			$(srcdir)/samples/bform.css \
+			$(srcdir)/samples/cform.css \
+			$(srcdir)/samples/demoform.css \
+			$(srcdir)/samples/mozform.css \
+			$(srcdir)/samples/xulTest.css \
+			$(srcdir)/samples/Anieyes.gif \
+			$(srcdir)/samples/gear1.gif \
+			$(srcdir)/samples/rock_gra.gif \
+			$(srcdir)/samples/beeptest.html \
+			$(srcdir)/samples/soundtest.html \
+			$(srcdir)/samples/bg.jpg \
+			$(srcdir)/samples/raptor.jpg \
+			$(srcdir)/samples/test.wav \
+			$(srcdir)/samples/checkboxTest.xul \
+			$(NULL)
+
+EXPORT_RESOURCE_THROBBER := $(wildcard $(srcdir)/throbber/anim*.gif)
+
+ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
+DIRS			+= unix
+UNIX_VIEWER_TK_LIBS	= $(DIST)/lib/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
+else
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+BEOS_PROGRAM_RESOURCE	= $(srcdir)/viewer-beos.rsrc
+TOOLKIT_CPPSRCS		= nsBeOSMain.cpp
+endif
+ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
+TOOLKIT_CPPSRCS		= nsPhMain.cpp nsPhMenu.cpp
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+GTK_GLUE		= -lgtksuperwin
+endif
+
+ifdef MOZ_OJI
+JSJ_LIB			= -ljsj
+endif
+
+XP_DIST_LIBS		= \
+			-lraptorgfx \
+			-lmozjs \
+			-lxpcom \
+			$(JSJ_LIB) \
+			$(NULL)
+
+XP_NS_UNDERBAR_CRAP	= \
+			$(MOZ_NECKO_UTIL_LIBS) \
+			$(MOZ_TIMER_LIBS) \
+			$(MOZ_WIDGET_SUPPORT_LIBS) \
+			$(NULL)
+
+XP_LIBS			= \
+			$(XP_NS_UNDERBAR_CRAP) \
+			$(XP_DIST_LIBS) \
+			$(NSPR_LIBS) \
+			$(NULL)
+
+ifdef MOZ_FULLCIRCLE
+XP_LIBS			+= $(FULLCIRCLE_LIBS)
+endif
+
+LIBS			= \
+			$(UNIX_VIEWER_TK_LIBS) \
+			$(GTK_GLUE) \
+			$(XP_LIBS) \
+			$(TK_LIBS) \
+			$(NULL)
+
+MOTIF_LIBS		= -lviewer_motif_s $(XP_LIBS) $(MOZ_MOTIF_LDFLAGS)
+QT_LIBS			= -lviewer_qt_s $(XP_LIBS) $(MOZ_QT_LDFLAGS)
+XLIB_LIBS		= -lviewer_xlib_s $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
+GTK_LIBS		= -lviewer_gtk_s -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
+
+EXTRA_DEPS		= \
+			$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \
+			$(UNIX_VIEWER_TK_LIBS) \
+			$(XP_NS_UNDERBAR_CRAP) \
+			$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
+
+install:: $(PROGRAM) $(srcdir)/mozilla-viewer.sh
+	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
+	$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber
+	$(INSTALL) $(srcdir)/resources/viewer.properties $(DIST)/bin/res
+	$(INSTALL) $(srcdir)/mozilla-viewer.sh $(DIST)/bin
+
+$(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_gtk_s.a
+	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(GTK_LIBS) $(OS_LIBS)
+	$(MOZ_POST_PROGRAM_COMMAND) $@
+
+$(PROGRAM)_motif: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_motif_s.a
+	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(MOTIF_LIBS) $(OS_LIBS)
+	$(MOZ_POST_PROGRAM_COMMAND) $@
+
+$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_qt_s.a
+	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(QT_LIBS) $(OS_LIBS)
+	$(MOZ_POST_PROGRAM_COMMAND) $@
+
+$(PROGRAM)_xlib: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_xlib_s.a
+	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(XLIB_LIBS) $(OS_LIBS)
+	$(MOZ_POST_PROGRAM_COMMAND) $@
+
+ifdef MOZ_ENABLE_GTK
+install:: $(PROGRAM)_gtk
+	$(INSTALL) -m 555 $< $(DIST)/bin
+
+clobber::
+	rm -f $(PROGRAM)_gtk
+endif
+
+ifdef MOZ_ENABLE_MOTIF
+install:: $(PROGRAM)_motif
+	$(INSTALL) -m 555 $< $(DIST)/bin
+
+clobber::
+	rm -f $(PROGRAM)_motif
+endif
+
+ifdef MOZ_ENABLE_QT
+install:: $(PROGRAM)_qt
+	$(INSTALL) -m 555 $< $(DIST)/bin
+
+clobber::
+	rm -f $(PROGRAM)_qt
+endif
+
+ifdef MOZ_ENABLE_XLIB
+install:: $(PROGRAM)_xlib
+	$(INSTALL) -m 555 $< $(DIST)/bin
+
+clobber::
+	rm -f $(PROGRAM)_xlib
+endif
+

mozilla/webshell/tests/viewer/unix/gtk/nsGtkMenu.cpp

@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "gdksuperwin.h"
+#include "gtkmozbox.h"
+
+#include "nsBrowserWindow.h"
+#include "resources.h"
+#include "nscore.h"
+
+#include "stdio.h"
+
+typedef GtkItemFactoryCallback GIFC;
+
+void gtk_ifactory_cb (nsBrowserWindow *nbw,
+                      guint callback_action, 
+                      GtkWidget *widget)
+{
+  nbw->DispatchMenuItem(callback_action);
+}
+
+GtkItemFactoryEntry menu_items[] =
+{
+  { "/_File",				nsnull,	nsnull,			0,			"<Branch>" },
+  { "/File/_New Window",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_WINDOW_OPEN,	nsnull },
+  { "/File/_Open...",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_FILE_OPEN,	nsnull },
+  { "/File/_View Source",		nsnull, (GIFC)gtk_ifactory_cb,	VIEW_SOURCE,		nsnull },
+  { "/File/_Samples",			nsnull,	nsnull,			0,			"<Branch>" },
+  { "/File/Samples/demo #0",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO0,		nsnull },
+  { "/File/Samples/demo #1",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO1,		nsnull },
+  { "/File/Samples/demo #2",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO2,		nsnull },
+  { "/File/Samples/demo #3",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO3,		nsnull },
+  { "/File/Samples/demo #4",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO4,		nsnull },
+  { "/File/Samples/demo #5",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO5,		nsnull },
+  { "/File/Samples/demo #6",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO6,		nsnull },
+  { "/File/Samples/demo #7",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO7,		nsnull },
+  { "/File/Samples/demo #8",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO8,		nsnull },
+  { "/File/Samples/demo #9",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO9,		nsnull },
+  { "/File/Samples/demo #10",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO10,		nsnull },
+  { "/File/Samples/demo #11",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO11,		nsnull },
+  { "/File/Samples/demo #12",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO12,		nsnull },
+  { "/File/Samples/demo #13",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO13,		nsnull },
+  { "/File/Samples/demo #14",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO14,		nsnull },
+  { "/File/Samples/demo #15",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO15,		nsnull },
+  { "/File/Samples/demo #16",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO16,		nsnull },
+  { "/File/Samples/demo #17",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO17,		nsnull },
+  { "/File/_Test Sites",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOP100,		nsnull },
+  { "/File/XPToolkit Tests",		nsnull,	nsnull,			0,			"<Branch>" },
+  { "/File/XPToolkit Tests/Toolbar Test 1",       nsnull, (GIFC)gtk_ifactory_cb,  VIEWER_XPTOOLKITTOOLBAR1,     nsnull },
+  { "/File/XPToolkit Tests/Tree Test 1",       nsnull, (GIFC)gtk_ifactory_cb,  VIEWER_XPTOOLKITTREE1,     nsnull },
+  { "/File/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/File/Print Preview",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_ONE_COLUMN,	nsnull },
+  { "/File/Print",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_PRINT,		nsnull },
+  { "/File/Print Setup",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_PRINT_SETUP,	nsnull },
+  { "/File/sep2",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/File/_Exit",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EXIT,		nsnull },
+
+  { "/_Edit",				nsnull,	nsnull,			0,			"<Branch>" },
+  { "/Edit/Cu_t",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_CUT,	nsnull },
+  { "/Edit/_Copy",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_COPY,	nsnull },
+  { "/Edit/_Paste",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_PASTE,	nsnull },
+  { "/Edit/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Edit/Select All",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_SELECTALL,	nsnull },
+  { "/Edit/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Edit/Find in Page",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_FINDINPAGE,	nsnull },
+
+//#ifdef DEBUG // turning off for now
+  { "/_Debug",				nsnull,	nsnull,			0,			"<Branch>"	},
+  { "/Debug/_Visual Debugging",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_VISUAL_DEBUGGING,nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Event Debugging/Toggle Paint Flashing",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_PAINT_FLASHING,nsnull },
+  { "/Debug/Event Debugging/Toggle Paint Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_PAINT_DUMPING,nsnull },
+  { "/Debug/Event Debugging/Toggle Invalidate Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_INVALIDATE_DUMPING,nsnull },
+  { "/Debug/Event Debugging/Toggle Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_EVENT_DUMPING,nsnull },
+  { "/Debug/Event Debugging/sep1", nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Event Debugging/Toggle Motion Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_MOTION_EVENT_DUMPING,nsnull },
+  { "/Debug/Event Debugging/Toggle Crossing Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_CROSSING_EVENT_DUMPING,nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/_Reflow Test",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_REFLOW_TEST,	nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Dump _Content",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_CONTENT,	nsnull },
+  { "/Debug/Dump _Frames",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_FRAMES,	nsnull },
+  { "/Debug/Dump _Views",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_VIEWS,	nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Dump _Style Sheets",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_STYLE_SHEETS,	nsnull },
+  { "/Debug/Dump _Style Contexts",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_STYLE_CONTEXTS,	nsnull},
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Show Content Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_CONTENT_SIZE,nsnull },
+  { "/Debug/Show Frame Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_FRAME_SIZE,	nsnull },
+  { "/Debug/Show Style Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_STYLE_SIZE,	nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Debug Save",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEBUGSAVE,	nsnull },
+  { "/Debug/Debug Output Text",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DISPLAYTEXT,	nsnull },
+  { "/Debug/Debug Output HTML",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DISPLAYHTML,	nsnull },
+  { "/Debug/Debug Toggle Selection",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_SELECTION,nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Debug Robot",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEBUGROBOT,	nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Show Content Quality",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_CONTENT_QUALITY,	nsnull },
+  { "/_Style",				nsnull,	nsnull,			0,			"<Branch>"	},
+  { "/Style/Select _Style Sheet",	       nsnull, nsnull,        0,        "<Branch>" },
+  { "/Style/Select Style Sheet/List Available Sheets", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_LIST, nsnull },
+  { "/Style/Select Style Sheet/sep1", nsnull, nsnull,        0,        "<Separator>" },
+  { "/Style/Select Style Sheet/Select Default", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_DEFAULT, nsnull },
+  { "/Style/Select Style Sheet/sep1", nsnull, nsnull,        0,        "<Separator>" },
+  { "/Style/Select Style Sheet/Select Alternative 1", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_ONE, nsnull },
+  { "/Style/Select Style Sheet/Select Alternative 2", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_TWO, nsnull },
+  { "/Style/Select Style Sheet/Select Alternative 3", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_THREE, nsnull },
+  { "/Style/Select Style Sheet/Select Alternative 4", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_FOUR, nsnull },
+  { "/Style/_Compatibility Mode",		nsnull,	nsnull,			0,			"<Branch>" },
+  { "/Style/Compatibility Mode/Nav Quirks",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_NAV_QUIRKS_MODE,	nsnull },
+  { "/Style/Compatibility Mode/Standard",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_STANDARD_MODE,	nsnull },
+
+  { "/Style/_Widget Render Mode",		nsnull,	nsnull,			0,			"<Branch>" },
+  { "/Style/Widget Render Mode/Native",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_NATIVE_WIDGET_MODE,	nsnull },
+  { "/Style/Widget Render Mode/Gfx",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_WIDGET_MODE,	nsnull },
+//#endif
+
+  { "/_Tools",                                nsnull, nsnull,                 0,              "<Branch>" },
+  { "/Tools/_JavaScript Console",	nsnull,	(GIFC)gtk_ifactory_cb,	JS_CONSOLE,	nsnull },
+  { "/Tools/_Editor Mode",		nsnull,	(GIFC)gtk_ifactory_cb,	EDITOR_MODE,	nsnull }
+};
+
+void CreateViewerMenus(nsIWidget *   aParent, 
+                       gpointer      data,
+                       GtkWidget **  aMenuBarOut) 
+{
+  NS_ASSERTION(nsnull != aParent,"null parent.");
+  NS_ASSERTION(nsnull != aMenuBarOut,"null out param.");
+
+  GtkItemFactory *item_factory;
+  GtkWidget *menubar;
+
+  GdkSuperWin *gdkSuperWin;
+  GtkWidget   *mozBox;
+
+  gdkSuperWin = (GdkSuperWin*)aParent->GetNativeData(NS_NATIVE_WIDGET);
+  
+  int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
+  item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", nsnull);
+
+  gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, data);
+
+  menubar = gtk_item_factory_get_widget (item_factory, "<main>");
+
+  gtk_menu_bar_set_shadow_type (GTK_MENU_BAR(menubar), GTK_SHADOW_NONE);
+
+  NS_ASSERTION(GDK_IS_SUPERWIN(gdkSuperWin), "code assumes a gdksuperwin.");
+  mozBox = gtk_mozbox_new(gdkSuperWin->bin_window);
+  NS_ASSERTION((mozBox != NULL), "failed to create mozBox.");
+
+  gtk_container_add(GTK_CONTAINER(mozBox), menubar);
+  gtk_mozbox_set_position(GTK_MOZBOX(mozBox), 0, 0 );
+  gtk_widget_show(mozBox);
+  gtk_widget_show(menubar);
+
+  *aMenuBarOut = menubar;
+}

mozilla/webtools/update/core/browser_detection.php

@@ -1,419 +0,0 @@
-<?php 
-/*
-Script Name: Full Featured PHP Browser/OS detection
-Author: Harald Hope, Website: http://tech.ratmachines.com/
-Script Source URI: http://tech.ratmachines.com/downloads/browser_detection.php
-Version 4.2.7
-Copyright (C) 04 March 2004
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-Lesser GPL license text:
-http://www.gnu.org/licenses/lgpl.txt
-
-Coding conventions:
-http://cvs.sourceforge.net/viewcvs.py/phpbb/phpBB2/docs/codingstandards.htm?rev=1.3
-*/
-
-/****************************************** 
-this is currently set to accept 9 parameters, although you can add as many as you want:
-1. safe - returns true/false, you can determine what makes the browser be safe lower down, 
-  currently it's set for ns4 and pre version 1 mozillas not being safe, plus all older browsers
-2. ie_version - tests to see what general IE it is, ie5x-6, ie4, or macIE, returns these values.
-3. moz_version - returns array of moz version, version number (includes full version, + etc), rv number (for math
-  comparison), rv number (for full rv, including alpha and beta versions), and release date
-4. dom - returns true/false if it is a basic dom browser, ie >= 5, opera >= 5, all new mozillas, safaris, konquerors
-5. os - returns which os is being used
-6. os_number - returns windows versions, 95, 98, me, nt 4, nt 5 [windows 2000], nt 5.1 [windows xp],
-  otherwise returns false
-7. browser - returns the browser name, in shorthand: ie, ie4, ie5x, op, moz, konq, saf, ns4
-8. number - returns the browser version number, if available, otherwise returns '' [not available]
-9. full - returns this array: $browser_name, $version_number, $ie_version, $dom_browser, $safe_browser, $os, $os_number
-*******************************************/
-
-// main script, uses two other functions, which_os() and browser_version() as needed
-function browser_detection( $which_test ) {
-  /*
-  uncomment the global variable declaration if you want the variables to be available on a global level
-  throughout your php page, make sure that php is configured to support the use of globals first!
-  Use of globals should be avoided however, and they are not necessary with this script
-  */
-
-  /*global $dom_browser, $safe_browser, $browser_user_agent, $os, $browser_name, $ie_version, 
-  $version_number, $os_number, $b_repeat, $moz_version, $moz_version_number, $moz_rv, $moz_rv_full, $moz_release;*/
-
-  static $dom_browser, $safe_browser, $browser_user_agent, $os, $browser_name, $ie_version, 
-  $version_number, $os_number, $b_repeat, $moz_version, $moz_version_number, $moz_rv, $moz_rv_full, $moz_release;
-
-  /* 
-  this makes the test only run once no matter how many times you call it
-  since all the variables are filled on the first run through, it's only a matter of returning the
-  the right ones 
-  */
-  if ( !$b_repeat )
-  {
-    //initialize all variables with default values to prevent error
-    $dom_browser = false;
-    $safe_browser = false;
-    $os = '';
-    $os_number = '';
-    $a_os_data = '';
-    $browser_name = '';
-    $version_number = '';
-    $ie_version = '';
-    $moz_version = '';
-    $moz_version_number = '';
-    $moz_rv = '';
-    $moz_rv_full = '';
-    $moz_release = '';
-
-    //make navigator user agent string lower case to make sure all versions get caught
-    $browser_user_agent = strtolower( $_SERVER['HTTP_USER_AGENT'] );
-    
-    $a_os_data = which_os( $browser_user_agent );// get os/number array
-    $os = $a_os_data[0];// os name, abbreviated
-    $os_number = $a_os_data[1];// os number if windows
-
-    /*
-    pack the browser type array, in this order
-    the order is important, because opera must be tested first, and ie4 tested for before ie general
-    same for konqueror, then safari, then gecko, since safari navigator user agent id's with 'gecko' in string.
-    note that $dom_browser is set for all  modern dom browsers, this gives you a default to use.
-
-    array[0] = id string for useragent, array[1] is if dom capable, array[2] is working name for browser
-
-    Note: all browser strings are in lower case to match the strtolower output, this avoids possible detection
-    errors
-    */
-    $a_browser_types[] = array( 'opera', true, 'op' );
-    $a_browser_types[] = array( 'msie', true, 'ie' );
-    $a_browser_types[] = array( 'konqueror', true, 'konq' );
-    $a_browser_types[] = array( 'safari', true, 'saf' );
-    // covers Netscape 6-7, K-Meleon, Most linux versions
-    // the 3 is for the rv: number, the release date is hardcoded
-    $a_browser_types[] = array( 'gecko', true, 'moz' );
-    // netscape 4 test: this has to be last or else ie or opera might register true
-    $a_browser_types[] = array( 'mozilla/4', false, 'ns4' );
-    $a_browser_types[] = array( 'lynx', false, 'lynx' );
-    $a_browser_types[] = array( 'webtv', true, 'webtv' );
-    // search engine spider bots:
-    $a_browser_types[] = array( 'googlebot', false, 'google' );// google
-    $a_browser_types[] = array( 'fast-webcrawler', false, 'fast' );// Fast AllTheWeb
-    $a_browser_types[] = array( 'msnbot', false, 'msn' );// msn search 
-    $a_browser_types[] = array( 'scooter', false, 'scooter' );// altavista
-    //$a_browser_types[] = array( '', false ); // browser array template
-
-    /* 
-    moz types array
-    note the order, netscape6 must come before netscape, which  is how netscape 7 id's itself.
-    rv comes last in case it is plain old mozilla 
-    */
-    $moz_types = array( 'firebird', 'phoenix', 'firefox', 'galeon', 'k-meleon', 'camino', 'netscape6', 
-    'netscape', 'rv' );
-
-    /*
-    run through the browser_types array, break if you hit a match, if no match, assume old browser
-    or non dom browser, assigns false value to $b_success.
-    */
-    for ($i = 0; $i < count($a_browser_types); $i++)
-    {
-      //unpacks browser array, assigns to variables
-      $s_browser = $a_browser_types[$i][0];// text string to id browser from array
-      $b_dom = $a_browser_types[$i][1];// hardcoded dom support from array
-      $browser_name = $a_browser_types[$i][2];// working name for browser
-      $b_success = false;
-
-      if (stristr($browser_user_agent, $s_browser)) 
-      {
-        // it defaults to true, will become false below if needed
-        // this keeps it easier to keep track of what is safe, only explicit false assignment will make it false.
-        $safe_browser = true;
-        switch ( $browser_name )
-        {
-          case 'ns4':
-            $safe_browser = false;
-            break;
-          case 'moz':
-            /*
-            note: The 'rv' test is not absolute since the rv number is very different on 
-            different versions, for example Galean doesn't use the same rv version as Mozilla, 
-            neither do later Netscapes, like 7.x. For more on this, read the full mozilla numbering 
-            conventions here:
-            http://www.mozilla.org/releases/cvstags.html
-            */
-
-            // this will return alpha and beta version numbers, if present
-            $moz_rv_full = browser_version( $browser_user_agent, 'rv' );
-            // this slices them back off for math comparisons
-            $moz_rv = substr( $moz_rv_full, 0, 3 );
-
-            // this is to pull out specific mozilla versions, firebird, netscape etc..
-            for ( $i = 0; $i < count( $moz_types ); $i++ )
-            {
-              if ( stristr( $browser_user_agent, $moz_types[$i] ) ) 
-              {
-                $moz_version = $moz_types[$i];
-                $moz_version_number = browser_version( $browser_user_agent, $moz_version );
-                break;
-              }
-            }
-            // this is necesary to protect against false id'ed moz'es and new moz'es.
-            // this corrects for galeon, or any other moz browser without an rv number
-            if ( !$moz_rv ) 
-            { 
-              $moz_rv = substr( $moz_version_number, 0, 3 ); 
-              $moz_rv_full = $moz_version_number; 
-              /* 
-              // you can use this instead if you are running php >= 4.2
-              $moz_rv = floatval( $moz_version_number ); 
-              $moz_rv_full = $moz_version_number;
-              */
-            }
-            // this corrects the version name in case it went to the default 'rv' for the test
-            if ( $moz_version == 'rv' ) 
-            {
-              $moz_version = 'mozilla';
-            }
-            
-            //the moz version will be taken from the rv number, see notes above for rv problems
-            $version_number = $moz_rv;
-            // gets the actual release date, necessary if you need to do functionality tests
-            $moz_release = browser_version( $browser_user_agent, 'gecko/' );
-            /* 
-            Test for mozilla 0.9.x / netscape 6.x
-            test your javascript/CSS to see if it works in these mozilla releases, if it does, just default it to:
-            $safe_browser = true;
-            */
-            if ( ( $moz_release < 20020400 ) || ( $moz_rv < 1 ) )
-            {
-              $safe_browser = false;
-            }
-            break;
-          case 'ie':
-            //$version_number = browser_version( $browser_user_agent, $s_browser, $substring_length );
-            $version_number = browser_version( $browser_user_agent, $s_browser );
-            if ( $os == 'mac' )
-            {
-              $ie_version = 'ieMac';
-            }
-            // this assigns a general ie id to the $ie_version variable
-            if ( $version_number >= 5 )
-            {
-              $ie_version = 'ie5x';
-            }
-            elseif ( ( $version_number > 3 ) && $version_number < 5 )
-            {
-              $dom_browser = false;
-              $ie_version = 'ie4';
-              $safe_browser = true; // this depends on what you're using the script for, make sure this fits your needs
-            }
-            else
-            {
-              $ie_version = 'old';
-              $safe_browser = false; 
-            }
-            break;
-          case 'op':
-            //$version_number = browser_version( $browser_user_agent, $s_browser, $substring_length );
-            $version_number = browser_version( $browser_user_agent, $s_browser );
-            if ( $version_number < 5 )// opera 4 wasn't very useable.
-            {
-              $safe_browser = false; 
-            }
-            break;
-          case 'saf':
-            //$version_number = browser_version( $browser_user_agent, $s_browser, $substring_length );
-            $version_number = browser_version( $browser_user_agent, $s_browser );
-            break;
-          default:
-            break;
-        }
-
-        $dom_browser = $b_dom;
-        $b_success = true;
-
-        break;
-      }
-    }
-    //assigns defaults if the browser was not found in the loop test
-    if ( !$b_success ) 
-    {
-      $safe_browser = false;
-      $dom_browser = false;
-      $browser_name = '';
-    }
-    // this ends the run through once if clause, set the boolean 
-    //to true so the function won't retest everything
-    $b_repeat = true;
-  }
-  /*
-  This is where you return values based on what parameter you used to call the function
-  $which_test is the passed parameter in the initial browser_detection('os') for example call
-  */
-  switch ( $which_test )
-  {
-    case 'safe':// returns true/false if your tests determine it's a safe browser
-      // you can change the tests to determine what is a safeBrowser for your scripts
-      // in this case sub rv 1 Mozillas and Netscape 4x's trigger the unsafe condition
-      return $safe_browser; 
-      break;
-    case 'ie_version': // returns iemac or ie5x
-      return $ie_version;
-      break;
-    case 'moz_version':// returns array of all relevant moz information
-      $moz_array = array( $moz_version, $moz_version_number, $moz_rv, $moz_rv_full, $moz_release );
-      return $moz_array;
-      break;
-    case 'dom':// returns true/fale if a DOM capable browser
-      return $dom_browser;
-      break;
-    case 'os':// returns os name
-      return $os; 
-      break;
-    case 'os_number':// returns os number if windows
-      return $os_number;
-      break;
-    case 'browser':// returns browser name
-      return $browser_name; 
-      break;
-    case 'number':// returns browser number
-      return $version_number;
-      break;
-    case 'full':// returns all relevant browser information in an array
-      $full_array = array( $browser_name, $version_number, $ie_version, $dom_browser, $safe_browser, $os, $os_number );
-      return $full_array;
-      break;
-    default:
-      break;
-  }
-}
-
-// gets which os from the browser string
-function which_os ( $browser_string )
-{
-  // initialize variables
-  $os = '';
-  $os_version = '';
-  /*
-  packs the os array
-  use this order since some navigator user agents will put 'macintosh' in the navigator user agent string
-  which would make the nt test register true
-  */
-  $a_os = array('lin', 'mac', 'unix', 'sunos', 'bsd', 'nt', 'win');
-
-  //os tester
-  for ($i = 0; $i < count($a_os); $i++)
-  {
-    //unpacks os array, assigns to variable
-    $s_os = $a_os[$i];
-
-    //assign os to global os variable, os flag true on success
-    if (stristr( $browser_string, $s_os )) 
-    {
-      $os = $s_os;
-
-      switch ( $os )
-      {
-        case 'win':
-          if ( strstr( $browser_string, '95' ) )
-          {
-            $os_version = '95';
-          }
-          elseif ( strstr( $browser_string, '98' ) )
-          {
-            $os_version = '98';
-          }
-          elseif ( strstr( $browser_string, 'me' ) )
-          {
-            $os_version = 'me';
-          }
-          elseif ( strstr( $browser_string, '2000' ) )// windows 2000, for opera ID
-          {
-            $os_version = '5.0';
-            $os = 'nt';
-          }
-          elseif ( strstr( $browser_string, 'xp' ) )// windows 2000, for opera ID
-          {
-            $os_version = '5.1';
-            $os = 'nt';
-          }
-          break;
-        case 'nt':
-          if ( strstr( $browser_string, 'nt 5.1' || strstr( $browser_string, 'xp' )) )// windows xp
-          {
-            $os_version = '5.1';//
-          }
-          elseif ( strstr( $browser_string, 'nt 5' ) || strstr( $browser_string, '2000' ) )// windows 2000
-          {
-            $os_version = '5.0';
-          }
-          elseif ( strstr( $browser_string, 'nt 4' ) )// nt 4
-          {
-            $os_version = '4';
-          }
-          elseif ( strstr( $browser_string, 'nt 3' ) )// nt 4
-          {
-            $os_version = '3';
-          }
-          break;
-        default:
-          break;
-      }
-      break;
-    }
-  }
-
-  // pack the os data array for return to main function
-  $os_data = array( $os, $os_version );
-  return $os_data;
-}
-
-// function returns browser number, gecko rv number, or gecko release date
-//function browser_version( $browser_user_agent, $search_string, $substring_length )
-function browser_version( $browser_user_agent, $search_string )
-{
-  // 8 is the longest that will be required, handles release dates: 20020323; 0.8.0+
-  $substring_length = 8;
-  //initialize browser number, will return '' if not found
-  $browser_number = '';
-
-  // use the passed parameter for $search_string
-  // start the substring slice right after these moz search strings
-  $start_pos = strpos( $browser_user_agent, $search_string ) + strlen( $search_string );
-
-  // this is just to get the release date, not other moz information
-  if ( ( $search_string != 'gecko/' ) ) 
-  { 
-    $start_pos++; 
-  }
-
-  // Initial trimming
-  $browser_number = substr( $browser_user_agent, $start_pos, $substring_length );
-
-  // Find the space, ;, or parentheses that ends the number
-  $browser_number = substr( $browser_number, 0, strcspn($browser_number, ' );') );
-
-  //make sure the returned value is actually the id number and not a string
-  // otherwise return ''
-  if ( !is_numeric( substr( $browser_number, 0, 1 ) ) )
-  { 
-    $browser_number = ''; 
-  }
-
-  return $browser_number;
-}
-
-/* 
-Here are some typical navigator.userAgent strings so you can see where the data comes from
-Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5) Gecko/20031007 Firebird/0.7 
-Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:0.9.4) Gecko/20011128 Netscape6/6.2.1
-*/
-?>

mozilla/webtools/update/core/config.php

@@ -1,73 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-
-// Mozilla Update -- PHP Configuration File
-// All common PHP Variables/functions are defined here
-
-//-- Site Timing :: Function and Start... --//
-function getmicrotime() {
-   list($usec, $sec) = explode(" ", microtime());
-   return ((float)$usec + (float)$sec);
-}
-$time_start = getmicrotime();
-
-//-- Website Variables--//
-$websitepath = "/opt/update"; // Local Path to Site Files
-$sitehostname = "update.mozilla.org"; // DNS Hostname
-
-//-- MySQL Server/Database Properties/Connection --//
-$mysqlServer="localhost";
-$mysqlData="update"; //MySQL Server Database Name
-$mysqlLogin=""; //MySQL Server UserName
-$mysqlPass=""; //MySQL Server Password
-
-
-$connection = mysql_connect("$mysqlServer","$mysqlLogin","$mysqlPass") or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_ERROR);
-$db = mysql_select_db("$mysqlData", $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_ERROR);
-
-//-- Page Header & Footer --//
-$page_header = "$websitepath/core/inc_header.php";
-$page_footer = "$websitepath/core/inc_footer.php";
-
-
-//includes
-include"inc_guids.php"; // GUID Handler
-include"inc_global.php"; // Global Functions
-include"sessionconfig.php"; //Start Session
-
-?>

mozilla/webtools/update/core/inc_browserdetection.php

@@ -1,145 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-
-//Various Sample User_Agents, uncomment to debug detection for one. :-)
-//$_SERVER["HTTP_USER_AGENT"] = "Mozilla/5.0 (Photon; U; QNX x86pc; en-US; rv:1.6a) Gecko/20030122";
-//$_SERVER["HTTP_USER_AGENT"] = "Mozilla/5.0 (BeOS; U; BeOS BePC; en-US; rv:1.4a) Gecko/20030305";
-//$_SERVER["HTTP_USER_AGENT"] = "Mozilla/5.0 (X11; U; SunOS i86pc; en-US; rv:1.7b) Gecko/20040302";
-//$_SERVER["HTTP_USER_AGENT"] = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6) Gecko/20040206 Lightninglizard/0.8";
-//$_SERVER["HTTP_USER_AGENT"] = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7b) Gecko/20040322 Nuclearunicorn/0.8.0+ (Firefox/0.8.0+ rebrand)";
-//$_SERVER["HTTP_USER_AGENT"] = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7) Gecko/20040626 Firefox/0.9";
-//$_SERVER["HTTP_USER_AGENT"] = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.7) Gecko/20040803 Firefox/0.9.3";
-//$_SERVER["HTTP_USER_AGENT"] = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.2) Gecko/20040818 Firefox/0.9.1+";
-
-include"browser_detection.php"; //Script that defines the browser_detection() function
-
-$OS = browser_detection('os');
-$moz_array = browser_detection('moz_version');
-
-//Turn $OS into something usable.
-if ( $moz_array[0] !== '' )
-{
-  switch ( $OS )
-  {
-    case 'win':
-    case 'nt':
-      $OS = 'Windows';
-      break;
-    case 'lin':
-      $OS = 'Linux';
-      break;
-    case 'solaris':
-    case 'sunos':
-      $OS = 'Solaris';
-      break;
-    case 'unix':
-    case 'bsd':
-      $OS = 'BSD';
-      break;
-    case 'mac':
-      $OS = 'MacOSX';
-      break;
-    default:
-      break;
-  }
-
-//Print what it's found, debug item.
-//echo ( 'Your Mozilla product is ' . $moz_array[0] . ' ' . $moz_array[1] . ' running on '. $OS . ' ');
-
-$application = $moz_array[0];
-$app_version = $moz_array[1];
-
-// XXX hack for 10.1 security release -- we need to munge
-// versions to just check major.minor and ignore release/etc. bits
-if ($app_version == "0.10.1") {
-  $app_version = "0.10";
-}
-
-// XXX hack for 1.0RC1/1.0RC2 release. browser detection needs to be more customizeable per release. heh.
-// This changes the displayed UA, to the app.extensions.ver internal.
-if ($app_version == "1.0rc1" or $app_version == "1.0rc2") {
-  $app_version = "1.0";
-}
-
-} else {
-//If it's not a Mozilla product, then return nothing and let the default app code work..
-}
-
-//----------------------------
-//Browser & OS Detection (Default Code)
-//----------------------------
-
-//if (!$_GET["application"] or ($_GET["application"]==$application && $_GET["version"]==$moz_array[1])) {
-//$app_version = $moz_array[1]; //Set app_version from Detection
-//}
-
-//Application
-if (!$application) { $application="firefox"; } //Default App is Firefox
-
-//App_Version
-//if ($_GET["version"]) {$app_version = $_GET["version"]; }
-
-if ($detection_force_version=="true") {$application=$_SESSION["application"];}
-//Get Max Version for App Specified
-$sql = "SELECT `major`,`minor`,`release`,`SubVer` FROM `t_applications` WHERE `AppName` = '$application' ORDER BY `major` DESC, `minor` DESC, `release` DESC, `SubVer` DESC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $row = mysql_fetch_array($sql_result);
-  $release = "$row[major].$row[minor]";
-  if ($row["release"]) {$release = ".$release$row[release]";}
-    $subver = $row["SubVer"];
-    if ($subver !=="final") {$release="$release$subver";}
-
-    if (!$app_version OR $detection_force_version=="true") { $app_version = $release; }
-    unset($release, $subver);
-
-//OS
-if ($_GET["os"]) {$OS = $_GET["os"];} //If Defined, set.
-
-// 1.0PR support
-if ($app_version=="1.0PR") {$app_version="0.10"; }
-
-// 0.9.x branch support -- All non-branch (+) builds should be 0.9.
-if (strpos($app_version, "+")=== false AND strpos($app_version, "0.9")===0) { $app_version="0.9";}
-
-
-
-//Register Browser Detection Values with the session
-if (!$_SESSION["application"]) { $_SESSION["application"] = $application; }
-if (!$_SESSION["app_version"]) { $_SESSION["app_version"] = $app_version; }
-if (!$_SESSION["app_os"]) { $_SESSION["app_os"] = $OS; }
-?>

mozilla/webtools/update/core/inc_footer.php

@@ -1,57 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<!--Page Footer-->
-<?php
-//Site Timer Counter :: Debug-Mode Item Only
-$time_end = getmicrotime();
-//Returns in format: sss.mmmuuunnnppp ;-) 
-// m = millisec, u=microsec, n=nansec, p=picosec
-$time = round($time_end - $time_start,"6");
-
-echo"<DIV class=\"footer\">&copy; 2004 <A HREF=\"http://www.mozilla.org\">The Mozilla Organization</A>"; if ($_SESSION["debug"]=="true") {echo" | Page Created in $time seconds"; } echo" | Terms of Use | Top</DIV>"; //Debug Time
-
-if ($pos !== false) {
-echo"</div>\n";
-}
-if ($_SESSION["debug"]=="true") {
-print(session_id());
-echo"<PRE>";print_r($_SESSION); echo"</PRE><Br>\n";
-echo"Current application data: $application - $app_version - $OS ";
-}
-?>

mozilla/webtools/update/core/inc_global.php

@@ -1,102 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-
-//inc_global.php -- Stuff that needs to be done globally to all of Mozilla Update
-
-//Cache Control Headers
-$expstr = gmdate("D, d M Y H:i:s", time() + 1800) . " GMT";
-header("Expires: $expstr");
-header("Cache-Control: public, pre-check=0, post-check=0, max-age=1800");
-
-
-//Attempt to fix Bug 246743 (strip_tags) and Bug 248242 (htmlentities)
-foreach ($_GET as $key => $val) {
-$_GET["$key"] = htmlentities(str_replace("\\","",strip_tags($_GET["$key"])));
-}
-
-//Set Debug Mode session Variable
-if ($_GET["debug"]=="true") {$_SESSION["debug"]=$_GET["debug"]; } else if ($_GET["debug"]=="false") {unset($_SESSION["debug"]);}
-
-// Bug 250596 Fixes for incoming $_GET variables.
-if ($_GET["application"]) {
-$_GET["application"] = strtolower($_GET["application"]);
-$sql = "SELECT AppID FROM  `t_applications` WHERE `AppName` = '".ucwords(strtolower($_GET["application"]))."' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-   if (mysql_num_rows($sql_result)===0) {unset($_GET["application"]);}
-}
-
-//if ($_GET["version"]) {
-//$sql = "SELECT AppID FROM  `t_applications` WHERE `Release` = '$_GET[version]' LIMIT 1";
-// $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-//   if (mysql_num_rows($sql_result)===0) {unset($_GET["application"]);}
-//}
-
-if ($_GET["category"] AND $_GET["category"] !=="All"
-    AND $_GET["category"] !=="Editors Pick" AND $_GET["category"] !=="Popular"
-    AND $_GET["category"] !=="Top Rated" AND $_GET["category"] !=="Newest") {
-$sql = "SELECT CatName FROM  `t_categories` WHERE `CatName` = '".ucwords(strtolower($_GET["category"]))."' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-   if (mysql_num_rows($sql_result)===0) {unset($_GET["category"]);}
-}
-
-if (!is_numeric($_GET["id"])) { unset($_GET["id"]); }
-if (!is_numeric($_GET["vid"])) { unset($_GET["vid"]); }
-if (!is_numeric($_GET["pageid"])) { unset($_GET["pageid"]); }
-if (!is_numeric($_GET["numpg"])) { unset($_GET["numpg"]); }
-
-// page_error() function
-
-function page_error($reason, $custom_message) {
-global $page_header, $page_footer;
-echo"<TITLE>Mozilla Update :: Error</TITLE>\n";
-echo"<LINK REL=\"STYLESHEET\" TYPE=\"text/css\" HREF=\"/core/update.css\">\n";
-include"$page_header";
-
-echo"<DIV class=\"contentbox\" style=\"border-color: #F00; width: 90%; margin: auto; min-height: 250px; margin-bottom: 5px\">\n";
-echo"<DIV class=\"boxheader\">Mozilla Update :: Error</DIV>\n";
-echo"<SPAN style=\"font-size: 12pt\">\n";
-echo"Mozilla Update has encountered an error and is unable to fulfill your request. Please try your request again later. If the
-problem continues, please contact the Mozilla Update staff. More information about the error may be found at the end of this
-message.<BR><BR>
-Error $reason: $custom_message<BR><BR>
-&nbsp;&nbsp;&nbsp;<A HREF=\"javascript:history.back()\">&#171;&#171; Go Back to Previous Page</A>";
-echo"</SPAN></DIV>\n";
-include"$page_footer";
-exit;
-}
-?>

mozilla/webtools/update/core/inc_guids.php

@@ -1,49 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-
-//Reset GUIDs to something human-readable
-if ($_GET["application"]=="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") {
-$_GET["application"]="firefox"; 
-
-} else if ($_GET["application"]=="{3550f703-e582-4d05-9a08-453d09bdfdc6}") {
-$_GET["application"]="thunderbird";
-
-} else if ($_GET["application"]=="{86c18b42-e466-45a9-ae7a-9b95ba6f5640}") {
-$_GET["application"]="mozilla";
-}
-?>

mozilla/webtools/update/core/inc_header.php

@@ -1,82 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-
-$pos = strpos($_SERVER["REQUEST_URI"], "/admin");
-if ($pos !== false) {
-echo'<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/mozupdates.bak.css">';
-$application="login";
- }
-?>
-<DIV class="header">
-<?php //if ($_GET["application"]) {$application=$_GET["application"]; } else {$application="firefox"; } ?>
-<DIV class="logo"><IMG SRC="/images/<?php echo"$application"; ?>-cornerlogo.png" BORDER=0 ALT=""></DIV>
-<DIV class="header-top"><A HREF="/"><IMG SRC="/images/updatelogo.png" BORDER=0 HEIGHT=55 WIDTH=270 ALT="Mozilla Update"></A></DIV>
-<DIV class="tabbar">
-<A HREF="/?application=mozilla"><IMG SRC="/images/tab-mozilla<?php if ($application=="mozilla") {echo"-selected"; } ?>.png" BORDER=0 HEIGHT=20 WIDTH=98 ALT="[Mozilla] "></A><A HREF="/?application=firefox"><IMG SRC="/images/tab-firefox<?php if ($application=="firefox") {echo"-selected"; } ?>.png" BORDER=0 HEIGHT=20 WIDTH=98 ALT="[Firefox] "></A><A HREF="/?application=thunderbird"><IMG SRC="/images/tab-thunderbird<?php if ($application=="thunderbird") {echo"-selected"; } ?>.png" BORDER=0 HEIGHT=20 WIDTH=105 ALT="[Thunderbird] "></A><A HREF="/developercp.php"><IMG SRC="/images/tab-login<?php if ($application=="login") {echo"-selected"; } ?>.png" BORDER=0 HEIGHT=20 WIDTH=98 ALT="[Login]"></A>
-</DIV>
-</DIV>
-<DIV class="bar"></DIV>
-<DIV class="nav">
-<?php if ($application !=="login") { ?>
-<A HREF="/?application=<?php echo"$application"; ?>">Home</A>
- | <A HREF="/faq/?application=<?php echo"$application"; ?>">FAQ</A>
-<?php
-// Types
-$types = array("E"=>"Extensions","T"=>"Themes");
-foreach($types as $typeid => $typename) {
-echo" | <A HREF=\"/".strtolower($typename)."/?application=$application\">$typename</A>";
-}
-//echo"<BR>\n";
-
-} else { echo"&nbsp;"; }
-?>
-</DIV>
-
-<?php
-if ($pos !== false) {
-?>
-<?php if ($_SESSION["logoncheck"] =="YES" && $headerline !="none") { ?>
-<DIV class="adminheading">
-Welcome<?php echo" $_SESSION[name]"; ?>!
-<a href="usermanager.php?function=edituser&amp;userid=<?php echo"$_SESSION[uid]"; ?>">Your Profile</a> | <A HREF="main.php">Home</A> |<A HREF="logout.php">Logout</A>
-<?php } ?>
-</DIV>
-<div id="mainContent">
-<?php
-}
-?>

mozilla/webtools/update/core/postfeedback.php

@@ -1,103 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-
-//Submit Review/Rating Feedback to Table
-require"../core/config.php";
-if (!$_POST[rating] && $_POST[rating] !=="0") {
-//No Rating Defined, send user back...
-$return_path="extensions/moreinfo.php?id=$_POST[id]&vid=$_POST[vid]&page=opinion&error=norating";
-header("Location: http://$_SERVER[HTTP_HOST]/$return_path");
-exit;
-}
-
-if (!$_POST[comments]) {
-  $_POST[comments]="NULL";
-  } else {
-  //Comments is not null, format comments and get default name/title.. if needed.
-  $_POST["comments"]="'$_POST[comments]'";
-  if (!$_POST[name]) {$_POST[name]=="Anonymous"; }
-  if (!$_POST[title]) {$_POST[title]=="My Comments..."; }
-  }
-
-$_POST["name"] = strip_tags($_POST["name"]);
-$_POST["title"] = strip_tags($_POST["title"]);
-$_POST["comments"] = strip_tags($_POST["comments"]);
-
-//Are we behind a proxy and given the IP via an alternate enviroment variable? If so, use it.
-    if ($_SERVER["HTTP_X_FORWARDED_FOR"]) {
-        $remote_addr = $_SERVER["HTTP_X_FORWARDED_FOR"];
-    } else {
-        $remote_addr = $_SERVER["REMOTE_ADDR"];
-    }
-
-$sql = "INSERT INTO `t_feedback` (`ID`, `CommentName`, `CommentVote`, `CommentTitle`, `CommentNote`, `CommentDate`, `commentip`) VALUES ('$_POST[id]', '$_POST[name]', '$_POST[rating]', '$_POST[title]', $_POST[comments], NOW(NULL), '$remote_addr');";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-
-//Get Rating Data and Create $ratingarray
-$sql = "SELECT ID, CommentVote FROM  `t_feedback` WHERE `ID` = '$_POST[id]' AND `CommentVote` IS NOT NULL AND `CommentNote` IS NOT NULL ORDER  BY `CommentDate` ASC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-     $ratingarray[$row[ID]][] = $row["CommentVote"];
-   }
-
-//Compile Rating Average
-$id = $_POST[id];
-if (!$ratingarray[$id]) {$ratingarray[$id] = array(); }
-$numratings = count($ratingarray[$id]);
-$sumratings = array_sum($ratingarray[$id]);
-if ($numratings>0) {
-$rating = round($sumratings/$numratings, 1);
-} else {
-$rating="0"; } //Default Rating
-
-
-$sql = "UPDATE `t_main` SET `Rating`='$rating' WHERE `ID`='$id' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-
-if ($_POST["type"]=="E") {
-    $type="extensions";
-} else if ($_POST["type"]=="T") {
-    $type="themes";
-}
-
-$return_path="$type/moreinfo.php?id=$_POST[id]&vid=$_POST[vid]&page=comments&action=postsuccessfull";
-header("Location: http://$sitehostname/$return_path");
-exit;
-?>

mozilla/webtools/update/core/sessionconfig.php

@@ -1,94 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-
-//session_name('sid');
-//session_name();
-//session_start();
-
-if ($_GET["version"]=="auto-detect") {$_GET["version"]=""; unset($_SESSION["app_version"]);}//Clear Versioning in Session For AutoDetect 
-if ($_GET["application"] AND $_GET["application"] != $_SESSION["application"]) {
-$_SESSION["application"] = $_GET["application"]; //Put the selected app into session. skip detection. ;-)
-unset($_SESSION["app_version"]);
-$detection_force_version = "true"; //Skip application checking, just fill in the version.
-}
-
-//Get Browser Detection Data if it's not in the Session vars already
-if (!$_SESSION["application"] OR !$_SESSION["app_version"]) {
-include"inc_browserdetection.php";
-}
-
-//Change OS Support for showlist.php
-  switch ( $_GET["os"] )
-  {
-    case 'windows':
-      $_GET["os"] = 'Windows';
-      break;
-    case 'linux':
-      $_GET["os"] = 'Linux';
-      break;
-    case 'solaris':
-      $_GET["os"] = 'Solaris';
-      break;
-    case 'bsd':
-      $_GET["os"] = 'BSD';
-      break;
-    case 'macosx':
-      $_GET["os"] = 'MacOSX';
-      break;
-    case 'all':
-      $_GET["os"] = 'ALL';
-      break;
-    default:
-      unset($_GET["os"]);
-      break;
-  }
-
-
-if (($_GET["os"] and $_SESSION["app_os"]) AND $_GET["os"] !== $_SESSION["app_os"]) {
-$_SESSION["app_os"]=$_GET["os"];
-
-}
-
-//Got session data for browser/app detection, populate the variables
-$application = $_SESSION["application"];
-$app_version = $_SESSION["app_version"];
-$OS = $_SESSION["app_os"];
-
-
-if ($_GET["debug"]=="killappdata") { unset($_SESSION["application"],$_SESSION["app_version"]); }
-?>

mozilla/webtools/update/core/update.css

@@ -1,226 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Update.
- *
- * The Initial Developer of the Original Code is
- * Chris "Wolf" Crews.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-BODY {
-	MARGIN: 0px 0px 5px; FONT-FAMILY: Arial; BACKGROUND-COLOR: #fff
-}
-A {
-	COLOR: #00129c; TEXT-DECORATION: none
-}
-A:visited {
-	COLOR: #00129c; TEXT-DECORATION: none
-}
-A:hover {
-	COLOR: #fc5900
-}
-DIV.header {
-	BACKGROUND-IMAGE: url(/images/header.png); BACKGROUND-REPEAT: repeat-x; HEIGHT: 77px
-}
-DIV.header-top {
-	HEIGHT: 57px
-}
-DIV.logo {
-	z-index: 1; position: absolute; right: 0px
-}
-DIV.tabbar {
-	PADDING-LEFT: 26px; HEIGHT: 20px
-}
-
-DIV.nav {
-	BACKGROUND-IMAGE: url(/images/orangebar.png); background-repeat: repeat-x; PADDING-TOP: 3px; PADDING-LEFT: 10px; FONT-WEIGHT: bold; MARGIN-BOTTOM: 10px; COLOR: #fff; BACKGROUND-COLOR: #0F67C1; a:VISITED: #fff
-}
-DIV.nav A:visited { 
-  COLOR: #FFF;
-}
-DIV.nav A {
-	COLOR: #fff
-}
-DIV.adminheading {
-	FONT-WEIGHT: bold; FONT-SIZE: 10pt; MARGIN-RIGHT: 10px; HEIGHT: 25px; TEXT-ALIGN: right
-}
-.box {
-	BORDER-RIGHT: #ccc 2px solid; PADDING-RIGHT: 5px; BORDER-TOP: #ccc 2px solid; PADDING-LEFT: 5px; FONT-WEIGHT: bold; FONT-SIZE: 14pt; MARGIN-BOTTOM: 15px; PADDING-BOTTOM: 5px; POSITION: relative; LEFT: 150px; BORDER-LEFT: #ccc 2px solid; WIDTH: 78%; PADDING-TOP: 5px; BORDER-BOTTOM: #ccc 2px solid; -moz-border-radius: 10px
-}
-.boxheader {
-	MARGIN-BOTTOM: 6px; BORDER-BOTTOM: #000 1px solid
-}
-.boxcolumns {
-	BORDER-RIGHT: #ccc 2px solid; PADDING-RIGHT: 2px; BORDER-TOP: #ccc 2px solid; PADDING-LEFT: 2px; FONT-SIZE: 12pt; MIN-HEIGHT: 200px; FLOAT: left; PADDING-BOTTOM: 2px; MARGIN-LEFT: 2px; BORDER-LEFT: #ccc 2px solid; WIDTH: 31%; PADDING-TOP: 2px; BORDER-BOTTOM: #ccc 2px solid; -moz-border-radius: 10px
-}
-DIV.sidelinks {
-	BORDER-RIGHT: #ccc 2px solid; PADDING-RIGHT: 2px; BORDER-TOP: #ccc 2px solid; MARGIN-TOP: 10px; PADDING-LEFT: 2px; PADDING-BOTTOM: 2px; MARGIN-LEFT: 3px; BORDER-LEFT: #ccc 2px solid; WIDTH: 135px; PADDING-TOP: 2px; BORDER-BOTTOM: #ccc 2px solid; POSITION: absolute; -moz-border-radius: 10px
-}
-.sidebartitle {
-	FONT-WEIGHT: bold
-}
-.sidebartext {
-	MARGIN-LEFT: 4px
-}
-.updatebox {
-	BORDER-RIGHT: #ccc 2px solid; PADDING-RIGHT: 5px; BORDER-TOP: #ccc 2px solid; MARGIN-TOP: 3px; PADDING-LEFT: 5px; FONT-WEIGHT: bold; FONT-SIZE: 14pt; MIN-HEIGHT: 200px; MARGIN-BOTTOM: 15px; PADDING-BOTTOM: 5px; MARGIN-LEFT: 1px; BORDER-LEFT: #ccc 2px solid; WIDTH: 230px; PADDING-TOP: 5px; BORDER-BOTTOM: #ccc 2px solid; POSITION: absolute; -moz-border-radius: 10px
-}
-.frontpagecontainer {
-	MIN-HEIGHT: 150px; WIDTH: 100%
-}
-.contentbox {
-	BORDER-RIGHT: #ccc 1px solid; PADDING-RIGHT: 5px; BORDER-TOP: #ccc 1px solid; PADDING-LEFT: 5px; FONT-WEIGHT: bold; FONT-SIZE: 14pt; PADDING-BOTTOM: 5px; MARGIN: 0px 5px 15px 0px; BORDER-LEFT: #ccc 1px solid; PADDING-TOP: 5px; BORDER-BOTTOM: #ccc 1px solid; -moz-border-radius: 10px
-}
-.contentcolumns {
-	FLOAT: left; WIDTH: 48%
-}
-
-#content {
-	PADDING-LEFT: 5px; POSITION: relative; LEFT: 145px; WIDTH: 85%;
-}
-
-DIV.item {
-	BORDER-RIGHT: #ccc 2px solid; PADDING-RIGHT: 8px; BORDER-TOP: #ccc 2px solid; PADDING-LEFT: 8px; PADDING-BOTTOM: 0px; MARGIN: 0px auto 15px; BORDER-LEFT: #ccc 2px solid; WIDTH: 95%; PADDING-TOP: 8px; BORDER-BOTTOM: #ccc 2px solid; -moz-border-radius: 10px
-}
-#listnav {
-	BORDER-RIGHT: #ccc 2px solid; PADDING-RIGHT: 6px; BORDER-TOP: #ccc 2px solid; PADDING-LEFT: 6px; FONT-WEIGHT: bold; FONT-SIZE: 10pt; PADDING-BOTTOM: 6px; MARGIN: 3px auto; BORDER-LEFT: #ccc 2px solid; WIDTH: 95%; PADDING-TOP: 6px; BORDER-BOTTOM: #ccc 2px solid; TEXT-ALIGN: left; -moz-border-radius: 10px
-}
-.listform {
-	BORDER-RIGHT: #3d97c0 1px dotted; PADDING-RIGHT: 2px; BORDER-TOP: #3d97c0 1px dotted; PADDING-LEFT: 2px; PADDING-BOTTOM: 2px; MARGIN: 10px auto auto; BORDER-LEFT: #3d97c0 1px dotted; WIDTH: 90%; PADDING-TOP: 2px; BORDER-BOTTOM: #3d97c0 1px dotted; HEIGHT: 25px; BACKGROUND-COLOR: #d4e9f2; TEXT-ALIGN: center
-}
-.title A {
-	COLOR: #fc5900
-}
-.title A:visited {
-	COLOR: #fc5900
-}
-.liststars {
-	FLOAT: right; WIDTH: 80px; HEIGHT: 20px
-}
-.listtitle {
-	FONT-WEIGHT: bold; FONT-SIZE: 11pt
-}
-.itemtitle {
-	FONT-WEIGHT: bold; FONT-SIZE: 14pt; MARGIN-BOTTOM: 10px; MARGIN-LEFT: 30px
-}
-.authorline {
-	FONT-SIZE: 10pt; MARGIN-LEFT: 15px
-}
-.itemdescription {
-	FONT-SIZE: 10pt
-}
-.iconbar {
-	PADDING-RIGHT: 5px; FONT-WEIGHT: normal; FONT-SIZE: 9pt; FLOAT: right; WIDTH: 125px; HEIGHT: 34px; TEXT-ALIGN: left
-}
-.filesize {
-	FONT-WEIGHT: bold; FONT-SIZE: 8pt
-}
-.smallfont {
-	FONT-WEIGHT: bold; FONT-SIZE: 8pt
-}
-.baseline {
-	BORDER-TOP: #ccc 1px solid; PADDING-LEFT: 10px; FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #333
-}
-.noitems {
-	FONT-WEIGHT: bold; FONT-SIZE: 12pt; HEIGHT: 60px; TEXT-ALIGN: center
-}
-.pagenum {
-	FONT-SIZE: 9pt; FLOAT: right
-}
-DIV.tabbar {
-	PADDING-RIGHT: 8px; PADDING-LEFT: 8px; PADDING-BOTTOM: 0px; MARGIN: 0px auto auto; WIDTH: 85%; PADDING-TOP: 0px; HEIGHT: 20px
-}
-DIV.tab {
-	BORDER-RIGHT: #ccc 2px solid; PADDING-RIGHT: 3px; BORDER-TOP: #ccc 2px solid; PADDING-LEFT: 3px; FONT-SIZE: 11pt; FLOAT: left; MARGIN: 0px 3px; VERTICAL-ALIGN: middle; BORDER-LEFT: #ccc 2px solid; BORDER-BOTTOM: #ccc 2px solid; HEIGHT: 20px; BACKGROUND-COLOR: #ddd; TEXT-ALIGN: center; -moz-border-radius: 10px
-}
-.downloadbox {
-	BORDER-RIGHT: #ccc 1px dotted; BORDER-TOP: #ccc 1px dotted; FONT-WEIGHT: bold; FLOAT: left; BORDER-LEFT: #ccc 1px dotted; BORDER-BOTTOM: #ccc 1px dotted; max-width: 395px;
-}
-.moreinfoinstall {
-	MARGIN-LEFT: 18px; WIDTH: 250px; HEIGHT: 34px
-}
-.commentbox {
-	BORDER-RIGHT: #ccc 1px solid; PADDING-RIGHT: 2px; BORDER-TOP: #ccc 1px solid; PADDING-LEFT: 5px; FONT-WEIGHT: bold; FONT-SIZE: 10pt; MIN-HEIGHT: 260px; PADDING-BOTTOM: 6px; MARGIN: auto 0px 5px auto; BORDER-LEFT: #ccc 1px solid; WIDTH: 50%; PADDING-TOP: 2px; BORDER-BOTTOM: #ccc 1px solid
-}
-.commenttitlebar {
-	PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 11pt; HEIGHT: 20px; BACKGROUND-COLOR: #eee
-}
-.commenttitle {
-	PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 11pt; POSITION: absolute
-}
-.commentfooter {
-	PADDING-RIGHT: 5px; FONT-SIZE: 8pt; TEXT-ALIGN: right
-}
-.nocomment {
-	MARGIN-LEFT: 30px
-}
-.mipageheading {
-	BORDER-TOP: #ccc 1px solid; MARGIN-TOP: 5px; PADDING-LEFT: 4px; FONT-WEIGHT: bold; FONT-SIZE: 11pt; MARGIN-BOTTOM: 5px; COLOR: #333
-}
-.reviewbox {
-	BORDER-RIGHT: #bbb 1px dotted; BORDER-TOP: #bbb 1px dotted; FONT-WEIGHT: bold; MARGIN: auto auto 10px; BORDER-LEFT: #bbb 1px dotted; WIDTH: 70%; BORDER-BOTTOM: #bbb 1px dotted
-};
-.opinionform {
-	FONT-WEIGHT: bold; FONT-SIZE: 10pt; MARGIN: auto 30px; WIDTH: 80%; LINE-HEIGHT: 30px
-}
-.errorbox {
-	BORDER-RIGHT: #f00 1px solid; PADDING-RIGHT: 3px; BORDER-TOP: #f00 1px solid; PADDING-LEFT: 3px; PADDING-BOTTOM: 3px; MARGIN: auto auto 20px; BORDER-LEFT: #f00 1px solid; WIDTH: 80%; PADDING-TOP: 3px; BORDER-BOTTOM: #f00 1px solid
-}
-.boxheader2 {
-	BORDER-TOP: #2e64ff 4px solid; HEIGHT: 4px
-}
-.boldfont {
-	FONT-WEIGHT: bold
-}
-.disabled {
-	FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #ccc; FONT-STYLE: italic
-}
-.emailactive {
-	FONT-WEIGHT: bold; FONT-SIZE: 10pt; FONT-STYLE: italic
-}
-.profileitemdesc {
-	FONT-WEIGHT: bold; FONT-SIZE: 10pt; MARGIN-BOTTOM: 4px; MARGIN-LEFT: 20px
-}
-.mailresult {
-	FONT-WEIGHT: bold; FONT-SIZE: 14pt; MARGIN: auto; WIDTH: 650px; HEIGHT: 30px; TEXT-ALIGN: center
-}
-.faqtitle {
-	FONT-WEIGHT: normal; FONT-SIZE: 24pt; COLOR: #0065CA; TEXT-ALIGN: center
-}
-.faqitemtitle {
-	FONT-WEIGHT: bold; FONT-SIZE: 12pt
-}
-.faqitemtext {
-	MARGIN-LEFT: 5px
-}
-.footer {
-	PADDING-RIGHT: 30px; FONT-WEIGHT: bold; FONT-SIZE: 10pt; MARGIN-LEFT: 200px; TEXT-ALIGN: right
-}

mozilla/webtools/update/database/README

@@ -1,4 +0,0 @@
-The files contained in this directory are schema for the Mozilla Update MySQL Database.
-This directory does not have to be on the webserver for the site to function, in fact, it should not be.
-
-Mozilla Update requires MySQL 4.0 or higher w/ InnoDB support.

mozilla/webtools/update/database/mozillaupdate.sql

@@ -1,348 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http:#www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Update.
-#
-# The Initial Developer of the Original Code is
-# Chris "Wolf" Crews.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-#   Alan Starr <alanjstarr@yahoo.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
--- phpMyAdmin SQL Dump
--- version 2.6.0-rc1
--- http://www.phpmyadmin.net
--- 
--- Host: localhost
--- Generation Time: Sep 12, 2004 at 05:07 AM
--- Server version: 4.0.18
--- PHP Version: 4.3.8
--- 
--- Database: `mozillaupdate`
--- 
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_applications`
--- 
-
-CREATE TABLE `t_applications` (
-  `AppID` int(11) NOT NULL auto_increment,
-  `AppName` varchar(30) NOT NULL default '',
-  `Version` varchar(10) NOT NULL default '',
-  `major` int(3) NOT NULL default '0',
-  `minor` int(3) NOT NULL default '0',
-  `release` int(3) NOT NULL default '0',
-  `build` int(14) NOT NULL default '0',
-  `SubVer` enum('a','b','final','','+') NOT NULL default 'final',
-  `GUID` varchar(50) NOT NULL default '',
-  PRIMARY KEY  (`AppID`),
-  KEY `AppName` (`AppName`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=25 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_approvallog`
--- 
-
-CREATE TABLE `t_approvallog` (
-  `LogID` int(5) NOT NULL auto_increment,
-  `ID` varchar(11) NOT NULL default '',
-  `vID` varchar(11) NOT NULL default '',
-  `UserID` varchar(11) NOT NULL default '',
-  `action` varchar(255) NOT NULL default '',
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
-  `comments` text NOT NULL,
-  PRIMARY KEY  (`LogID`),
-  KEY `ID` (`ID`),
-  KEY `vID` (`vID`),
-  KEY `UserID` (`UserID`),
-  KEY `UserID_2` (`UserID`)
-) TYPE=InnoDB AUTO_INCREMENT=430 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_authorxref`
--- 
-
-CREATE TABLE `t_authorxref` (
-  `ID` int(11) NOT NULL default '0',
-  `UserID` int(11) NOT NULL default '0',
-  KEY `ID` (`ID`),
-  KEY `UserID` (`UserID`)
-) TYPE=InnoDB;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_categories`
--- 
-
-CREATE TABLE `t_categories` (
-  `CategoryID` int(11) NOT NULL auto_increment,
-  `CatName` varchar(30) NOT NULL default '',
-  `CatDesc` varchar(100) NOT NULL default '',
-  `CatType` enum('E','T','P') NOT NULL default 'E',
-  PRIMARY KEY  (`CategoryID`)
-) TYPE=InnoDB AUTO_INCREMENT=28 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_categoryxref`
--- 
-
-CREATE TABLE `t_categoryxref` (
-  `ID` int(11) NOT NULL default '0',
-  `CategoryID` int(11) NOT NULL default '0',
-  KEY `IDIndex` (`ID`,`CategoryID`),
-  KEY `CategoryID` (`CategoryID`)
-) TYPE=InnoDB;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_downloads`
--- 
-
-CREATE TABLE `t_downloads` (
-  `dID` int(11) NOT NULL auto_increment,
-  `ID` varchar(5) NOT NULL default '',
-  `date` varchar(14) default NULL,
-  `downloadcount` int(15) NOT NULL default '0',
-  `vID` varchar(5) NOT NULL default '',
-  `user_ip` varchar(15) NOT NULL default '',
-  `user_agent` text NOT NULL,
-  `type` enum('count','download') NOT NULL default 'download',
-  PRIMARY KEY  (`dID`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=3 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_faq`
--- 
-
-CREATE TABLE `t_faq` (
-  `id` int(3) NOT NULL auto_increment,
-  `index` varchar(5) NOT NULL default '1',
-  `alias` varchar(12) NOT NULL default '',
-  `title` varchar(150) NOT NULL default '',
-  `text` text NOT NULL,
-  `lastupdated` timestamp(14) NOT NULL,
-  `active` enum('YES','NO') NOT NULL default 'YES',
-  PRIMARY KEY  (`id`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=7 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_feedback`
--- 
-
-CREATE TABLE `t_feedback` (
-  `CommentID` int(11) NOT NULL auto_increment,
-  `ID` int(11) NOT NULL default '0',
-  `CommentName` varchar(100) default NULL,
-  `CommentVote` enum('0','1','2','3','4','5') default NULL,
-  `CommentTitle` varchar(75) NOT NULL default '',
-  `CommentNote` text,
-  `CommentDate` datetime NOT NULL default '0000-00-00 00:00:00',
-  `commentip` varchar(15) NOT NULL default '',
-  PRIMARY KEY  (`CommentID`),
-  KEY `ID` (`ID`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=15487 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_main`
--- 
-
-CREATE TABLE `t_main` (
-  `ID` int(11) NOT NULL auto_increment,
-  `GUID` varchar(50) NOT NULL default '',
-  `Name` varchar(100) NOT NULL default '',
-  `Type` enum('T','E','P') NOT NULL default 'T',
-  `DateAdded` datetime NOT NULL default '0000-00-00 00:00:00',
-  `DateUpdated` datetime NOT NULL default '0000-00-00 00:00:00',
-  `Homepage` varchar(200) default NULL,
-  `Description` varchar(255) NOT NULL default '',
-  `Rating` varchar(4) NOT NULL default '0',
-  `downloadcount` int(15) NOT NULL default '0',
-  `TotalDownloads` int(18) NOT NULL default '0',
-  PRIMARY KEY  (`ID`),
-  KEY `Type` (`Type`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=218 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_os`
--- 
-
-CREATE TABLE `t_os` (
-  `OSID` int(11) NOT NULL auto_increment,
-  `OSName` varchar(20) NOT NULL default '',
-  PRIMARY KEY  (`OSID`),
-  UNIQUE KEY `OSName` (`OSName`)
-) TYPE=InnoDB AUTO_INCREMENT=7 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_previews`
--- 
-
-CREATE TABLE `t_previews` (
-  `PreviewID` int(11) NOT NULL auto_increment,
-  `PreviewURI` varchar(200) NOT NULL default '',
-  `vID` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`PreviewID`),
-  KEY `vID` (`vID`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=24 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_reviews`
--- 
-
-CREATE TABLE `t_reviews` (
-  `rID` int(11) NOT NULL auto_increment,
-  `ID` int(11) NOT NULL default '0',
-  `AppID` int(11) NOT NULL default '0',
-  `DateAdded` datetime NOT NULL default '0000-00-00 00:00:00',
-  `AuthorID` int(11) NOT NULL default '0',
-  `Title` varchar(60) NOT NULL default '',
-  `Body` text,
-  `pick` enum('YES','NO') NOT NULL default 'NO',
-  `featured` enum('YES','NO') NOT NULL default 'NO',
-  PRIMARY KEY  (`rID`),
-  KEY `ID` (`ID`),
-  KEY `AppID` (`AppID`),
-  KEY `AuthorID` (`AuthorID`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=3 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_userprofiles`
--- 
-
-CREATE TABLE `t_userprofiles` (
-  `UserID` int(11) NOT NULL auto_increment,
-  `UserName` varchar(100) NOT NULL default '',
-  `UserEmail` varchar(100) NOT NULL default '',
-  `UserWebsite` varchar(100) default NULL,
-  `UserPass` varchar(200) NOT NULL default '',
-  `UserMode` enum('A','E','U','D') NOT NULL default 'U',
-  `UserTrusted` enum('TRUE','FALSE') NOT NULL default 'FALSE',
-  `UserEmailHide` tinyint(1) NOT NULL default '1',
-  PRIMARY KEY  (`UserID`),
-  UNIQUE KEY `UserEmail` (`UserEmail`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=142 ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `t_version`
--- 
-
-CREATE TABLE `t_version` (
-  `vID` int(11) NOT NULL auto_increment,
-  `ID` int(11) NOT NULL default '0',
-  `Version` varchar(30) NOT NULL default '0',
-  `OSID` int(11) NOT NULL default '0',
-  `AppID` int(11) NOT NULL default '0',
-  `MinAppVer` varchar(10) NOT NULL default '',
-  `MinAppVer_int` varchar(10) NOT NULL default '',
-  `MaxAppVer` varchar(10) NOT NULL default '',
-  `MaxAppVer_int` varchar(10) NOT NULL default '',
-  `Size` int(11) NOT NULL default '0',
-  `DateAdded` datetime NOT NULL default '0000-00-00 00:00:00',
-  `DateUpdated` datetime NOT NULL default '0000-00-00 00:00:00',
-  `URI` varchar(255) NOT NULL default '',
-  `Notes` text,
-  `approved` enum('YES','NO','?') NOT NULL default '?',
-  PRIMARY KEY  (`vID`),
-  KEY `ID` (`ID`),
-  KEY `AppID` (`AppID`),
-  KEY `OSID` (`OSID`),
-  KEY `Version` (`Version`)
-) TYPE=InnoDB PACK_KEYS=0 AUTO_INCREMENT=558 ;
-
--- 
--- Constraints for dumped tables
--- 
-
--- 
--- Constraints for table `t_authorxref`
--- 
-ALTER TABLE `t_authorxref`
-  ADD CONSTRAINT `0_125` FOREIGN KEY (`ID`) REFERENCES `t_main` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE,
-  ADD CONSTRAINT `0_126` FOREIGN KEY (`UserID`) REFERENCES `t_userprofiles` (`UserID`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Constraints for table `t_categoryxref`
--- 
-ALTER TABLE `t_categoryxref`
-  ADD CONSTRAINT `0_128` FOREIGN KEY (`ID`) REFERENCES `t_main` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE,
-  ADD CONSTRAINT `0_129` FOREIGN KEY (`CategoryID`) REFERENCES `t_categories` (`CategoryID`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Constraints for table `t_feedback`
--- 
-ALTER TABLE `t_feedback`
-  ADD CONSTRAINT `0_131` FOREIGN KEY (`ID`) REFERENCES `t_main` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Constraints for table `t_previews`
--- 
-ALTER TABLE `t_previews`
-  ADD CONSTRAINT `0_133` FOREIGN KEY (`vID`) REFERENCES `t_version` (`vID`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Constraints for table `t_reviews`
--- 
-ALTER TABLE `t_reviews`
-  ADD CONSTRAINT `0_135` FOREIGN KEY (`ID`) REFERENCES `t_main` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE,
-  ADD CONSTRAINT `0_136` FOREIGN KEY (`AppID`) REFERENCES `t_applications` (`AppID`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Constraints for table `t_version`
--- 
-ALTER TABLE `t_version`
-  ADD CONSTRAINT `0_139` FOREIGN KEY (`ID`) REFERENCES `t_main` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE,
-  ADD CONSTRAINT `0_140` FOREIGN KEY (`AppID`) REFERENCES `t_applications` (`AppID`) ON DELETE CASCADE ON UPDATE CASCADE;

mozilla/webtools/update/developercp.php

@@ -1,77 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-<TITLE>Mozilla Update :: Developer Control Panel - Coming Soon</TITLE>
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-$application="login";
-include"$page_header";
-?>
-<DIV class="faqtitle">Developer Control Panel - Coming Soon</DIV>
-
-<DIV style="width: 75%; margin: auto; margin-top: 20px; border: 1px dotted #0065CA; padding: 5px">
-In the next version of Mozilla Update, Mozilla Update will have a new section for Extension/Theme authors to login to. This new section
-will give them the ability to manage their extensions and themes that're hosted on Mozilla Update themselves.<BR>
-<BR>
-Authors will have the ability to add a new extension or theme themselves, as well as adding new versions of that extension or theme,
-updating an existing listing (including being able to change the application-compatibility settings w/o needing a new file), and if
-they so desire, the ability to remove entirely an old version of an extension or theme or the entire listing.<BR>
-<BR>
-Other features that will be available include the capability of adding and managing preview images of their extension or theme,
-a developer comments feature, so they can easily communicate to end-users known problems with the extension/theme.
-<BR>
-</DIV>
-
-&nbsp;<P>
-
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/extensions/authorprofiles.php

@@ -1,194 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-
-<?php
-//Bookmarking-Friendly Page Title
-$sql = "SELECT  UserName FROM `t_userprofiles`  WHERE UserID = '$_GET[id]' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-if (mysql_num_rows($sql_result)===0) {
-$return = page_error("2","Author ID is Invalid or Missing.");
-exit;
-
-}
-  $row = mysql_fetch_array($sql_result);
-?>
-
-<TITLE>Mozilla Update :: Extensions - Author Profile: <?php echo"$row[UserName]"; ?></TITLE>
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-include"$page_header";
-
-$type = "E";
-$category = $_GET["category"];
-include"inc_sidebar.php";
-?>
-<DIV id="content">
-<?php
-$userid = $_GET["id"];
- $sql = "SELECT * FROM `t_userprofiles` WHERE `UserID` = '$userid' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-   $row = mysql_fetch_array($sql_result);
-    $userid = $row["UserID"];
-    $username = $row["UserName"];
-    $useremail = $row["UserEmail"];
-    $userwebsite = $row["UserWebsite"];
-    $userpass = $row["UserPass"];
-    $userrole = $row["UserRole"];
-    $useremailhide = $row["UserEmailHide"];
-?>
-<DIV class="item">
-<SPAN class="boldfont">Profile for <?php echo"$username"; ?></SPAN><BR>
-<DIV class="boxheader2"></DIV>
-<SPAN class="boldfont">Homepage:</SPAN> <?php 
-if ($userwebsite) {echo"<A HREF=\"$userwebsite\" target=\"_blank\">$userwebsite</A>";
- } else {
-echo"<SPAN CLASS=\"disabled\">Not Available for this Author</SPAN>";
-}
-?><BR>
-<SPAN class="boldfont">E-Mail:</SPAN> <?php if ($useremailhide=="1") {
-echo"<SPAN class=\"disabled\">Not Disclosed by Author</SPAN>";
-} else {
-echo"<SPAN class=\"emailactive\">Contact this Author via the <A HREF=\"#email\">E-Mail form</A> below</SPAN>";
-} 
-?>
-</DIV>
-&nbsp;<BR>
-<DIV class="item">
-<SPAN class="boldfont">All Extensions and Themes by <?php echo"$username"; ?></SPAN><BR>
-<DIV class="boxheader2"></DIV>
-<?php
-$sql = "SELECT  TM.ID, TM.Type, TM.Name, TM.Description, TM.DateUpdated, TM.TotalDownloads, TU.UserEmail FROM  `t_main`  TM 
-LEFT JOIN t_authorxref TAX ON TM.ID = TAX.ID
-INNER JOIN t_userprofiles TU ON TAX.UserID = TU.UserID
-WHERE TU.UserID = '$userid' AND TM.Type !='P'
-ORDER  BY  `Type` , `Name` ";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $numresults = mysql_num_rows($sql_result);
-  while ($row = mysql_fetch_array($sql_result)) {
-
-
-$sql2 = "SELECT `vID`, `Version` FROM `t_version` WHERE `ID` = '$row[ID]' AND `approved` = 'YES' ORDER BY `Version` ASC LIMIT 1";
- $sql_result2 = mysql_query($sql2, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row2 = mysql_fetch_array($sql_result2)) {
-   $vid = $row2["vID"];
-   $version = $row2["Version"];
-
-$v++;
-    $id = $row["ID"];
-    $type = $row["Type"];
-    $name = $row["Name"];
-    $dateadded = $row["DateAdded"];
-    $dateupdated = $row["DateUpdated"];
-    $homepage = $row["Homepage"];
-    $description = $row["Description"];
-    $authors = $row["UserEmail"];
-    $downloadcount = $row["TotalDownloads"];
-
-	$day=substr($dateupdated,8,2);  //get the day
-    $month=substr($dateupdated,5,2); //get the month
-    $year=substr($dateupdated,0,4); //get the year
-    $hour=substr($dateupdated,11,2); //get the hour
-    $minute=substr($dateupdated,14,2); //get the minute
-    $second=substr($dateupdated,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $dateupdated = gmdate("F d, Y g:i:sa", $timestamp); //gmdate("F d, Y", $dutimestamp);
-
-echo"<DIV CLASS=\"item\">";
-echo"<SPAN class=\"title itemtitle\" style=\"margin-left: 0px\"><A HREF=\"moreinfo.php?application=$application&id=$id\">$name</A></SPAN><BR>";
-echo"<DIV class=\"profileitemdesc\">$description</DIV>\n";
-echo"<DIV class=\"baseline\">Updated: $dateupdated | Downloads: $downloadcount</DIV>\n";
-
-echo"</DIV>\n";
-echo"<BR>\n";
-}
-}
-if ($numresults=="0") {
-echo"<DIV class=\"noitems\">No Extensions or Themes in the Database for $username yet...</DIV>";
-}
-?>
-</DIV>
-&nbsp;<BR>
-<?php if ($useremailhide !=="1") { ?>
-<A NAME="email"></A>
-<DIV class="item">
-<SPAN class="boldfont">Send an E-Mail to <?php echo"$username"; ?></SPAN><BR>
-<DIV class="boxheader2"></DIV>
-<?php
-//SendMail Returned Message Section
-if ($_GET["mail"]) {
-$mail = $_GET["mail"];
-echo"<DIV class=\"mailresult\">";
-if ($mail=="successful") {
-echo"Your message has been sent successfully..."; 
-} else if ($mail=="unsuccessful") {
-echo"An error occured, your message was not sent... Please try again..."; 
-}
-echo"</DIV>\n";
-}
-?>
-<FORM NAME="sendmail" METHOD="POST" ACTION="sendmail.php">
-<INPUT NAME="senduserid" TYPE="HIDDEN" VALUE="<?php echo"$userid"; ?>">
-Your Name: <INPUT NAME="fromname" TYPE="TEXT" SIZE=40 MAXLENGTH=100>&nbsp;&nbsp; Email: <INPUT NAME="fromemail" TYPE="TEXT" SIZE=40 MAXLENGTH=100><BR>
-Subject: <INPUT NAME="subject" TYPE="TEXT" SIZE=40 MAXLENGTH=100><BR>
-Message:<BR>
-<CENTER><TEXTAREA NAME="body" ROWS=20 COLS=65></TEXTAREA><BR>
-<INPUT NAME="submit" TYPE="SUBMIT" VALUE="Send Message">&nbsp;&nbsp;<INPUT NAME="reset" TYPE="RESET" VALUE="Reset Form"><BR>
-</CENTER>
-</FORM>
-</DIV>
-&nbsp;<BR>
-<?php } ?>
-</DIV>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/extensions/inc_sidebar.php

@@ -1,88 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<DIV class="sidelinks">
-<?php
-unset($typename);
-$types = array("E"=>"Extensions","T"=>"Themes","U"=>"Updates");
-$typename = $types["$type"];
-echo"<DIV CLASS=\"sidebartitle\">Categories:</DIV>\n";
-echo"<DIV class=\"sidebartext\">";
-if (!$category AND $index !="yes") {echo"<SPAN CLASS=\"title\">"; }
-  echo"<SPAN class=\"sidebartitle\"><A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=All\" TITLE=\"Show All ".ucwords($typename)." Alphabetically\">All</A></SPAN><BR>\n";
-if (!$category AND $index !="yes") {echo"</SPAN>"; }
-
-// Object Categories
-$sql = "SELECT `CatName`,`CatDesc` FROM `t_categories` WHERE `CatType` = '$type' ORDER BY `CatName`";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-  $catname = $row["CatName"];
-  $catdesc = $row["CatDesc"];
-  if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">$catname</A><BR>\n";
-  if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-  }
-?>
-<BR>
-<?php
-$catname = "Editors Pick";
-$catdesc = ucwords($typename)." picked by the Mozilla Update Editors";
-if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">Editor's Pick</A><BR>\n";
-if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-
-$catname = "Popular";
-$catdesc = ucwords($typename)." downloaded the most";
-if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">$catname</A><BR>\n";
-if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-
-$catname = "Top Rated";
-$catdesc = ucwords($typename)." rated the highest";
-if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">$catname</A><BR>\n";
-if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-
-$catname = "Newest";
-$catdesc = "Most recent ".ucwords($typename);
-if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">$catname</A><BR>\n";
-if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-?>
-</DIV>
-</DIV>

mozilla/webtools/update/extensions/index.php

@@ -1,229 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-
-<TITLE>Mozilla Update :: Extensions - Add Features to Mozilla Software</TITLE>
-
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-$type = "E";
-if ($_GET["application"]) {$application=$_GET["application"]; }
-include"$page_header";
-$index="yes";
-include"inc_sidebar.php";
-?>
-<DIV class="box">
-<DIV class="boxheader" style="width: 100%">What is an Extension?</DIV>
-<SPAN class="itemdescription">Extensions are small add-ons that add new functionality to <?php print(ucwords($application)); ?>.
-They can add anything from a toolbar button to a completely new feature. They allow the browser to be customized to fit the
-personal needs of each user if they need additional features<?php if ($application !=="mozilla") { ?>, while keeping <?php print(ucwords($application)); ?> small
-to download <?php } ?>.</SPAN>
-</DIV>
-
-<DIV class="box">
-<DIV class="boxheader" style="width: 100%">Featured <?php print(ucwords($application)); ?> Extension</DIV>
-<?php
-$sql = "SELECT TR.ID, TM.Name, `Title`, TR.DateAdded, `Body`, `Type`, `pick` FROM `t_reviews`  TR
-INNER JOIN t_main TM ON TR.ID = TM.ID
-INNER JOIN t_version TV ON TV.ID = TM.ID
-INNER JOIN t_applications TA ON TA.AppID = TV.AppID
-WHERE `Type` = '$type' AND `AppName` = '$application' AND `featured`='YES' ORDER BY `rID` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $id = $row["ID"];
-    $name = $row["Name"];
-    $title = $row["Title"];
-    $dateadded = $row["DateAdded"];
-    $pick = $row["pick"];
-    $body = $row["Body"];
-    $bodylength = strlen($body);
-if ($bodylength>"250") {
- $body = substr($body,0,250);
- $body .= " <a href=\"moreinfo.php?id=$id&application=$application&page=staffreview\">[More...]</a>";
- 
- }
-
-//Create Customizeable Timestamp
-	$day=substr($dateadded,8,2);  //get the day
-    $month=substr($dateadded,5,2); //get the month
-    $year=substr($dateadded,0,4); //get the year
-    $hour=substr($dateadded,11,2); //get the hour
-    $minute=substr($dateadded,14,2); //get the minute
-    $second=substr($dateadded,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $date = gmdate("F, Y", $timestamp);
-
-echo"<a href=\"moreinfo.php?id=$id\">$name</A> -- $title";
-if ($pick=="YES") {echo" - $date Editors Pick"; }
-echo"<BR>\n";
-echo"<SPAN class=\"itemdescription\">$body</SPAN><BR>\n";
-}
-?>
-</DIV>
-<?php
-//Temporary!! Current Version Array Code
-$currentver_array = array("firefox"=>"1.0", "thunderbird"=>"1.0", "mozilla"=>"1.7");
-$currentver_display_array = array("firefox"=>"1.0", "thunderbird"=>"1.0", "mozilla"=>"1.7.x");
-$currentver = $currentver_array[$application];
-$currentver_display = $currentver_display_array[$application];
-?>
-<DIV class="box" style="width: 80%; min-height: 200px; border: 0px">
-<DIV class="boxcolumns">
-<DIV class="boxheader"><A HREF="showlist.php?application=<?php echo"$application"; ?>&category=Popular">Most Popular</A>:</DIV>
-<?php
-$i=0;
-$sql = "SELECT TM.ID, TV.vID,TM.Name, TV.Version, TM.TotalDownloads, TM.downloadcount
-FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-WHERE  `Type`  =  '$type' AND `AppName` = '$application' AND `minAppVer_int` <='$currentver' AND `maxAppVer_int` >= '$currentver' AND `downloadcount` > '0' AND `approved` = 'YES' ORDER BY `downloadcount` DESC ";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $i++;
-   $id = $row["ID"];
-   $vid = $row["vID"];
-   $name = $row["Name"];
-   $version = $row["Version"];
-   $downloadcount = $row["downloadcount"];
-   $totaldownloads = $row["TotalDownloads"];
-if ($lastname == $name) {$i--; continue; }
-  echo"$i - <a href=\"moreinfo.php?application=$application&id=$id\">$name</a><br>\n";
-  echo"<SPAN class=\"smallfont nocomment\">($downloadcount downloads)</SPAN><BR>\n";
-
-$lastname = $name;
-if ($i >= "5") {break;}
-}
-?>
-<BR>
-</DIV>
-<DIV class="boxcolumns">
-<DIV class="boxheader"><A HREF="showlist.php?category=Top Rated">Top Rated</A>:</DIV>
-<?php
-$r=0;
-$usednames = array();
-$sql = "SELECT TM.ID, TV.vID, TM.Name, TV.Version, TM.Rating, TU.UserName
-FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER JOIN t_authorxref TAX ON TAX.ID = TM.ID
-INNER JOIN t_userprofiles TU ON TU.UserID = TAX.UserID
-WHERE  `Type`  =  '$type' AND `AppName` = '$application' AND `minAppVer_int` <='$currentver' AND `maxAppVer_int` >= '$currentver' AND `Rating` > '0' AND `approved` = 'YES' ORDER BY `Rating` DESC, `Name` ASC, `Version` DESC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $r++; $s++;
-   $id = $row["ID"];
-   $vid = $row["vID"];
-   $name = $row["Name"];
-   $version = $row["Version"];
-   $rating = $row["Rating"];
-  $arraysearch = array_search("$name", $usednames);
-  if ($arraysearch !== false AND $usedversions[$arraysearch]['version']<$version) {$r--; continue; } //
-  echo"$r - <a href=\"moreinfo.php?application=$application&id=$id\">$name</a>&nbsp;";
-
-  //$rating = round($rating);
-echo"<SPAN title=\"Rated: $rating of 5\" style=\"font-size: 8pt\">";
-for ($i = 1; $i <= floor($rating); $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-if ($rating>floor($rating)) {
-$val = ($rating-floor($rating))*10;
-echo"<IMG SRC=\"/images/stars/star_0$val.png\" BORDER=0 ALT=\"\">";
-$i++;
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-echo"</SPAN><br>\n";
-//echo"<SPAN class=\"smallfont nocomment\">By $author</SPAN><BR>\n";
-$usednames[$s] = $name;
-$usedversions[$s] = $version;
-if ($r >= "5") {break;}
-}
-unset($usednames, $usedversions, $r, $s, $i);
-?>
-</DIV>
-<DIV class="boxcolumns">
-<DIV class="boxheader"><A HREF="showlist.php?category=Newest">Most Recent</A>:</DIV>
-<?php
-$i=0;
-$sql = "SELECT TM.ID, TV.vID, TM.Name, TV.Version, TV.DateAdded
-FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID
-WHERE  `Type`  =  '$type' AND `AppName` = '$application' AND `minAppVer_int` <='$currentver' AND `maxAppVer_int` >= '$currentver' AND (`OSName` = '$_SESSION[app_os]' OR `OSName` = 'ALL') AND `approved` = 'YES' ORDER BY `DateAdded` DESC ";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $i++;
-   $id = $row["ID"];
-   $vid = $row["vID"];
-   $name = $row["Name"];
-   $version = $row["Version"];
-   $dateadded = $row["DateAdded"];
-//Create Customizeable Datestamp
-    $timestamp = strtotime("$dateadded");
-    $dateadded = gmdate("F d, Y g:i:sa", $timestamp); //    $dateupdated = gmdate("F d, Y g:i:sa T", $timestamp);
-
-if ($lastname == $name) {$i--; continue; }
-  echo"$i - <a href=\"moreinfo.php?application=$application&id=$id&vid=$vid\">$name $version</a><BR>\n";
-  echo"<SPAN class=\"smallfont nocomment\">($dateadded)</SPAN><BR>\n";
-
-$lastname = $name;
-if ($i >= "5") {break;}
-}
-?>
-</DIV>
-</DIV>
-<BR>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/extensions/install.php

@@ -1,106 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php 
-require"../core/config.php";
-//Get Full Information for the file requested.
-$sql = "SELECT `URI` FROM `t_version` WHERE `ID`='$_GET[id]' AND `vID`='$_GET[vid]' LIMIT 1";
-$sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
- $row = mysql_fetch_array($sql_result);
-$uri=$row["URI"]; 
-
-header("Location: $uri");
-exit;
-
-//XXX This codepath sucks performance wise and has been disabled. See Bug 267822.
-
-// New DownloadCount management Code..
-//Check for user, to see if they recently accessed this file (filters duplicate/triplicate+ requests in a short period).
-  $maxlife = date("YmdHis", mktime(date("H"), date("i")-10, date("s"), date("m"), date("d"), date("Y")));
-  $sql = "SELECT `dID` FROM `t_downloads` WHERE `ID`='$_GET[id]' AND `vID`='$_GET[vid]' AND `user_ip`='$_SERVER[REMOTE_ADDR]' AND `user_agent` = '$_SERVER[HTTP_USER_AGENT]' AND `date`>'$maxlife' AND `type`='download' LIMIT 1";
-    $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-    if (mysql_num_rows($sql_result)=="0") {
-     //Insert a record of this download for the next 10 minutes anyway. :-)
-     $today=date("YmdHis");
-      $sql = "INSERT INTO `t_downloads` (`ID`,`date`,`vID`, `user_ip`, `user_agent`, `type`) VALUES ('$_GET[id]','$today','$_GET[vid]', '$_SERVER[REMOTE_ADDR]', '$_SERVER[HTTP_USER_AGENT]', 'download');";
-        $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-    //Cleanup the Individual Downloads part of the table for old records
-    $sql = "DELETE FROM `t_downloads` WHERE `date`<'$maxlife' AND `type`='download'";
-      $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-$today=date("Ymd")."000000";
-  //Per day download tracking -- Record hits for this day in the record (if it doesn't exist create it)
-  $sql = "SELECT `dID` FROM `t_downloads` WHERE `ID`='$_GET[id]' AND `date`='$today' AND `type`='count' LIMIT 1";
-    $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-    if (mysql_num_rows($sql_result)=="0") {
-      $sql = "INSERT INTO `t_downloads` (`ID`,`date`,`downloadcount`,`type`) VALUES ('$_GET[id]','$today','1','count');";
-    } else {
-        $row = mysql_fetch_array($sql_result);
-      $sql = "UPDATE `t_downloads` SET `downloadcount`=downloadcount+1 WHERE `dID`='$row[dID]' LIMIT 1";
-    }
-      $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-
-//Download Statistic Management Code
-// Maintain the last 7 days record count
-// This is also where the weekly w/e code would go. if that feature is ever created.
-   $mindate = date("Ymd", mktime(0, 0, 0, date("m"), date("d")-7, date("Y")))."000000";
-   $downloadcount="0";
-  $sql = "SELECT `downloadcount` FROM `t_downloads` WHERE `ID`='$_GET[id]' AND `date`>='$mindate' AND `type`='count'  ORDER BY `date` DESC";
-   $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-    while ($row = mysql_fetch_array($sql_result)) {
-     $downloadcount = $downloadcount+$row["downloadcount"];
-    }
-  //Update the 7 day count in the main record.
-  $sql = "UPDATE `t_main` SET `downloadcount`='$downloadcount' WHERE `ID`='$_GET[id]' LIMIT 1";
-    $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-  //Update the total downloadcount in the main record.
-  $sql = "UPDATE `t_main` SET `TotalDownloads`=TotalDownloads+1 WHERE `ID`='$_GET[id]' LIMIT 1";
-    $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-  //Clean up the Counts per day for >8 days. (and in the future, compile the week/ending records for this data)
-    $sql = "DELETE FROM `t_downloads` WHERE `ID`='$_GET[id]' AND `date`<'$mindate' AND `type`='count'";
-      $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-   
-    }
-
-//Send User on their way to the file...
-header("Location: $uri")
-?>

mozilla/webtools/update/extensions/moreinfo.php

@@ -1,550 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-
-<?php
-//Bookmarking-Friendly Page Title
-$sql = "SELECT  Name FROM `t_main`  WHERE ID = '$_GET[id]' AND Type = 'E' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-if (mysql_num_rows($sql_result)===0) {
-$return = page_error("1","Extension ID is Invalid or Missing.");
-exit;
-
-}
-  $row = mysql_fetch_array($sql_result);
-
-//Page Titles
-$pagetitles = array("releases"=>"All Releases", "comments"=>"User Comments", "staffreview"=>"Editor Review", "opinion"=>" My Opinion");
-$pagetitle = $pagetitles[$_GET["page"]];
-?>
-
-<TITLE>Mozilla Update :: Extensions -- More Info: <?php echo"$row[Name]"; if ($pagetitle) {echo" - $pagetitle"; } ?></TITLE>
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-include"$page_header";
-$type = "E";
-$category=$_GET["category"];
-include"inc_sidebar.php";
-?>
-<DIV id="content">
-<?php
-//Get Author Data
-$sql2 = "SELECT  TM.Name, TU.UserName, TU.UserID, TU.UserEmail FROM  `t_main`  TM 
-LEFT JOIN t_authorxref TAX ON TM.ID = TAX.ID
-INNER JOIN t_userprofiles TU ON TAX.UserID = TU.UserID
-WHERE TM.ID = '$_GET[id]'
-ORDER  BY  `Type` , `Name`  ASC ";
- $sql_result2 = mysql_query($sql2, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row2 = mysql_fetch_array($sql_result2)) {
-     $authorarray[$row2[Name]][] = $row2["UserName"];
-     $authorids[$row2[UserName]] = $row2["UserID"];
-   }
-
-
-//Run Query and Create List
-$s = "0";
-$sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Description, TM.Rating, TV.vID, TV.Version, TV.MinAppVer, TV.MaxAppVer, TV.Size, TV.DateAdded AS VerDateAdded, TV.DateUpdated AS VerDateUpdated, TV.URI, TV.Notes, TM.TotalDownloads, TA.AppName, TOS.OSName, TP.PreviewURI
-FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID
-LEFT  JOIN t_previews TP ON TV.vID = TP.vID
-WHERE TM.ID = '$_GET[id]' AND `approved` = 'YES' ";
-if ($_GET["vid"]) { $sql .=" AND TV.vID = '$_GET[vid]' "; }
-$sql .= "ORDER  BY  `Name` , `Version` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $row = mysql_fetch_array($sql_result);
-
-
-$v++;
-    $id = $row["ID"];
-    $type = $row["Type"];
-    $name = $row["Name"];
-    $dateadded = $row["DateAdded"];
-    $dateupdated = $row["DateUpdated"];
-    $homepage = $row["Homepage"];
-    $description = $row["Description"];
-    $rating = $row["Rating"];
-    $authors = $authorarray[$name];
-    $osname = $row["OSName"];
-
-   $vid = $row["vID"];
-if (!$_GET['vid']) {$_GET['vid']=$vid;}
-   $appname = $row["AppName"];
-   $minappver = $row["MinAppVer"];
-   $maxappver = $row["MaxAppVer"];
-   $verdateadded = $row["VerDateAdded"];
-   $verdateupdated = $row["VerDateUpdated"];
-   $filesize = $row["Size"];
-   $notes = $row["Notes"];
-   $version = $row["Version"];
-   $uri = $row["URI"];
-   $previewuri = $row["PreviewURI"];
-   $downloadcount = $row["TotalDownloads"];
-
-if ($VerDateAdded > $dateadded) {$dateadded = $VerDateAdded; }
-if ($VerDateUpdated > $dateupdated) {$dateupdated = $VerDateUpdated; }
-
-
-
-//Turn Authors Array into readable string...
-$authorcount = count($authors);
-foreach ($authors as $author) {
-$userid = $authorids[$author];
-$n++;
-$authorstring .= "<A HREF=\"authorprofiles.php?application=$application&id=$userid\">$author</A>";
-if ($authorcount != $n) {$authorstring .=", "; }
-
-}
-$authors = $authorstring;
-unset($authorstring, $n); // Clear used Vars.. 
-
-//Create Customizeable Timestamp for DateAdded/DateUpdated
-	$day=substr($dateadded,8,2);  //get the day
-    $month=substr($dateadded,5,2); //get the month
-    $year=substr($dateadded,0,4); //get the year
-    $hour=substr($dateadded,11,2); //get the hour
-    $minute=substr($dateadded,14,2); //get the minute
-    $second=substr($dateadded,17,2); //get the sec
-    $datimestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-
-	$day=substr($dateupdated,8,2);  //get the day
-    $month=substr($dateupdated,5,2); //get the month
-    $year=substr($dateupdated,0,4); //get the year
-    $hour=substr($dateupdated,11,2); //get the hour
-    $minute=substr($dateupdated,14,2); //get the minute
-    $second=substr($dateupdated,17,2); //get the sec
-    $dutimestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-
-    $dateadded = gmdate("F d, Y g:i:sa", $datimestamp); //gmdate("F d, Y", $datimestamp);
-    $dateupdated = gmdate("F d, Y g:i:sa", $dutimestamp); //gmdate("F d, Y", $dutimestamp);
-
-//Rating
-if (!$rating) { $rating="0"; }
-?>
-
-
-<DIV class="tabbar">
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid"; ?>">More Info</A></DIV>
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid&page=releases"; ?>">All Releases</A></DIV>
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid&page=comments"; ?>">Comments</A></DIV>
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid&page=staffreview"; ?>">Editor Review</A></DIV>
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid&page=opinion"; ?>">My Opinion</A></DIV>
-</DIV>
-<?php
-echo"<DIV class=\"item\">\n";
-//echo"<DIV style=\"height: 100px\">"; //Why?!?
-if ($previewuri) {
-list($width, $height, $imagetype, $attr) = getimagesize("$websitepath"."$previewuri");
-
-echo"<IMG SRC=\"$previewuri\" BORDER=0 HEIGHT=$height WIDTH=$width STYLE=\"float: right; padding-right: 5px\" ALT=\"$name preview\">";
-}
-
-//Upper-Right Side Box
-echo"<DIV class=\"liststars\" title=\"$rating of 5 stars\" style=\"font-size: 8pt\"><A HREF=\"moreinfo.php?application=$application&id=$id&page=comments\">";
-for ($i = 1; $i <= floor($rating); $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-if ($rating>floor($rating)) {
-$val = ($rating-floor($rating))*10;
-echo"<IMG SRC=\"/images/stars/star_0$val.png\" BORDER=0 ALT=\"\">";
-$i++;
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-echo"</A></DIV>\n";
-
-echo"<DIV class=\"itemtitle\">";
-echo"<SPAN class=\"title\"><A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid\">$name $version</A></SPAN><BR>";
-echo"<SPAN class=\"authorline\">By $authors</SPAN><br>";
-echo"</DIV>";
-
-//Description & Version Notes
-echo"<SPAN class=\"itemdescription\">";
-echo"$description<BR>";
-if ($notes) {echo"$notes"; }
-echo"</SPAN>\n";
-
-//echo"</DIV>\n";
-echo"<BR>\n\n";
-
-$page = $_GET["page"];
-if (!$page or $page=="general") {
-?>
-<DIV class="downloadbox">
-<?php
-//Create DateStamp for Version Release Date ($verdateadded)
-	$day=substr($verdateadded,8,2);  //get the day
-    $month=substr($verdateadded,5,2); //get the month
-    $year=substr($verdateadded,0,4); //get the year
-    $hour=substr($verdateadded,11,2); //get the hour
-    $minute=substr($verdateadded,14,2); //get the minute
-    $second=substr($verdateadded,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $verdateadded = gmdate("F d, Y", $timestamp);
-
-//Calculate Download Time
-$speed = "56"; //In Kbit/s
-$speedinkb = "5.5"; //$speedinkb = $speed/8; //In KB/s 
-$timeinsecs = round($filesize/$speedinkb);
-$time_minutes = floor($timeinsecs/60);
-$time_seconds = round($timeinsecs-($time_minutes*60),-1);
-$time_seconds = $time_seconds+2; //Compensate for mirror overhead
-
-$time = "About ";
-if ($time_minutes>0) {
-$time .= "$time_minutes minutes ";
-}
-$time .="$time_seconds seconds";
-
-$filename = basename($uri);
-
-echo"
-<SPAN style=\"itemdescription\">Released on $verdateadded</SPAN><BR>
-
-
-<DIV class=\"moreinfoinstall\">";
-if ($appname=="Thunderbird") { 
-echo"<A HREF=\"install.php/$filename?id=$id&vid=$vid\" TITLE=\"Download $name $version (Right-Click to Download)\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" ALT=\"\">&nbsp;( Download Now )</A><BR>";
-} else {
-echo"<A HREF=\"javascript:void(InstallTrigger.install({'$name $version':'$uri'}))\" TITLE=\"Install $name $version\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" ALT=\"\">&nbsp;( Install Now )</A><BR>";
-//echo"<A HREF=\"install.php/$filename?id=$id&vid=$vid\" TITLE=\"Install $name $version (Right-Click to Download)\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" ALT=\"\">&nbsp;( Install Now )</A><BR>";
-}
-echo"
-<SPAN class=\"filesize\">&nbsp;&nbsp;$filesize KB, ($time @ $speed"."k)</SPAN></DIV>
-<BR>";
-if ($application=="thunderbird") {
-echo"<SPAN style=\"font-size: 10pt; color: #00F\">Extension Install Instructions for Thunderbird Users:</SPAN><BR>
-<SPAN style=\"font-size: 8pt;\">(1) Right-Click the link above and choose \"Save Link As...\" to Download and save the file to your hard disk.<BR>
-(2) In Mozilla Thunderbird, open the extension manager (Tools Menu/Extensions)<BR>
-(3) Click the Install button, and locate/select the file you downloaded and click \"OK\"</SPAN><BR>
-";
-}
-if ($homepage) {echo"<SPAN style=\"font-size:10pt\">Having a problem with this Extension? For Help and Technical Support, visit the <A HREF=\"$homepage\">Extension's Homepage</A>.</SPAN>";}
-
-echo"<UL style=\"font-size:10pt\">";
-if ($homepage) {echo"<LI> <A HREF=\"$homepage\">Extension Home Page</A>"; }
-if ($appname !="Thunderbird") {echo"<LI> <a href=\"install.php/$filename?id=$id&vid=$vid\" TITLE=\"Right-click to Save\">Download Extension</A>"; }
-echo"<LI> <A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&page=releases\">Other Versions</A>";
-?>
-</UL>
-</DIV>
-
-<DIV class="commentbox">
-<DIV class="boxheader">User Comments:</DIV>
-<BR>
-<?php
-$sql = "SELECT CommentName, CommentTitle, CommentNote, CommentDate, CommentVote FROM  `t_feedback` WHERE ID = '$_GET[id]' AND CommentNote IS NOT NULL ORDER  BY `CommentDate` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $num_results = mysql_num_rows($sql_result);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $commentname = $row["CommentName"];
-    $commenttitle = $row["CommentTitle"];
-    $commentnotes = $row["CommentNote"];
-    $commentdate = $row["CommentDate"];
-    $rating = $row["CommentVote"];
-
-//Create Customizeable Datestamp
-	$day=substr($commentdate,8,2);  //get the day
-    $month=substr($commentdate,5,2); //get the month
-    $year=substr($commentdate,0,4); //get the year
-    $hour=substr($commentdate,11,2); //get the hour
-    $minute=substr($commentdate,14,2); //get the minute
-    $second=substr($commentdate,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $commentdate = gmdate("F d, Y g:ia", $timestamp);
-
-echo"<DIV class=\"commenttitlebar\">";
-echo"<SPAN class=\"commenttitle\">$commenttitle</SPAN>";
-echo"<SPAN class=\"liststars\">";
-
-for ($i = 1; $i <= $rating; $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 WIDTH=16 HEIGHT=16 ALT=\"*\">";
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 WIDTH=16 HEIGHT=16 ALT=\"\">";
-}
-echo"</SPAN>";
-echo"</DIV>";
-echo"&nbsp;&nbsp;By $commentname<BR>\n";
-echo"&nbsp;<BR>\n";
-echo"$commentnotes<BR>\n\n";
-echo"&nbsp;<BR>\n";
-echo"<DIV class=\"commentfooter\">\n";
-echo"$commentdate | <A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&page=comments\">More Comments...</A> | <A HREF=\"moreinfo.php?id=$id&vid=$vid&category=$category&vid=$vid&page=opinion\">Rate It!</A>\n";
-echo"</DIV>\n";
-}
-
-if ($num_results=="0") {
-echo"<DIV class=\"nocomment\">";
-echo"Nobody's Commented on this Extension Yet<BR>";
-echo"Be the First! <A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&page=opinion\">Rate It!</A>";
-echo"</DIV>";
-}
-
-?>
-
-</DIV>
-
-<?php
-} else if ($page=="releases") {
-
-echo"<DIV class=\"mipageheading\">";
-echo"Recent Releases:<BR>";
-echo"</DIV>";
-
-$sql = "SELECT TV.vID, TV.Version, TV.MinAppVer, TV.MaxAppVer, TV.Size, TV.URI, TV.Notes, TA.AppName, TOS.OSName
-FROM  `t_version` TV
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID
-WHERE TV.ID = '$_GET[id]' AND `approved` = 'YES'
-ORDER  BY  `Version` DESC, `OSName` ASC 
-LIMIT 0, 10";
-
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $vid = $row["vID"];
-   $minappver = $row["MinAppVer"];
-   $maxappver = $row["MaxAppVer"];
-   $filesize = $row["Size"];
-   $notes = $row["Notes"];
-   $version = $row["Version"];
-   $uri = $row["URI"];
-   $osname = $row["OSName"];
-   $appname = $row["AppName"];
-   $filename = basename($uri);
-
-echo"<DIV>"; //Open Version DIV
-
-//Description & Version Notes
-echo"<SPAN class=\"itemdescription\">";
-echo"<SPAN class=\"listtitle\"><A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid\">Version $version</A></SPAN><br>\n";
-if ($notes) {echo"$notes"; }
-echo"</SPAN>\n";
-
-//Icon Bar Modules
-echo"<DIV style=\"height: 34px\">";
-echo"<DIV class=\"iconbar\" style=\"width: 100px;\">";
-
-if ($appname=="Thunderbird") { 
-echo"<A HREF=\"install.php/$filename?id=$id&vid=$vid\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"Install $name (Right-Click to Download)\" ALT=\"\">Download</A>";
-} else {
-echo"<A HREF=\"javascript:void(InstallTrigger.install({'$name $version':'$uri'}))\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"Install $name (Right-Click to Download)\" ALT=\"\">Install</A>";
-}
-
-echo"<BR><SPAN class=\"filesize\">Size: $filesize kb</SPAN></DIV>";
-//echo"<DIV class=\"iconbar\" style=\"width: 100px;\"><A HREF=\"install.php/$filename?id=$id&vid=$vid\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"Install $name (Right-Click to Download)\" ALT=\"\">Install</A><BR><SPAN class=\"filesize\">Size: $filesize kb</SPAN></DIV>";
-echo"<DIV class=\"iconbar\"><IMG SRC=\"/images/".strtolower($appname)."_icon.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float: left\" ALT=\"$appname\">&nbsp;Works with:<BR>&nbsp;&nbsp;$minappver - $maxappver</DIV>";
-echo"<DIV class=\"iconbar\" style=\"width: 90px;\"><IMG SRC=\"/images/".strtolower($osname)."_icon.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float: left\" ALT=\"\">OS:<BR>"; if($osname=="ALL") {echo"All OSes";} else {echo"$osname";} echo"</DIV>";
-echo"</DIV>";
-
-echo"</DIV>";
-}
-
-//End General Page
-} else if ($page=="comments") {
-//Comments/Ratings Page
-echo"<DIV class=\"mipageheading\">";
-echo"User Comments:<BR>";
-echo"</DIV>";
-$sql = "SELECT CommentName, CommentTitle, CommentNote, CommentDate, CommentVote FROM  `t_feedback` WHERE ID = '$_GET[id]' AND CommentNote IS NOT NULL ORDER  BY  `CommentDate` ASC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $num_results = mysql_num_rows($sql_result);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $name = $row["CommentName"];
-    $title = $row["CommentTitle"];
-    $notes = $row["CommentNote"];
-    $date = $row["CommentDate"];
-    $rating = $row["CommentVote"];
-
-echo"<DIV class=\"commenttitlebar\">";
-echo"<SPAN class=\"commenttitle\">$title</SPAN>";
-echo"<SPAN class=\"liststars\">";
-
-for ($i = 1; $i <= $rating; $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 WIDTH=16 HEIGHT=16 ALT=\"*\">";
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 WIDTH=16 HEIGHT=16 ALT=\"\">";
-}
-echo"</SPAN>";
-echo"</DIV>";
-echo"$notes<BR>\n\n";
-
-echo"<DIV class=\"commentfooter\">\n";
-echo"<SPAN style=\"padding-left: 30px; font-size: 8pt; font-weight: bold\">Posted on $date by $name</SPAN><br>";
-echo"</DIV>\n";
-}
-
-if ($num_results=="0") {
-echo"<DIV class=\"nocomment\">";
-echo"Nobody has commented on this extension yet...<BR>
-Be the First!
-<A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&page=opinion\">Leave your comments</A>...";
-echo"</DIV>\n";
-}
-
-
-echo"<DIV style=\"height: 5px;\"></DIV>";
-
-} else if ($page=="staffreview") {
-//Staff/Editor Review Tab
-echo"<DIV class=\"mipageheading\">";
-echo"Editor Review:<BR>";
-echo"</DIV>";
-
-echo"<DIV class=\"reviewbox\">\n";
-$sql = "SELECT TR.ID, `Title`, TR.DateAdded, `Body`, `Type`, `Pick`, TU.UserName FROM `t_reviews`  TR
-INNER  JOIN t_main TM ON TR.ID = TM.ID
-INNER  JOIN t_userprofiles TU ON TR.AuthorID = TU.UserID
-WHERE `Type` = 'E' AND TR.ID = '$_GET[id]' ORDER BY `rID` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
- $num_results = mysql_num_rows($sql_result);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $id = $row["ID"];
-    $title = $row["Title"];
-    $dateadded = $row["DateAdded"];
-    $body = $row["Body"];
-    $pick = $row["Pick"];
-    $username = $row["UserName"];
-
-//Create Customizeable Timestamp
-//	$day=substr($dateadded,8,2);  //get the day
-//    $month=substr($dateadded,5,2); //get the month
-//    $year=substr($dateadded,0,4); //get the year
-//    $hour=substr($dateadded,11,2); //get the hour
-//    $minute=substr($dateadded,14,2); //get the minute
-//    $second=substr($dateadded,17,2); //get the sec
-//    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $timestamp = strtotime("$dateadded");
-    $date = gmdate("F, Y", $timestamp);
-    $posteddate = date("F j Y, g:i:sa", $timestamp);
-
-
-echo"$title<br>\n";
-if ($pick=="YES") {echo"<SPAN class=\"itemdescription\">&nbsp;&nbsp;&nbsp;$date Editors Pick<BR>\n"; }
-echo"<BR>\n";
-echo"$body</SPAN><BR>\n";
-echo"<DIV class=\"commentfooter\">Posted on $posteddate by $username</DIV>\n";
-}
-$typename = "extension";
-if ($num_results=="0") {
-echo"
-<SPAN style=\"font-weight: bold\">
-This $typename has not yet been reviewed.<BR><BR>
-
-To see what other users think of this extension, view the <A HREF=\"moreinfo.php?application=$application&id=$id&page=comments\">User Comments...</A>
-</SPAN>
-";
-
-
-}
-echo"</DIV>\n";
-
-} else if ($page=="opinion") {
-//My Opinion Tab
-echo"<DIV class=\"mipageheading\">";
-echo"Your Rating / Feedback:<BR>";
-echo"</DIV>";
-?>
-<?php
-if ($_GET["error"]=="norating") {
-echo"<DIV class=\"errorbox\">\n
-Your comment submission had the following error(s), please fix these errors and try again.<br>\n
-&nbsp;&nbsp;&nbsp;Rating field cannot be left blank.<br>\n
-</DIV>\n";
-}
-?>
-<DIV class="opinionform">
-<FORM NAME="opinon" METHOD="POST" ACTION="../core/postfeedback.php">
-<INPUT NAME="id" TYPE="HIDDEN" VALUE="<?php echo"$id"; ?>">
-<INPUT NAME="vid" TYPE="HIDDEN" VALUE="<?php echo"$vid"; ?>">
-<INPUT NAME="type" TYPE="HIDDEN" value="E">
-Your Name:<BR>
-<INPUT NAME="name" TYPE="TEXT" SIZE=30 MAXLENGTH=30><BR>
-
-Rating:*<BR>
-<SELECT NAME="rating">
-    <OPTION value="">Rating:
-	<OPTION value="5">5 Stars
-	<OPTION value="4">4 Stars
-	<OPTION value="3">3 Stars
-	<OPTION value="2">2 Stars
-	<OPTION value="1">1 Star
-    <OPTION value="0">0 Stars
-</SELECT><BR>
-
-Title:<BR>
-<INPUT NAME="title" TYPE="TEXT" SIZE=30 MAXLENGTH=50><BR>
-
-Review/Comments:<BR>
-<TEXTAREA NAME="comments" ROWS=5 COLS=55></TEXTAREA><BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN class="smallfont">No Comment?<INPUT NAME="commententered" TYPE="CHECKBOX" VALUE="FALSE"></SPAN><BR>
-<INPUT NAME="submit" TYPE="SUBMIT" VALUE="Post">&nbsp;&nbsp;<INPUT NAME="reset" TYPE="RESET" VALUE="Reset"><BR>
-<SPAN class="smallfont">* Required Fields</SPAN>
-</FORM>
-
-</DIV>
-<?php
-} // End Pages
-echo"<DIV class=\"baseline\">";
-echo"Date Added: $dateadded | Last Updated: $dateupdated | ";
-echo"Total Downloads: $downloadcount<BR>";
-echo"</DIV>\n";
-echo"</DIV>\n";
-echo"<BR>\n";
-?>
-</DIV>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/extensions/sendmail.php

@@ -1,107 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-//Mozilla Update Message System
-//Send Mail script... 
-exit;
-require"../core/config.php";
-
-if (!$_POST["senduserid"]) {
-exit("<B>Error: no valid user to e-mail, possible attempt to spam detected...</B>");
-}
-
-//Get E-Mail Address from DB based on passed data..
-  $sql = "SELECT `UserEmail` FROM `t_userprofiles` WHERE `UserID` = '$_POST[senduserid]' AND `UserEmailHide`='0' LIMIT 1";
-  $sql_result = mysql_query($sql, $connection) or trigger_error("<FONT COLOR=\"#FF0000\"><B>MySQL Error ".mysql_errno().": ".mysql_error()."</B></FONT>", E_USER_NOTICE);
-  $row = mysql_fetch_array($sql_result);
-  $to_address=$row["UserEmail"]; 
-
-
-//All From_, To_, and subject variables are passed from the form
-// and do not need to be defined here.. unless debugging..
-
-$from_name = $_POST["fromname"];
-$from_address = $_POST["fromemail"];
-$subject = $_POST["subject"];
-
-//Anti-Abuse
-$findme  = '@';
-$pos = strpos($to_address, $findme);
-
-if ($pos === false) {
-//This isn't a valid e-mail address being passed... 
-//Send the e-mail message to the $from_address, just for fun..
-$to_address = $from_address;
-}
-
-$message = $_POST["body"];
-
-//Message Footer (Auto-Appended to Messages sent using this form.
-$message .= "\n\n";
-$message .= "____________________________________\n";
-$message .= "Message sent through the Mozilla Update Message system.\n
-The system allows visitors to send you e-mail without revealing your e-mail address to them.
-If you no longer wish to receive e-mail from visitors, you may change your preferences online at http;//update.mozilla.org.\n";
-
-
-$headers .= "MIME-Version: 1.0\r\n";
-$headers .= "Content-type: text/plain; charset=iso-8859-1\r\n";
-$headers .= "From: ".$from_name." <".$from_address.">\r\n";
-$headers .= "Reply-To: ".$from_name." <".$from_address.">\r\n";
-$headers .= "X-Priority: 3\r\n";
-$headers .= "X-MSMail-Priority: Normal\r\n";
-$headers .= "X-Mailer: Mozilla Update Message System 1.0";
-
-$mailstatus = mail($to_address, $subject, $message, $headers);
-
-
-
-if ($mailstatus===FALSE) {
-//Message Unsuccessful
-$return_path="extensions/authorprofiles.php?id=$_POST[senduserid]&mail=unsuccessful";
-
-} else if ($mailstatus===TRUE) {
-//Message Successful
-$return_path="extensions/authorprofiles.php?id=$_POST[senduserid]&mail=successful";
-
-}
-header("Location: http://$_SERVER[HTTP_HOST]/$return_path#email");
-exit;
-
-?>

mozilla/webtools/update/extensions/showlist.php

@@ -1,484 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-
-<?php
-//----------------------------
-//Global General $_GET variables
-//----------------------------
-//Detection Override
-if ($_GET["version"]) {$app_version=$_GET["version"]; $_SESSION["app_version"]=$_GET["version"];}
-
-if ($_GET["numpg"]) {$_SESSION["items_per_page"]=$_GET["numpg"]; }
-if ($_SESSION["items_per_page"]) {$items_per_page = $_SESSION["items_per_page"];} else {$items_per_page="10";}//Default Num per Page is 10
-
-if ($_GET["category"]) { $_SESSION["category"] = $_GET["category"]; }
-if ($_SESSION["category"]) {$category = $_SESSION["category"];}
-if ($category=="All") {$category="";}
-
-
-if (!$_GET["pageid"]) {$pageid="1"; } else { $pageid = $_GET["pageid"]; } //Default PageID is 1
-$type="E"; //Default Type is E
-
-unset($typename);
-$types = array("E"=>"Extensions","T"=>"Themes","U"=>"Updates");
-$typename = $types["$type"];
-
-//RSS Autodiscovery Link Stuff
-switch ($_SESSION["category"]) {
-  case "Newest":
-    $rsslist = "newest";
-    break;
-  case "Popular":
-    $rsslist = "popular";
-    break;
-  case "Top Rated":
-    $rsslist = "rated";
-    break;
-}
-
-$rssfeed = "rss/?application=" . $application . "&type=" . $type . "&list=" . $rsslist;
-
-if (!$category) {$categoryname = "All $typename"; } else {$categoryname = $category; }
-?>
-
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-
-<TITLE>Mozilla Update :: Extensions - List - <?php echo"$categoryname"; if ($pageid) {echo" - Page $pageid"; } ?></TITLE>
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-<?php
-if ($rsslist) {
-echo"<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"http://$_SERVER[HTTP_HOST]/$rssfeed\">";
-}
-?>
-</HEAD>
-<BODY>
-<?php
-include"$page_header";
-
-// -----------------------------------------------
-// Begin Content of the Page Here
-// -----------------------------------------------
-
-include"inc_sidebar.php";
-
-echo"<DIV id=\"content\">\n"; // Begin Content Area
-//Query for List Creation
-$s = "0";
-$startpoint = ($pageid-1)*$items_per_page;
-if ($category=="Editors Pick" or $category=="Newest" or $category=="Popular" or $category=="Top Rated") {
-if ($category =="Editors Pick") {
-$editorpick="true";
-} else if ($category =="Newest") {
-$orderby = "TV.DateAdded DESC, `Name` ASC";
-} else if ($category =="Popular") {
-$orderby = "TM.TotalDownloads DESC, `Name` ASC";
-} else if ($category =="Top Rated") {
-$orderby = "TM.Rating DESC, `Name` ASC";
-}
-$catname = $category;
-$category = "%";
-}
-if ($app_version=="0.10") {$app_version="0.95"; }
-$sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Description, TM.Rating, TM.TotalDownloads, TV.vID,
-SUBSTRING(MAX(CONCAT(LPAD(TV.Version, 6, '0'), TV.vID)), 7)  AS MAXvID,
-MAX(TV.Version) AS Version,
-TA.AppName, TOS.OSName
-FROM `t_main` TM 
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID ";
-if ($category && $category !=="%") { $sql .="INNER  JOIN t_categoryxref TCX ON TM.ID = TCX.ID
-INNER JOIN t_categories TC ON TCX.CategoryID = TC.CategoryID "; }
-if ($editorpick=="true") { $sql .="INNER JOIN t_reviews TR ON TM.ID = TR.ID "; }
-$sql .="WHERE Type = '$type' AND AppName = '$application' AND `approved` = 'YES' ";
-if ($editorpick=="true") { $sql .="AND TR.Pick = 'YES' "; }
-if ($category && $category !=="%") {$sql .="AND CatName LIKE '$category' ";}
-if ($app_version) { $sql .=" AND TV.MinAppVer_int <= '".strtolower($app_version)."' AND TV.MaxAppVer_int >= '".strtolower($app_version)."' ";}
-if ($OS) { $sql .=" AND (TOS.OSName = '$OS' OR TOS.OSName = 'All') "; }
-$sql .="GROUP BY `Name` ";
-if ($orderby) {
-$sql .="ORDER BY $orderby";
-} else {
-$sql .="ORDER  BY  `Name` , `Version` DESC ";
-}
-
-$resultsquery = $sql;
-unset($sql);
-
-//Get Total Results from Result Query & Populate Page Control Vars.
- $sql_result = mysql_query($resultsquery, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $totalresults = mysql_num_rows($sql_result);
-
-  $num_pages = ceil($totalresults/$items_per_page); //Total # of Pages
-  if ($pageid>$num_pages) {$pageid=$num_pages;} //Check PageId for Validity
-  $startpoint = ($pageid-1)*$items_per_page;
-if ($startpoint<0) {$startpoint=0; $startitem=0;}
-  $startitem = $startpoint+1;
-  $enditem = $startpoint+$items_per_page;
- if ($totalresults=="0") {$startitem = "0"; }
- if ($enditem>$totalresults) {$enditem=$totalresults;} //Verify EndItem
-
-
-if ($_GET[nextnum]) {$startpoint = $_GET["nextnum"]; }
-//$resultsquery = str_replace("GROUP BY `Name` ", "", $resultsquery);
-$resultsquery .= " LIMIT $startpoint , $items_per_page"; //Append LIMIT clause to result query
-
-if ($category=="%") {$category = $catname; unset($catname); }
-
-//Now Showing Box
-echo"<DIV id=\"listnav\">";
-if (!$OS) {$OS="all";}
-if (!$category) {$categoryname="All"; } else {$categoryname = $category;}
-echo"<DIV class=\"pagenum\" "; if ($application!="mozilla") {echo" style=\"margin-right: 58%;\""; } echo">";
-$previd=$pageid-1;
-if ($previd >"0") {
-echo"<a href=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$previd\">&#171; Previous</A> &bull; ";
-}
-echo"Page $pageid of $num_pages";
-
-$nextid=$pageid+1;
-if ($pageid <$num_pages) {
-echo" &bull; <a href=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$nextid\">Next &#187;</a>";
-}
-
-echo"</DIV>\n";
-
-echo"<SPAN class=\"listtitle\">".ucwords("$application $typename &#187; $categoryname ")."</SPAN><br>";
-echo"".ucwords("$typename")." $startitem - $enditem of $totalresults";
-
-
-// Modify List Form
-
-echo"<DIV class=\"listform\">";
-echo"<FORM NAME=\"listviews\" METHOD=\"GET\" ACTION=\"showlist.php\">\n";
-echo"<INPUT NAME=\"application\" TYPE=\"hidden\" VALUE=\"$application\">\n";
-//Items-Per-Page
-echo"Show/Page: ";
-$perpage = array("5","10","20","50");
-echo"<SELECT name=\"numpg\">";
-foreach ($perpage as $value) {
-echo"<OPTION value=\"$value\"";
-if ($items_per_page==$value) {echo" SELECTED"; }
-echo">$value</OPTION>";
-}
-echo"</SELECT>\n";
-
-
-// Operating Systems
-echo" OS: ";
-echo"<SELECT name=\"os\">\n";
-$sql = "SELECT `OSName` FROM `t_os` ORDER BY `OSName`";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-  $osname = $row["OSName"];
-  echo"<OPTION value=\"".strtolower($osname)."\"";
-  if (strtolower($OS) == strtolower($osname)) {echo" SELECTED";}
-  echo">$osname</OPTION>";
-  }
-echo"</SELECT>\n";
-
-
-//Versions of Application
-echo"Versions: ";
-echo"<SELECT name=\"version\">";
-if ($application != "thunderbird") {echo"<OPTION value=\"auto-detect\">Auto-Detect</OPTION>";}
-$app_orig = $application; //Store original to protect against possible corruption
-$sql = "SELECT `Version`, `major`, `minor`, `release`, `SubVer` FROM `t_applications` WHERE `AppName` = '$application' ORDER BY `major` DESC, `minor` DESC, `release` DESC, `SubVer` DESC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-  $version = $row["Version"];
-  $subver = $row["SubVer"];
-  $release = "$row[major].$row[minor]";
-  if ($row["release"]) {$release = ".$release$row[release]";}
-if ($app_version=="0.95") {$app_version="0.10"; }
-//Firesomething Support
-if ($application=="firefox") { if ($release == "0.7") {$application="firebird";} else {$application="firefox";} }
-
-if ($subver !=="final") {$release="$release$subver";}
-echo"<OPTION value=\"$release\"";
-if ($app_version == $release) {echo" SELECTED"; }
-echo">".ucwords($application)." $version</OPTION>";
-
-if ($app_version=="0.10") {$app_version="0.95"; }
-  }
-$application = $app_orig; unset($app_orig);
-
-
-echo"</SELECT>\n";
-echo"<INPUT NAME=\"submit\" TYPE=\"SUBMIT\" VALUE=\"Update\">";
-echo"</FORM>";
-echo"</DIV>";
-
-echo"</DIV>\n";
-
-
-//---------------------------------
-// Begin List
-//---------------------------------
-//Get Author Data and Create $authorarray and $authorids
-$sql = "SELECT  TM.Name, TU.UserName, TU.UserID, TU.UserEmail FROM  `t_main`  TM 
-LEFT JOIN t_authorxref TAX ON TM.ID = TAX.ID
-INNER JOIN t_userprofiles TU ON TAX.UserID = TU.UserID
-ORDER  BY  `Type` , `Name`  ASC "; // TM.Type = 'E'
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-     $authorarray[$row[Name]][] = $row["UserName"];
-     $authorids[$row[UserName]] = $row["UserID"];
-   }
-
-//Assemble a display application version array
-$sql = "SELECT `Version`, `major`, `minor`, `release`, `SubVer` FROM `t_applications` WHERE `AppName`='$application' ORDER BY `major`,`minor`";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-  $version = $row["Version"];
-  $subver = $row["SubVer"];
-  $release = "$row[major].$row[minor]";
-  if ($row["release"]) {$release = ".$release$row[release]";}
-  if ($subver !=="final") {$release="$release$subver";}
-
-  $appvernames[$release] = $version;
-  }
-
-//Query to Generate List..
-$sql = "$resultsquery";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-
-    $id = $row["ID"];
-    $type = $row["Type"];
-    $name = $row["Name"];
-    $dateadded = $row["DateAdded"];
-    $dateupdated = $row["DateUpdated"];
-    $homepage = $row["Homepage"];
-    $description = $row["Description"];
-    $rating = $row["Rating"];
-    $authors = $authorarray[$name];
-    $osname = $row["OSName"];
-    $appname = $row["AppName"];
-    $downloadcount = $row["TotalDownloads"];
-
-//Get Version Record for Referenced MAXvID from list query
-$sql2 = "SELECT TV.vID, TV.Version, TV.MinAppVer, TV.MaxAppVer, TV.Size, TV.DateAdded AS VerDateAdded, TV.DateUpdated AS VerDateUpdated, TV.URI, TV.Notes, TP.PreviewURI FROM  `t_version` TV
-LEFT  JOIN t_previews TP ON TV.vID = TP.vID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID
-WHERE TV.ID = '$id' AND TV.Version = '$row[Version]' AND TA.AppName = '$appname' AND TOS.OSName = '$osname' LIMIT 1";
- $sql_result2 = mysql_query($sql2, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-$vid = $row[MAXvID];
-  $row = mysql_fetch_array($sql_result2);
-
-   $vid = $row["vID"];
-if ($appvernames[$row["MinAppVer"]]) {$minappver = $appvernames[$row["MinAppVer"]]; } else { $minappver = $row["MinAppVer"]; }
-if ($appvernames[$row["MaxAppVer"]]) {$maxappver = $appvernames[$row["MaxAppVer"]]; } else { $maxappver = $row["MaxAppVer"]; }
-   $VerDateAdded = $row["VerDateAdded"];
-   $VerDateUpdated = $row["VerDateUpdated"];
-   $filesize = $row["Size"];
-   $notes = $row["Notes"];
-   $version = $row["Version"];
-   $uri = $row["URI"];
-   $previewuri = $row["PreviewURI"];
-
-   $filename = basename($uri);
-
-if ($VerDateAdded > $dateadded) {$dateadded = $VerDateAdded; }
-if ($VerDateUpdated > $dateupdated) {$dateupdated = $VerDateUpdated; }
-
-//Turn Authors Array into readable string...
-$authorcount = count($authors);
-foreach ($authors as $author) {
-$userid = $authorids[$author];
-$n++;
-$authorstring .= "<A HREF=\"authorprofiles.php?application=$application&id=$userid\">$author</A>";
-if ($authorcount != $n) {$authorstring .=", "; }
-
-}
-$authors = $authorstring;
-unset($authorstring, $n); // Clear used Vars.. 
-
-//Create Customizeable Timestamp
-	$day=substr($dateupdated,8,2);  //get the day
-    $month=substr($dateupdated,5,2); //get the month
-    $year=substr($dateupdated,0,4); //get the year
-    $hour=substr($dateupdated,11,2); //get the hour
-    $minute=substr($dateupdated,14,2); //get the minute
-    $second=substr($dateupdated,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $dateupdated = gmdate("F d, Y g:i:sa", $timestamp); //gmdate("F d, Y g:i:sa T", $timestamp);
-
-
-echo"<DIV class=\"item\">\n";
-//echo"<DIV style=\"height: 100px\">"; //Not sure why this is here, it caused text to flood out of the box though.
-
-if ($previewuri) {
-list($width, $height, $type, $attr) = getimagesize("$websitepath"."$previewuri");
-
-echo"<IMG SRC=\"$previewuri\" BORDER=0 HEIGHT=$height WIDTH=$width STYLE=\"float: right; padding-right: 5px\" ALT=\"$name preview\">";
-}
-
-
-//Upper-Right Side Box
-echo"<DIV class=\"liststars\" title=\"$rating of 5 stars\" style=\"font-size: 8pt\"><A HREF=\"moreinfo.php?application=$application&id=$id&page=comments\">";
-for ($i = 1; $i <= floor($rating); $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-if ($rating>floor($rating)) {
-$val = ($rating-floor($rating))*10;
-echo"<IMG SRC=\"/images/stars/star_0$val.png\" BORDER=0 ALT=\"\">";
-$i++;
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-echo"</A></DIV>\n";
-
-
-echo"<DIV class=\"itemtitle\">";
-echo"<SPAN class=\"title\"><A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid\">$name $version</A></SPAN><BR>";
-echo"<SPAN class=\"authorline\">By $authors</SPAN><br>";
-echo"</DIV>";
-
-//Description & Version Notes
-echo"<SPAN class=\"itemdescription\">";
-echo"$description<BR>";
-if ($notes) {echo"$notes"; }
-echo"</SPAN>\n";
-echo"<BR>";
-//echo"</DIV>";
-
-//Icon Bar Modules
-echo"<DIV style=\"height: 34px\">";
-echo"<DIV class=\"iconbar\" style=\"width: 104px;\">";
-if ($appname=="Thunderbird") {
-echo"<A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"More Info about $name\" ALT=\"\">More Info</A>";
-} else {
-//echo"<A HREF=\"install.php/$filename?id=$id&vid=$vid\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"Install $name\" ALT=\"\">Install</A>";
-echo"<A HREF=\"javascript:void(InstallTrigger.install({'$name $version':'$uri'}))\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"Install $name\" ALT=\"\">Install</A>";
-}
-echo"<BR><SPAN class=\"filesize\">Size: $filesize kb</SPAN></DIV>";
-if ($homepage) {echo"<DIV class=\"iconbar\" style=\"width: 98px;\"><A HREF=\"$homepage\"><IMG SRC=\"/images/home.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"$name Homepage\" ALT=\"\">Homepage</A></DIV>";}
-echo"<DIV class=\"iconbar\"><IMG SRC=\"/images/".strtolower($appname)."_icon.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float: left\" ALT=\"$appname\">&nbsp;Works with:<BR>&nbsp;&nbsp;$minappver - $maxappver</DIV>";
-if($osname !=="ALL") { echo"<DIV class=\"iconbar\" style=\"width: 85px;\"><IMG SRC=\"/images/".strtolower($osname)."_icon.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float: left\" ALT=\"\">OS:<BR>$osname</DIV>"; }
-echo"</DIV>";
-
-echo"<DIV class=\"baseline\">Updated: $dateupdated | Total Downloads: $downloadcount<BR></DIV>\n";
-echo"</DIV>\n";
-
-} //End While Loop
-if ($totalresults=="0") {
-echo"<DIV class=\"item noitems\">\n";
-echo"No extensions found in this category for ".ucwords($application).".\n";
-echo"</DIV>\n";
-
-}
-?>
-
-
-
-
-<?php
-// Begin PHP Code for Dynamic Navbars
-if ($pageid <=$num_pages) {
-echo"<DIV id=\"listnav\">";
-
-
-echo"<DIV class=\"pagenum\">";
-$previd=$pageid-1;
-if ($previd >"0") {
-echo"<a href=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$previd\">&#171; Previous</A> &bull; ";
-}
-echo"Page $pageid of $num_pages";
-
-
-$nextid=$pageid+1;
-if ($pageid <$num_pages) {
-echo" &bull; <a href=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$nextid\">Next &#187;</a>";
-}
-echo"<BR>\n";
-
-
-//Skip to Page...
-if ($num_pages>1) {
-echo"Jump to: ";
-$pagesperpage=9; //Plus 1 by default..
-$i = 01;
-//Dynamic Starting Point
-if ($pageid>11) {
-$nextpage=$pageid-10;
-}
-$i=$nextpage;
-
-//Dynamic Ending Point
-$maxpagesonpage=$pageid+$pagesperpage;
-//Page #s
-while ($i <= $maxpagesonpage && $i <= $num_pages) {
-
-if ($i==$pageid) { 
-    echo"<SPAN style=\"color: #FF0000\">$i</SPAN>&nbsp;";
-  } else {
-    echo"<A HREF=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$i\">$i</A>&nbsp;";
-
-}
-
-    $i++;
-}
-}
-
-echo"</DIV>\n";
-
-echo"<SPAN class=\"listtitle\">".ucwords("$application $typename &#187; $categoryname ")."</SPAN><br>";
-echo"".ucwords("$typename")." $startitem - $enditem of $totalresults";
-
-echo"</DIV>\n";
-}
-
-echo"</DIV>\n"; //End Content
-?>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/faq/index.php

@@ -1,75 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-<TITLE>Mozilla Update :: Frequently Asked Questions</TITLE>
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-include"$page_header";
-?>
-<DIV class="faqtitle">Frequently Asked Questions</DIV>
-
-<?php
-$sql = "SELECT `title`, `text` FROM  `t_faq` WHERE `active` = 'YES' ORDER  BY  `index` ASC, `title` ASC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $title = $row["title"];
-   $text = nl2br($row["text"]);
-
-echo"<DIV class=\"item\">\n";
-echo"<DIV class=\"boxheader faqitemtitle\">$title</DIV>\n";
-echo"<DIV class=\"faqitemtext\">$text</DIV>\n";
-echo"</DIV>\n";
-}
-?>
-
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/inc_featuredupdate.php

@@ -1,76 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-
-<DIV class="contentbox" style="margin-left: 2px; border-color: #00E;">
-<DIV class="boxheader">Thunderbird 1.0 Released!</DIV>
-<SPAN class="itemdescription">
-<P><IMG SRC="images/product-front-thunderbird.png" width="96" height="105" alt="" align=left border=0>Thunderbird 1.0 is now available for download! New features include Saved Search Folders (aka Virtual Folders)
-which allow you to display messages based on previously set search criteria across multiple folders. Message Grouping
-allows you to organize e-mail in a folder by grouping them based on various attributes like Date, Sender, Label, etc.
-Thunderbird 1.0 also includes numerous bug fixes and other improvements.</P>
-
-<SPAN style="font-size: 16pt; text-align: center;">
-<a href="http://www.mozilla.org/products/thunderbird/">Get Thunderbird 1.0!</a></SPAN><BR>
-
-<a href="http://www.mozilla.org/products/thunderbird/releases/">Thunderbird Release Notes</a> | <a href="http://www.mozilla.org/press/mozilla-2004-12-7.html">Press Release</a><BR>
-
-
-</SPAN>
-</DIV>
-
-<DIV class="contentbox" style="margin-left: 2px; border-color: #E00;">
-<DIV class="boxheader">Firefox 1.0 Released!</DIV>
-<SPAN class="itemdescription">
-<P><IMG SRC="images/product-front-firefox.png" width="112" height="112" alt="" align=left border=0>
-The wait is over. Get Firefox 1.0, the most standards compliant, flexible, and user-centric web-browsing platform on Earth.
-Firefox 1.0 is the culmination of almost 7 years of work by thousands of independent hackers and companies through Mozilla.org,
-and over two years of intense focus on a streamlined browser made for the masses hungry for a better web experience.
-Firefox 1.0 Features include Tabbed Browsing, Smarter Search and FastFind, Hassle-Free Downloading, Live Bookmarks,
-Extension and Theme Support, and more.
-
-</P>
-
-<SPAN style="font-size: 16pt; text-align: center;">
-<a href="http://www.mozilla.org/products/firefox/">Get Firefox 1.0!</a></SPAN><BR>
-
-<a href="http://www.mozilla.org/products/firefox/releases/1.0.html">Firefox Release Notes</a> | <a href="http://www.mozilla.org/press/mozilla-2004-11-09.html">Press Release</a><BR>
-
-
-</SPAN>
-</DIV>

mozilla/webtools/update/index.php

@@ -1,192 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-
-<TITLE>Mozilla Update</TITLE>
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-include"$page_header";
-?>
-
-<DIV class="contentbox" style="margin-left: 2px;">
-<DIV class="boxheader">Welcome to Mozilla Update</DIV>
-<SPAN class="itemdescription">
-Mozilla Update hosts Extensions and Themes for Mozilla software. On this site you can find Extensions and Themes for Mozilla Firefox,
-Mozilla Thunderbird and the Mozilla 1.x suite, with more to come. The site is broken up into sections for each product, with the
-extensions and themes categorized to be easy to find. They're also sorted by what version of the product you're using, so you can
-browse only for Firefox 0.9 compatible extensions, for example. For more information about Mozilla Update, please read our <A HREF="/faq/">Frequently Asked Questions...</A>
-
-</SPAN>
-</DIV>
-<?php include"inc_featuredupdate.php"; ?>
-
-<?php
-//include"inc_softwareupdate.php";
-if ($_GET["application"]) {$application=$_GET["application"]; }
-?>
-<?php
-//Temporary!! Current Version Array Code
-$currentver_array = array("firefox"=>"1.0", "thunderbird"=>"1.0", "mozilla"=>"1.7");
-$currentver_display_array = array("firefox"=>"1.0", "thunderbird"=>"1.0", "mozilla"=>"1.7.x");
-$currentver = $currentver_array[$application];
-$currentver_display = $currentver_display_array[$application];
-?>
-
-
-<DIV class="frontpagecontainer">
-<DIV class="contentbox contentcolumns">
-<DIV class="boxheader"><?php print(ucwords($application)); echo" $currentver_display"; ?> Extensions</DIV>
-
-<?php
-$sql = "SELECT TM.ID
-FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-WHERE  `Type`  =  'E' AND `AppName` = '$application' AND `minAppVer_int`<='$currentver' AND `maxAppVer_int` >='$currentver' AND `approved` = 'YES' GROUP BY TM.ID";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $numextensions = mysql_num_rows($sql_result);
-?>
-     <a href="/extensions/?application=<?php echo"$application"; ?>">Browse extensions</a> (<?php echo"$numextensions"; ?> available)<BR> 
-<BR>
-<?php
-$sql = "SELECT TR.ID, `Title`, TR.DateAdded, `Body`, `Type`, `pick` FROM `t_reviews`  TR
-INNER JOIN t_main TM ON TR.ID = TM.ID
-INNER JOIN t_version TV ON TV.ID = TM.ID
-INNER JOIN t_applications TA ON TA.AppID = TV.AppID
-WHERE `Type` = 'E' AND `AppName` = '$application' AND `pick`='YES' ORDER BY `rID` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $id = $row["ID"];
-    $title = $row["Title"];
-    $pick = $row["pick"];
-    $dateadded = $row["DateAdded"];
-    $body = $row["Body"];
-    $bodylength = strlen($body);
-if ($bodylength>"250") {
- $body = substr($body,0,250);
- $body .= " <a href=\"/extensions/moreinfo.php?id=$id&application=$application&page=staffreview\">[More...]</a>";
- 
- }
-
-//Create Customizeable Timestamp
-	$day=substr($dateadded,8,2);  //get the day
-    $month=substr($dateadded,5,2); //get the month
-    $year=substr($dateadded,0,4); //get the year
-    $hour=substr($dateadded,11,2); //get the hour
-    $minute=substr($dateadded,14,2); //get the minute
-    $second=substr($dateadded,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $date = gmdate("F, Y", $timestamp);
-
-
-echo"$title<br>&nbsp;&nbsp;&nbsp;$date";
-if ($pick=="YES") {echo" Editors Pick";}
-echo"<BR><BR>\n";
-echo"<SPAN class=\"itemdescription\">$body</SPAN><BR>\n";
-}
-?>
-<BR>
-</DIV>
-
-<DIV class="contentbox contentcolumns">
-<DIV class="boxheader"><?php print(ucwords($application)); echo" $currentver_display"; ?> Themes</DIV>
-<?php
-$sql = "SELECT TM.ID FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-WHERE  `Type`  =  'T' AND `AppName` = '$application' AND `minAppVer_int` <='$currentver' AND `maxAppVer_int` >= '$currentver' AND `approved` = 'YES' GROUP BY TM.ID";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $numthemes = mysql_num_rows($sql_result);
-?>
-     <a href="/themes/?application=<?php echo"$application"; ?>">Browse themes</a> (<?php echo"$numthemes"; ?> available)<BR>
-<BR>
-<?php
-$sql = "SELECT TR.ID, `Title`, TR.DateAdded, `Body`, `Type`, `pick` FROM `t_reviews`  TR
-INNER JOIN t_main TM ON TR.ID = TM.ID
-INNER JOIN t_version TV ON TV.ID = TM.ID
-INNER JOIN t_applications TA ON TA.AppID = TV.AppID
-WHERE `Type` = 'T' AND `AppName` = '$application' AND `pick`='YES' ORDER BY `rID` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $id = $row["ID"];
-    $title = $row["Title"];
-    $pick = $row["pick"];
-    $dateadded = $row["DateAdded"];
-    $body = $row["Body"];
-    $bodylength = strlen($body);
-if ($bodylength>"250") {
- $body = substr($body,0,250);
- $body .= " <a href=\"/moreinfo.php?id=$id&application=$application&page=staffreview\">[More...]</a>";
- 
- }
-
-//Create Customizeable Timestamp
-	$day=substr($dateadded,8,2);  //get the day
-    $month=substr($dateadded,5,2); //get the month
-    $year=substr($dateadded,0,4); //get the year
-    $hour=substr($dateadded,11,2); //get the hour
-    $minute=substr($dateadded,14,2); //get the minute
-    $second=substr($dateadded,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $date = gmdate("F, Y", $timestamp);
-
-echo"$title - $date";
-if ($pick=="YES") {echo" Editors Pick<BR><BR>\n";}
-echo"<BR><BR>\n";
-echo"$body<BR>\n";
-}
-?>
-<BR>
-</DIV>
-</DIV>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/rss/inc_rssfeed.php

@@ -1,95 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//   Alan Starr <alanjstarr@yahoo.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-//  http://blogs.law.harvard.edu/tech/rss
-
-switch ($type) {
-  case "E":
-    $listType = "Extensions";
-    break;
-  case "P":
-    $listType = "Plugins";
-    break;
-  case "T":
-    $listType = "Themes";
-    break;
-}
-
-echo "<rss version=\"2.0\">\n";
-echo "<channel>\n";
-
-echo "  <title>" . htmlentities($sitetitle) . "::" . htmlentities($list) . " " . $listType . "</title>\n";
-echo "  <link>" . htmlentities($siteurl) . "</link>\n";
-echo "  <description>" . htmlentities($description) . "</description>\n";
-echo "  <language>" . htmlentities($sitelanguage) . "</language>\n";
-echo "  <copyright>" . htmlentities($sitecopyright) . "</copyright>\n";
-echo "  <lastBuildDate>" . $currenttime . "</lastBuildDate>\n";
-echo "  <ttl>" . $rssttl . "</ttl>\n";
-echo "  <image>\n";
-echo "    <title>" . htmlentities($sitetitle) . "</title>\n";
-echo "    <link>" . htmlentities($siteurl) . "</link>\n";
-echo "    <url>" . htmlentities($siteicon) . "</url>\n";
-echo "    <width>16</width>\n";
-echo "    <height>16</height>\n";
-echo "  </image>\n";
-
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $id = $row["ID"];
-    $title = htmlentities($row["Title"]);
-    $description = htmlentities($row["Description"]);
-    $dateupdated = gmdate("r", strtotime($row["DateStamp"]));
-    $version = $row["Version"];
-    $vid = $row["vID"];
-    $appname = $row["AppName"];
-
-    echo "    <item>\n";
-    echo "      <pubDate>" . $dateupdated . "</pubDate>\n";
-    echo "      <title>" . $title . " " . $version . " for " . $appname . "</title>\n";
-    echo "      <link>http://$sitehostname/" . strtolower($listType) . "/moreinfo.php?id=" . $id . "&amp;vid=" . $vid . "</link>\n";
-    echo "      <description>" . $description . "</description>\n";
-    echo "    </item>\n";
-
-  }
-
-echo "</channel>\n";
-echo "</rss>\n";
-
-?>

mozilla/webtools/update/rss/index.php

@@ -1,107 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//   Alan Starr <alanjstarr@yahoo.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-
-$app = strtolower($_GET["application"]);  // Firefox, Thunderbird, Mozilla
-$type = $_GET["type"]; //E, T, [P]
-$list = ucwords(strtolower($_GET["list"])); // Newest, Updated, [Editors], Popular
-
-$sitetitle = "Mozilla Update";
-$siteicon = "http://www.mozilla.org/images/mozilla-16.png";
-$siteurl = "http://update.mozilla.org";
-$sitedescription = "the way to keep your mozilla software up-to-date";
-$sitelanguage = "en-us";
-$sitecopyright = "Creative Commons?";
-$currenttime = gmdate(r);// GMT 
-$rssttl = "120"; //Life of feed in minutes
-
-//header("Content-Type: application/octet-stream");
-header("Content-Type: text/xml");
-
-// Firefox, extensions, by date added
-
-$select = "SELECT DISTINCT 
-t_main.ID, 
-t_main.Name AS Title, 
-t_main.Description,  
-t_version.Version, 
-t_version.vID,
-t_version.DateUpdated AS DateStamp,
-t_applications.AppName";
-
-$from = "FROM  t_main 
-INNER  JOIN t_version ON t_main.ID = t_version.ID
-INNER  JOIN t_applications ON t_version.AppID = t_applications.AppID";
-
-$where = "`approved` = 'YES'"; // Always have a WHERE
-
-if ($app == 'firefox' || $app == 'thunderbird' || $app == 'mozilla') {
-  $where .= " AND t_applications.AppName = '$app'";
-}
-
-if ($type == 'E' || $type == 'T' || $type == 'P') {
-  $where .= " AND t_main.Type = '$type'";
-}
-
-switch ($list) {
-   case "Popular":
-     $orderby = "t_main.DownloadCount DESC";
-     break;
-   case "Updated":
-     $orderby = "t_main.DateUpdated DESC";
-     break;
-   case "Rated":
-     $orderby = "t_main.Rating DESC";
-     break;
-   case "Newest":
-   default:
-     $orderby = "t_main.DateAdded DESC";
-     break;
-}
-
-$sql = $select . " " . $from . " WHERE " . $where . " ORDER BY " . $orderby . " LIMIT 0, 10";
-
-//echo $sql;
-
-include"inc_rssfeed.php";
-
-
-?>

mozilla/webtools/update/themes/authorprofiles.php

@@ -1,195 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-
-<?php
-//Bookmarking-Friendly Page Title
-$sql = "SELECT  UserName FROM `t_userprofiles`  WHERE UserID = '$_GET[id]' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-if (mysql_num_rows($sql_result)===0) {
-$return = page_error("2","Author ID is Invalid or Missing.");
-exit;
-
-}
-  $row = mysql_fetch_array($sql_result);
-?>
-
-<TITLE>Mozilla Update :: Themes - Author Profile: <?php echo"$row[UserName]"; ?></TITLE>
-
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-include"$page_header";
-
-$type = "T";
-$category = $_GET["category"];
-include"inc_sidebar.php";
-?>
-<DIV id="content">
-<?php
-$userid = $_GET["id"];
- $sql = "SELECT * FROM `t_userprofiles` WHERE `UserID` = '$userid' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-   $row = mysql_fetch_array($sql_result);
-    $userid = $row["UserID"];
-    $username = $row["UserName"];
-    $useremail = $row["UserEmail"];
-    $userwebsite = $row["UserWebsite"];
-    $userpass = $row["UserPass"];
-    $userrole = $row["UserRole"];
-    $useremailhide = $row["UserEmailHide"];
-?>
-<DIV class="item">
-<SPAN class="boldfont">Profile for <?php echo"$username"; ?></SPAN><BR>
-<DIV class="boxheader2"></DIV>
-<SPAN class="boldfont">Homepage:</SPAN> <?php 
-if ($userwebsite) {echo"<A HREF=\"$userwebsite\" target=\"_blank\">$userwebsite</A>";
- } else {
-echo"<SPAN CLASS=\"disabled\">Not Available for this Author</SPAN>";
-}
-?><BR>
-<SPAN class="boldfont">E-Mail:</SPAN> <?php if ($useremailhide=="1") {
-echo"<SPAN class=\"disabled\">Not Disclosed by Author</SPAN>";
-} else {
-echo"<SPAN class=\"emailactive\">Contact this Author via the <A HREF=\"#email\">E-Mail form</A> below</SPAN>";
-} 
-?>
-</DIV>
-&nbsp;<BR>
-<DIV class="item">
-<SPAN class="boldfont">All Extensions and Themes by <?php echo"$username"; ?></SPAN><BR>
-<DIV class="boxheader2"></DIV>
-<?php
-$sql = "SELECT  TM.ID, TM.Type, TM.Name, TM.Description, TM.DateUpdated, TM.TotalDownloads, TU.UserEmail FROM  `t_main`  TM 
-LEFT JOIN t_authorxref TAX ON TM.ID = TAX.ID
-INNER JOIN t_userprofiles TU ON TAX.UserID = TU.UserID
-WHERE TU.UserID = '$userid' AND TM.Type !='P'
-ORDER  BY  `Type` , `Name` ";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $numresults = mysql_num_rows($sql_result);
-  while ($row = mysql_fetch_array($sql_result)) {
-    unset($downloadcount);
-
-$sql2 = "SELECT `vID`, `Version` FROM `t_version` WHERE `ID` = '$row[ID]' AND `approved` = 'YES' ORDER BY `Version` ASC LIMIT 1";
- $sql_result2 = mysql_query($sql2, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row2 = mysql_fetch_array($sql_result2)) {
-   $vid = $row2["vID"];
-   $version = $row2["Version"];
-
-$v++;
-    $id = $row["ID"];
-    $type = $row["Type"];
-    $name = $row["Name"];
-    $dateadded = $row["DateAdded"];
-    $dateupdated = $row["DateUpdated"];
-    $homepage = $row["Homepage"];
-    $description = $row["Description"];
-    $authors = $row["UserEmail"];
-    $downloadcount = $row["TotalDownloads"];
-
-	$day=substr($dateupdated,8,2);  //get the day
-    $month=substr($dateupdated,5,2); //get the month
-    $year=substr($dateupdated,0,4); //get the year
-    $hour=substr($dateupdated,11,2); //get the hour
-    $minute=substr($dateupdated,14,2); //get the minute
-    $second=substr($dateupdated,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $dateupdated = gmdate("F d, Y g:i:sa", $timestamp); //gmdate("F d, Y", $dutimestamp);
-
-echo"<DIV CLASS=\"item\">";
-echo"<SPAN class=\"title itemtitle\" style=\"margin-left: 0px\"><A HREF=\"moreinfo.php?application=$application&id=$id\">$name</A></SPAN><BR>";
-echo"<DIV class=\"profileitemdesc\">$description</DIV>\n";
-echo"<DIV class=\"baseline\">Updated: $dateupdated | Downloads: $downloadcount</DIV>\n";
-
-echo"</DIV>\n";
-echo"<BR>\n";
-}
-}
-if ($numresults=="0") {
-echo"<DIV class=\"noitems\">No Extensions or Themes in the Database for $username yet...</DIV>";
-}
-?>
-</DIV>
-&nbsp;<BR>
-<?php if ($useremailhide !=="1") { ?>
-<A NAME="email"></A>
-<DIV class="item">
-<SPAN class="boldfont">Send an E-Mail to <?php echo"$username"; ?></SPAN><BR>
-<DIV class="boxheader2"></DIV>
-<?php
-//SendMail Returned Message Section
-if ($_GET["mail"]) {
-$mail = $_GET["mail"];
-echo"<DIV class=\"mailresult\">";
-if ($mail=="successful") {
-echo"Your message has been sent successfully..."; 
-} else if ($mail=="unsuccessful") {
-echo"An error occured, your message was not sent... Please try again..."; 
-}
-echo"</DIV>\n";
-}
-?>
-<FORM NAME="sendmail" METHOD="POST" ACTION="sendmail.php">
-<INPUT NAME="senduserid" TYPE="HIDDEN" VALUE="<?php echo"$userid"; ?>">
-Your Name: <INPUT NAME="fromname" TYPE="TEXT" SIZE=40 MAXLENGTH=100>&nbsp;&nbsp; Email: <INPUT NAME="fromemail" TYPE="TEXT" SIZE=40 MAXLENGTH=100><BR>
-Subject: <INPUT NAME="subject" TYPE="TEXT" SIZE=40 MAXLENGTH=100><BR>
-Message:<BR>
-<CENTER><TEXTAREA NAME="body" ROWS=20 COLS=65></TEXTAREA><BR>
-<INPUT NAME="submit" TYPE="SUBMIT" VALUE="Send Message">&nbsp;&nbsp;<INPUT NAME="reset" TYPE="RESET" VALUE="Reset Form"><BR>
-</CENTER>
-</FORM>
-</DIV>
-&nbsp;<BR>
-<?php } ?>
-</DIV>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/themes/inc_sidebar.php

@@ -1,85 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<DIV class="sidelinks">
-<?php
-echo"<DIV CLASS=\"sidebartitle\">Categories:</DIV>\n";
-echo"<DIV class=\"sidebartext\">";
-if (!$category AND $index !="yes") {echo"<SPAN CLASS=\"title\">"; }
-  echo"<SPAN class=\"sidebartitle\"><A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=All\" TITLE=\"Show All ".ucwords($typename)." Alphabetically\">All</A></SPAN><BR>\n";
-if (!$category AND $index !="yes") {echo"</SPAN>"; }
-
-// Object Categories
-$sql = "SELECT `CatName`,`CatDesc` FROM `t_categories` WHERE `CatType` = '$type' ORDER BY `CatName`";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-  $catname = $row["CatName"];
-  $catdesc = $row["CatDesc"];
-  if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">$catname</A><BR>\n";
-  if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-  }
-?>
-<BR>
-<?php
-$catname = "Editors Pick";
-$catdesc = ucwords($typename)." picked by the Mozilla Update Editors";
-if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">Editor's Pick</A><BR>\n";
-if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-
-$catname = "Popular";
-$catdesc = ucwords($typename)." downloaded the most";
-if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">$catname</A><BR>\n";
-if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-
-$catname = "Top Rated";
-$catdesc = ucwords($typename)." rated the highest";
-if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">$catname</A><BR>\n";
-if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-
-$catname = "Newest";
-$catdesc = "Most recent ".ucwords($typename);
-if (strtolower($category) == strtolower($catname)) {echo"<SPAN CLASS=\"title\">"; }
-  echo"<A HREF=\"showlist.php?application=$application&version=$app_version&numpg=$items_per_page&category=$catname\" TITLE=\"$catdesc\">$catname</A><BR>\n";
-if (strtolower($category) == strtolower($catname)) {echo"</SPAN>"; }
-?>
-</DIV>
-</DIV>

mozilla/webtools/update/themes/index.php

@@ -1,232 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-
-<TITLE>Mozilla Update :: Themes - Change the Look of Mozilla Software</TITLE>
-
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-$type = "T";
-if ($_GET["application"]) {$application=$_GET["application"]; }
-include"$page_header";
-$index="yes";
-include"inc_sidebar.php";
-?>
-<DIV class="box">
-<DIV class="boxheader" style="width: 100%">What is a Theme?</DIV>
-<SPAN class="itemdescription">Themes are skins for <?php print(ucwords($application)); ?>, they allow you to change the look and
-feel of the browser and personalize it to your tastes. A theme can simply change the colors of <?php print(ucwords($application)); ?> 
-or it can change every piece of the browser appearance.</SPAN>
-</DIV>
-
-<DIV class="box">
-<DIV class="boxheader" style="width: 100%">Featured <?php print(ucwords($application)); ?> Theme</DIV>
-<?php
-$sql = "SELECT TR.ID, TM.Name, `Title`, TR.DateAdded, `Body`, `Type`, `pick` FROM `t_reviews`  TR
-INNER JOIN t_main TM ON TR.ID = TM.ID
-INNER JOIN t_version TV ON TV.ID = TM.ID
-INNER JOIN t_applications TA ON TA.AppID = TV.AppID
-WHERE `Type` = '$type' AND `AppName` = '$application' AND `featured`='YES' ORDER BY `rID` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $id = $row["ID"];
-    $name = $row["Name"];
-    $title = $row["Title"];
-    $dateadded = $row["DateAdded"];
-    $pick = $row["pick"];
-    $body = $row["Body"];
-    $bodylength = strlen($body);
-if ($bodylength>"250") {
- $body = substr($body,0,250);
- $body .= " <a href=\"moreinfo.php?application=$application&id=$id&page=staffreview\">[More...]</a>";
- 
- }
-
-//Create Customizeable Timestamp
-	$day=substr($dateadded,8,2);  //get the day
-    $month=substr($dateadded,5,2); //get the month
-    $year=substr($dateadded,0,4); //get the year
-    $hour=substr($dateadded,11,2); //get the hour
-    $minute=substr($dateadded,14,2); //get the minute
-    $second=substr($dateadded,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $date = gmdate("F, Y", $timestamp);
-
-echo"<a href=\"moreinfo.php?application=$application&id=$id\">$name</A> -- $title";
-if ($pick=="YES") {echo" - $date Editors Pick"; }
-echo"<BR>\n";
-echo"<SPAN class=\"itemdescription\">$body</SPAN><BR>\n";
-}
-?>
-</DIV>
-<?php
-//Temporary!! Current Version Array Code
-$currentver_array = array("firefox"=>"1.0", "thunderbird"=>"1.0", "mozilla"=>"1.7");
-$currentver_display_array = array("firefox"=>"1.0", "thunderbird"=>"1.0", "mozilla"=>"1.7.x");
-$currentver = $currentver_array[$application];
-$currentver_display = $currentver_display_array[$application];
-?>
-<DIV class="box" style="width: 80%; min-height: 200px; border: 0px">
-<DIV class="boxcolumns">
-<DIV class="boxheader"><A HREF="showlist.php?application=<?php echo"$application"; ?>&category=Popular">Most Popular</A>:</DIV>
-<?php
-$i=0;
-$sql = "SELECT TM.ID, TV.vID,TM.Name, TV.Version, TM.TotalDownloads, TM.downloadcount
-FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-WHERE  `Type`  =  '$type' AND `AppName` = '$application' AND `minAppVer_int` <='$currentver' AND `maxAppVer_int` >= '$currentver' AND `DownloadCount` > '0' AND `approved` = 'YES' ORDER BY `DownloadCount` DESC ";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $i++;
-   $id = $row["ID"];
-   $vid = $row["vID"];
-   $name = $row["Name"];
-   $version = $row["Version"];
-   $downloadcount = $row["downloadcount"];
-   $totaldownloads = $row["TotalDownloads"];
-if ($lastname == $name) {$i--; continue; }
-  echo"$i - <a href=\"moreinfo.php?application=$application&id=$id\">$name</a><br>\n";
-  echo"<SPAN class=\"smallfont nocomment\">($downloadcount downloads)</SPAN><BR>\n";
-
-$lastname = $name;
-if ($i >= "5") {break;}
-}
-?>
-<BR>
-</DIV>
-<DIV class="boxcolumns">
-<DIV class="boxheader"><A HREF="showlist.php?application=<?php echo"$application"; ?>&category=Top Rated">Top Rated</A>:</DIV>
-<?php
-$r=0;
-$usednames = array();
-$sql = "SELECT TM.ID, TV.vID, TM.Name, TV.Version, TM.Rating, TU.UserName
-FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER JOIN t_authorxref TAX ON TAX.ID = TM.ID
-INNER JOIN t_userprofiles TU ON TU.UserID = TAX.UserID
-WHERE  `Type`  =  '$type' AND `AppName` = '$application' AND `minAppVer_int` <='$currentver' AND `maxAppVer_int` >= '$currentver' AND `Rating` > '0' AND `approved` = 'YES' ORDER BY `Rating` DESC, `Name` ASC, `Version` DESC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $r++; $s++;
-   $id = $row["ID"];
-   $vid = $row["vID"];
-   $name = $row["Name"];
-   $version = $row["Version"];
-   $rating = $row["Rating"];
-  $arraysearch = array_search("$name", $usednames);
-  if ($arraysearch !== false AND $usedversions[$arraysearch]['version']<$version) {$r--; continue; } //
-  echo"$r - <a href=\"moreinfo.php?application=$application&id=$id&vid=$vid\">$name</a>&nbsp;";
-
-  //$rating = round($rating);
-
-echo"<SPAN title=\"Rated: $rating of 5\" style=\"font-size: 8pt\">";
-for ($i = 1; $i <= floor($rating); $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-if ($rating>floor($rating)) {
-$val = ($rating-floor($rating))*10;
-echo"<IMG SRC=\"/images/stars/star_0$val.png\" BORDER=0 ALT=\"\">";
-$i++;
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-echo"</SPAN><br>\n";
-//echo"<SPAN class=\"smallfont nocomment\">By $author</SPAN><BR>\n";
-$usednames[$s] = $name;
-$usedversions[$s] = $version;
-if ($r >= "5") {break;}
-}
-unset($usednames, $usedversions, $r, $s, $i);
-?>
-</DIV>
-<DIV class="boxcolumns">
-<DIV class="boxheader"><A HREF="showlist.php?application=<?php echo"$application"; ?>&category=Newest">Most Recent</A>:</DIV>
-<?php
-$i=0;
-//MacOSX Specific override for All+Mac themes. Bug 252294
-if ($_SESSION["app_os"]=="MacOSX") { $app_os = $_SESSION["app_os"]; } else { $app_os = "ALL"; }
-
-$sql = "SELECT TM.ID, TV.vID, TM.Name, TV.Version, TV.DateAdded
-FROM  `t_main` TM
-INNER JOIN t_version TV ON TM.ID = TV.ID
-INNER JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER JOIN t_os TOS ON TV.OSID = TOS.OSID
-WHERE `Type`  =  '$type' AND `AppName` = '$application' AND `minAppVer_int` <='$currentver' AND `maxAppVer_int` >= '$currentver' AND (`OSName` = '$_SESSION[app_os]' OR `OSName` = '$app_os') AND `approved` = 'YES' ORDER BY `DateAdded` DESC ";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $i++;
-   $id = $row["ID"];
-   $vid = $row["vID"];
-   $name = $row["Name"];
-   $version = $row["Version"];
-   $dateadded = $row["DateAdded"];
-//Create Customizeable Datestamp
-    $timestamp = strtotime("$dateadded");
-    $dateadded = gmdate("F d, Y g:i:sa", $timestamp); //    $dateupdated = gmdate("F d, Y g:i:sa T", $timestamp);
-
-if ($lastname == $name) {$i--; continue; }
-  echo"$i - <a href=\"moreinfo.php?application=$application&id=$id&vid=$vid\">$name $version</a><BR>\n";
-  echo"<SPAN class=\"smallfont nocomment\">($dateadded)</SPAN><BR>\n";
-
-$lastname = $name;
-if ($i >= "5") {break;}
-}
-?>
-</DIV>
-</DIV>
-<BR>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/themes/install.php

@@ -1,106 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php 
-require"../core/config.php";
-//Get Full Information for the file requested.
-$sql = "SELECT `URI` FROM `t_version` WHERE `ID`='$_GET[id]' AND `vID`='$_GET[vid]' LIMIT 1";
-$sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
- $row = mysql_fetch_array($sql_result);
-$uri=$row["URI"]; 
-
-header("Location: $uri");
-exit;
-
-//XXX This codepath sucks performance wise and has been disabled. See Bug 267822.
-
-// New DownloadCount management Code..
-//Check for user, to see if they recently accessed this file (filters duplicate/triplicate+ requests in a short period).
-  $maxlife = date("YmdHis", mktime(date("H"), date("i")-10, date("s"), date("m"), date("d"), date("Y")));
-  $sql = "SELECT `dID` FROM `t_downloads` WHERE `ID`='$_GET[id]' AND `vID`='$_GET[vid]' AND `user_ip`='$_SERVER[REMOTE_ADDR]' AND `user_agent` = '$_SERVER[HTTP_USER_AGENT]' AND `date`>'$maxlife' AND `type`='download' LIMIT 1";
-    $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-    if (mysql_num_rows($sql_result)=="0") {
-     //Insert a record of this download for the next 10 minutes anyway. :-)
-     $today=date("YmdHis");
-      $sql = "INSERT INTO `t_downloads` (`ID`,`date`,`vID`, `user_ip`, `user_agent`, `type`) VALUES ('$_GET[id]','$today','$_GET[vid]', '$_SERVER[REMOTE_ADDR]', '$_SERVER[HTTP_USER_AGENT]', 'download');";
-        $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-    //Cleanup the Individual Downloads part of the table for old records
-    $sql = "DELETE FROM `t_downloads` WHERE `date`<'$maxlife' AND `type`='download'";
-      $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-$today=date("Ymd")."000000";
-  //Per day download tracking -- Record hits for this day in the record (if it doesn't exist create it)
-  $sql = "SELECT `dID` FROM `t_downloads` WHERE `ID`='$_GET[id]' AND `date`='$today' AND `type`='count' LIMIT 1";
-    $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-    if (mysql_num_rows($sql_result)=="0") {
-      $sql = "INSERT INTO `t_downloads` (`ID`,`date`,`downloadcount`,`type`) VALUES ('$_GET[id]','$today','1','count');";
-    } else {
-        $row = mysql_fetch_array($sql_result);
-      $sql = "UPDATE `t_downloads` SET `downloadcount`=downloadcount+1 WHERE `dID`='$row[dID]' LIMIT 1";
-    }
-      $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-
-//Download Statistic Management Code
-// Maintain the last 7 days record count
-// This is also where the weekly w/e code would go. if that feature is ever created.
-   $mindate = date("Ymd", mktime(0, 0, 0, date("m"), date("d")-7, date("Y")))."000000";
-   $downloadcount="0";
-  $sql = "SELECT `downloadcount` FROM `t_downloads` WHERE `ID`='$_GET[id]' AND `date`>='$mindate' AND `type`='count' ORDER BY `date` DESC";
-   $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-    while ($row = mysql_fetch_array($sql_result)) {
-     $downloadcount = $downloadcount+$row["downloadcount"];
-    }
-  //Update the 7 day count in the main record.
-  $sql = "UPDATE `t_main` SET `downloadcount`='$downloadcount' WHERE `ID`='$_GET[id]' LIMIT 1";
-    $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-  //Update the total downloadcount in the main record.
-  $sql = "UPDATE `t_main` SET `TotalDownloads`=TotalDownloads+1 WHERE `ID`='$_GET[id]' LIMIT 1";
-    $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-
-  //Clean up the Counts per day for >8 days. (and in the future, compile the week/ending records for this data)
-    $sql = "DELETE FROM `t_downloads` WHERE `ID`='$_GET[id]' AND `date`<'$mindate' AND `type`='count'";
-      $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-   
-    }
-
-//Send User on their way to the file...
-header("Location: $uri")
-?>

mozilla/webtools/update/themes/moreinfo.php

@@ -1,541 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-
-<?php
-//Bookmarking-Friendly Page Title
-$sql = "SELECT  Name FROM `t_main`  WHERE ID = '$_GET[id]' AND Type = 'T' LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-if (mysql_num_rows($sql_result)===0) {
-$return = page_error("1","Extension ID is Invalid or Missing.");
-exit;
-
-}
-  $row = mysql_fetch_array($sql_result);
-
-//Page Titles
-$pagetitles = array("releases"=>"All Releases", "comments"=>"User Comments", "staffreview"=>"Editor Review", "opinion"=>" My Opinion");
-$pagetitle = $pagetitles[$_GET["page"]];
-?>
-
-<TITLE>Mozilla Update :: Themes -- More Info: <?php echo"$row[Name]"; if ($pagetitle) {echo" - $pagetitle"; } ?></TITLE>
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-</HEAD>
-<BODY>
-<?php
-include"$page_header";
-$type = "T";
-$category=$_GET["category"];
-include"inc_sidebar.php";
-?>
-<DIV id="content">
-<?php
-//Get Author Data
-$sql2 = "SELECT  TM.Name, TU.UserName, TU.UserID, TU.UserEmail FROM  `t_main`  TM 
-LEFT JOIN t_authorxref TAX ON TM.ID = TAX.ID
-INNER JOIN t_userprofiles TU ON TAX.UserID = TU.UserID
-WHERE TM.ID = '$_GET[id]'
-ORDER  BY  `Type` , `Name`  ASC "; // TM.Type = 'E'
- $sql_result2 = mysql_query($sql2, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row2 = mysql_fetch_array($sql_result2)) {
-     $authorarray[$row2[Name]][] = $row2["UserName"];
-     $authorids[$row2[UserName]] = $row2["UserID"];
-   }
-
-
-//Run Query and Create List
-$s = "0";
-$sql = "SELECT TM.ID, TM.Type, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Description, TM.Rating, TV.vID, TV.Version, TV.MinAppVer, TV.MaxAppVer, TV.Size, TV.DateAdded AS VerDateAdded, TV.DateUpdated AS VerDateUpdated, TV.URI, TV.Notes, TM.TotalDownloads, TA.AppName, TOS.OSName, TP.PreviewURI
-FROM  `t_main` TM
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID
-LEFT  JOIN t_previews TP ON TV.vID = TP.vID
-WHERE TM.ID = '$_GET[id]' AND `approved` = 'YES' ";
-if ($_GET["vid"]) { $sql .=" AND TV.vID = '$_GET[vid]' "; }
-$sql .= "ORDER  BY  `Name` , `Version` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $row = mysql_fetch_array($sql_result);
-
-
-$v++;
-    $id = $row["ID"];
-    $type = $row["Type"];
-    $name = $row["Name"];
-    $dateadded = $row["DateAdded"];
-    $dateupdated = $row["DateUpdated"];
-    $homepage = $row["Homepage"];
-    $description = $row["Description"];
-    $rating = $row["Rating"];
-    $authors = $authorarray[$name];
-    $osname = $row["OSName"];
-
-   $vid = $row["vID"];
-if (!$_GET['vid']) {$_GET['vid']=$vid;}
-   $appname = $row["AppName"];
-   $minappver = $row["MinAppVer"];
-   $maxappver = $row["MaxAppVer"];
-   $verdateadded = $row["VerDateAdded"];
-   $verdateupdated = $row["VerDateUpdated"];
-   $filesize = $row["Size"];
-   $notes = $row["Notes"];
-   $version = $row["Version"];
-   $uri = $row["URI"];
-   $previewuri = $row["PreviewURI"];
-   $downloadcount = $row["TotalDownloads"];
-   $filename = basename($uri);
-
-if ($VerDateAdded > $dateadded) {$dateadded = $VerDateAdded; }
-if ($VerDateUpdated > $dateupdated) {$dateupdated = $VerDateUpdated; }
-
-
-
-//Turn Authors Array into readable string...
-$authorcount = count($authors);
-foreach ($authors as $author) {
-$userid = $authorids[$author];
-$n++;
-$authorstring .= "<A HREF=\"authorprofiles.php?application=$application&id=$userid\">$author</A>";
-if ($authorcount != $n) {$authorstring .=", "; }
-
-}
-$authors = $authorstring;
-unset($authorstring, $n); // Clear used Vars.. 
-
-//Create Customizeable Timestamp for DateAdded/DateUpdated
-	$day=substr($dateadded,8,2);  //get the day
-    $month=substr($dateadded,5,2); //get the month
-    $year=substr($dateadded,0,4); //get the year
-    $hour=substr($dateadded,11,2); //get the hour
-    $minute=substr($dateadded,14,2); //get the minute
-    $second=substr($dateadded,17,2); //get the sec
-    $datimestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-
-	$day=substr($dateupdated,8,2);  //get the day
-    $month=substr($dateupdated,5,2); //get the month
-    $year=substr($dateupdated,0,4); //get the year
-    $hour=substr($dateupdated,11,2); //get the hour
-    $minute=substr($dateupdated,14,2); //get the minute
-    $second=substr($dateupdated,17,2); //get the sec
-    $dutimestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-
-    $dateadded = gmdate("F d, Y g:i:sa", $datimestamp); //gmdate("F d, Y", $datimestamp);
-    $dateupdated = gmdate("F d, Y g:i:sa", $dutimestamp); //gmdate("F d, Y", $dutimestamp);
-
-//Rating
-if (!$rating) { $rating="0"; }
-?>
-
-
-<DIV class="tabbar">
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid"; ?>">More Info</A></DIV>
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid&page=releases"; ?>">All Releases</A></DIV>
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid&page=comments"; ?>">Comments</A></DIV>
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid&page=staffreview"; ?>">Editor Review</A></DIV>
-<DIV class="tab"><A HREF="?<?php echo"application=$application&id=$id&vid=$vid&page=opinion"; ?>">My Opinion</A></DIV>
-</DIV>
-<?php
-echo"<DIV class=\"item\">\n";
-//echo"<DIV style=\"height: 100px\">"; //Why?!?
-if ($previewuri) {
-list($width, $height, $imagetype, $attr) = getimagesize("$websitepath"."$previewuri");
-
-echo"<IMG SRC=\"$previewuri\" BORDER=0 HEIGHT=$height WIDTH=$width STYLE=\"float: right; padding-right: 5px\" ALT=\"$name preview\">";
-}
-
-//Upper-Right Side Box
-echo"<DIV class=\"liststars\" title=\"$rating of 5 stars\" style=\"font-size: 8pt\"><A HREF=\"moreinfo.php?application=$application&id=$id&page=comments\">";
-for ($i = 1; $i <= floor($rating); $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-if ($rating>floor($rating)) {
-$val = ($rating-floor($rating))*10;
-echo"<IMG SRC=\"/images/stars/star_0$val.png\" BORDER=0 ALT=\"\">";
-$i++;
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-echo"</A></DIV>\n";
-
-echo"<DIV class=\"itemtitle\">";
-echo"<SPAN class=\"title\"><A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid\">$name $version</A></SPAN><BR>";
-echo"<SPAN class=\"authorline\">By $authors</SPAN><br>";
-echo"</DIV>";
-
-//Description & Version Notes
-echo"<SPAN class=\"itemdescription\">";
-echo"$description<BR>";
-if ($notes) {echo"$notes"; }
-echo"</SPAN>\n";
-
-//echo"</DIV>\n";
-echo"<BR>\n\n";
-
-$page = $_GET["page"];
-if (!$page or $page=="general") {
-?>
-<DIV class="downloadbox">
-<?php
-//Create DateStamp for Version Release Date ($verdateadded)
-	$day=substr($verdateadded,8,2);  //get the day
-    $month=substr($verdateadded,5,2); //get the month
-    $year=substr($verdateadded,0,4); //get the year
-    $hour=substr($verdateadded,11,2); //get the hour
-    $minute=substr($verdateadded,14,2); //get the minute
-    $second=substr($verdateadded,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $verdateadded = gmdate("F d, Y", $timestamp);
-
-//Calculate Download Time
-$speed = "56"; //In Kbit/s
-$speedinkb = "5.5"; //$speedinkb = $speed/8; //In KB/s 
-$timeinsecs = round($filesize/$speedinkb);
-$time_minutes = floor($timeinsecs/60);
-$time_seconds = round($timeinsecs-($time_minutes*60),-1);
-$time_seconds = $time_seconds+2; //Compensate for mirror overhead
-
-$time = "About ";
-if ($time_minutes>0) {
-$time .= "$time_minutes minutes ";
-}
-$time .="$time_seconds seconds";
-
-echo"
-<SPAN style=\"itemdescription\">Released on $verdateadded</SPAN><BR>
-<DIV class=\"moreinfoinstall\">";
-if ($appname=="Thunderbird") { 
-echo"<A HREF=\"install.php/$filename?id=$id&vid=$vid\" TITLE=\"Download $name $version\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" ALT=\"\">&nbsp;( Download Now )</A><BR>";
-} else {
-//Make Theme Install work again, Bug 246754
-//echo"<A HREF=\"javascript:void(InstallTrigger.installChrome(InstallTrigger.SKIN,'install.php/$filename?id=$id&vid=$vid','$name'))\"";
-echo"<A HREF=\"javascript:void(InstallTrigger.installChrome(InstallTrigger.SKIN,'$uri','$name $version'))\" TITLE=\"Install $name $version (Right-Click to Download)\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" ALT=\"\">&nbsp;( Install Now )</A><BR>";
-}
-echo"
-<SPAN class=\"filesize\">&nbsp;&nbsp;$filesize KB, ($time @ $speed"."k)</SPAN></DIV>
-<BR>";
-if ($application=="thunderbird") {
-echo"<SPAN style=\"font-size: 10pt; color: #00F\">Theme Install Instructions for Thunderbird Users:</SPAN><BR>
-<SPAN style=\"font-size: 8pt;\">(1) Click the link above to Download and save the file to your hard disk.<BR>
-(2) In Mozilla Thunderbird, open the theme manager (Tools Menu/Themes)<BR>
-(3) Click the Install button, and locate/select the file you downloaded and click \"OK\"<BR></SPAN>
-";
-}
-
-if ($homepage) {echo"<SPAN style=\"font-size:10pt\">Having a problem with this theme? For Help and Technical Support, visit the <A HREF=\"$homepage\">Theme's Homepage</A>.</SPAN>";}
-
-echo"<UL style=\"font-size:10pt\">";
-if ($homepage) {echo"<LI> <A HREF=\"$homepage\">Theme Homepage</A>"; }
-if ($appname !="Thunderbird") {echo"<LI> <a href=\"install.php/$filename?id=$id&vid=$vid\">Download Theme</A>"; }
-echo"<LI> <A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&page=releases\">Other Versions</A>";
-?>
-</UL>
-</DIV>
-
-<DIV class="commentbox">
-<DIV class="boxheader">User Comments:</DIV>
-<BR>
-<?php
-$sql = "SELECT CommentName, CommentTitle, CommentNote, CommentDate, CommentVote FROM  `t_feedback` WHERE ID = '$_GET[id]' AND CommentNote IS NOT NULL ORDER  BY `CommentDate` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $num_results = mysql_num_rows($sql_result);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $commentname = $row["CommentName"];
-    $commenttitle = $row["CommentTitle"];
-    $commentnotes = $row["CommentNote"];
-    $commentdate = $row["CommentDate"];
-    $rating = $row["CommentVote"];
-
-//Create Customizeable Datestamp
-	$day=substr($commentdate,8,2);  //get the day
-    $month=substr($commentdate,5,2); //get the month
-    $year=substr($commentdate,0,4); //get the year
-    $hour=substr($commentdate,11,2); //get the hour
-    $minute=substr($commentdate,14,2); //get the minute
-    $second=substr($commentdate,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $commentdate = gmdate("F d, Y g:ia", $timestamp);
-
-echo"<DIV class=\"commenttitlebar\">";
-echo"<SPAN class=\"commenttitle\">$commenttitle</SPAN>";
-echo"<SPAN class=\"liststars\">";
-
-for ($i = 1; $i <= $rating; $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 WIDTH=16 HEIGHT=16 ALT=\"*\">";
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 WIDTH=16 HEIGHT=16 ALT=\"\">";
-}
-echo"</SPAN>";
-echo"</DIV>";
-echo"&nbsp;&nbsp;By $commentname<BR>\n";
-echo"&nbsp;<BR>\n";
-echo"$commentnotes<BR>\n\n";
-echo"&nbsp;<BR>\n";
-echo"<DIV class=\"commentfooter\">\n";
-echo"$commentdate | <A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&page=comments\">More Comments...</A> | <A HREF=\"moreinfo.php?id=$id&vid=$vid&page=opinion\">Rate It!</A>\n";
-echo"</DIV>\n";
-}
-
-if ($num_results=="0") {
-echo"<DIV class=\"nocomment\">";
-echo"Nobody's Commented on this Extension Yet<BR>";
-echo"Be the First! <A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&page=opinion\">Rate It!</A>";
-echo"</DIV>";
-}
-
-?>
-
-</DIV>
-
-<?php
-} else if ($page=="releases") {
-
-echo"<DIV class=\"mipageheading\">";
-echo"Recent Releases:<BR>";
-echo"</DIV>";
-
-$sql = "SELECT TV.vID, TV.Version, TV.MinAppVer, TV.MaxAppVer, TV.Size, TV.URI, TV.Notes, TA.AppName, TOS.OSName
-FROM  `t_version` TV
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID
-WHERE TV.ID = '$_GET[id]' AND `approved` = 'YES'
-ORDER  BY  `Version` DESC, `OSName` ASC 
-LIMIT 0, 10";
-
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-   $vid = $row["vID"];
-   $minappver = $row["MinAppVer"];
-   $maxappver = $row["MaxAppVer"];
-   $filesize = $row["Size"];
-   $notes = $row["Notes"];
-   $version = $row["Version"];
-   $uri = $row["URI"];
-   $osname = $row["OSName"];
-   $appname = $row["AppName"];
-
-echo"<DIV>"; //Open Version DIV
-
-//Description & Version Notes
-echo"<SPAN class=\"itemdescription\">";
-echo"<SPAN class=\"listtitle\"><A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid\">Version $version</A></SPAN><br>\n";
-if ($notes) {echo"$notes"; }
-echo"</SPAN>\n";
-
-//Icon Bar Modules
-echo"<DIV style=\"height: 34px\">";
-echo"<DIV class=\"iconbar\" style=\"width: 100px;\">";
-
-if ($appname=="Thunderbird") { 
-echo"<A HREF=\"install.php/$filename?id=$id&vid=$vid\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"Install $name (Right-Click to Download)\" ALT=\"\">Download</A>";
-} else {
-echo"<A HREF=\"javascript:void(InstallTrigger.installChrome(InstallTrigger.SKIN,'$uri','$name $version'))\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"Install $name\" ALT=\"\">Install</A>";
-}
-
-echo"<BR><SPAN class=\"filesize\">Size: $filesize kb</SPAN></DIV>";
-echo"<DIV class=\"iconbar\"><IMG SRC=\"/images/".strtolower($appname)."_icon.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float: left\" ALT=\"$appname \">&nbsp;Works with:<BR>&nbsp;&nbsp;$minappver - $maxappver</DIV>";
-echo"<DIV class=\"iconbar\" style=\"width: 90px;\"><IMG SRC=\"/images/".strtolower($osname)."_icon.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float: left\" ALT=\"\">OS:<BR>"; if($osname=="ALL") {echo"All OSes";} else {echo"$osname";} echo"</DIV>";
-echo"</DIV>";
-
-echo"</DIV>";
-}
-
-//End General Page
-} else if ($page=="comments") {
-//Comments/Ratings Page
-echo"<DIV class=\"mipageheading\">";
-echo"User Comments:<BR>";
-echo"</DIV>";
-$sql = "SELECT CommentName, CommentTitle, CommentNote, CommentDate, CommentVote FROM  `t_feedback` WHERE ID = '$_GET[id]' AND CommentNote IS NOT NULL ORDER  BY  `CommentDate` ASC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $num_results = mysql_num_rows($sql_result);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $name = $row["CommentName"];
-    $title = $row["CommentTitle"];
-    $notes = $row["CommentNote"];
-    $date = $row["CommentDate"];
-    $rating = $row["CommentVote"];
-
-echo"<DIV class=\"commenttitlebar\">";
-echo"<SPAN class=\"commenttitle\">$title</SPAN>";
-echo"<SPAN class=\"liststars\">";
-
-for ($i = 1; $i <= $rating; $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 WIDTH=16 HEIGHT=16 ALT=\"*\">";
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 WIDTH=16 HEIGHT=16 ALT=\"\">";
-}
-echo"</SPAN>";
-echo"</DIV>";
-echo"$notes<BR>\n\n";
-
-echo"<DIV class=\"commentfooter\">\n";
-echo"<SPAN style=\"padding-left: 30px; font-size: 8pt; font-weight: bold\">Posted on $date by $name</SPAN><br>";
-echo"</DIV>\n";
-}
-
-if ($num_results=="0") {
-echo"<DIV class=\"nocomment\">";
-echo"Nobody has commented on this extension yet...<BR>
-Be the First!
-<A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&page=opinion\">Leave your comments</A>...";
-echo"</DIV>\n";
-}
-
-
-echo"<DIV style=\"height: 5px;\"></DIV>";
-
-} else if ($page=="staffreview") {
-//Staff/Editor Review Tab
-echo"<DIV class=\"mipageheading\">";
-echo"Editor Review:<BR>";
-echo"</DIV>";
-
-echo"<DIV class=\"reviewbox\">\n";
-$sql = "SELECT TR.ID, `Title`, TR.DateAdded, `Body`, `Type`, `Pick`, TU.UserName FROM `t_reviews`  TR
-INNER  JOIN t_main TM ON TR.ID = TM.ID
-INNER  JOIN t_userprofiles TU ON TR.AuthorID = TU.UserID
-WHERE `Type` = 'E' AND TR.ID = '$_GET[id]' ORDER BY `rID` DESC LIMIT 1";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
- $num_results = mysql_num_rows($sql_result);
-  while ($row = mysql_fetch_array($sql_result)) {
-    $id = $row["ID"];
-    $title = $row["Title"];
-    $dateadded = $row["DateAdded"];
-    $body = $row["Body"];
-    $pick = $row["Pick"];
-    $username = $row["UserName"];
-
-//Create Customizeable Timestamp
-    $timestamp = strtotime("$dateadded");
-    $date = gmdate("F, Y", $timestamp);
-    $posteddate = gmdate("F j Y, g:i:sa", $timestamp);
-
-
-echo"$title<br>\n";
-if ($pick=="YES") {echo"<SPAN class=\"itemdescription\">&nbsp;&nbsp;&nbsp;$date Editors Pick<BR>\n"; }
-echo"<BR>\n";
-echo"$body</SPAN><BR>\n";
-echo"<DIV class=\"commentfooter\">Posted on $posteddate by $username</DIV>\n";
-}
-$typename = "extension";
-if ($num_results=="0") {
-echo"
-<SPAN style=\"font-weight: bold\">
-This $typename has not yet been reviewed.<BR><BR>
-
-To see what other users think of this extension, view the <A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid&category=$category&page=comments\">User Comments...</A>
-</SPAN>
-";
-
-
-}
-echo"</DIV>\n";
-
-} else if ($page=="opinion") {
-//My Opinion Tab
-echo"<DIV class=\"mipageheading\">";
-echo"Your Rating / Feedback:<BR>";
-echo"</DIV>";
-?>
-<?php
-if ($_GET["error"]=="norating") {
-echo"<DIV class=\"errorbox\">\n
-Your comment submission had the following error(s), please fix these errors and try again.<br>\n
-&nbsp;&nbsp;&nbsp;Rating field cannot be left blank.<br>\n
-</DIV>\n";
-}
-?>
-<DIV class="opinionform">
-<FORM NAME="opinon" METHOD="POST" ACTION="../core/postfeedback.php">
-<INPUT NAME="id" TYPE="HIDDEN" VALUE="<?php echo"$id"; ?>">
-<INPUT NAME="vid" TYPE="HIDDEN" VALUE="<?php echo"$vid"; ?>">
-<INPUT NAME="type" TYPE="HIDDEN" value="T">
-Your Name:<BR>
-<INPUT NAME="name" TYPE="TEXT" SIZE=30 MAXLENGTH=30><BR>
-
-Rating:*<BR>
-<SELECT NAME="rating">
-    <OPTION value="">Rating:
-	<OPTION value="5">5 Stars
-	<OPTION value="4">4 Stars
-	<OPTION value="3">3 Stars
-	<OPTION value="2">2 Stars
-	<OPTION value="1">1 Star
-    <OPTION value="0">0 Stars
-</SELECT><BR>
-
-Title:<BR>
-<INPUT NAME="title" TYPE="TEXT" SIZE=30 MAXLENGTH=50><BR>
-
-Review/Comments:<BR>
-<TEXTAREA NAME="comments" ROWS=5 COLS=55></TEXTAREA><BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN class="smallfont">No Comment?<INPUT NAME="commententered" TYPE="CHECKBOX" VALUE="FALSE"></SPAN><BR>
-<INPUT NAME="submit" TYPE="SUBMIT" VALUE="Post">&nbsp;&nbsp;<INPUT NAME="reset" TYPE="RESET" VALUE="Reset"><BR>
-<SPAN class="smallfont">* Required Fields</SPAN>
-</FORM>
-
-</DIV>
-<?php
-} // End Pages
-
-echo"<DIV class=\"baseline\">";
-echo"Date Added: $dateadded | Last Updated: $dateupdated | ";
-echo"Total Downloads: $downloadcount<BR>";
-echo"</DIV>\n";
-echo"</DIV>\n";
-echo"<BR>\n";
-?>
-</DIV>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/themes/sendmail.php

@@ -1,107 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-//Mozilla Update Message System
-//Send Mail script... 
-exit;
-require"../core/config.php";
-
-if (!$_POST["senduserid"]) {
-exit("<B>Error: no valid user to e-mail, possible attempt to spam detected...</B>");
-}
-
-//Get E-Mail Address from DB based on passed data..
-  $sql = "SELECT `UserEmail` FROM `t_userprofiles` WHERE `UserID` = '$_POST[senduserid]' AND `UserEmailHide`='0' LIMIT 1";
-  $sql_result = mysql_query($sql, $connection) or trigger_error("<FONT COLOR=\"#FF0000\"><B>MySQL Error ".mysql_errno().": ".mysql_error()."</B></FONT>", E_USER_NOTICE);
-  $row = mysql_fetch_array($sql_result);
-  $to_address=$row["UserEmail"]; 
-
-
-//All From_, To_, and subject variables are passed from the form
-// and do not need to be defined here.. unless debugging..
-
-$from_name = $_POST["fromname"];
-$from_address = $_POST["fromemail"];
-$subject = $_POST["subject"];
-
-//Anti-Abuse
-$findme  = '@';
-$pos = strpos($to_address, $findme);
-
-if ($pos === false) {
-//This isn't a valid e-mail address being passed... 
-//Send the e-mail message to the $from_address, just for fun..
-$to_address = $from_address;
-}
-
-$message = $_POST["body"];
-
-//Message Footer (Auto-Appended to Messages sent using this form.
-$message .= "\n\n";
-$message .= "____________________________________\n";
-$message .= "Message sent through the Mozilla Update Message system.\n
-The system allows visitors to send you e-mail without revealing your e-mail address to them.
-If you no longer wish to receive e-mail from visitors, you may change your preferences online at http;//update.mozilla.org.\n";
-
-
-$headers .= "MIME-Version: 1.0\r\n";
-$headers .= "Content-type: text/plain; charset=iso-8859-1\r\n";
-$headers .= "From: ".$from_name." <".$from_address.">\r\n";
-$headers .= "Reply-To: ".$from_name." <".$from_address.">\r\n";
-$headers .= "X-Priority: 3\r\n";
-$headers .= "X-MSMail-Priority: Normal\r\n";
-$headers .= "X-Mailer: Mozilla Update Message System 1.0";
-
-$mailstatus = mail($to_address, $subject, $message, $headers);
-
-
-
-if ($mailstatus===FALSE) {
-//Message Unsuccessful
-$return_path="extensions/authorprofiles.php?id=$_POST[senduserid]&mail=unsuccessful";
-
-} else if ($mailstatus===TRUE) {
-//Message Successful
-$return_path="extensions/authorprofiles.php?id=$_POST[senduserid]&mail=successful";
-
-}
-header("Location: http://$_SERVER[HTTP_HOST]/$return_path#email");
-exit;
-
-?>

mozilla/webtools/update/themes/showlist.php

@@ -1,501 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-?>
-<?php
-require"../core/config.php";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
-<html lang="EN" dir="ltr">
-<head>
-
-<?php
-//----------------------------
-//Global General $_GET variables
-//----------------------------
-//Detection Override
-if ($_GET["version"]) { $app_version=$_GET["version"]; $_SESSION["app_version"]=$_GET["version"]; }
-
-if ($_GET["numpg"]) {$_SESSION["items_per_page"]=$_GET["numpg"]; }
-if ($_SESSION["items_per_page"]) {$items_per_page = $_SESSION["items_per_page"];} else {$items_per_page="10";}//Default Num per Page is 10
-
-if ($_GET["category"]) { $_SESSION["category"] = $_GET["category"]; }
-if ($_SESSION["category"]) {$category = $_SESSION["category"];}
-if ($category=="All") {$category="";}
-
-
-if (!$_GET["pageid"]) {$pageid="1"; } else { $pageid = $_GET["pageid"]; } //Default PageID is 1
-$type="T"; //Default Type is T
-
-
-unset($typename);
-$types = array("E"=>"Extensions","T"=>"Themes","U"=>"Updates");
-$typename = $types["$type"];
-
-
-//RSS Autodiscovery Link
-switch ($_SESSION["category"]) {
-  case "Newest":
-    $rsslist = "newest";
-    break;
-  case "Popular":
-    $rsslist = "popular";
-    break;
-  case "Top Rated":
-    $rsslist = "rated";
-    break;
-}
-
-$rssfeed = "rss/?application=" . $application . "&type=" . $type . "&list=" . $rsslist;
-
-if (!$category) {$categoryname = "All $typename"; } else {$categoryname = $category; }
-?>
-
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-<TITLE>Mozilla Update :: Themes - List - <?php echo"$categoryname"; if ($pageid) {echo" - Page $pageid"; } ?></TITLE>
-
-<LINK REL="STYLESHEET" TYPE="text/css" HREF="/core/update.css">
-<?php
-if ($rsslist) {
-echo"<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"http://$_SERVER[HTTP_HOST]/$rssfeed\">";
-}
-?>
-</HEAD>
-<BODY>
-<?php
-include"$page_header";
-
-// -----------------------------------------------
-// Begin Content of the Page Here
-// -----------------------------------------------
-
-include"inc_sidebar.php";
-
-
-
-echo"<DIV id=\"content\">\n"; // Begin Content Area
-
-//Query for List Creation
-$s = "0";
-$startpoint = ($pageid-1)*$items_per_page;
-if ($category=="Editors Pick" or $category=="Newest" or $category=="Popular" or $category=="Top Rated") {
-if ($category =="Editors Pick") {
-$editorpick="true";
-} else if ($category =="Newest") {
-$orderby = "TV.DateAdded DESC, `Name` ASC";
-} else if ($category =="Popular") {
-$orderby = "TM.TotalDownloads DESC, `Name` ASC";
-} else if ($category =="Top Rated") {
-$orderby = "TM.Rating DESC, `Name` ASC";
-}
-$catname = $category;
-$category = "%";
-}
-
-if ($app_version=="0.10") {$app_version="0.95"; }
-$sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Description, TM.Rating, TM.TotalDownloads, TV.vID,
-SUBSTRING(MAX(CONCAT(LPAD(TV.Version, 6, '0'), TV.vID)), 7)  AS MAXvID,
-MAX(TV.Version) AS Version,
-TA.AppName, TOS.OSName
-FROM `t_main` TM 
-INNER  JOIN t_version TV ON TM.ID = TV.ID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID ";
-if ($category && $category !=="%") { $sql .="INNER  JOIN t_categoryxref TCX ON TM.ID = TCX.ID
-INNER JOIN t_categories TC ON TCX.CategoryID = TC.CategoryID "; }
-if ($editorpick=="true") { $sql .="INNER JOIN t_reviews TR ON TM.ID = TR.ID "; }
-$sql .="WHERE Type = '$type' AND AppName = '$application' AND `approved` = 'YES' ";
-if ($editorpick=="true") { $sql .="AND TR.Pick = 'YES' "; }
-if ($category && $category !=="%") {$sql .="AND CatName LIKE '$category' ";}
-if ($app_version) { $sql .=" AND TV.MinAppVer_int <= '".strtolower($app_version)."' AND TV.MaxAppVer_int >= '".strtolower($app_version)."' ";}
-
-//MacOSX Specific override for All+Mac themes. Bug 252294
-if ($OS=="MacOSX") { $app_os = $OS; } else { $app_os = "ALL"; }
-
-if ($OS) { $sql .=" AND (TOS.OSName = '$OS' OR TOS.OSName = '$app_os') "; }
-$sql .="GROUP BY `Name` ";
-if ($orderby) {
-$sql .="ORDER BY $orderby";
-} else {
-$sql .="ORDER  BY  `Name` , `Version` DESC ";
-}
-$resultsquery = $sql;
-unset($sql);
-
-//Get Total Results from Result Query & Populate Page Control Vars.
- $sql_result = mysql_query($resultsquery, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $totalresults = mysql_num_rows($sql_result);
-
-  $num_pages = ceil($totalresults/$items_per_page); //Total # of Pages
-  if ($pageid>$num_pages) {$pageid=$num_pages;} //Check PageId for Validity
-  $startpoint = ($pageid-1)*$items_per_page;
-if ($startpoint<0) {$startpoint=0; $startitem=0;}
-  $startitem = $startpoint+1;
-  $enditem = $startpoint+$items_per_page;
- if ($totalresults=="0") {$startitem = "0"; }
- if ($enditem>$totalresults) {$enditem=$totalresults;} //Verify EndItem
-
-
-if ($_GET[nextnum]) {$startpoint = $_GET["nextnum"]; }
-//$resultsquery = str_replace("GROUP BY `Name` ", "", $resultsquery);
-$resultsquery .= " LIMIT $startpoint , $items_per_page"; //Append LIMIT clause to result query
-
-if ($category=="%") {$category = $catname; unset($catname); }
-
-//Now Showing Box
-echo"<DIV id=\"listnav\">";
-if (!$OS) {$OS="all";}
-if (!$category) {$categoryname="All"; } else {$categoryname = $category;}
-echo"<DIV class=\"pagenum\" "; if ($application!="mozilla") {echo" style=\"margin-right: 58%;\""; } echo">";
-$previd=$pageid-1;
-if ($previd >"0") {
-echo"<a href=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$previd\">&#171; Previous</A> &bull; ";
-}
-echo"Page $pageid of $num_pages";
-
-
-$nextid=$pageid+1;
-if ($pageid <$num_pages) {
-echo" &bull; <a href=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$nextid\">Next &#187;</a>";
-}
-
-echo"</DIV>\n";
-
-echo"<SPAN class=\"listtitle\">".ucwords("$application $typename &#187; $categoryname ")."</SPAN><br>";
-echo"".ucwords("$typename")." $startitem - $enditem of $totalresults";
-
-
-
-// Modify List Form
-
-echo"<DIV class=\"listform\">";
-echo"<FORM NAME=\"listviews\" METHOD=\"GET\" ACTION=\"showlist.php\">\n";
-echo"<input name=\"application\" type=\"hidden\" value=\"$application\">\n";
-//Items-Per-Page
-echo"Show/Page: ";
-$perpage = array("5","10","20","50");
-echo"<SELECT name=\"numpg\">";
-foreach ($perpage as $value) {
-echo"<OPTION value=\"$value\"";
-if ($items_per_page==$value) {echo" SELECTED"; }
-echo">$value</OPTION>";
-}
-echo"</SELECT>\n";
-
-// Operating Systems
-echo" OS: ";
-echo"<SELECT name=\"os\">\n";
-$sql = "SELECT `OSName` FROM `t_os` ORDER BY `OSName`";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-  $osname = $row["OSName"];
-  echo"<OPTION value=\"".strtolower($osname)."\"";
-  if (strtolower($OS) == strtolower($osname)) {echo" SELECTED";}
-  echo">$osname</OPTION>";
-  }
-echo"</SELECT>\n";
-
-
-//Versions of Application
-echo"Versions: ";
-echo"<SELECT name=\"version\">";
-if ($application != "thunderbird") {echo"<OPTION value=\"auto-detect\">Auto-Detect</OPTION>";}
-$app_orig = $application; //Store original to protect against possible corruption
-$sql = "SELECT `Version`, `major`, `minor`, `release`, `SubVer` FROM `t_applications` WHERE `AppName` = '$application' ORDER BY `major` DESC, `minor` DESC, `release` DESC, `SubVer` DESC";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-  $version = $row["Version"];
-  $subver = $row["SubVer"];
-  $release = "$row[major].$row[minor]";
-  if ($row["release"]) {$release = ".$release$row[release]";}
-if ($app_version=="0.95") {$app_version="0.10"; }
-//Firesomething Support
-if ($application=="firefox") { if ($release == "0.7") {$application="firebird";} else {$application="firefox";} }
-
-if ($subver !=="final") {$release="$release$subver";}
-echo"<OPTION value=\"$release\"";
-if ($app_version == $release) {echo" SELECTED"; }
-echo">".ucwords($application)." $version</OPTION>";
-
-if ($app_version=="0.10") {$app_version="0.95"; }
-  }
-$application = $app_orig; unset($app_orig);
-
-echo"</SELECT>\n";
-echo"<INPUT NAME=\"submit\" TYPE=\"SUBMIT\" VALUE=\"Update\">";
-echo"</FORM>";
-echo"</DIV>";
-
-echo"</DIV>\n";
-
-
-//---------------------------------
-// Begin List
-//---------------------------------
-//Get Author Data and Create $authorarray and $authorids
-$sql = "SELECT  TM.Name, TU.UserName, TU.UserID, TU.UserEmail FROM  `t_main`  TM 
-LEFT JOIN t_authorxref TAX ON TM.ID = TAX.ID
-INNER JOIN t_userprofiles TU ON TAX.UserID = TU.UserID
-ORDER  BY  `Type` , `Name`  ASC "; // TM.Type = 'E'
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-     $authorarray[$row[Name]][] = $row["UserName"];
-     $authorids[$row[UserName]] = $row["UserID"];
-   }
-
-//Assemble a display application version array
-$sql = "SELECT `Version`, `major`, `minor`, `release`, `SubVer` FROM `t_applications` WHERE `AppName`='$application' ORDER BY `major`,`minor`";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-  $version = $row["Version"];
-  $subver = $row["SubVer"];
-  $release = "$row[major].$row[minor]";
-  if ($row["release"]) {$release = ".$release$row[release]";}
-  if ($subver !=="final") {$release="$release$subver";}
-
-  $appvernames[$release] = $version;
-  }
-
-//Query to Generate List..
-$sql = "$resultsquery";
- $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  while ($row = mysql_fetch_array($sql_result)) {
-
-    $id = $row["ID"];
-    $type = $row["Type"];
-    $name = $row["Name"];
-    $dateadded = $row["DateAdded"];
-    $dateupdated = $row["DateUpdated"];
-    $homepage = $row["Homepage"];
-    $description = $row["Description"];
-    $rating = $row["Rating"];
-    $authors = $authorarray[$name];
-    $osname = $row["OSName"];
-    $appname = $row["AppName"];
-    $downloadcount = $row["TotalDownloads"];
-
-//Get Version Record for Referenced MAXvID from list query
-//$sql2 = "SELECT TV.vID, TV.Version, TV.MinAppVer, TV.MaxAppVer, TV.Size, TV.DateAdded AS VerDateAdded, TV.DateUpdated AS VerDateUpdated, TV.URI, TV.Notes, TP.PreviewURI FROM  `t_version` TV
-//LEFT  JOIN t_previews TP ON TV.vID = TP.vID
-//WHERE TV.vID = '$row[MAXvID]' LIMIT 1";
-
-$sql2 = "SELECT TV.vID, TV.Version, TV.MinAppVer, TV.MaxAppVer, TV.Size, TV.DateAdded AS VerDateAdded, TV.DateUpdated AS VerDateUpdated, TV.URI, TV.Notes, TP.PreviewURI FROM  `t_version` TV
-LEFT  JOIN t_previews TP ON TV.vID = TP.vID
-INNER  JOIN t_applications TA ON TV.AppID = TA.AppID
-INNER  JOIN t_os TOS ON TV.OSID = TOS.OSID
-WHERE TV.ID = '$id' AND TV.Version = '$row[Version]' AND TA.AppName = '$appname' AND TOS.OSName = '$osname' LIMIT 1";
- $sql_result2 = mysql_query($sql2, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
-  $row = mysql_fetch_array($sql_result2);
-
-   $vid = $row["vID"];
-if ($appvernames[$row["MinAppVer"]]) {$minappver = $appvernames[$row["MinAppVer"]]; } else { $minappver = $row["MinAppVer"]; }
-if ($appvernames[$row["MaxAppVer"]]) {$maxappver = $appvernames[$row["MaxAppVer"]]; } else { $maxappver = $row["MaxAppVer"]; }
-   $VerDateAdded = $row["VerDateAdded"];
-   $VerDateUpdated = $row["VerDateUpdated"];
-   $filesize = $row["Size"];
-   $notes = $row["Notes"];
-   $version = $row["Version"];
-   $uri = $row["URI"];
-   $previewuri = $row["PreviewURI"];
-
-
-if ($VerDateAdded > $dateadded) {$dateadded = $VerDateAdded; }
-if ($VerDateUpdated > $dateupdated) {$dateupdated = $VerDateUpdated; }
-
-//Turn Authors Array into readable string...
-$authorcount = count($authors);
-foreach ($authors as $author) {
-$userid = $authorids[$author];
-$n++;
-$authorstring .= "<A HREF=\"authorprofiles.php?application=$application&id=$userid\">$author</A>";
-if ($authorcount != $n) {$authorstring .=", "; }
-
-}
-$authors = $authorstring;
-unset($authorstring, $n); // Clear used Vars.. 
-
-//Create Customizeable Timestamp
-	$day=substr($dateupdated,8,2);  //get the day
-    $month=substr($dateupdated,5,2); //get the month
-    $year=substr($dateupdated,0,4); //get the year
-    $hour=substr($dateupdated,11,2); //get the hour
-    $minute=substr($dateupdated,14,2); //get the minute
-    $second=substr($dateupdated,17,2); //get the sec
-    $timestamp = strtotime("$year-$month-$day $hour:$minute:$second");
-    $dateupdated = gmdate("F d, Y g:i:sa", $timestamp); //gmdate("F d, Y g:i:sa T", $timestamp);
-
-
-echo"<DIV class=\"item\">\n";
-//echo"<DIV style=\"height: 100px\">"; //Not sure why this is here, it caused text to flood out of the box though.
-
-if ($previewuri) {
-list($width, $height, $imagetype, $attr) = getimagesize("$websitepath"."$previewuri");
-
-echo"<IMG SRC=\"$previewuri\" BORDER=0 HEIGHT=$height WIDTH=$width STYLE=\"float: right; padding-right: 5px\" ALT=\"$name preview\">";
-}
-
-//Upper-Right Side Box
-echo"<DIV class=\"liststars\" title=\"$rating of 5 stars\" style=\"font-size: 8pt\"><A HREF=\"moreinfo.php?application=$application&id=$id&page=comments\">";
-for ($i = 1; $i <= floor($rating); $i++) {
-echo"<IMG SRC=\"/images/stars/star_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-if ($rating>floor($rating)) {
-$val = ($rating-floor($rating))*10;
-echo"<IMG SRC=\"/images/stars/star_0$val.png\" BORDER=0 ALT=\"\">";
-$i++;
-}
-for ($i = $i; $i <= 5; $i++) {
-echo"<IMG SRC=\"/images/stars/graystar_icon.png\" BORDER=0 ALT=\""; if ($i==1) {echo"$rating of 5 stars";} echo"\">";
-}
-echo"</A></DIV>\n";
-
-
-echo"<DIV class=\"itemtitle\">";
-echo"<SPAN class=\"title\"><A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid\">$name $version</A></SPAN><BR>";
-echo"<SPAN class=\"authorline\">By $authors</SPAN><br>";
-echo"</DIV>";
-
-//Description & Version Notes
-echo"<SPAN class=\"itemdescription\">";
-echo"$description<BR>";
-if ($notes) {echo"$notes"; }
-echo"</SPAN>\n";
-echo"<BR>";
-//echo"</DIV>";
-
-//Icon Bar Modules
-echo"<DIV style=\"height: 34px\">";
-echo"<DIV class=\"iconbar\" style=\"width: 104px;\">";
-
-if ($appname=="Thunderbird") {
-echo"<A HREF=\"moreinfo.php?application=$application&id=$id&vid=$vid\"><IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"More Info about $name\" ALT=\"\">More Info</A>";
-} else {
-//Make Theme Install work again, Bug 246754
-//echo"<A HREF=\"javascript:void(InstallTrigger.installChrome(InstallTrigger.SKIN,'install.php?id=$id&vid=$vid','$name'))\">";
-echo"<A HREF=\"javascript:void(InstallTrigger.installChrome(InstallTrigger.SKIN,'$uri','$name $version'))\">";
-echo"<IMG SRC=\"/images/download.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"Install $name\" ALT=\"\">Install</A>";
-}
-echo"<BR><SPAN class=\"filesize\">Size: $filesize kb</SPAN></DIV>";
-
-if ($homepage) {echo"<DIV class=\"iconbar\" style=\"width: 98px;\"><A HREF=\"$homepage\"><IMG SRC=\"/images/home.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float:left;\" TITLE=\"$name Homepage\" ALT=\"\">Homepage</A></DIV>";}
-echo"<DIV class=\"iconbar\"><IMG SRC=\"/images/".strtolower($appname)."_icon.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float: left\" ALT=\"$appname\">&nbsp;Works with:<BR>&nbsp;&nbsp;$minappver - $maxappver</DIV>";
-if ($osname !=="ALL") {
-echo"<DIV class=\"iconbar\" style=\"width: 85px;\"><IMG SRC=\"/images/".strtolower($osname)."_icon.png\" BORDER=0 HEIGHT=34 WIDTH=34 STYLE=\"float: left\" ALT=\"\">OS:<BR>$osname</DIV>";
-}
-echo"</DIV>";
-
-echo"<DIV class=\"baseline\">Updated: $dateupdated | Total Downloads: $downloadcount<BR></DIV>\n";
-echo"</DIV>\n";
-
-} //End While Loop
-if ($totalresults=="0") {
-echo"<DIV class=\"item noitems\">\n";
-echo"No themes found in this category for ".ucwords($application).".\n";
-echo"</DIV>\n";
-
-}
-?>
-
-
-
-
-<?php
-$type="T";
-// Begin PHP Code for Dynamic Navbars
-if ($pageid <=$num_pages) {
-echo"<DIV id=\"listnav\">";
-
-
-echo"<DIV class=\"pagenum\">";
-$previd=$pageid-1;
-if ($previd >"0") {
-echo"<a href=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$previd\">&#171; Previous</A> &bull; ";
-}
-echo"Page $pageid of $num_pages";
-
-
-$nextid=$pageid+1;
-if ($pageid <$num_pages) {
-echo" &bull; <a href=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$nextid\">Next &#187;</a>";
-}
-echo"<BR>\n";
-
-
-//Skip to Page...
-if ($num_pages>1) {
-echo"Jump to: ";
-$pagesperpage=9; //Plus 1 by default..
-$i = 01;
-//Dynamic Starting Point
-if ($pageid>11) {
-$nextpage=$pageid-10;
-}
-$i=$nextpage;
-
-//Dynamic Ending Point
-$maxpagesonpage=$pageid+$pagesperpage;
-//Page #s
-while ($i <= $maxpagesonpage && $i <= $num_pages) {
-
-if ($i==$pageid) { 
-    echo"<SPAN style=\"color: #FF0000\">$i</SPAN>&nbsp;";
-  } else {
-    echo"<A HREF=\"?application=$application&version=$app_version&category=$category&numpg=$items_per_page&pageid=$i\">$i</A>&nbsp;";
-
-}
-
-    $i++;
-}
-}
-
-echo"</DIV>\n";
-
-echo"<SPAN class=\"listtitle\">".ucwords("$application $typename &#187; $categoryname ")."</SPAN><br>";
-echo"".ucwords("$typename")." $startitem - $enditem of $totalresults";
-
-echo"</DIV>\n";
-}
-
-echo"</DIV>\n"; //End Content
-?>
-<?php
-include"$page_footer";
-?>
-</BODY>
-</HTML>

mozilla/webtools/update/update/VersionCheck.php

@@ -1,270 +0,0 @@
-<?php
-/* -*- Mode: php; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Extension Update Service.
- *
- * The Initial Developer of the Original Code is Vladimir Vukicevic.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Vladimir Vukicevic <vladimir@pobox.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/// config bits:
-$db_server = "localhost";
-$db_user = "";
-$db_pass = "";
-$db_name = "";
-
-// map the mysql t_main.type enum into the right type
-$ext_typemap = array('T' => 'theme',
-                     'E' => 'extension',
-                     'P' => 'plugin');
-
-header("Content-type: text/rdf");
-
-// error handling
-function bail ($errstr) {
-    die("Error: " . $errstr);
-}
-
-
-// major.minor.release.build[+]
-// make sure this is a valid version
-function expandversion ($vstr) {
-    $v = explode('.', $vstr);
-
-    if ($vstr == '' || count($v) == 0 || count($v) > 4) {
-        bail ('Bogus version.');
-    }
-
-    $vlen = count($v);
-    $ret = array();
-    $hasplus = 0;
-
-    for ($i = 0; $i < 4; $i++) {
-        if ($i > $vlen-1) {
-            // this version chunk was not specified; give 0
-            $ret[] = 0;
-        } else {
-            $s = $v[$i];
-            if ($i == 3) {
-                // need to check for +
-                $slen = strlen($s);
-                if ($s{$slen-1} == '+') {
-                    $s = substr($s, 0, $slen-1);
-                    $hasplus = 1;
-                }
-            }
-
-            $ret[] = intval($s);
-        }
-    }
-
-    $ret[] = $hasplus;
-
-    return $ret;
-}
-
-function vercmp ($a, $b) {
-    if ($a == $b)
-        return 0;
-
-    $va = expandversion($a);
-    $vb = expandversion($b);
-
-    for ($i = 0; $i < 5; $i++)
-        if ($va[$i] != $vb[$i])
-            return ($vb[$i] - $va[$i]);
-
-    return 0;
-}
-
-
-//
-// These are passed in the GET string
-//
-
-if (!array_key_exists('reqVersion', $_GET))
-    bail ("Invalid request.");
-
-$reqVersion = $_GET['reqVersion'];
-
-if ($reqVersion == 1) {
-
-    if (!array_key_exists('id', $_GET) ||
-        !array_key_exists('version', $_GET) ||
-        !array_key_exists('maxAppVersion', $_GET) ||
-        !array_key_exists('appID', $_GET) ||
-        !array_key_exists('appVersion', $_GET))
-        bail ("Invalid request.");
-
-    $reqItemGuid = $_GET['id'];
-    $reqItemVersion = $_GET['version'];
-    $reqItemMaxAppVersion = $_GET['maxAppVersion'];
-    $reqTargetAppGuid = $_GET['appID'];
-    $reqTargetAppVersion = $_GET['appVersion'];
-} else {
-    // bail
-    bail ("Bad request version received");
-}
-
-// check args
-if (empty($reqItemGuid) || empty($reqItemVersion) || empty($reqTargetAppGuid)) {
-    bail ("Invalid request.");
-}
-
-// XXX PUT VALUES IN
-mysql_connect($db_server, $db_user, $db_pass)
-    || bail ("Failed to connect to database.");
-
-mysql_select_db ($db_name)
-    || bail ("Failed to select database.");
-
-// We need to fetch two things for the database:
-// 1) The current extension version's info, for a possibly updated max version
-// 2) The latest version available, if different from the above.
-//
-// We know:
-//  - $reqItemGuid
-//  - $reqItemVersion
-//  - $reqTargetAppGuid
-//  - $reqTargetAppVersion
-//
-// We need to get:
-//  - extension GUID
-//  - extension version
-//  - extension xpi link
-//  - app ID
-//  - app min version
-//  - app max version
-
-$query = "SELECT t_main.guid AS extguid,
-                 t_main.type AS exttype,
-                 t_version.version AS extversion,
-                 t_version.uri AS exturi,
-                 t_version.minappver AS appminver,
-                 t_version.maxappver AS appmaxver,
-                 t_applications.guid AS appguid
-          FROM t_main, t_version, t_applications
-          WHERE t_main.guid = '" . mysql_real_escape_string($reqItemGuid) . "' AND
-                t_main.id = t_version.id AND
-                t_version.appid = t_applications.appid AND
-                t_version.approved = 'YES' AND
-                t_applications.guid = '" . mysql_real_escape_string($reqTargetAppGuid) . "'";
-
-$result = mysql_query ($query);
-
-if (!$result) {
-    bail ('Query error: ' . mysql_error());
-}
-
-// info for this version
-$thisVersionData = '';
-// info for highest version
-$highestVersion = '';
-$highestVersionData = '';
-
-$itemType = '';
-
-while ($line = mysql_fetch_array($result, MYSQL_ASSOC)) {
-    if (empty($itemType)) {
-        $itemType = $ext_typemap[$line['exttype']];
-    }
-
-    // is this row for the current version?
-    if ($line['extversion'] == $reqItemVersion) {
-        $thisVersionData = $line;
-    } else if (vercmp ($reqItemVersion, $line['extversion']) > 0) {
-        // did we already see an update with a higher version than this?
-        if ($highestVersion != '' && vercmp ($highestVersion, $line['extversion']) < 0)
-            continue;
-
-        // does this update support my current app version?
-        if (vercmp($line['appmaxver'], $reqTargetAppVersion) > 0 ||
-            vercmp($reqTargetAppVersion, $line['appminver']) > 0)
-            continue;
-
-        $highestVersion = $line['extversion'];
-        $highestVersionData = $line;
-    }
-}
-
-mysql_free_result ($result);
-
-//
-// Now to spit out the RDF.  We hand-generate because the data is pretty simple.
-//
-
-print "<?xml version=\"1.0\"?>\n";
-print "<RDF:RDF xmlns:RDF=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:em=\"http://www.mozilla.org/2004/em-rdf#\">\n\n";
-
-print "<RDF:Description about=\"urn:mozilla:{$itemType}:{$reqItemGuid}\">\n";
-
-// output list of updates (just highest and this)
-print " <em:updates><RDF:Seq>\n";
-if (!empty($thisVersionData))
-    print "  <RDF:li resource=\"urn:mozilla:{$itemType}:{$reqItemGuid}:{$thisVersionData['extversion']}\"/>\n";
-if (!empty($highestVersionData))
-    print "  <RDF:li resource=\"urn:mozilla:{$itemType}:{$reqItemGuid}:{$highestVersionData['extversion']}\"/>\n";
-print " </RDF:Seq></em:updates>\n";
-
-// output compat bits for firefox 0.9
-if (!empty($highestVersionData)) {
-    print " <em:version>{$highestVersionData['extversion']}</em:version>\n";
-    print " <em:updateLink>{$highestVersionData['exturi']}</em:updateLink>\n";
-}
-
-print "</RDF:Description>\n\n";
-
-function print_update ($data) {
-    global $ext_typemap;
-    $dataItemType = $ext_typemap[$data['exttype']];
-    print "<RDF:Description about=\"urn:mozilla:{$dataItemType}:{$data['extguid']}:{$data['extversion']}\">\n";
-    print " <em:version>{$data['extversion']}</em:version>\n";
-    print " <em:targetApplication>\n";
-    print "  <RDF:Description>\n";
-    print "   <em:id>{$data['appguid']}</em:id>\n";
-    print "   <em:minVersion>{$data['appminver']}</em:minVersion>\n";
-    print "   <em:maxVersion>{$data['appmaxver']}</em:maxVersion>\n";
-    print "   <em:updateLink>{$data['exturi']}</em:updateLink>\n";
-    print "  </RDF:Description>\n";
-    print " </em:targetApplication>\n";
-    print "</RDF:Description>\n";
-}
-
-if (!empty($thisVersionData))
-    print_update ($thisVersionData);
-if (!empty($highestVersionData))
-    print_update ($highestVersionData);
-
-print "</RDF:RDF>\n";
-
-?>
-

mozilla/widget/src/Makefile.in

@@ -0,0 +1,67 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= xpwidgets support
+
+#
+# Dont build the DSO under the 'build' directory as windows does.
+#
+# The DSOs get built in the toolkit dir itself.  Do this so that 
+# multiple implementations of widget can be built on the same
+# source tree.
+#
+ifndef MOZ_MONOLITHIC_TOOLKIT
+
+ifdef MOZ_ENABLE_GTK
+DIRS		+= gtksuperwin
+DIRS		+= gtk
+endif
+
+ifdef MOZ_ENABLE_MOTIF
+DIRS		+= motif
+endif
+
+ifdef MOZ_ENABLE_XLIB
+DIRS		+= xlib
+endif
+
+ifdef MOZ_ENABLE_QT
+DIRS		+= qt
+endif
+
+else
+DIRS		+= $(MOZ_WIDGET_TOOLKIT)
+endif
+
+# unix_services are only useful in unix, duh...
+ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
+DIRS		+= unix_services
+endif
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/widget/src/gtk/Makefile.in

@@ -0,0 +1,100 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= widget_gtk
+
+REQUIRES	= util img xpcom raptor netlib
+
+CPPSRCS		= \
+		nsAppShell.cpp \
+		nsButton.cpp \
+		nsCheckButton.cpp \
+		nsClipboard.cpp \
+		nsComboBox.cpp \
+		nsContextMenu.cpp \
+		nsDragService.cpp \
+		nsFilePicker.cpp \
+		nsFileWidget.cpp \
+		nsFontRetrieverService.cpp \
+		nsFontSizeIterator.cpp \
+		nsGtkEventHandler.cpp \
+		nsGtkUtils.cpp \
+		nsLabel.cpp \
+		nsListBox.cpp \
+		nsLookAndFeel.cpp \
+		nsMenu.cpp \
+		nsMenuBar.cpp \
+		nsMenuItem.cpp \
+		nsPopUpMenu.cpp \
+		nsRadioButton.cpp \
+		nsScrollbar.cpp \
+		nsSound.cpp \
+		nsTextAreaWidget.cpp \
+		nsTextHelper.cpp \
+		nsTextWidget.cpp \
+		nsToolkit.cpp \
+		nsWidget.cpp \
+		nsWidgetFactory.cpp \
+		nsWindow.cpp \
+		$(NULL)
+
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+
+EXTRA_DSO_LDOPTS = \
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(MOZ_COMPONENT_LIBS) \
+		-lraptorgfx \
+		$(NULL)
+
+ifndef MOZ_MONOLITHIC_TOOLKIT
+EXTRA_DSO_LDOPTS +=  -L$(DIST)/lib -lgtksuperwin $(MOZ_GTK_LDFLAGS)
+else
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+ifndef MOZ_MONOLITHIC_TOOLKIT
+CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
+CFLAGS		+= $(MOZ_GTK_CFLAGS)
+else
+CXXFLAGS	+= $(TK_CFLAGS)
+CFLAGS		+= $(TK_CFLAGS)
+endif
+
+DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_XIM
+
+ifeq ($(OS_ARCH), Linux)
+DEFINES		+= -D_BSD_SOURCE
+endif
+
+INCLUDES	+= \
+		-I$(srcdir)/../xpwidgets \
+		-I$(srcdir) \
+		$(NULL)
+
+$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+

mozilla/widget/src/gtk/mozicon.xpm

@@ -0,0 +1,292 @@
+/* XPM */
+static char * mozilla_icon_xpm[] = {
+"32 32 257 2",
+"  	c None",
+". 	c #AA7303",
+"+ 	c #A67003",
+"@ 	c #B77C03",
+"# 	c #8D6003",
+"$ 	c #8D6004",
+"% 	c #6C4A04",
+"& 	c #3A2804",
+"* 	c #6B4802",
+"= 	c #9B6903",
+"- 	c #5A2C04",
+"; 	c #411B04",
+"> 	c #9D6A03",
+", 	c #7A5203",
+"' 	c #510D04",
+") 	c #6B1104",
+"! 	c #7D5503",
+"~ 	c #674604",
+"{ 	c #C21E04",
+"] 	c #C21D04",
+"^ 	c #523804",
+"/ 	c #513702",
+"( 	c #552904",
+"_ 	c #DD2204",
+": 	c #DF2204",
+"< 	c #582904",
+"[ 	c #5F3F02",
+"} 	c #6B2504",
+"| 	c #FE2604",
+"1 	c #AB7303",
+"2 	c #9B6904",
+"3 	c #C31F04",
+"4 	c #FE2704",
+"5 	c #A81904",
+"6 	c #926304",
+"7 	c #4D3302",
+"8 	c #483104",
+"9 	c #C61E04",
+"0 	c #B11B04",
+"a 	c #891604",
+"b 	c #761204",
+"c 	c #614304",
+"d 	c #775102",
+"e 	c #795102",
+"f 	c #785102",
+"g 	c #C58603",
+"h 	c #642404",
+"i 	c #B21A04",
+"j 	c #1F0604",
+"k 	c #550E04",
+"l 	c #631004",
+"m 	c #402404",
+"n 	c #AF7703",
+"o 	c #3D2902",
+"p 	c #7F5602",
+"q 	c #805604",
+"r 	c #0C0904",
+"s 	c #080604",
+"t 	c #080706",
+"u 	c #090604",
+"v 	c #060404",
+"w 	c #620F04",
+"x 	c #7A1304",
+"y 	c #030204",
+"z 	c #570E04",
+"A 	c #721204",
+"B 	c #270704",
+"C 	c #080504",
+"D 	c #0A0604",
+"E 	c #533804",
+"F 	c #A56F02",
+"G 	c #B87C03",
+"H 	c #3B2804",
+"I 	c #A51904",
+"J 	c #FC2704",
+"K 	c #D62004",
+"L 	c #691004",
+"M 	c #C01E04",
+"N 	c #6D1004",
+"O 	c #9C1804",
+"P 	c #B31C04",
+"Q 	c #150404",
+"R 	c #801404",
+"S 	c #DD2304",
+"T 	c #120404",
+"U 	c #130404",
+"V 	c #500C04",
+"W 	c #CC1E04",
+"X 	c #AA1A04",
+"Y 	c #100904",
+"Z 	c #B47A03",
+"` 	c #A77103",
+" .	c #513704",
+"..	c #891704",
+"+.	c #F62604",
+"@.	c #BA1D04",
+"#.	c #3C0A04",
+"$.	c #EB2304",
+"%.	c #DE2304",
+"&.	c #560E04",
+"*.	c #E82304",
+"=.	c #FE2804",
+"-.	c #BE1D04",
+";.	c #F12404",
+">.	c #661004",
+",.	c #020204",
+"'.	c #5E0F04",
+").	c #A61A04",
+"!.	c #4A3204",
+"~.	c #BC7E03",
+"{.	c #8E6002",
+"].	c #684604",
+"^.	c #390D04",
+"/.	c #EE2404",
+"(.	c #FE2904",
+"_.	c #7D1304",
+":.	c #8C1504",
+"<.	c #200604",
+"[.	c #A81A04",
+"}.	c #E72204",
+"|.	c #DA2004",
+"1.	c #070204",
+"2.	c #280704",
+"3.	c #543904",
+"4.	c #9F6C02",
+"5.	c #674602",
+"6.	c #B47B04",
+"7.	c #311004",
+"8.	c #B11C04",
+"9.	c #AA1B04",
+"0.	c #6A1104",
+"a.	c #801504",
+"b.	c #2B0704",
+"c.	c #09090A",
+"d.	c #450B04",
+"e.	c #360904",
+"f.	c #DC2204",
+"g.	c #EE2504",
+"h.	c #C11D04",
+"i.	c #6F1104",
+"j.	c #704B04",
+"k.	c #9C6902",
+"l.	c #A56F03",
+"m.	c #5F4004",
+"n.	c #8D1604",
+"o.	c #440A04",
+"p.	c #1A0504",
+"q.	c #931604",
+"r.	c #621004",
+"s.	c #7F1404",
+"t.	c #921704",
+"u.	c #F82504",
+"v.	c #F52504",
+"w.	c #981804",
+"x.	c #241804",
+"y.	c #5B3E04",
+"z.	c #D82204",
+"A.	c #D02004",
+"B.	c #DA2104",
+"C.	c #D52104",
+"D.	c #2A1A04",
+"E.	c #AC7403",
+"F.	c #2B1C04",
+"G.	c #D04004",
+"H.	c #FC3C04",
+"I.	c #F94E04",
+"J.	c #881504",
+"K.	c #FC2604",
+"L.	c #792804",
+"M.	c #AC7503",
+"N.	c #9A6803",
+"O.	c #782804",
+"P.	c #F66504",
+"Q.	c #F94B04",
+"R.	c #F46804",
+"S.	c #F46604",
+"T.	c #F76504",
+"U.	c #FB4204",
+"V.	c #C13D04",
+"W.	c #5D0E04",
+"X.	c #DA2204",
+"Y.	c #741604",
+"Z.	c #8C5E03",
+"`.	c #885B03",
+" +	c #8B1904",
+".+	c #DE2204",
+"++	c #D22D04",
+"@+	c #C42D04",
+"#+	c #580E04",
+"$+	c #9F1804",
+"%+	c #895D04",
+"&+	c #D62204",
+"*+	c #371904",
+"=+	c #2C1A04",
+"-+	c #4A0C04",
+";+	c #140404",
+">+	c #AB1A04",
+",+	c #DA2304",
+"'+	c #6A4702",
+")+	c #754F02",
+"!+	c #821404",
+"~+	c #462B04",
+"{+	c #B37A03",
+"]+	c #B17803",
+"^+	c #714C04",
+"/+	c #580F04",
+"(+	c #E32204",
+"_+	c #DD2104",
+":+	c #611D04",
+"<+	c #BA7F03",
+"[+	c #B27803",
+"}+	c #6F1D04",
+"|+	c #FD2704",
+"1+	c #F22504",
+"2+	c #634304",
+"3+	c #875B03",
+"4+	c #734F02",
+"5+	c #805704",
+"6+	c #1D0504",
+"7+	c #DB2204",
+"8+	c #EA2404",
+"9+	c #2E0804",
+"0+	c #815803",
+"a+	c #941704",
+"b+	c #C11E04",
+"c+	c #391B04",
+"d+	c #A77104",
+"e+	c #B67C04",
+"f+	c #371D04",
+"g+	c #360A04",
+"h+	c #573A04",
+"i+	c #372604",
+"j+	c #3E2104",
+"k+	c #B57A03",
+"l+	c #B57B03",
+"m+	c #603F04",
+"n+	c #430A04",
+"o+	c #351904",
+"p+	c #A36E03",
+"q+	c #BE8103",
+"r+	c #1D1404",
+"s+	c #483004",
+"t+	c #A26E03",
+"u+	c #6D4B02",
+"v+	c #825804",
+"w+	c #0B0804",
+"x+	c #976603",
+"y+	c #815703",
+"z+	c #926404",
+"A+	c #895D03",
+"B+	c #614202",
+"C+	c #9A6804",
+"D+	c #C88704",
+"E+	c #C18303",
+"F+	c #654302",
+"G+	c #744F02",
+"H+	c #704B02",
+"                                                                ",
+"                                .                               ",
+"                              + @                               ",
+"                              # $                               ",
+"                              % & *                             ",
+"                            = - ; >                             ",
+"                            , ' ) !                             ",
+"                            ~ { ] ^                             ",
+"                          / ( _ : < [                           ",
+"                          . } | | } 1                           ",
+"                          2 3 | 4 5 6                           ",
+"                        7 8 9 0 a b c                           ",
+"  d e f f f d d d d d d g h i j k l m n d d d d d d d d d d d o ",
+"  p q r s s s s t s s u v w x y z A B C D D D D D s s s s E F   ",
+"      G H I J 4 | 4 | K L L M N O P Q R | S T U V W X Y Z       ",
+"        `  ...+.| 4 @.#.$.4 | %.&.*.4 =.-.;.>.,.'.).!.~.        ",
+"          {.].^./.(.X _.;.| :.T <.[.| }.z | |.1.2.3.4.          ",
+"            5.6.7.8.9.0.a.b.c.d.e.f.g.h.&.| i.u j.k.            ",
+"                l.m.n.o.p.q._.r.a.s.t.u.v.w.x.Z                 ",
+"                  {.y.P z.R A.v.x j B.| C.D.E.                  ",
+"                    F.G.H.I.4 | 4 t.J.f.K.L.M.                  ",
+"                  N.O.P.Q.R.S.T.U.V.W.X.4 Y.Z.                  ",
+"                  `. +4 =.| | .+++@+#+$+| K %+                  ",
+"                  %+&+| | | I *+=+-+;+>+,+&+x.'+                ",
+"                )+=+X.=.| !+~+{+]+^+,./+(+_+:+<+                ",
+"                [+}+|+1+) 2+3+    4+5+6+7+8+9+0+                ",
+"                $ a+b+c+d+            e+f+0.g+h+                ",
+"                i+A j+k+                l+m+n+o+p+              ",
+"              q+r+s+t+                    u+v+w+x+              ",
+"              y+z+A+                        B+C+2               ",
+"              D+                                E+F+            ",
+"            G+                                    H+            "};

mozilla/widget/src/gtk/mozicon50.xpm

@@ -0,0 +1,63 @@
+/* XPM */
+static char * mozicon50_xpm[] = {
+"50 51 9 1",
+" 	c None",
+".	c #000000",
+"+	c #FF0000",
+"@	c #808000",
+"#	c #800000",
+"$	c #FF6633",
+"%	c #990066",
+"&	c #FF00FF",
+"*	c #222222",
+"                                                  ",
+"                         @                        ",
+"                        $@                        ",
+"                        @@                        ",
+"                        @@$                       ",
+"                       $@*@                       ",
+"                       @@.@                       ",
+"                       @..@                       ",
+"                      $@..@@                      ",
+"                      $@##*@                      ",
+"                      @*#+.@                      ",
+"                      @.++.@$                     ",
+"                     $@.++.@$                     ",
+"                     @*#++#*@                     ",
+"                     @.++++.@                     ",
+"                    $@.++++.@$                    ",
+"                    @*#++++**@                    ",
+"                    @.#++++#.@                    ",
+"                   $@.++####.@                    ",
+"                   @@*+#*##*.@@                   ",
+"*@@@@@@@@@@@@@@@@@@@.#+..*##*#@@@@@@@@@@@@@@@@@@@*",
+" *@@*................+#..*###.................@@* ",
+"  %@@@.#++++++++++++#**#*#++.###++*...#+++#.*@@*  ",
+"    *@@.#+++++++++#.##++#+#+*.#+++#..##++#.@@@%   ",
+"      $@..+++++++.#++++++##++++#++#...++*.@@$     ",
+"       @@*.#+++++.#+++++*.#++++##++#.*...@@       ",
+"        $@@.#+++#*++++#....#+++*#+++...*@$        ",
+"         *@@..++#*++#**.*.*+++#.#++*..@@$         ",
+"           $@*.++******#+++++#+#+++..@@           ",
+"            $@@.##..*$#**#+#*#++++..@@            ",
+"             $@@.#+#***##...#++++.*@@             ",
+"              %@@*++++++++#.#++++.@@              ",
+"               @.#+++++++++.##+++.@$              ",
+"               @.+$$$$$+$$$#*#+++*@@              ",
+"              $@*+$$$$$$$+$#.#+++#.@              ",
+"              @*#+++++++++++.#++++.@              ",
+"              @.#+++++++#*++.##+++.@$             ",
+"             $@.+++++++....#..+#++*@@             ",
+"             @@*+++++#.*@@@...*+++#.@             ",
+"             @.#++++#.@@@ @@..#++++.@             ",
+"             @.++++*.@@$  %@@..+++#.@@            ",
+"            $@.+++..@@*     $@*.#+#**@            ",
+"            @@#+#.*@$%       $@@.##..@            ",
+"            @.##.@@            @@..#.@$           ",
+"           $@.*.@@$             @@**.@$           ",
+"           $@.*@@               %$@@.*@           ",
+"           @.@@$                  *@@.@           ",
+"           @@@$                    %@@@$          ",
+"          $@@%                      %@@@          ",
+"          @@                          $@          ",
+"          $                            *          "};

mozilla/widget/src/gtk/nsAppShell.cpp

@@ -0,0 +1,459 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "prmon.h"
+#include "nsCOMPtr.h"
+#include "nsAppShell.h"
+#include "nsIAppShell.h"
+#include "nsIServiceManager.h"
+#include "nsIEventQueueService.h"
+#include "nsICmdLineService.h"
+#include "nsGtkEventHandler.h"
+#include <stdlib.h>
+
+#ifdef MOZ_GLE
+#include <gle/gle.h>
+#endif
+
+#include "nsIWidget.h"
+#include "nsIPref.h"
+
+
+#include "glib.h"
+
+struct OurGdkIOClosure {
+  GdkInputFunction  function;
+  gpointer          data;
+};
+
+static gboolean
+our_gdk_io_invoke(GIOChannel* source, GIOCondition condition, gpointer data)
+{
+  OurGdkIOClosure* ioc = (OurGdkIOClosure*) data;
+  if (ioc) {
+    (*ioc->function)(ioc->data, g_io_channel_unix_get_fd(source),
+                     GDK_INPUT_READ);
+  }
+  return TRUE;
+}
+
+static void
+our_gdk_io_destroy(gpointer data)
+{
+  OurGdkIOClosure* ioc = (OurGdkIOClosure*) data;
+  if (ioc) {
+    g_free(ioc);
+  }
+}
+
+static gint
+our_gdk_input_add (gint              source,
+                   GdkInputFunction  function,
+                   gpointer          data,
+                   gint              priority)
+{
+  guint result;
+  OurGdkIOClosure *closure = g_new (OurGdkIOClosure, 1);
+  GIOChannel *channel;
+
+  closure->function = function;
+  closure->data = data;
+
+  channel = g_io_channel_unix_new (source);
+  result = g_io_add_watch_full (channel, priority, G_IO_IN,
+                                our_gdk_io_invoke,
+                                closure, our_gdk_io_destroy);
+  g_io_channel_unref (channel);
+
+  return result;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// XPCOM CIDs
+//
+//-------------------------------------------------------------------------
+static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+
+// a linked, ordered list of event queues and their tokens
+class EventQueueToken {
+public:
+  EventQueueToken(nsIEventQueue *aQueue, const gint aToken);
+  virtual ~EventQueueToken();  
+  nsIEventQueue   *mQueue;
+  gint mToken;
+  EventQueueToken *mNext;
+};
+
+EventQueueToken::EventQueueToken(nsIEventQueue *aQueue, const gint aToken) {
+  mQueue = aQueue;
+  NS_IF_ADDREF(mQueue);
+  mToken = aToken;
+  mNext = 0;
+}
+
+EventQueueToken::~EventQueueToken(){
+ NS_IF_RELEASE(mQueue);
+}
+
+class EventQueueTokenQueue {
+public:
+  EventQueueTokenQueue();
+  virtual ~EventQueueTokenQueue();
+  nsresult PushToken(nsIEventQueue *aQueue, gint aToken);
+  PRBool PopToken(nsIEventQueue *aQueue, gint *aToken);
+
+private:
+  EventQueueToken *mHead;
+};
+
+EventQueueTokenQueue::EventQueueTokenQueue() {
+  mHead = 0;
+}
+
+EventQueueTokenQueue::~EventQueueTokenQueue() {
+
+  // if we reach this point with an empty token queue, well, fab. however,
+  // we expect the first event queue to still be active. so we take
+  // special care to unhook that queue (not that failing to do so seems
+  // to hurt anything). more queues than that would be an error.
+//NS_ASSERTION(!mHead || !mHead->mNext, "event queue token list deleted when not empty");
+  // (and skip the assertion for now. we're leaking event queues because they
+  // are referenced by things that leak, so this assertion goes off a lot.)
+  if (mHead) {
+    gdk_input_remove(mHead->mToken);
+    delete mHead;
+    // and leak the rest. it's an error, anyway
+  }
+}
+
+nsresult EventQueueTokenQueue::PushToken(nsIEventQueue *aQueue, gint aToken) {
+  EventQueueToken *newToken = new EventQueueToken(aQueue, aToken);
+  NS_ASSERTION(newToken, "couldn't allocate token queue element");
+  if (!newToken)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  newToken->mNext = mHead;
+  mHead = newToken;
+  return NS_OK;
+}
+
+PRBool EventQueueTokenQueue::PopToken(nsIEventQueue *aQueue, gint *aToken) {
+  EventQueueToken *token, *lastToken;
+  PRBool          found = PR_FALSE;
+  NS_ASSERTION(mHead, "attempt to retrieve event queue token from empty queue");
+  if (mHead)
+    NS_ASSERTION(mHead->mQueue == aQueue, "retrieving event queue from past head of queue queue");
+
+  token = mHead;
+  lastToken = 0;
+  while (token && token->mQueue != aQueue) {
+    lastToken = token;
+    token = token->mNext;
+  }
+  if (token) {
+    if (lastToken)
+      lastToken->mNext = token->mNext;
+    else
+      mHead = token->mNext;
+    found = PR_TRUE;
+    *aToken = token->mToken;
+    delete token;
+  }
+  return found;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsAppShell constructor
+//
+//-------------------------------------------------------------------------
+nsAppShell::nsAppShell()
+{
+  NS_INIT_REFCNT();
+  mDispatchListener = 0;
+  mEventQueueTokens = new EventQueueTokenQueue();
+  // throw on error would really be civilized here
+  NS_ASSERTION(mEventQueueTokens, "couldn't allocate event queue token queue");
+}
+
+//-------------------------------------------------------------------------
+//
+// nsAppShell destructor
+//
+//-------------------------------------------------------------------------
+nsAppShell::~nsAppShell()
+{
+  delete mEventQueueTokens;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsISupports implementation macro
+//
+//-------------------------------------------------------------------------
+
+NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell)
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListener)
+{
+  mDispatchListener = aDispatchListener;
+  return NS_OK;
+}
+
+static void event_processor_callback(gpointer data,
+                                     gint source,
+                                     GdkInputCondition condition)
+{
+  nsIEventQueue *eventQueue = (nsIEventQueue*)data;
+  if (eventQueue)
+    eventQueue->ProcessPendingEvents();
+}
+
+#define PREF_NCOLS "browser.ncols"
+#define PREF_INSTALLCMAP "browser.installcmap"
+
+static void
+HandleColormapPrefs( void )
+{
+	PRInt32 ivalue = 0;
+        PRBool bvalue;
+	nsresult rv;
+
+	/* The default is to do nothing. INSTALLCMAP has precedence over
+	   NCOLS. Ignore the fact we can't do this if it fails, as it is
+	   not critical */
+ 
+	NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
+	if (NS_FAILED(rv) || (!prefs)) 
+		return;
+       
+	/* first check ncols */
+ 
+	rv = prefs->GetIntPref(PREF_NCOLS, &ivalue);
+	if (NS_SUCCEEDED(rv) && ivalue >= 0 && ivalue <= 255 ) {
+		gdk_rgb_set_min_colors( ivalue );
+		return;
+	}
+
+	/* next check installcmap */
+
+	rv = prefs->GetBoolPref(PREF_INSTALLCMAP, &bvalue);
+	if (NS_SUCCEEDED(rv)) {
+		if ( PR_TRUE == bvalue )
+			gdk_rgb_set_min_colors( 255 );	// force it
+		else
+			gdk_rgb_set_min_colors( 0 );
+	}
+}
+	
+//-------------------------------------------------------------------------
+//
+// Create the application shell
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsAppShell::Create(int *bac, char **bav)
+{
+  gchar *home=nsnull;
+  gchar *path=nsnull;
+
+  int argc = bac ? *bac : 0;
+  char **argv = bav;
+#if 1
+  nsresult rv;
+
+  NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv);
+  if (NS_SUCCEEDED(rv))
+  {
+    rv = cmdLineArgs->GetArgc(&argc);
+    if(NS_FAILED(rv))
+      argc = bac ? *bac : 0;
+
+    rv = cmdLineArgs->GetArgv(&argv);
+    if(NS_FAILED(rv))
+      argv = bav;
+  }
+#endif
+
+  gtk_set_locale ();
+
+  gtk_init (&argc, &argv);
+
+  // It is most convenient for us to intercept our events after
+  // they have been converted to GDK, but before GTK+ gets them
+  gdk_event_handler_set (handle_gdk_event, NULL, NULL);
+
+#ifdef MOZ_GLE
+  gle_init (&argc, &argv);
+#endif
+
+  // delete the cmdLineArgs thing?
+
+  HandleColormapPrefs();
+  gdk_rgb_init();
+
+  home = g_get_home_dir();
+  if ((char*)nsnull != home) {
+    path = g_strdup_printf("%s%c%s", home, G_DIR_SEPARATOR, ".gtkrc");
+    if ((char *)nsnull != path) {
+      gtk_rc_parse(path);
+      g_free(path);
+    }
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Spinup - do any preparation necessary for running a message loop
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsAppShell::Spinup()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Spindown - do any cleanup necessary for finishing a message loop
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsAppShell::Spindown()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Run
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsAppShell::Run()
+{
+  NS_ADDREF_THIS();
+  nsresult   rv = NS_OK;
+  nsIEventQueue * EQueue = nsnull;
+
+  // Get the event queue service 
+  NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
+  if (NS_FAILED(rv)) {
+    NS_ASSERTION("Could not obtain event queue service", PR_FALSE);
+    return rv;
+  }
+
+#ifdef DEBUG
+  printf("Got the event queue from the service\n");
+#endif /* DEBUG */
+
+  //Get the event queue for the thread.
+  rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &EQueue);
+
+  // If a queue already present use it.
+  if (EQueue)
+    goto done;
+
+  // Create the event queue for the thread
+  rv = eventQService->CreateThreadEventQueue();
+  if (NS_OK != rv) {
+    NS_ASSERTION("Could not create the thread event queue", PR_FALSE);
+    return rv;
+  }
+  //Get the event queue for the thread
+  rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &EQueue);
+  if (NS_OK != rv) {
+    NS_ASSERTION("Could not obtain the thread event queue", PR_FALSE);
+    return rv;
+  }    
+
+
+done:
+
+#ifdef DEBUG
+  printf("Calling gdk_input_add with event queue\n");
+#endif /* DEBUG */
+
+  // (has to be called explicitly for this, the primordial appshell, because
+  // of startup ordering problems.)
+  ListenToEventQueue(EQueue, PR_TRUE);
+
+  gtk_main();
+
+  NS_IF_RELEASE(EQueue);
+  Release();
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Exit a message handler loop
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsAppShell::Exit()
+{
+  gtk_main_quit ();
+
+  return NS_OK;
+}
+
+// does nothing. used by xp code with non-gtk expectations.
+// this method will be removed once xp eventloops are working.
+NS_IMETHODIMP nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *& aEvent)
+{
+  aRealEvent = PR_FALSE;
+  aEvent = 0;
+  return NS_OK;
+}
+
+// simply executes one iteration of the event loop. used by xp code with
+// non-gtk expectations.
+// this method will be removed once xp eventloops are working.
+NS_IMETHODIMP nsAppShell::DispatchNativeEvent(PRBool aRealEvent, void *aEvent)
+{
+  g_main_iteration(PR_TRUE);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsAppShell::ListenToEventQueue(nsIEventQueue *aQueue,
+                                             PRBool aListen)
+{
+  // tell gdk to listen to the event queue or not
+
+  gint queueToken;
+  if (aListen) {
+    queueToken = our_gdk_input_add(aQueue->GetEventQueueSelectFD(),
+                                   event_processor_callback,
+                                   aQueue, G_PRIORITY_DEFAULT_IDLE);
+    mEventQueueTokens->PushToken(aQueue, queueToken);
+  } else {
+    if (mEventQueueTokens->PopToken(aQueue, &queueToken))
+      gdk_input_remove(queueToken);
+  }
+  return NS_OK;
+}
+

mozilla/widget/src/gtk/nsAppShell.h

@@ -0,0 +1,50 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsAppShell_h__
+#define nsAppShell_h__
+
+#include "nsIAppShell.h"
+#include <gtk/gtk.h>
+
+/**
+ * Native GTK+ Application shell wrapper
+ */
+
+class  EventQueueTokenQueue;
+
+class nsAppShell : public nsIAppShell
+{
+public:
+  nsAppShell();
+  virtual ~nsAppShell();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIAPPSHELL
+
+private:
+  nsDispatchListener   *mDispatchListener;
+  EventQueueTokenQueue *mEventQueueTokens;
+};
+
+#endif // nsAppShell_h__
+

mozilla/widget/src/gtk/nsButton.cpp

@@ -0,0 +1,156 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "nsGtkEventHandler.h"
+
+#include "nsButton.h"
+#include "nsString.h"
+
+NS_IMPL_ADDREF_INHERITED(nsButton, nsWidget)
+NS_IMPL_RELEASE_INHERITED(nsButton, nsWidget)
+NS_IMPL_QUERY_INTERFACE2(nsButton, nsIButton, nsIWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsButton constructor
+//
+//-------------------------------------------------------------------------
+nsButton::nsButton() : nsWidget() , nsIButton()
+{
+}
+
+//-------------------------------------------------------------------------
+//
+// Create the native Button widget
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsButton::CreateNative(GtkObject *parentWindow)
+{
+#ifdef USE_SUPERWIN
+    if (!GDK_IS_SUPERWIN(parentWindow)) {
+    g_print("Damn, brother.  That's not a superwin.\n");
+    return NS_ERROR_FAILURE;
+  }
+  
+  GdkSuperWin *superwin = GDK_SUPERWIN(parentWindow);
+
+  mMozBox = gtk_mozbox_new(superwin->bin_window);
+
+#endif
+
+  mWidget = gtk_button_new_with_label("");
+  gtk_widget_set_name(mWidget, "nsButton");
+
+#ifdef USE_SUPERWIN
+
+  // make sure that we put the scrollbar into the mozbox
+
+  gtk_container_add(GTK_CONTAINER(mMozBox), mWidget);
+
+#endif /* USE_SUPERWIN */
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsButton destructor
+//
+//-------------------------------------------------------------------------
+nsButton::~nsButton()
+{
+}
+
+void nsButton::InitCallbacks(char * aName)
+{
+  InstallButtonPressSignal(mWidget);
+  InstallButtonReleaseSignal(mWidget);
+
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+
+  // These are needed so that the events will go to us and not our parent.
+  AddToEventMask(mWidget,
+                 GDK_BUTTON_PRESS_MASK |
+                 GDK_BUTTON_RELEASE_MASK |
+                 GDK_ENTER_NOTIFY_MASK |
+                 GDK_EXPOSURE_MASK |
+                 GDK_FOCUS_CHANGE_MASK |
+                 GDK_KEY_PRESS_MASK |
+                 GDK_KEY_RELEASE_MASK |
+                 GDK_LEAVE_NOTIFY_MASK |
+                 GDK_POINTER_MOTION_MASK);
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsButton::SetLabel(const nsString& aText)
+{
+  NS_ALLOC_STR_BUF(label, aText, 256);
+
+  gtk_label_set(GTK_LABEL(GTK_BIN (mWidget)->child), label);
+
+  NS_FREE_STR_BUF(label);
+  return (NS_OK);
+}
+
+//-------------------------------------------------------------------------
+//
+// Get this button label
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsButton::GetLabel(nsString& aBuffer)
+{
+  char * text;
+
+  gtk_label_get(GTK_LABEL(GTK_BIN (mWidget)->child), &text);
+  aBuffer.SetLength(0);
+  aBuffer.Append(text);
+
+  return (NS_OK);
+
+}
+
+//-------------------------------------------------------------------------
+//
+// set font for button
+//
+//-------------------------------------------------------------------------
+/* virtual */
+void nsButton::SetFontNative(GdkFont *aFont)
+{
+  GtkStyle *style = gtk_style_copy(GTK_BIN (mWidget)->child->style);
+  // gtk_style_copy ups the ref count of the font
+  gdk_font_unref (style->font);
+  
+  style->font = aFont;
+  gdk_font_ref(style->font);
+  
+  gtk_widget_set_style(GTK_BIN (mWidget)->child, style);
+  
+  gtk_style_unref(style);
+}

mozilla/widget/src/gtk/nsButton.h

@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsButton_h__
+#define nsButton_h__
+
+#include "nsWidget.h"
+#include "nsIButton.h"
+
+/**
+ * Native GTK+ button wrapper
+ */
+class nsButton : public nsWidget,
+                 public nsIButton
+{
+
+public:
+  nsButton();
+  virtual ~nsButton();
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIButton part
+  NS_IMETHOD     SetLabel(const nsString& aText);
+  NS_IMETHOD     GetLabel(nsString& aBuffer);
+
+  virtual void SetFontNative(GdkFont *aFont);
+
+protected:
+  NS_METHOD CreateNative(GtkObject *parentWindow);
+  virtual void InitCallbacks(char * aName = nsnull);
+};
+
+#endif // nsButton_h__

mozilla/widget/src/gtk/nsCheckButton.cpp

@@ -0,0 +1,250 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsCheckButton.h"
+#include "nsString.h"
+
+NS_IMPL_ADDREF_INHERITED(nsCheckButton, nsWidget)
+NS_IMPL_RELEASE_INHERITED(nsCheckButton, nsWidget)
+NS_IMPL_QUERY_INTERFACE2(nsCheckButton, nsICheckButton, nsIWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsCheckButton constructor
+//
+//-------------------------------------------------------------------------
+nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton()
+{
+  NS_INIT_REFCNT();
+  mLabel = nsnull;
+  mCheckButton = nsnull;
+  mState = PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsCheckButton destructor
+//
+//-------------------------------------------------------------------------
+nsCheckButton::~nsCheckButton()
+{
+}
+
+void
+nsCheckButton::OnDestroySignal(GtkWidget* aGtkWidget)
+{
+  if (aGtkWidget == mCheckButton) {
+    mCheckButton = nsnull;
+  }
+  else if (aGtkWidget == mLabel) {
+    mLabel = nsnull;
+  }
+  else {
+    nsWidget::OnDestroySignal(aGtkWidget);
+  }
+}
+
+//-------------------------------------------------------------------------
+//
+// Create the native CheckButton widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD  nsCheckButton::CreateNative(GtkObject *parentWindow)
+{
+  mWidget = gtk_event_box_new();
+  mCheckButton = gtk_check_button_new();
+
+  gtk_container_add(GTK_CONTAINER(mWidget), mCheckButton);
+
+  gtk_widget_show(mCheckButton);
+
+  gtk_widget_set_name(mWidget, "nsCheckButton");
+
+  return NS_OK;
+}
+
+void nsCheckButton::InitCallbacks(char * aName)
+{
+  InstallButtonPressSignal(mCheckButton);
+  InstallButtonReleaseSignal(mCheckButton);
+
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+
+  // These are needed so that the events will go to us and not our parent.
+  AddToEventMask(mWidget,
+                 GDK_BUTTON_PRESS_MASK |
+                 GDK_BUTTON_RELEASE_MASK |
+                 GDK_ENTER_NOTIFY_MASK |
+                 GDK_EXPOSURE_MASK |
+                 GDK_FOCUS_CHANGE_MASK |
+                 GDK_KEY_PRESS_MASK |
+                 GDK_KEY_RELEASE_MASK |
+                 GDK_LEAVE_NOTIFY_MASK |
+                 GDK_POINTER_MOTION_MASK);
+
+  // Add in destroy callback
+  gtk_signal_connect(GTK_OBJECT(mCheckButton),
+                     "destroy",
+                     GTK_SIGNAL_FUNC(DestroySignal),
+                     this);
+
+  InstallSignal((GtkWidget *)mCheckButton,
+                (gchar *)"toggled",
+                GTK_SIGNAL_FUNC(nsCheckButton::ToggledSignal));
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::SetState(const PRBool aState)
+{
+  mState = aState;
+
+  if (mWidget && mCheckButton) 
+  {
+    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
+
+    item->active = (gboolean) mState;
+
+    gtk_widget_queue_draw(GTK_WIDGET(item));
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::GetState(PRBool& aState)
+{
+  aState = mState;
+    
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this Checkbox label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::SetLabel(const nsString& aText)
+{
+  if (mWidget) {
+    NS_ALLOC_STR_BUF(label, aText, 256);
+    if (mLabel) {
+      gtk_label_set(GTK_LABEL(mLabel), label);
+    } else {
+      mLabel = gtk_label_new(label);
+      gtk_misc_set_alignment (GTK_MISC (mLabel), 0.0, 0.5);
+      gtk_container_add(GTK_CONTAINER(mCheckButton), mLabel);
+      gtk_widget_show(mLabel);
+      gtk_signal_connect(GTK_OBJECT(mLabel),
+                         "destroy",
+                         GTK_SIGNAL_FUNC(DestroySignal),
+                         this);
+    }
+    NS_FREE_STR_BUF(label);
+  }
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Get this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::GetLabel(nsString& aBuffer)
+{
+  aBuffer.SetLength(0);
+  if (mWidget) {
+    char * text;
+    if (mLabel) {
+      gtk_label_get(GTK_LABEL(mLabel), &text);
+      aBuffer.Append(text);
+    }
+  }
+  return NS_OK;
+}
+
+/* virtual */ void
+nsCheckButton::OnToggledSignal(const gboolean aState)
+{
+  // Untoggle the sonofabitch
+  if (mWidget && mCheckButton) 
+  {
+    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
+
+    item->active = !item->active;
+
+    gtk_widget_queue_draw(GTK_WIDGET(item));
+  }
+}
+//////////////////////////////////////////////////////////////////////
+
+/* static */ gint 
+nsCheckButton::ToggledSignal(GtkWidget *      aWidget, 
+                             gpointer         aData)
+{
+  NS_ASSERTION( nsnull != aWidget, "widget is null");
+
+  nsCheckButton * button = (nsCheckButton *) aData;
+
+  NS_ASSERTION( nsnull != button, "instance pointer is null");
+
+  button->OnToggledSignal(GTK_TOGGLE_BUTTON(aWidget)->active);
+
+  return PR_TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////
+// SetBackgroundColor for CheckButton
+/*virtual*/
+void nsCheckButton::SetBackgroundColorNative(GdkColor *aColorNor,
+                                        GdkColor *aColorBri,
+                                        GdkColor *aColorDark)
+{
+  // use same style copy as SetFont
+  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
+  
+  style->bg[GTK_STATE_NORMAL]=*aColorNor;
+  
+  // Mouse over button
+  style->bg[GTK_STATE_PRELIGHT]=*aColorBri;
+
+  // Button is down
+  style->bg[GTK_STATE_ACTIVE]=*aColorDark;
+
+  // other states too? (GTK_STATE_ACTIVE, GTK_STATE_PRELIGHT,
+  //               GTK_STATE_SELECTED, GTK_STATE_INSENSITIVE)
+  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
+  // set style for eventbox too
+  gtk_widget_set_style(mWidget, style);
+
+  gtk_style_unref(style);
+}
+

mozilla/widget/src/gtk/nsCheckButton.h

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsCheckButton_h__
+#define nsCheckButton_h__
+
+#include "nsWidget.h"
+#include "nsICheckButton.h"
+
+/**
+ * Native GTK+ Checkbox wrapper
+ */
+
+
+class nsCheckButton : public nsWidget,
+                      public nsICheckButton
+{
+
+public:
+  nsCheckButton();
+  virtual                 ~nsCheckButton();
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsICheckButton part
+  NS_IMETHOD SetLabel(const nsString &aText);
+  NS_IMETHOD GetLabel(nsString &aBuffer);
+  NS_IMETHOD SetState(const PRBool aState);
+  NS_IMETHOD GetState(PRBool& aState);
+
+  virtual void OnToggledSignal(const gboolean aState);
+
+protected:
+  NS_IMETHOD CreateNative(GtkObject *parentWindow);
+  virtual void InitCallbacks(char * aName = nsnull);
+  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
+
+  // Sets background for checkbutton
+  virtual void SetBackgroundColorNative(GdkColor *aColorNor,
+                                        GdkColor *aColorBri,
+                                        GdkColor *aColorDark);
+
+  GtkWidget *mLabel;
+  GtkWidget *mCheckButton;
+
+  // We need to maintain our own state to be in sync with the
+  // gecko check controlling frame.
+  PRBool     mState;
+
+private:
+
+  static gint ToggledSignal(GtkWidget *      aWidget, 
+                            gpointer         aData);
+};
+
+#endif // nsCheckButton_h__

mozilla/widget/src/gtk/nsClipboard.cpp

@@ -0,0 +1,872 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsClipboard.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsISupportsArray.h"
+#include "nsIClipboardOwner.h"
+#include "nsITransferable.h"   // kTextMime
+#include "nsISupportsPrimitives.h"
+
+#include "nsIWidget.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsWidgetsCID.h"
+#include "nsXPIDLString.h"
+#include "nsPrimitiveHelpers.h"
+
+#include "nsVoidArray.h"
+
+
+// The class statics:
+GtkWidget* nsClipboard::sWidget = 0;
+
+
+#if defined(DEBUG_mcafee) || defined(DEBUG_pavlov)
+#define DEBUG_CLIPBOARD
+#endif
+ 
+enum {
+  TARGET_NONE,
+  TARGET_TEXT_PLAIN,
+  TARGET_TEXT_XIF,
+  TARGET_TEXT_UNICODE,
+  TARGET_TEXT_HTML,
+  TARGET_AOLMAIL,
+  TARGET_IMAGE_PNG,
+  TARGET_IMAGE_JPEG,
+  TARGET_IMAGE_GIF,
+  // compatibility types
+  TARGET_UTF8,
+  TARGET_UNKNOWN,
+  TARGET_LAST
+};
+
+static GdkAtom sSelTypes[TARGET_LAST];
+
+
+//-------------------------------------------------------------------------
+//
+// nsClipboard constructor
+//
+//-------------------------------------------------------------------------
+nsClipboard::nsClipboard() : nsBaseClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("nsClipboard::nsClipboard()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  //NS_INIT_REFCNT();
+  mIgnoreEmptyNotification = PR_FALSE;
+  mClipboardOwner = nsnull;
+  mTransferable   = nsnull;
+  mSelectionData.data = nsnull;
+  mSelectionData.length = 0;
+
+  // initialize the widget, etc we're binding to
+  Init();
+}
+
+// XXX if GTK's internal code changes this isn't going to work
+// copied from gtk code because it is a static function we can't get to it.
+// need to bug owen taylor about getting this code public.
+
+typedef struct _GtkSelectionTargetList GtkSelectionTargetList;
+
+struct _GtkSelectionTargetList {
+  GdkAtom selection;
+  GtkTargetList *list;
+};
+
+static const char *gtk_selection_handler_key = "gtk-selection-handlers";
+
+void __gtk_selection_target_list_remove (GtkWidget *widget)
+{
+  GtkSelectionTargetList *sellist;
+  GList *tmp_list;
+  GList *lists;
+  lists = (GList*)gtk_object_get_data (GTK_OBJECT (widget), gtk_selection_handler_key);
+  tmp_list = lists;
+  while (tmp_list)
+    {
+      sellist = (GtkSelectionTargetList*)tmp_list->data;
+      gtk_target_list_unref (sellist->list);
+      g_free (sellist);
+      tmp_list = tmp_list->next;
+    }
+  g_list_free (lists);
+  gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key, NULL);
+}
+
+//-------------------------------------------------------------------------
+//
+// nsClipboard destructor
+//
+//-------------------------------------------------------------------------
+nsClipboard::~nsClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("nsClipboard::~nsClipboard()\n");  
+#endif /* DEBUG_CLIPBOARD */
+
+  // Remove all our event handlers:
+  if (sWidget &&
+      (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == sWidget->window))
+    gtk_selection_remove_all(sWidget);
+
+  // free the selection data, if any
+  if (mSelectionData.data != nsnull)
+    g_free(mSelectionData.data);
+
+  nsClipboard *cb = (nsClipboard*)gtk_object_get_data(GTK_OBJECT(sWidget), "cb");
+  if (cb != nsnull)
+  {
+    NS_RELEASE(cb);
+    gtk_object_remove_data(GTK_OBJECT(sWidget), "cb");
+  }
+
+  if (sWidget)
+  {
+    gtk_widget_destroy(sWidget);
+    sWidget = nsnull;
+  }
+}
+
+
+// 
+// GTK Weirdness!
+// This is here in the hope of being able to call
+//  gtk_selection_add_targets(w, GDK_SELECTION_PRIMARY,
+//                            targets,
+//                            1);
+// instead of
+//   gtk_selection_add_target(sWidget, 
+//                            GDK_SELECTION_PRIMARY,
+//                            GDK_SELECTION_TYPE_STRING,
+//                            GDK_SELECTION_TYPE_STRING);
+// but it turns out that this changes the whole gtk selection model;
+// when calling add_targets copy uses selection_clear_event and the
+// data structure needs to be filled in in a way that we haven't
+// figured out; when using add_target copy uses selection_get and
+// the data structure is already filled in as much as it needs to be.
+// Some gtk internals wizard will need to solve this mystery before
+// we can use add_targets().
+//static GtkTargetEntry targets[] = {
+//  { "strings n stuff", GDK_SELECTION_TYPE_STRING, GDK_SELECTION_TYPE_STRING }
+//};
+//
+
+//-------------------------------------------------------------------------
+void nsClipboard::Init(void)
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("nsClipboard::Init\n");
+#endif
+
+  sSelTypes[TARGET_NONE]          = GDK_NONE;
+  sSelTypes[TARGET_TEXT_PLAIN]    = gdk_atom_intern(kTextMime, FALSE);
+  sSelTypes[TARGET_TEXT_XIF]      = gdk_atom_intern(kXIFMime, FALSE);
+  sSelTypes[TARGET_TEXT_UNICODE]  = gdk_atom_intern(kUnicodeMime, FALSE);
+  sSelTypes[TARGET_UTF8]          = gdk_atom_intern("UTF8", FALSE);
+  sSelTypes[TARGET_TEXT_HTML]     = gdk_atom_intern(kHTMLMime, FALSE);
+  sSelTypes[TARGET_AOLMAIL]       = gdk_atom_intern(kAOLMailMime, FALSE);
+  sSelTypes[TARGET_IMAGE_PNG]     = gdk_atom_intern(kPNGImageMime, FALSE);
+  sSelTypes[TARGET_IMAGE_JPEG]    = gdk_atom_intern(kJPEGImageMime, FALSE);
+  sSelTypes[TARGET_IMAGE_GIF]     = gdk_atom_intern(kGIFImageMime, FALSE);
+  // compatibility with other apps
+
+
+  // create invisible widget to use for the clipboard
+  sWidget = gtk_invisible_new();
+
+  // add the clipboard pointer to the widget so we can get it.
+  gtk_object_set_data(GTK_OBJECT(sWidget), "cb", this);
+
+  NS_ADDREF_THIS();
+
+  // Handle selection requests if we called gtk_selection_add_target:
+  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_get",
+                     GTK_SIGNAL_FUNC(nsClipboard::SelectionGetCB),
+                     nsnull);
+
+  // When someone else takes the selection away:
+  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_clear_event",
+                     GTK_SIGNAL_FUNC(nsClipboard::SelectionClearCB),
+                     nsnull);
+
+  // Set up the paste handler:
+  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_received",
+                     GTK_SIGNAL_FUNC(nsClipboard::SelectionReceivedCB),
+                     nsnull);
+}
+
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsClipboard::SetNativeClipboardData()
+{
+  mIgnoreEmptyNotification = PR_TRUE;
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SetNativeClipboardData()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == mTransferable) {
+    printf("nsClipboard::SetNativeClipboardData(): no transferable!\n");
+    return NS_ERROR_FAILURE;
+  }
+
+  // are we already the owner?
+  if (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == sWidget->window)
+  {
+    // if so, clear all the targets
+    __gtk_selection_target_list_remove(sWidget);
+    //    gtk_selection_remove_all(sWidget);
+  }
+
+  // we arn't already the owner, so we will become it
+  gint have_selection = gtk_selection_owner_set(sWidget,
+                                                GDK_SELECTION_PRIMARY,
+                                                GDK_CURRENT_TIME);
+  if (have_selection == 0)
+    return NS_ERROR_FAILURE;
+
+  // get flavor list that includes all flavors that can be written (including ones 
+  // obtained through conversion)
+  nsCOMPtr<nsISupportsArray> flavorList;
+  nsresult errCode = mTransferable->FlavorsTransferableCanExport ( getter_AddRefs(flavorList) );
+  if ( NS_FAILED(errCode) )
+    return NS_ERROR_FAILURE;
+
+  PRUint32 cnt;
+  flavorList->Count(&cnt);
+  for ( PRUint32 i=0; i<cnt; ++i )
+  {
+    nsCOMPtr<nsISupports> genericFlavor;
+    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
+    nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
+    if ( currentFlavor ) {
+      nsXPIDLCString flavorStr;
+      currentFlavor->ToString(getter_Copies(flavorStr));
+      gint format = GetFormat(flavorStr);
+
+      // add these types as selection targets
+      RegisterFormat(format);
+    }
+  }
+
+  mIgnoreEmptyNotification = PR_FALSE;
+
+  return NS_OK;
+}
+
+void nsClipboard::AddTarget(GdkAtom aAtom)
+{
+  gtk_selection_add_target(sWidget,
+                           GDK_SELECTION_PRIMARY,
+                           aAtom, aAtom);
+}
+
+gint nsClipboard::GetFormat(const char* aMimeStr)
+{
+  gint type = TARGET_NONE;
+  nsCAutoString mimeStr ( CBufDescriptor(NS_CONST_CAST(char*,aMimeStr), PR_TRUE, PL_strlen(aMimeStr)+1) );
+#ifdef DEBUG_CLIPBOARD
+  g_print("  nsClipboard::GetFormat(%s)\n", aMimeStr);
+#endif
+  if (mimeStr.Equals(kTextMime)) {
+    type = TARGET_TEXT_PLAIN;
+  } else if (mimeStr.Equals("STRING")) {
+    type = TARGET_TEXT_PLAIN;
+  } else if (mimeStr.Equals(kXIFMime)) {
+    type = TARGET_TEXT_XIF;
+  } else if (mimeStr.Equals(kUnicodeMime)) {
+    type = TARGET_TEXT_UNICODE;
+  } else if (mimeStr.Equals(kHTMLMime)) {
+    type = TARGET_TEXT_HTML;
+  } else if (mimeStr.Equals(kAOLMailMime)) {
+    type = TARGET_AOLMAIL;
+  } else if (mimeStr.Equals(kPNGImageMime)) {
+    type = TARGET_IMAGE_PNG;
+  } else if (mimeStr.Equals(kJPEGImageMime)) {
+    type = TARGET_IMAGE_JPEG;
+  } else if (mimeStr.Equals(kGIFImageMime)) {
+    type = TARGET_IMAGE_GIF;
+  }
+
+#ifdef WE_DO_DND
+  else if (mimeStr.Equals(kDropFilesMime)) {
+    format = CF_HDROP;
+  } else {
+    format = ::RegisterClipboardFormat(aMimeStr);
+  }
+#endif
+  return type;
+}
+
+void nsClipboard::RegisterFormat(gint format)
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("  nsClipboard::RegisterFormat(%s)\n", gdk_atom_name(sSelTypes[format]));
+#endif
+
+  /* when doing the selection_add_target, each case should have the same last parameter
+     which matches the case match */
+  switch(format)
+  {
+  case TARGET_TEXT_PLAIN:
+    // text/plain (default)
+    AddTarget(sSelTypes[format]);
+
+    // STRING (what X uses)
+    AddTarget(GDK_SELECTION_TYPE_STRING);
+    break;
+
+
+  case TARGET_TEXT_XIF:
+    // text/xif (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_TEXT_UNICODE:
+    // text/unicode (default)
+    AddTarget(sSelTypes[format]);
+
+    // UTF8 (what X uses)
+    AddTarget(sSelTypes[TARGET_UTF8]);
+    break;
+
+
+  case TARGET_TEXT_HTML:
+    // text/html (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_AOLMAIL:
+    // text/aolmail (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_IMAGE_PNG:
+    // image/png (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_IMAGE_JPEG:
+    // image/jpeg (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_IMAGE_GIF:
+    // image/gif (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  default:
+    // if we don't match something above, then just add it like its something we know about...
+    AddTarget(sSelTypes[format]);
+  }
+}
+
+PRBool nsClipboard::DoRealConvert(GdkAtom type)
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("    nsClipboard::DoRealConvert(%li)\n    {\n", type);
+#endif
+  int e = 0;
+  // Set a flag saying that we're blocking waiting for the callback:
+  mBlocking = PR_TRUE;
+
+  //
+  // ask X what kind of data we can get
+  //
+#ifdef DEBUG_CLIPBOARD
+  g_print("     Doing real conversion of atom type '%s'\n", gdk_atom_name(type));
+#endif
+  gtk_selection_convert(sWidget,
+                        GDK_SELECTION_PRIMARY,
+                        type,
+                        GDK_CURRENT_TIME);
+
+  // Now we need to wait until the callback comes in ...
+  // i is in case we get a runaway (yuck).
+#ifdef DEBUG_CLIPBOARD
+  printf("      Waiting for the callback... mBlocking = %d\n", mBlocking);
+#endif /* DEBUG_CLIPBOARD */
+  for (e=0; mBlocking == PR_TRUE && e < 1000; ++e)
+  {
+    gtk_main_iteration_do(PR_TRUE);
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  g_print("    }\n");
+#endif
+
+  if (mSelectionData.length > 0)
+    return PR_TRUE;
+
+  return PR_FALSE;
+}
+
+/* return PR_TRUE if we have converted or PR_FALSE if we havn't and need to keep being called */
+PRBool nsClipboard::DoConvert(gint format)
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("  nsClipboard::DoConvert(%s)\n", gdk_atom_name(sSelTypes[format]));
+#endif
+
+  /* when doing the selection_add_target, each case should have the same last parameter
+     which matches the case match */
+  PRBool r = PR_FALSE;
+
+  switch(format)
+  {
+  case TARGET_TEXT_PLAIN:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    r = DoRealConvert(GDK_SELECTION_TYPE_STRING);
+    if (r) return r;
+    break;
+
+  case TARGET_TEXT_XIF:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_TEXT_UNICODE:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    r = DoRealConvert(sSelTypes[TARGET_UTF8]);
+    if (r) return r;
+    break;
+
+  case TARGET_TEXT_HTML:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_AOLMAIL:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_IMAGE_PNG:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_IMAGE_JPEG:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_IMAGE_GIF:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  default:
+    g_print("DoConvert called with bogus format\n");
+  }
+  return r;
+}
+
+//-------------------------------------------------------------------------
+//
+// The blocking Paste routine
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP
+nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable)
+{
+
+#ifdef DEBUG_CLIPBOARD
+  printf("nsClipboard::GetNativeClipboardData()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == aTransferable) {
+    printf("  GetNativeClipboardData: Transferable is null!\n");
+    return NS_ERROR_FAILURE;
+  }
+
+  // get flavor list that includes all acceptable flavors (including ones obtained through
+  // conversion)
+  nsCOMPtr<nsISupportsArray> flavorList;
+  nsresult errCode = aTransferable->FlavorsTransferableCanImport ( getter_AddRefs(flavorList) );
+  if ( NS_FAILED(errCode) )
+    return NS_ERROR_FAILURE;
+
+  // Walk through flavors and see which flavor matches the one being pasted:
+  PRUint32 cnt;
+  flavorList->Count(&cnt);
+  nsCAutoString foundFlavor;
+  for ( PRUint32 i = 0; i < cnt; ++i ) {
+    nsCOMPtr<nsISupports> genericFlavor;
+    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
+    nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
+    if ( currentFlavor ) {
+      nsXPIDLCString flavorStr;
+      currentFlavor->ToString ( getter_Copies(flavorStr) );
+      gint format = GetFormat(flavorStr);
+      if (DoConvert(format)) {
+        foundFlavor = flavorStr;
+        break;
+      }
+    }
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  Got the callback: '%s', %d\n",
+         mSelectionData.data, mSelectionData.length);
+#endif /* DEBUG_CLIPBOARD */
+
+  // We're back from the callback, no longer blocking:
+  mBlocking = PR_FALSE;
+
+  // 
+  // Now we have data in mSelectionData.data.
+  // We just have to copy it to the transferable.
+  // 
+
+#if 0  
+// pinkerton - we have the flavor already from above, so we don't need
+// to re-derrive it.
+  nsString *name = new nsString((const char*)gdk_atom_name(mSelectionData.type));
+  int format = GetFormat(*name);
+  df->SetString((const char*)gdk_atom_name(sSelTypes[format]));
+#endif
+
+  nsCOMPtr<nsISupports> genericDataWrapper;
+  nsPrimitiveHelpers::CreatePrimitiveForData ( foundFlavor, mSelectionData.data, mSelectionData.length, getter_AddRefs(genericDataWrapper) );
+  aTransferable->SetTransferData(foundFlavor,
+                                 genericDataWrapper,
+                                 mSelectionData.length);
+
+//delete name;
+  
+  // transferable is now copying the data, so we can free it.
+  //  g_free(mSelectionData.data);
+  mSelectionData.data = nsnull;
+  mSelectionData.length = 0;
+
+  return NS_OK;
+}
+
+/**
+ * Called when the data from a paste comes in (recieved from gdk_selection_convert)
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ * @param  aTime time the selection was requested
+ */
+void
+nsClipboard::SelectionReceivedCB (GtkWidget        *aWidget,
+                                  GtkSelectionData *aSelectionData,
+                                  guint             aTime)
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("      nsClipboard::SelectionReceivedCB\n      {\n");
+#endif /* DEBUG_CLIPBOARD */
+  nsClipboard *cb =(nsClipboard *)gtk_object_get_data(GTK_OBJECT(aWidget),
+                                                      "cb");
+  if (!cb)
+  {
+    g_print("no clipboard found.. this is bad.\n");
+    return;
+  }
+  cb->SelectionReceiver(aWidget, aSelectionData);
+#ifdef DEBUG_CLIPBOARD
+  g_print("      }\n");
+#endif
+}
+
+
+/**
+ * local method (called from nsClipboard::SelectionReceivedCB)
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ */
+void
+nsClipboard::SelectionReceiver (GtkWidget *aWidget,
+                                GtkSelectionData *aSD)
+{
+  gint type;
+
+  mBlocking = PR_FALSE;
+
+  if (aSD->length < 0)
+  {
+    printf("        Error retrieving selection: length was %d\n",
+           aSD->length);
+    return;
+  }
+
+  type = TARGET_NONE;
+  for (int i=0; i < TARGET_LAST; i++)
+  {
+    if (sSelTypes[i] == aSD->type)
+    {
+      type = i;
+      break;
+    }
+  }
+
+  switch (type)
+  {
+  case GDK_TARGET_STRING:
+  case TARGET_UTF8:
+  case TARGET_TEXT_PLAIN:
+  case TARGET_TEXT_XIF:
+  case TARGET_TEXT_UNICODE:
+  case TARGET_TEXT_HTML:
+#ifdef DEBUG_CLIPBOARD
+    g_print("        Copying mSelectionData pointer -- ");
+#endif
+    mSelectionData = *aSD;
+    mSelectionData.data = g_new(guchar, aSD->length + 1);
+#ifdef DEBUG_CLIPBOARD
+    g_print("        Data = %s\n    Length = %i\n", aSD->data, aSD->length);
+#endif
+    memcpy(mSelectionData.data,
+           aSD->data,
+           aSD->length);
+    // Null terminate in case anyone cares,
+    // and so we can print the string for debugging:
+    mSelectionData.data[aSD->length] = '\0';
+    mSelectionData.length = aSD->length;
+    return;
+
+  default:
+    mSelectionData = *aSD;
+    mSelectionData.data = g_new(guchar, aSD->length + 1);
+    memcpy(mSelectionData.data,
+           aSD->data,
+           aSD->length);
+    mSelectionData.length = aSD->length;
+    return;
+  }
+}
+
+
+
+/**
+ * Some platforms support deferred notification for putting data on the clipboard
+ * This method forces the data onto the clipboard in its various formats
+ * This may be used if the application going away.
+ *
+ * @result NS_OK if successful.
+ */
+NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::ForceDataToClipboard()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == mTransferable) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsClipboard::HasDataMatchingFlavors(nsISupportsArray* aFlavorList, PRBool * outResult)
+{
+  *outResult = PR_TRUE;  // say we always do.
+  return NS_OK;
+}
+
+
+/**
+ * This is the callback which is called when another app
+ * requests the selection.
+ *
+ * @param  widget The widget
+ * @param  aSelectionData Selection data
+ * @param  info Value passed in from the callback init
+ * @param  time Time when the selection request came in
+ */
+void nsClipboard::SelectionGetCB(GtkWidget        *widget,
+                                 GtkSelectionData *aSelectionData,
+                                 guint            aInfo,
+                                 guint            aTime)
+{ 
+#ifdef DEBUG_CLIPBOARD
+  printf("nsClipboard::SelectionGetCB\n"); 
+#endif /* DEBUG_CLIPBOARD */
+
+  nsClipboard *cb = (nsClipboard *)gtk_object_get_data(GTK_OBJECT(widget),
+                                                       "cb");
+
+  void     *clipboardData;
+  PRUint32 dataLength;
+  nsresult rv;
+
+  // Make sure we have a transferable:
+  if (!cb->mTransferable) {
+    printf("Clipboard has no transferable!\n");
+    return;
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  g_print("  aInfo == %d -", aInfo);
+#endif
+
+  char* dataFlavor = nsnull;
+
+  // switch aInfo (atom) to our enum
+  int type = (int)aInfo;
+  for (int i=0; i < TARGET_LAST; i++)
+  {
+    if (sSelTypes[i] == aInfo)
+    {
+      type = i;
+      break;
+    }
+  }
+
+  switch(type)
+    {
+    case GDK_TARGET_STRING:
+    case TARGET_TEXT_PLAIN:
+      dataFlavor = kTextMime;
+      break;
+    case TARGET_TEXT_XIF:
+      dataFlavor = kXIFMime;
+      break;
+    case TARGET_TEXT_UNICODE:
+    case TARGET_UTF8:
+      dataFlavor = kUnicodeMime;
+      break;
+    case TARGET_TEXT_HTML:
+      dataFlavor = kHTMLMime;
+      break;
+    case TARGET_AOLMAIL:
+      dataFlavor = kAOLMailMime;
+      break;
+    case TARGET_IMAGE_PNG:
+      dataFlavor = kPNGImageMime;
+      break;
+    case TARGET_IMAGE_JPEG:
+      dataFlavor = kJPEGImageMime;
+      break;
+    case TARGET_IMAGE_GIF:
+      dataFlavor = kGIFImageMime;
+      break;
+    default:
+      {
+        /* handle outside things */
+      }
+    }
+#ifdef DEBUG_CLIPBOARD
+  g_print("- aInfo is for %s\n", gdk_atom_name(aInfo));
+#endif
+
+  // Get data out of transferable.
+  nsCOMPtr<nsISupports> genericDataWrapper;
+  rv = cb->mTransferable->GetTransferData(dataFlavor, 
+                                          getter_AddRefs(genericDataWrapper),
+                                          &dataLength);
+  nsPrimitiveHelpers::CreateDataFromPrimitive ( dataFlavor, genericDataWrapper, &clipboardData, dataLength );
+  if (NS_SUCCEEDED(rv) && clipboardData && dataLength > 0) {
+    size_t size = 1;
+    // find the number of bytes in the data for the below thing
+    //    size_t size = sizeof((void*)((unsigned char)clipboardData[0]));
+    //    g_print("************  *****************      ******************* %i\n", size);
+
+    gtk_selection_data_set(aSelectionData,
+                           aInfo, size*8,
+                           (unsigned char *)clipboardData,
+                           dataLength);
+    nsCRT::free ( NS_REINTERPRET_CAST(char*, clipboardData) );
+  }
+  else
+    printf("Transferable didn't support the data flavor\n");
+}
+
+
+/**
+ * Called when another app requests selection ownership
+ *
+ * @param  aWidget the widget
+ * @param  aEvent the GdkEvent for the selection
+ * @param  aData value passed in from the callback init
+ */
+void nsClipboard::SelectionClearCB(GtkWidget *aWidget,
+                                   GdkEventSelection *aEvent,
+                                   gpointer aData)
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SelectionClearCB\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  nsClipboard *cb = (nsClipboard *)gtk_object_get_data(GTK_OBJECT(aWidget),
+                                                       "cb");
+
+  cb->EmptyClipboard();
+}
+
+
+/**
+ * The routine called when another app asks for the content of the selection
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ * @param  aData value passed in from the callback init
+ */
+void
+nsClipboard::SelectionRequestCB (GtkWidget *aWidget,
+                                 GtkSelectionData *aSelectionData,
+                                 gpointer aData)
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SelectionRequestCB\n");
+#endif /* DEBUG_CLIPBOARD */
+}
+
+/**
+ * ...
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ * @param  aData value passed in from the callback init
+ */
+void
+nsClipboard::SelectionNotifyCB (GtkWidget *aWidget,
+                                GtkSelectionData *aSelectionData,
+                                gpointer aData)
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SelectionNotifyCB\n");
+#endif /* DEBUG_CLIPBOARD */
+}

mozilla/widget/src/gtk/nsClipboard.h

@@ -0,0 +1,132 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsClipboard_h__
+#define nsClipboard_h__
+
+#include "nsBaseClipboard.h"
+#include <gtk/gtk.h>
+#include <gtk/gtkinvisible.h>
+
+class nsITransferable;
+class nsIClipboardOwner;
+class nsIWidget;
+
+/**
+ * Native Gtk Clipboard wrapper
+ */
+
+class nsClipboard : public nsBaseClipboard
+{
+
+public:
+  nsClipboard();
+  virtual ~nsClipboard();
+
+  // nsIClipboard  
+  NS_IMETHOD ForceDataToClipboard();
+  NS_IMETHOD HasDataMatchingFlavors(nsISupportsArray* aFlavorList, PRBool * outResult);
+
+  // invisible widget.  also used by dragndrop
+  static GtkWidget *sWidget;
+
+protected:
+  NS_IMETHOD SetNativeClipboardData();
+  NS_IMETHOD GetNativeClipboardData(nsITransferable * aTransferable);
+
+  PRBool  mIgnoreEmptyNotification;
+
+  void AddTarget(GdkAtom aAtom);
+
+  gint GetFormat(const char* aMimeStr);
+  void RegisterFormat(gint format);
+
+
+  PRBool DoRealConvert(GdkAtom type);
+  PRBool DoConvert(gint format);
+
+  void Init(void);
+
+  // Used for communicating pasted data
+  // from the asynchronous X routines back to a blocking paste:
+  GtkSelectionData mSelectionData;
+  PRBool mBlocking;
+
+  void SelectionReceiver(GtkWidget *aWidget,
+                         GtkSelectionData *aSD);
+
+  /**
+   * This is the callback which is called when another app
+   * requests the selection.
+   *
+   * @param  widget The widget
+   * @param  aSelectionData Selection data
+   * @param  info Value passed in from the callback init
+   * @param  time Time when the selection request came in
+   */
+  static void SelectionGetCB(GtkWidget *aWidget, 
+                             GtkSelectionData *aSelectionData,
+                             guint      /*info*/,
+                             guint      /*time*/);
+
+  /**
+   * Called when another app requests selection ownership
+   *
+   * @param  aWidget the widget
+   * @param  aEvent the GdkEvent for the selection
+   * @param  aData value passed in from the callback init
+   */
+  static void SelectionClearCB(GtkWidget *aWidget, 
+                               GdkEventSelection *aEvent,
+                               gpointer aData);
+
+  /**
+   * The routine called when another app asks for the content of the selection
+   *
+   * @param  aWidget the widget
+   * @param  aSelectionData gtk selection stuff
+   * @param  aData value passed in from the callback init
+   */
+  static void SelectionRequestCB(GtkWidget *aWidget,
+                                 GtkSelectionData *aSelectionData,
+                                 gpointer data);
+  
+  /**
+   * Called when the data from a paste comes in
+   *
+   * @param  aWidget the widget
+   * @param  aSelectionData gtk selection stuff
+   * @param  aTime time the selection was requested
+   */
+  static void SelectionReceivedCB(GtkWidget *aWidget,
+                                  GtkSelectionData *aSelectionData,
+                                  guint aTime);
+
+
+  static void SelectionNotifyCB(GtkWidget *aWidget,
+                                GtkSelectionData *aSelectionData,
+                                gpointer aData);
+  
+
+};
+
+#endif // nsClipboard_h__

mozilla/widget/src/gtk/nsComboBox.cpp

@@ -0,0 +1,357 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "nsComboBox.h"
+#include "nsGUIEvent.h"
+#include "nsString.h"
+
+#define DBG 0
+
+#define INITIAL_MAX_ITEMS 128
+#define ITEMS_GROWSIZE    128
+
+NS_IMPL_ADDREF_INHERITED(nsComboBox, nsWidget)
+NS_IMPL_RELEASE_INHERITED(nsComboBox, nsWidget)
+NS_IMPL_QUERY_INTERFACE3(nsComboBox, nsIComboBox, nsIListWidget, nsIWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsComboBox constructor
+//
+//-------------------------------------------------------------------------
+nsComboBox::nsComboBox() : nsWidget(), nsIListWidget(), nsIComboBox()
+{
+  NS_INIT_REFCNT();
+  mMultiSelect = PR_FALSE;
+  mItems = nsnull;
+  mNumItems = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsComboBox:: destructor
+//
+//-------------------------------------------------------------------------
+nsComboBox::~nsComboBox()
+{
+  if (mItems) {
+    for (GList *items = mItems; items; items = (GList*) g_list_next(items)){
+      g_free(items->data);
+    }
+    g_list_free(mItems);
+  }
+  gtk_widget_destroy(mCombo);
+}
+
+void nsComboBox::InitCallbacks(char * aName)
+{
+  InstallButtonPressSignal(mWidget);
+  InstallButtonReleaseSignal(mWidget);
+
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+   
+  // These are needed so that the events will go to us and not our parent.
+  AddToEventMask(mWidget,
+                 GDK_BUTTON_PRESS_MASK |
+                 GDK_BUTTON_RELEASE_MASK |
+                 GDK_ENTER_NOTIFY_MASK |
+                 GDK_EXPOSURE_MASK |
+                 GDK_FOCUS_CHANGE_MASK |
+                 GDK_KEY_PRESS_MASK |
+                 GDK_KEY_RELEASE_MASK |
+                 GDK_LEAVE_NOTIFY_MASK |  
+                 GDK_POINTER_MOTION_MASK);
+}
+
+
+//-------------------------------------------------------------------------
+//
+//  initializer
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsComboBox::SetMultipleSelection(PRBool aMultipleSelections)
+{
+  mMultiSelect = aMultipleSelections;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+//  AddItemAt
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsComboBox::AddItemAt(nsString &aItem, PRInt32 aPosition)
+{
+  NS_ALLOC_STR_BUF(val, aItem, 256);
+  mItems = g_list_insert( mItems, g_strdup(val), aPosition );
+  mNumItems++;
+  if (mCombo) {
+    gtk_combo_set_popdown_strings( GTK_COMBO( mCombo ), mItems );
+  }
+  NS_FREE_STR_BUF(val);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Finds an item at a postion
+//
+//-------------------------------------------------------------------------
+PRInt32  nsComboBox::FindItem(nsString &aItem, PRInt32 aStartPos)
+{
+  NS_ALLOC_STR_BUF(val, aItem, 256);
+  int i;
+  PRInt32 inx = -1;
+  GList *items = g_list_nth(mItems, aStartPos);
+  for(i=0; items != NULL; items = (GList *) g_list_next(items), i++ )
+    {
+      if(!strcmp(val, (gchar *) items->data))
+        {
+          inx = i;
+          break;
+        }
+    }
+  NS_FREE_STR_BUF(val);
+  return inx;
+}
+
+//-------------------------------------------------------------------------
+//
+//  CountItems - Get Item Count
+//
+//-------------------------------------------------------------------------
+PRInt32  nsComboBox::GetItemCount()
+{
+  return (PRInt32)mNumItems;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Removes an Item at a specified location
+//
+//-------------------------------------------------------------------------
+PRBool  nsComboBox::RemoveItemAt(PRInt32 aPosition)
+{ 
+  if (aPosition >= 0 && aPosition < mNumItems) {
+
+    g_free(g_list_nth(mItems, aPosition)->data);
+    mItems = g_list_remove_link(mItems, g_list_nth(mItems, aPosition));
+    mNumItems--;
+    if (mCombo) {
+      gtk_combo_set_popdown_strings(GTK_COMBO( mCombo ), mItems);
+    }
+    return PR_TRUE;
+  }
+  else
+    return PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Removes an Item at a specified location
+//
+//-------------------------------------------------------------------------
+PRBool nsComboBox::GetItemAt(nsString& anItem, PRInt32 aPosition)
+{
+  if (aPosition >= 0 && aPosition < mNumItems) {
+    anItem = (gchar *) g_list_nth(mItems, aPosition)->data;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Gets the selected of selected item
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::GetSelectedItem(nsString& aItem)
+{
+  aItem.Truncate();
+  if (mCombo) {
+    aItem = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(mCombo)->entry));
+  }
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Gets the list of selected otems
+//
+//-------------------------------------------------------------------------
+PRInt32 nsComboBox::GetSelectedIndex()
+{
+  nsString nsstring;
+  GetSelectedItem(nsstring);
+  return FindItem(nsstring, 0);
+}
+
+//-------------------------------------------------------------------------
+//
+//  SelectItem
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::SelectItem(PRInt32 aPosition)
+{
+  GList *pos;
+  if (!mItems)
+    return NS_ERROR_FAILURE;
+
+  pos = g_list_nth(mItems, aPosition);
+  if (!pos)
+    return NS_ERROR_FAILURE;
+
+  if (mCombo) {
+    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(mCombo)->entry),
+                       (gchar *) pos->data);
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  GetSelectedCount
+//
+//-------------------------------------------------------------------------
+PRInt32 nsComboBox::GetSelectedCount()
+{
+  if (!mMultiSelect) {
+    PRInt32 inx = GetSelectedIndex();
+    return (inx == -1? 0 : 1);
+  } else {
+    return 0;
+  }
+}
+
+//-------------------------------------------------------------------------
+//
+//  GetSelectedIndices
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize)
+{
+  // this is an error
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Deselect
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::Deselect()
+{
+  if (mMultiSelect) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Create the native GtkCombo widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD  nsComboBox::CreateNative(GtkObject *parentWindow)
+{
+  mWidget = ::gtk_event_box_new();
+
+  ::gtk_widget_set_name(mWidget, "nsComboBox");
+  mCombo = ::gtk_combo_new();
+  gtk_widget_show(mCombo);
+
+  /* make the stuff uneditable */
+  gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(mCombo)->entry), PR_FALSE);
+
+  gtk_signal_connect(GTK_OBJECT(mCombo),
+                     "destroy",
+                     GTK_SIGNAL_FUNC(DestroySignal),
+                     this);
+  gtk_signal_connect(GTK_OBJECT(GTK_COMBO(mCombo)->popwin),
+                     "unmap",
+                     GTK_SIGNAL_FUNC(UnmapSignal),
+                     this);
+
+  gtk_container_add(GTK_CONTAINER(mWidget), mCombo);
+
+  return NS_OK;
+}
+
+void
+nsComboBox::OnDestroySignal(GtkWidget* aGtkWidget)
+{
+  if (aGtkWidget == mCombo) {
+    mCombo = nsnull;
+  }
+  else {
+    nsWidget::OnDestroySignal(aGtkWidget);
+  }
+}
+
+gint
+nsComboBox::UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo)
+{
+  if (!aCombo) return PR_FALSE;
+  aCombo->OnUnmapSignal(aGtkWidget);
+  return PR_TRUE;
+}
+
+void
+nsComboBox::OnUnmapSignal(GtkWidget * aWidget)
+{
+  if (!aWidget) return;
+
+  // Generate a NS_CONTROL_CHANGE event and send it to the frame
+  nsGUIEvent event;
+  event.eventStructType = NS_GUI_EVENT;
+  nsPoint point(0,0);
+  InitEvent(event, NS_CONTROL_CHANGE, &point);
+  DispatchWindowEvent(&event);
+}
+
+//-------------------------------------------------------------------------
+//
+// Get handle for style
+//
+//-------------------------------------------------------------------------
+/*virtual*/
+void nsComboBox::SetFontNative(GdkFont *aFont)
+{
+  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
+  // gtk_style_copy ups the ref count of the font
+  gdk_font_unref (style->font);
+  
+  style->font = aFont;
+  gdk_font_ref(style->font);
+  
+  gtk_widget_set_style(GTK_BIN (mWidget)->child, style);
+  
+  gtk_style_unref(style);
+}

mozilla/widget/src/gtk/nsComboBox.h

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsComboBox_h__
+#define nsComboBox_h__
+
+#include "nsWidget.h"
+#include "nsIComboBox.h"
+
+/**
+ * Native GTK+ Listbox wrapper
+ */
+
+class nsComboBox : public nsWidget,
+                   public nsIListWidget,
+                   public nsIComboBox
+{
+
+public:
+  nsComboBox();
+  virtual ~nsComboBox();
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIComboBox interface
+  NS_IMETHOD      AddItemAt(nsString &aItem, PRInt32 aPosition);
+  virtual PRInt32 FindItem(nsString &aItem, PRInt32 aStartPos);
+  virtual PRInt32 GetItemCount();
+  virtual PRBool  RemoveItemAt(PRInt32 aPosition);
+  virtual PRBool  GetItemAt(nsString& anItem, PRInt32 aPosition);
+  NS_IMETHOD      GetSelectedItem(nsString& aItem);
+  virtual PRInt32 GetSelectedIndex();
+  NS_IMETHOD      SelectItem(PRInt32 aPosition);
+  NS_IMETHOD      Deselect() ;
+
+  // nsIComboBox interface
+  NS_IMETHOD      SetMultipleSelection(PRBool aMultipleSelections);
+  PRInt32         GetSelectedCount();
+  NS_IMETHOD      GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
+
+  virtual void SetFontNative(GdkFont *aFont);
+
+protected:
+  NS_IMETHOD  CreateNative(GtkObject *parentWindow);
+  virtual void InitCallbacks(char * aName = nsnull);
+  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
+  virtual void OnUnmapSignal(GtkWidget* aWidget);
+  static gint UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo);
+
+  GtkWidget  *mCombo;  /* workaround for gtkcombo bug */
+  GList *mItems;
+  PRBool  mMultiSelect;
+  int     mNumItems;
+};
+
+#endif // nsComboBox_h__

mozilla/widget/src/gtk/nsContextMenu.cpp

@@ -0,0 +1,744 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "nsContextMenu.h"
+#include "nsIComponentManager.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMNode.h"
+#include "nsIMenuBar.h"
+#include "nsIMenuItem.h"
+#include "nsIMenuListener.h"
+#include "nsString.h"
+#include "nsGtkEventHandler.h"
+#include "nsCOMPtr.h"
+#include "nsWidgetsCID.h"
+
+static NS_DEFINE_CID(kMenuCID,             NS_MENU_CID);
+static NS_DEFINE_CID(kMenuItemCID,         NS_MENUITEM_CID);
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+//-------------------------------------------------------------------------
+nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (NULL == aInstancePtr) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  *aInstancePtr = NULL;
+
+  if (aIID.Equals(nsIMenu::GetIID())) {
+    *aInstancePtr = (void*)(nsIMenu*) this;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(kISupportsIID)) {
+    *aInstancePtr = (void*)(nsISupports*)(nsIMenu*)this;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(nsIMenuListener::GetIID())) {
+    *aInstancePtr = (void*)(nsIMenuListener*)this;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  return NS_NOINTERFACE;
+}
+
+//-------------------------------------------------------------------------
+NS_IMPL_ADDREF(nsContextMenu)
+NS_IMPL_RELEASE(nsContextMenu)
+
+//-------------------------------------------------------------------------
+//
+// nsContextMenu constructor
+//
+//-------------------------------------------------------------------------
+nsContextMenu::nsContextMenu()
+{
+  NS_INIT_REFCNT();
+  mNumMenuItems  = 0;
+  mMenu          = nsnull;
+  mParent        = nsnull;
+  mListener      = nsnull;
+  mConstructCalled = PR_FALSE;
+  
+  mDOMNode       = nsnull;
+  mWebShell      = nsnull;
+  mDOMElement    = nsnull;
+
+  mAlignment      = "topleft";
+  mAnchorAlignment = "none";
+}
+
+//-------------------------------------------------------------------------
+//
+// nsContextMenu destructor
+//
+//-------------------------------------------------------------------------
+nsContextMenu::~nsContextMenu()
+{
+
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Create the proper widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::Create(nsISupports *aParent,
+                                const nsString& anAlignment,
+                                const nsString& anAnchorAlignment)
+{
+  if(aParent)
+  {
+    nsIWidget *parent = nsnull;
+    aParent->QueryInterface(nsIWidget::GetIID(), (void**) &parent);
+    if(parent)
+    {
+      mParent = parent;
+      NS_RELEASE(parent);
+    }
+  }
+
+  mAlignment       = anAlignment;
+  mAnchorAlignment = anAnchorAlignment;
+
+  mMenu = gtk_menu_new();
+
+  gtk_signal_connect (GTK_OBJECT (mMenu), "map",
+                      GTK_SIGNAL_FUNC(menu_map_handler),
+                      this);
+  gtk_signal_connect (GTK_OBJECT (mMenu), "unmap",
+                      GTK_SIGNAL_FUNC(menu_unmap_handler),
+                      this);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::GetParent(nsISupports*& aParent)
+{
+  aParent = nsnull;
+  if (nsnull != mParent) {
+    return mParent->QueryInterface(kISupportsIID,
+                                   (void**)&aParent);
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
+{
+  if(aItem)
+  {
+    nsIMenuItem * menuitem = nsnull;
+    aItem->QueryInterface(nsIMenuItem::GetIID(),
+                          (void**)&menuitem);
+    if(menuitem)
+    {
+      AddMenuItem(menuitem); // nsMenu now owns this
+      NS_RELEASE(menuitem);
+    }
+    else
+    {
+      nsIMenu * menu = nsnull;
+      aItem->QueryInterface(nsIMenu::GetIID(),
+                            (void**)&menu);
+      if(menu)
+      {
+        AddMenu(menu); // nsMenu now owns this
+        NS_RELEASE(menu);
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddMenuItem(nsIMenuItem * aMenuItem)
+{
+  GtkWidget *widget;
+  void      *voidData;
+  
+  aMenuItem->GetNativeData(voidData);
+  widget = GTK_WIDGET(voidData);
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
+
+  // XXX add aMenuItem to internal data structor list
+  // Need to be adding an nsISupports *, not nsIMenuItem *
+  nsISupports * supports = nsnull;
+  aMenuItem->QueryInterface(kISupportsIID,
+                            (void**)&supports);
+  {
+    mMenuItemVoidArray.AppendElement(supports);
+    mNumMenuItems++;
+  }
+  
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddMenu(nsIMenu * aMenu)
+{
+  nsString Label;
+  GtkWidget *newmenu=nsnull;
+  char *labelStr;
+  void *voidData=NULL;
+  
+  aMenu->GetLabel(Label);
+  labelStr = Label.ToNewCString();
+
+  // Create nsMenuItem
+  nsIMenuItem * pnsMenuItem = nsnull;
+  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
+                                                   nsnull,
+                                                   nsIMenuItem::GetIID(),
+                                                   (void**)&pnsMenuItem);
+  if (NS_OK == rv) {
+    nsISupports * supports = nsnull;
+    QueryInterface(kISupportsIID, (void**) &supports);
+    pnsMenuItem->Create(supports, labelStr, PR_FALSE); //PR_TRUE); 
+    NS_RELEASE(supports);               
+    
+    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
+    AddItem(supports); // Parent should now own menu item
+    NS_RELEASE(supports);
+          
+    void * menuitem = nsnull;
+    pnsMenuItem->GetNativeData(menuitem);
+  
+    voidData = NULL;
+    aMenu->GetNativeData(&voidData);
+    newmenu = GTK_WIDGET(voidData);
+
+    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), newmenu);
+  
+    NS_RELEASE(pnsMenuItem);
+  } 
+
+  nsCRT::free(labelStr);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddSeparator() 
+{
+  // Create nsMenuItem
+  nsIMenuItem * pnsMenuItem = nsnull;
+  nsresult rv = nsComponentManager::CreateInstance(
+    kMenuItemCID, nsnull, nsIMenuItem::GetIID(), (void**)&pnsMenuItem);
+  if (NS_OK == rv) {
+    nsString tmp = "separator";
+    nsISupports * supports = nsnull;
+    QueryInterface(kISupportsIID, (void**) &supports);
+    pnsMenuItem->Create(supports, tmp, PR_TRUE);  
+    NS_RELEASE(supports);
+    
+    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
+    AddItem(supports); // Parent should now own menu item
+    NS_RELEASE(supports); 
+          
+    NS_RELEASE(pnsMenuItem);
+  } 
+  
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::GetItemCount(PRUint32 &aCount)
+{
+  // this should be right.. does it need to be +1 ?
+  aCount = g_list_length(GTK_MENU_SHELL(mMenu)->children);
+  //g_print("nsMenu::GetItemCount = %i\n", aCount);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::GetItemAt(const PRUint32 aCount, nsISupports *& aMenuItem)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::InsertItemAt(const PRUint32 aCount, nsISupports * aMenuItem)
+{
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::InsertSeparator(const PRUint32 aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::RemoveItem(const PRUint32 aCount)
+{
+#if 0
+  // this may work here better than Removeall(), but i'm not sure how to test this one
+  nsISupports *item = mMenuItemVoidArray[aPos];
+  delete item;
+  mMenuItemVoidArray.RemoveElementAt(aPos);
+#endif
+  /*
+  gtk_menu_shell_remove (GTK_MENU_SHELL (mMenu), item);
+
+  nsCRT::free(labelStr);
+
+  voidData = NULL;
+
+  aMenu->GetNativeData(&voidData);
+  newmenu = GTK_WIDGET(voidData);
+
+  gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
+  */
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::RemoveAll()
+{
+  //g_print("nsMenu::RemoveAll()\n");
+#undef DEBUG_pavlov
+#ifdef DEBUG_pavlov
+  // this doesn't work quite right, but this is about all that should really be needed
+  int i=0;
+  nsIMenu *menu = nsnull;
+  nsIMenuItem *menuitem = nsnull;
+  nsISupports *item = nsnull;
+
+  for (i=mMenuItemVoidArray.Count(); i>0; i--)
+  {
+    item = (nsISupports*)mMenuItemVoidArray[i-1];
+
+    if(nsnull != item)
+    {
+      if (NS_OK == item->QueryInterface(nsIMenuItem::GetIID(), (void**)&menuitem))
+      {
+        // we do this twice because we have to do it once for QueryInterface,
+        // then we want to get rid of it.
+        // g_print("remove nsMenuItem\n");
+        NS_RELEASE(menuitem);
+        NS_RELEASE(item);
+        menuitem = nsnull;
+      } else if (NS_OK == item->QueryInterface(nsIMenu::GetIID(), (void**)&menu)) {
+#ifdef NOISY_MENUS
+        g_print("remove nsMenu\n");
+#endif
+        NS_RELEASE(menu);
+        NS_RELEASE(item);
+        menu = nsnull;
+      }
+      // mMenuItemVoidArray.RemoveElementAt(i-1);
+    }
+  }
+  mMenuItemVoidArray.Clear();
+
+  return NS_OK;
+#else
+  for (int i = mMenuItemVoidArray.Count(); i > 0; i--) {
+    if(nsnull != mMenuItemVoidArray[i-1]) {
+      nsIMenuItem * menuitem = nsnull;
+      ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenuItem::GetIID(),
+                                                              (void**)&menuitem);
+      if(menuitem) {
+        void *gtkmenuitem = nsnull;
+        menuitem->GetNativeData(gtkmenuitem);
+        if (gtkmenuitem) {
+          gtk_widget_ref(GTK_WIDGET(gtkmenuitem));
+          //gtk_widget_destroy(GTK_WIDGET(gtkmenuitem));
+          g_print("%p, %p\n",
+                  GTK_WIDGET(GTK_CONTAINER(GTK_MENU_SHELL(GTK_MENU(mMenu)))),
+                  GTK_WIDGET(GTK_WIDGET(gtkmenuitem)->parent));
+          gtk_container_remove(GTK_CONTAINER(GTK_MENU_SHELL(GTK_MENU(mMenu))),
+                               GTK_WIDGET(gtkmenuitem));
+        }
+ 
+      } else {
+ 
+        nsIMenu * menu= nsnull;
+        ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(),
+                                                                (void**)&menu);
+        if(menu)
+          {
+            void * gtkmenu = nsnull;
+            menu->GetNativeData(&gtkmenu);
+ 
+            if(gtkmenu){
+              g_print("nsMenu::RemoveAll() trying to remove nsMenu");
+ 
+              //gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
+            }
+          }
+ 
+      }
+    }
+  }
+//g_print("end RemoveAll\n");
+  return NS_OK;
+#endif
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::GetNativeData(void ** aData)
+{
+  *aData = (void *)mMenu;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddMenuListener(nsIMenuListener * aMenuListener)
+{
+  mListener = aMenuListener;
+  NS_ADDREF(mListener);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::RemoveMenuListener(nsIMenuListener * aMenuListener)
+{
+  if (aMenuListener == mListener) {
+    NS_IF_RELEASE(mListener);
+  }
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+// nsIMenuListener interface
+//-------------------------------------------------------------------------
+nsEventStatus nsContextMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent)
+{
+  if (nsnull != mListener) {
+    mListener->MenuSelected(aMenuEvent);
+  }
+  return nsEventStatus_eIgnore;
+}
+
+void menu_popup_position(GtkMenu *menu,
+                         gint *x,
+                         gint *y,
+                         gpointer data)
+{
+  nsContextMenu *cm = (nsContextMenu*)data;
+  *x = cm->GetX();
+  *y = cm->GetY();
+}
+
+nsEventStatus nsContextMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
+{
+  MenuConstruct(aMenuEvent,
+                mParent,
+                mDOMNode,
+                mWebShell);
+
+  //GtkWidget *parent = GTK_WIDGET(mParent->GetNativeData(NS_NATIVE_WIDGET));
+  gtk_menu_popup (GTK_MENU(mMenu),
+                  (GtkWidget*)nsnull, (GtkWidget*)nsnull,
+                  menu_popup_position,
+                  this, 1, GDK_CURRENT_TIME);
+  /*
+  if (nsnull != mListener) {
+    mListener->MenuSelected(aMenuEvent);
+  }
+  */
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsIMenuItem * nsContextMenu::FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId)
+{
+  return nsnull;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsContextMenu::MenuDeselected(const nsMenuEvent & aMenuEvent)
+{
+  if (nsnull != mListener) {
+    mListener->MenuDeselected(aMenuEvent);
+  }
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsContextMenu::MenuConstruct(const nsMenuEvent &aMenuEvent,
+                                           nsIWidget         *aParentWindow, 
+                                           void              *menuNode,
+                                           void              *aWebShell)
+{
+  //g_print("nsMenu::MenuConstruct called \n");
+  if(menuNode){
+    SetDOMNode((nsIDOMNode*)menuNode);
+  }
+  
+  if(!aWebShell){
+    aWebShell = mWebShell;
+  }
+
+  // First open the menu.
+  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
+  if (domElement)
+    domElement->SetAttribute("open", "true");
+
+   // Begin menuitem inner loop
+    nsCOMPtr<nsIDOMNode> menuitemNode;
+    ((nsIDOMNode*)mDOMNode)->GetFirstChild(getter_AddRefs(menuitemNode));
+ 
+    unsigned short menuIndex = 0;
+
+    while (menuitemNode) {
+      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
+      if (menuitemElement) {
+        nsString menuitemNodeType;
+        nsString menuitemName;
+        menuitemElement->GetNodeName(menuitemNodeType);
+        if (menuitemNodeType.Equals("menuitem")) {
+          // LoadMenuItem
+          LoadMenuItem(this,
+                       menuitemElement,
+                       menuitemNode,
+                       menuIndex,
+                       (nsIWebShell*)aWebShell);
+        } else if (menuitemNodeType.Equals("separator")) {
+          AddSeparator();
+        } else if (menuitemNodeType.Equals("menu")) {
+          // Load a submenu
+          LoadSubMenu(this, menuitemElement, menuitemNode);
+        }
+      }
+      
+      ++menuIndex;
+      
+      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
+      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
+    } // end menu item innner loop
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsContextMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  // Close the node.
+  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
+  if (domElement)
+    domElement->RemoveAttribute("open");
+
+  //g_print("nsMenu::MenuDestruct called \n");
+  mConstructCalled = PR_FALSE;
+  RemoveAll();
+  return nsEventStatus_eIgnore;
+}
+
+//----------------------------------------
+void nsContextMenu::LoadMenuItem(nsIMenu        *pParentMenu,
+                                 nsIDOMElement  *menuitemElement,
+                                 nsIDOMNode     *menuitemNode,
+                                 unsigned short  menuitemIndex,
+                                 nsIWebShell    *aWebShell)
+{
+  static const char* NS_STRING_TRUE = "true";
+  nsString disabled;
+  nsString menuitemName;
+  nsString menuitemCmd;
+
+  menuitemElement->GetAttribute(nsAutoString("disabled"), disabled);
+  menuitemElement->GetAttribute(nsAutoString("name"), menuitemName);
+  menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
+      
+  // Create nsMenuItem
+  nsIMenuItem * pnsMenuItem = nsnull;
+  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
+                                                   nsnull, 
+                                                   nsIMenuItem::GetIID(), 
+                                                   (void**)&pnsMenuItem);
+  if (NS_OK == rv) {
+    pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
+                     
+    nsISupports * supports = nsnull;
+    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
+    pParentMenu->AddItem(supports); // Parent should now own menu item
+    NS_RELEASE(supports);
+            
+    if(disabled == NS_STRING_TRUE) {
+      pnsMenuItem->SetEnabled(PR_FALSE);
+    }
+  
+    // Create MenuDelegate - this is the intermediator inbetween 
+    // the DOM node and the nsIMenuItem
+    // The nsWebShellWindow wacthes for Document changes and then notifies the 
+    // the appropriate nsMenuDelegate object
+    nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(menuitemNode));
+    if (!domElement) {
+      //return NS_ERROR_FAILURE;
+		return;
+    }
+    
+    nsAutoString cmdAtom("onclick");
+    nsString cmdName;
+
+    domElement->GetAttribute(cmdAtom, cmdName);
+
+    pnsMenuItem->SetCommand(cmdName);
+   // DO NOT use passed in webshell because of messed up windows dynamic loading
+      // code. 
+    pnsMenuItem->SetWebShell(mWebShell);
+    pnsMenuItem->SetDOMElement(domElement);
+
+    NS_RELEASE(pnsMenuItem);
+    
+  } 
+  return;
+}
+
+//----------------------------------------
+void nsContextMenu::LoadSubMenu(nsIMenu         *pParentMenu,
+                                nsIDOMElement   *menuElement,
+                                nsIDOMNode      *menuNode)
+{
+  nsString menuName;
+  menuElement->GetAttribute(nsAutoString("name"), menuName);
+  //printf("Creating Menu [%s] \n", menuName.ToNewCString()); // this leaks
+
+  // Create nsMenu
+  nsIMenu * pnsMenu = nsnull;
+  nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
+                                                   nsnull,
+                                                   nsIMenu::GetIID(),
+                                                   (void**)&pnsMenu);
+  if (NS_OK == rv) {
+    // Call Create
+    nsISupports * supports = nsnull;
+    pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
+    pnsMenu->Create(supports, menuName);
+    NS_RELEASE(supports); // Balance QI
+
+    // Set nsMenu Name
+    pnsMenu->SetLabel(menuName); 
+
+    supports = nsnull;
+    pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
+    pParentMenu->AddItem(supports); // parent takes ownership
+    NS_RELEASE(supports);
+
+    pnsMenu->SetWebShell(mWebShell);
+    pnsMenu->SetDOMNode(menuNode);
+
+    /*
+    // Begin menuitem inner loop
+    unsigned short menuIndex = 0;
+
+    nsCOMPtr<nsIDOMNode> menuitemNode;
+    menuNode->GetFirstChild(getter_AddRefs(menuitemNode));
+    while (menuitemNode) {
+      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
+      if (menuitemElement) {
+        nsString menuitemNodeType;
+        menuitemElement->GetNodeName(menuitemNodeType);
+
+#ifdef DEBUG_saari
+        printf("Type [%s] %d\n", menuitemNodeType.ToNewCString(), menuitemNodeType.Equals("separator"));
+#endif
+
+        if (menuitemNodeType.Equals("menuitem")) {
+          // Load a menuitem
+          LoadMenuItem(pnsMenu, menuitemElement, menuitemNode, menuIndex, mWebShell);
+        } else if (menuitemNodeType.Equals("separator")) {
+          pnsMenu->AddSeparator();
+        } else if (menuitemNodeType.Equals("menu")) {
+          // Add a submenu
+          LoadSubMenu(pnsMenu, menuitemElement, menuitemNode);
+        }
+      }
+	  ++menuIndex;
+      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
+      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
+    } // end menu item innner loop
+    */
+  }     
+}
+
+//----------------------------------------
+void nsContextMenu::LoadMenuItem(nsIContextMenu *pParentMenu,
+                                 nsIDOMElement  *menuitemElement,
+                                 nsIDOMNode     *menuitemNode,
+                                 unsigned short  menuitemIndex,
+                                 nsIWebShell    *aWebShell)
+{
+
+}
+
+//----------------------------------------
+void nsContextMenu::LoadSubMenu(nsIContextMenu  *pParentMenu,
+                                nsIDOMElement   *menuElement,
+                                nsIDOMNode      *menuNode)
+{
+
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::SetLocation(PRInt32 aX, PRInt32 aY)
+{
+  mX = aX;
+  mY = aY;
+  return NS_OK;
+}
+
+
+// local methods
+gint nsContextMenu::GetX(void)
+{
+  return mX;
+}
+
+gint nsContextMenu::GetY(void)
+{
+  return mY;
+}
+// end silly local methods
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::SetDOMNode(nsIDOMNode *aMenuNode)
+{
+  mDOMNode = aMenuNode;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::SetDOMElement(nsIDOMElement *aMenuElement)
+{
+  mDOMElement = aMenuElement;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::SetWebShell(nsIWebShell *aWebShell)
+{
+  mWebShell = aWebShell;
+  return NS_OK;
+}

mozilla/widget/src/gtk/nsContextMenu.h

@@ -0,0 +1,139 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsContextMenu_h__
+#define nsContextMenu_h__
+
+#include "nsIContextMenu.h"
+#include "nsISupportsArray.h"
+#include "nsVoidArray.h"
+
+#include "nsIDOMElement.h"
+#include "nsIWebShell.h"
+
+class nsIMenuListener;
+
+/**
+ * Native Win32 button wrapper
+ */
+
+class nsContextMenu : public nsIContextMenu, public nsIMenuListener
+{
+
+public:
+  nsContextMenu();
+  virtual ~nsContextMenu();
+
+  NS_DECL_ISUPPORTS
+  
+  //nsIMenuListener interface
+  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent,
+                              nsIWidget         * aParentWindow, 
+                              void              * menubarNode,
+                              void              * aWebShell);
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
+
+  // nsIMenu Methods
+  NS_IMETHOD Create(nsISupports * aParent,
+                    const nsString& anAlignment,
+                    const nsString& aAnchorAlign);
+  NS_IMETHOD GetParent(nsISupports *&aParent);
+
+  NS_IMETHOD AddItem(nsISupports * aItem);
+
+  NS_IMETHOD AddSeparator();
+  NS_IMETHOD GetItemCount(PRUint32 &aCount);
+  NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem);
+  NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem);
+  NS_IMETHOD RemoveItem(const PRUint32 aPos);
+  NS_IMETHOD RemoveAll();
+  NS_IMETHOD GetNativeData(void** aData);
+
+  NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
+  NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
+
+  //
+  NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
+  NS_IMETHOD AddMenu(nsIMenu * aMenu);
+  NS_IMETHOD InsertSeparator(const PRUint32 aCount);
+
+  NS_IMETHOD SetDOMNode(nsIDOMNode * menuNode);
+  NS_IMETHOD SetDOMElement(nsIDOMElement * menuElement);
+  NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
+  NS_IMETHOD SetLocation(PRInt32 aX, PRInt32 aY);
+
+  gint GetX(void);
+  gint GetY(void);
+
+
+protected:
+  nsIMenuBar * GetMenuBar(nsIMenu * aMenu);
+  nsIWidget *  GetParentWidget();
+  char* GetACPString(nsString& aStr);
+
+  void LoadMenuItem(nsIMenu       * pParentMenu,
+                    nsIDOMElement * menuitemElement,
+                    nsIDOMNode    * menuitemNode,
+                    unsigned short  menuitemIndex,
+                    nsIWebShell   * aWebShell);
+  
+  void LoadSubMenu(nsIMenu       * pParentMenu,
+                   nsIDOMElement * menuElement,
+                   nsIDOMNode    * menuNode);
+
+  void LoadMenuItem(nsIContextMenu * pParentMenu,
+                    nsIDOMElement  * menuitemElement,
+                    nsIDOMNode     * menuitemNode,
+                    unsigned short   menuitemIndex,
+                    nsIWebShell    * aWebShell);
+  
+  void LoadSubMenu(nsIContextMenu * pParentMenu,
+                   nsIDOMElement  * menuElement,
+                   nsIDOMNode     * menuNode);
+
+  nsIMenuItem * FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId);
+
+  nsString   mLabel;
+  PRUint32   mNumMenuItems;
+  GtkWidget  *mMenu;
+  
+  nsVoidArray mMenuItemVoidArray;
+
+  nsIWidget  *mParent;
+  nsIMenuListener * mListener;
+  
+  PRBool mConstructCalled;
+  nsIDOMNode    * mDOMNode;
+  nsIWebShell   * mWebShell;
+  nsIDOMElement * mDOMElement;
+
+  nsString        mAlignment;
+  nsString        mAnchorAlignment;
+
+  PRInt32         mX;
+  PRInt32         mY;
+};
+
+#endif // nsContextMenu_h__

mozilla/widget/src/gtk/nsDragService.cpp

@@ -0,0 +1,592 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsDragService.h"
+
+#include "nsITransferable.h"
+#include "nsString.h"
+#include "nsClipboard.h"
+#include "nsIRegion.h"
+#include "nsVoidArray.h"
+#include "nsISupportsPrimitives.h"
+#include "nsPrimitiveHelpers.h"
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+
+#include "nsWidgetsCID.h"
+
+NS_IMPL_ADDREF_INHERITED(nsDragService, nsBaseDragService)
+NS_IMPL_RELEASE_INHERITED(nsDragService, nsBaseDragService)
+NS_IMPL_QUERY_INTERFACE2(nsDragService, nsIDragService, nsIDragSession)
+
+#define DEBUG_DRAG 1
+
+//-------------------------------------------------------------------------
+//
+// DragService constructor
+//
+//-------------------------------------------------------------------------
+nsDragService::nsDragService()
+{
+  NS_INIT_REFCNT();
+  mWidget = nsnull;
+  mNumFlavors = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// DragService destructor
+//
+//-------------------------------------------------------------------------
+nsDragService::~nsDragService()
+{
+}
+
+enum {
+  TARGET_STRING,
+  TARGET_ROOTWIN
+};
+
+static GtkTargetEntry target_table[] = {
+  { "STRING",     0, TARGET_STRING },
+  { "text/plain", 0, TARGET_STRING },
+  { "application/x-rootwin-drop", 0, TARGET_ROOTWIN }
+};
+
+static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
+
+
+NS_IMETHODIMP nsDragService::StartDragSession()
+{
+  printf("nsDragService::StartDragSession()\n");
+  nsBaseDragService::StartDragSession();
+  
+  /*
+  gtk_drag_source_set(mWidget,
+                      GDK_MODIFIER_MASK,
+                      targetlist,
+                      mNumFlavors,
+                      action);
+  */
+  gtk_drag_source_set(mWidget,
+                      GDK_MODIFIER_MASK,
+                      target_table,
+                      n_targets,
+                      mActionType);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDragService::EndDragSession()
+{
+  printf("nsDragService::EndDragSession()\n");
+  nsBaseDragService::EndDragSession();
+  
+  gtk_drag_source_unset(mWidget);
+
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::InvokeDragSession (nsISupportsArray *aTransferableArray,
+                                                nsIScriptableRegion *aRegion,
+                                                PRUint32 aActionType)
+{
+  mWidget = gtk_get_event_widget(gtk_get_current_event());
+
+  // add the flavors from the transferables. Cache this array for the send data proc
+  GtkTargetList *targetlist = RegisterDragItemsAndFlavors(aTransferableArray);
+
+  switch (aActionType)
+  {
+    case DRAGDROP_ACTION_NONE:
+      mActionType = GDK_ACTION_DEFAULT;
+      break;
+    case DRAGDROP_ACTION_COPY:
+      mActionType = GDK_ACTION_COPY;
+      break;
+    case DRAGDROP_ACTION_MOVE:
+      mActionType = GDK_ACTION_MOVE;
+      break;
+    case DRAGDROP_ACTION_LINK:
+      mActionType = GDK_ACTION_LINK;
+      break;
+  }
+
+  StartDragSession();
+
+  // XXX 3rd param ???    &                last param should be a real event...
+  gtk_drag_begin(mWidget, targetlist, mActionType, 1, gtk_get_current_event());
+
+
+
+
+#if 0  
+  // we have to synthesize the native event because we may be called from JavaScript
+  // through XPConnect. In that case, we only have a DOM event and no way to
+  // get to the native event. As a consequence, we just always fake it.
+  Point globalMouseLoc;
+  ::GetMouse(&globalMouseLoc);
+  ::LocalToGlobal(&globalMouseLoc);
+  WindowPtr theWindow = nsnull;
+  if ( ::FindWindow(globalMouseLoc, &theWindow) != inContent ) {
+    // debugging sanity check
+    #ifdef NS_DEBUG
+    DebugStr("\pAbout to start drag, but FindWindow() != inContent; g");
+    #endif
+  }  
+  EventRecord theEvent;
+  theEvent.what = mouseDown;
+  theEvent.message = reinterpret_cast<UInt32>(theWindow);
+  theEvent.when = 0;
+  theEvent.where = globalMouseLoc;
+  theEvent.modifiers = 0;
+  
+  RgnHandle theDragRgn = ::NewRgn();
+  BuildDragRegion ( aDragRgn, globalMouseLoc, theDragRgn );
+
+  // register drag send proc which will call us back when asked for the actual
+  // flavor data (instead of placing it all into the drag manager)
+  ::SetDragSendProc ( theDragRef, sDragSendDataUPP, this );
+
+  // start the drag. Be careful, mDragRef will be invalid AFTER this call (it is
+  // reset by the dragTrackingHandler).
+  ::TrackDrag ( theDragRef, &theEvent, theDragRgn );
+
+  // clean up after ourselves 
+  ::DisposeRgn ( theDragRgn );
+  result = ::DisposeDrag ( theDragRef );
+  NS_ASSERTION ( result == noErr, "Error disposing drag" );
+  mDragRef = 0L;
+  mDataItems = nsnull;
+
+  return NS_OK; 
+
+#endif
+
+
+
+
+  return NS_OK;
+}
+
+
+
+
+GtkTargetList *
+nsDragService::RegisterDragItemsAndFlavors(nsISupportsArray *inArray)
+{
+  unsigned int numDragItems = 0;
+  inArray->Count(&numDragItems);
+
+  GtkTargetList *targetlist;
+  targetlist = gtk_target_list_new(nsnull, numDragItems);
+
+  for (unsigned int i = 0; i < numDragItems; ++i)
+  {
+    nsCOMPtr<nsISupports> genericItem;
+    inArray->GetElementAt (i, getter_AddRefs(genericItem));
+    nsCOMPtr<nsITransferable> currItem (do_QueryInterface(genericItem));
+    if (currItem)
+    {
+      nsCOMPtr<nsISupportsArray> flavorList;
+      if (NS_SUCCEEDED(currItem->FlavorsTransferableCanExport(getter_AddRefs(flavorList))))
+      {
+        flavorList->Count (&mNumFlavors);
+        for (PRUint32 flavorIndex = 0; flavorIndex < mNumFlavors; ++flavorIndex)
+        {
+          nsCOMPtr<nsISupports> genericWrapper;
+          flavorList->GetElementAt ( flavorIndex, getter_AddRefs(genericWrapper) );
+          nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericWrapper) );
+          if ( currentFlavor )
+          {
+            nsXPIDLCString flavorStr;
+            currentFlavor->ToString ( getter_Copies(flavorStr) );
+
+            // register native flavors
+            GdkAtom atom = gdk_atom_intern(flavorStr, PR_TRUE);
+            gtk_target_list_add(targetlist, atom, 1, atom);
+          }
+
+        } // foreach flavor in item              
+      } // if valid flavor list
+    } // if item is a transferable
+  } // foreach drag item
+
+  return targetlist;
+}
+
+
+/* return PR_TRUE if we have converted or PR_FALSE if we havn't and need to keep being called */
+PRBool nsDragService::DoConvert(GdkAtom type)
+{
+#ifdef DEBUG_DRAG
+  g_print("    nsDragService::DoRealConvert(%li)\n    {\n", type);
+#endif
+  int e = 0;
+  // Set a flag saying that we're blocking waiting for the callback:
+  mBlocking = PR_TRUE;
+
+  //
+  // ask X what kind of data we can get
+  //
+#ifdef DEBUG_DRAG
+  g_print("     Doing real conversion of atom type '%s'\n", gdk_atom_name(type));
+#endif
+  gtk_selection_convert(mWidget,
+                        GDK_SELECTION_PRIMARY,
+                        type,
+                        GDK_CURRENT_TIME);
+
+  // Now we need to wait until the callback comes in ...
+  // i is in case we get a runaway (yuck).
+#ifdef DEBUG_DRAG
+  printf("      Waiting for the callback... mBlocking = %d\n", mBlocking);
+#endif /* DEBUG_CLIPBOARD */
+  for (e=0; mBlocking == PR_TRUE && e < 1000; ++e)
+  {
+    gtk_main_iteration_do(PR_TRUE);
+  }
+
+#ifdef DEBUG_DRAG
+  g_print("    }\n");
+#endif
+
+  if (mSelectionData.length > 0)
+    return PR_TRUE;
+
+  return PR_FALSE;
+}
+
+#if 0
+
+/**
+ * Called when the data from a drag comes in (recieved from gdk_selection_convert)
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ * @param  aTime time the selection was requested
+ */
+void
+nsDragService::SelectionReceivedCB (GtkWidget        *aWidget,
+                                    GdkDragContext   *aContext,
+                                    gint              aX,
+                                    gint              aY,
+                                    GtkSelectionData *aSelectionData,
+                                    guint             aInfo,
+                                    guint             aTime)
+{
+#ifdef DEBUG_DRAG
+  printf("      nsDragService::SelectionReceivedCB\n      {\n");
+#endif
+  nsDragService *ds =(nsDragSession *)gtk_object_get_data(GTK_OBJECT(aWidget),
+                                                        "ds");
+  if (!cb)
+  {
+    g_print("no dragservice found.. this is bad.\n");
+    return;
+  }
+
+
+  ds->SelectionReceiver(aWidget, aSelectionData);
+#ifdef DEBUG_DRAG
+  g_print("      }\n");
+#endif
+}
+
+
+/**
+ * local method (called from nsClipboard::SelectionReceivedCB)
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ */
+void
+nsDragService::SelectionReceiver (GtkWidget *aWidget,
+                                GtkSelectionData *aSD)
+{
+  gint type;
+
+  mBlocking = PR_FALSE;
+
+  if (aSD->length < 0)
+  {
+    printf("        Error retrieving selection: length was %d\n",
+           aSD->length);
+    return;
+  }
+
+
+  switch (type)
+  {
+  case GDK_TARGET_STRING:
+  case TARGET_COMPOUND_TEXT:
+  case TARGET_TEXT_PLAIN:
+  case TARGET_TEXT_XIF:
+  case TARGET_TEXT_UNICODE:
+  case TARGET_TEXT_HTML:
+#ifdef DEBUG_CLIPBOARD
+    g_print("        Copying mSelectionData pointer -- ");
+#endif
+    mSelectionData = *aSD;
+    mSelectionData.data = g_new(guchar, aSD->length + 1);
+#ifdef DEBUG_CLIPBOARD
+    g_print("        Data = %s\n    Length = %i\n", aSD->data, aSD->length);
+#endif
+    memcpy(mSelectionData.data,
+           aSD->data,
+           aSD->length);
+    // Null terminate in case anyone cares,
+    // and so we can print the string for debugging:
+    mSelectionData.data[aSD->length] = '\0';
+    mSelectionData.length = aSD->length;
+    return;
+
+  default:
+    mSelectionData = *aSD;
+    mSelectionData.data = g_new(guchar, aSD->length + 1);
+    memcpy(mSelectionData.data,
+           aSD->data,
+           aSD->length);
+    mSelectionData.length = aSD->length;
+    return;
+  }
+}
+
+#endif
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::GetNumDropItems (PRUint32 * aNumItems)
+{
+  *aNumItems = 0;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::GetData (nsITransferable * aTransferable, PRUint32 anItem)
+{
+
+#ifdef DEBUG_DRAG
+  printf("nsClipboard::GetNativeClipboardData()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (!aTransferable) {
+    printf("  GetData: Transferable is null!\n");
+    return NS_ERROR_FAILURE;
+  }
+
+  // get flavor list that includes all acceptable flavors (including ones obtained through
+  // conversion)
+  nsCOMPtr<nsISupportsArray> flavorList;
+  nsresult errCode = aTransferable->FlavorsTransferableCanImport ( getter_AddRefs(flavorList) );
+  if ( NS_FAILED(errCode) )
+    return NS_ERROR_FAILURE;
+
+  // Walk through flavors and see which flavor matches the one being pasted:
+  PRUint32 cnt;
+  flavorList->Count(&cnt);
+  nsCAutoString foundFlavor;
+  for ( PRUint32 i = 0; i < cnt; ++i ) {
+    nsCOMPtr<nsISupports> genericFlavor;
+    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
+    nsCOMPtr<nsISupportsString> currentFlavor (do_QueryInterface(genericFlavor));
+    if ( currentFlavor ) {
+      nsXPIDLCString flavorStr;
+      currentFlavor->ToString(getter_Copies(flavorStr));
+      if (DoConvert(gdk_atom_intern(flavorStr, 1))) {
+        foundFlavor = flavorStr;
+        break;
+      }
+    }
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  Got the callback: '%s', %d\n",
+         mSelectionData.data, mSelectionData.length);
+#endif /* DEBUG_CLIPBOARD */
+
+  // We're back from the callback, no longer blocking:
+  mBlocking = PR_FALSE;
+
+  // 
+  // Now we have data in mSelectionData.data.
+  // We just have to copy it to the transferable.
+  // 
+
+#if 0  
+// pinkerton - we have the flavor already from above, so we don't need
+// to re-derrive it.
+  nsString *name = new nsString((const char*)gdk_atom_name(mSelectionData.type));
+  int format = GetFormat(*name);
+  df->SetString((const char*)gdk_atom_name(sSelTypes[format]));
+#endif
+
+  nsCOMPtr<nsISupports> genericDataWrapper;
+  nsPrimitiveHelpers::CreatePrimitiveForData ( foundFlavor, mSelectionData.data, mSelectionData.length, getter_AddRefs(genericDataWrapper) );
+  aTransferable->SetTransferData(foundFlavor,
+                                 genericDataWrapper,
+                                 mSelectionData.length);
+
+  //delete name;
+  
+  // transferable is now copying the data, so we can free it.
+  //  g_free(mSelectionData.data);
+  mSelectionData.data = nsnull;
+  mSelectionData.length = 0;
+
+  gtk_drag_source_unset(mWidget);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval)
+{
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::GetCurrentSession (nsIDragSession **aSession)
+{
+  return NS_ERROR_FAILURE;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//-------------------------------------------------------------------------
+void  
+nsDragService::DragLeave (GtkWidget	       *widget,
+			                    GdkDragContext   *context,
+			                    guint             time)
+{
+  g_print("leave\n");
+  //gHaveDrag = PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+PRBool
+nsDragService::DragMotion(GtkWidget	       *widget,
+			                    GdkDragContext   *context,
+			                    gint              x,
+			                    gint              y,
+			                    guint             time)
+{
+  g_print("drag motion\n");
+  GtkWidget *source_widget;
+
+#if 0
+  if (!gHaveDrag) {
+      gHaveDrag = PR_TRUE;
+  }
+#endif
+
+  source_widget = gtk_drag_get_source_widget (context);
+  g_print("motion, source %s\n", source_widget ?
+	          gtk_type_name (GTK_OBJECT (source_widget)->klass->type) :
+	          "unknown");
+
+  gdk_drag_status (context, context->suggested_action, time);
+  
+  return PR_TRUE;
+}
+
+//-------------------------------------------------------------------------
+PRBool
+nsDragService::DragDrop(GtkWidget	       *widget,
+			                  GdkDragContext   *context,
+			                  gint              x,
+			                  gint              y,
+			                  guint             time)
+{
+  g_print("drop\n");
+  //gHaveDrag = PR_FALSE;
+
+  if (context->targets){
+    gtk_drag_get_data (widget, context, 
+			                 GPOINTER_TO_INT (context->targets->data), 
+			                 time);
+    return PR_TRUE;
+  }
+  
+  return PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+void  
+nsDragService::DragDataReceived  (GtkWidget          *widget,
+			                            GdkDragContext     *context,
+			                            gint                x,
+			                            gint                y,
+			                            GtkSelectionData   *data,
+			                            guint               info,
+			                            guint               time)
+{
+  if ((data->length >= 0) && (data->format == 8)) {
+    g_print ("Received \"%s\"\n", (gchar *)data->data);
+    gtk_drag_finish (context, PR_TRUE, PR_FALSE, time);
+    return;
+  }
+  
+  gtk_drag_finish (context, PR_FALSE, PR_FALSE, time);
+}
+  
+//-------------------------------------------------------------------------
+void  
+nsDragService::DragDataGet(GtkWidget          *widget,
+		                       GdkDragContext     *context,
+		                       GtkSelectionData   *selection_data,
+		                       guint               info,
+		                       guint               time,
+		                       gpointer            data)
+{
+  gtk_selection_data_set (selection_data,
+                          selection_data->target,
+                          8, (guchar *)"I'm Data!", 9);
+}
+
+//-------------------------------------------------------------------------
+void  
+nsDragService::DragDataDelete(GtkWidget          *widget,
+			                        GdkDragContext     *context,
+			                        gpointer            data)
+{
+  g_print ("Delete the data!\n");
+}

mozilla/widget/src/gtk/nsDragService.h

@@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsDragService_h__
+#define nsDragService_h__
+
+#include "nsBaseDragService.h"
+#include <gtk/gtk.h>
+
+
+/**
+ * Native GTK DragService wrapper
+ */
+
+class nsDragService : public nsBaseDragService
+{
+
+public:
+  nsDragService();
+  virtual ~nsDragService();
+  
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIDragService
+  NS_IMETHOD InvokeDragSession (nsISupportsArray * anArrayTransferables,
+                                nsIScriptableRegion * aRegion, PRUint32 aActionType);
+  NS_IMETHOD GetCurrentSession (nsIDragSession ** aSession);
+
+  // nsIDragSession
+  NS_IMETHOD GetData (nsITransferable * aTransferable, PRUint32 anItem);
+  NS_IMETHOD GetNumDropItems (PRUint32 * aNumItems);
+  NS_IMETHOD IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval);
+
+  NS_IMETHOD StartDragSession();
+  NS_IMETHOD EndDragSession();
+    
+
+  GtkTargetList *RegisterDragItemsAndFlavors(nsISupportsArray *inArray);
+
+protected:
+
+  PRBool DoConvert(GdkAtom type);
+
+  static PRBool gHaveDrag;
+
+  static void DragLeave(GtkWidget      *widget,
+                        GdkDragContext *context,
+                        guint           time);
+
+  static PRBool DragMotion(GtkWidget      *widget,
+                           GdkDragContext *context,
+                           gint            x,
+                           gint            y,
+                           guint           time);
+
+  static PRBool DragDrop(GtkWidget   *widget,
+                         GdkDragContext *context,
+                         gint            x,
+                         gint            y,
+                         guint            time);
+
+  static void DragDataReceived(GtkWidget        *widget,
+			                         GdkDragContext   *context,
+			                         gint              x,
+			                         gint              y,
+			                         GtkSelectionData *data,
+			                         guint             info,
+			                         guint             time);
+
+  static void DragDataGet(GtkWidget          *widget,
+		                      GdkDragContext     *context,
+		                      GtkSelectionData   *selection_data,
+		                      guint               info,
+		                      guint               time,
+		                      gpointer            data);
+
+  static void  DragDataDelete(GtkWidget          *widget,
+			                        GdkDragContext     *context,
+			                        gpointer            data);
+
+private:
+  GdkDragAction mActionType;
+  PRUint32 mNumFlavors;
+  GtkWidget *mWidget;
+  GdkDragContext *mDragContext;
+  GtkSelectionData mSelectionData;
+  PRBool mBlocking;
+};
+
+#endif // nsDragService_h__

mozilla/widget/src/gtk/nsFilePicker.cpp

@@ -0,0 +1,304 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsFilePicker.h"
+
+NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker)
+
+//-------------------------------------------------------------------------
+//
+// nsFilePicker constructor
+//
+//-------------------------------------------------------------------------
+nsFilePicker::nsFilePicker()
+{
+  NS_INIT_REFCNT();
+  mWidget = nsnull;
+  mDisplayDirectory = nsnull;
+  mFilterMenu = nsnull;
+  mOptionMenu = nsnull;
+  mNumberOfFilters = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsFilePicker destructor
+//
+//-------------------------------------------------------------------------
+nsFilePicker::~nsFilePicker()
+{
+  if (mFilterMenu)
+  {
+    GtkWidget *menu_item;
+    GList *list = g_list_first(GTK_MENU_SHELL(mFilterMenu)->children);
+
+    for (;list; list = list->next)
+    {
+      menu_item = GTK_WIDGET(list->data);
+      gchar *data = (gchar*)gtk_object_get_data(GTK_OBJECT(menu_item), "filters");
+      
+      if (data)
+        nsCRT::free(data);
+    }
+  }
+
+  gtk_widget_destroy(mWidget);
+}
+
+
+static void file_ok_clicked(GtkWidget *w, PRBool *ret)
+{
+  g_print("user hit ok\n");
+  *ret = PR_TRUE;
+  gtk_main_quit();
+}
+
+static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
+{
+  g_print("user hit cancel\n");
+  *ret = PR_FALSE;
+  gtk_main_quit();
+}
+
+static void filter_item_activated(GtkWidget *w, gpointer data)
+{
+  //  nsFilePicker *f = (nsFilePicker*)data;
+  gchar *foo = (gchar*)gtk_object_get_data(GTK_OBJECT(w), "filters");
+  g_print("filter_item_activated(): %s\n", foo);
+}
+
+//-------------------------------------------------------------------------
+//
+// Show - Display the file dialog
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
+{
+  NS_ENSURE_ARG_POINTER(retval);
+
+  PRBool ret;
+  if (mWidget) {
+    // make things shorter
+    GtkFileSelection *fs = GTK_FILE_SELECTION(mWidget);
+
+    if (mNumberOfFilters != 0)
+    {
+      gtk_option_menu_set_menu(GTK_OPTION_MENU(mOptionMenu), mFilterMenu);
+    }
+    else
+      gtk_widget_hide(mOptionMenu);
+
+#if 0
+    if (mDisplayDirectory)
+      gtk_file_selection_complete(fs, "/");
+#endif
+
+    //    gtk_window_set_modal(GTK_WINDOW(mWidget), PR_TRUE);
+    gtk_widget_show(mWidget);
+
+    // handle close, destroy, etc on the dialog
+    gtk_signal_connect(GTK_OBJECT(fs->ok_button), "clicked",
+                       GTK_SIGNAL_FUNC(file_ok_clicked),
+                       &ret);
+    gtk_signal_connect(GTK_OBJECT(fs->cancel_button), "clicked",
+                       GTK_SIGNAL_FUNC(file_cancel_clicked),
+                       &ret);
+    // start new loop.   ret is set in the above callbacks.
+    gtk_main();
+  }
+  else {
+    ret = PR_FALSE;
+  }
+
+  if (ret)
+    *retval = returnOK;
+  else
+    *retval = returnCancel;
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the list of filters
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsFilePicker::SetFilterList(PRInt32 aNumberOfFilters,
+                                          const PRUnichar **aTitles,
+                                          const PRUnichar **filters)
+{
+#if 0
+  GtkWidget *menu_item;
+
+  mNumberOfFilters  = aNumberOfFilters;
+  mTitles           = aTitles;
+  mFilters          = aFilters;
+
+  mFilterMenu = gtk_menu_new();
+
+  for(unsigned int i=0; i < aNumberOfFilters; i++)
+  {
+    // we need *.{htm, html, xul, etc}
+    char *foo = aTitles[i].ToNewCString();
+    char *filters = aFilters[i].ToNewCString();
+    printf("%20s %s\n", foo, filters);
+
+    menu_item = gtk_menu_item_new_with_label(nsAutoCString(aTitles[i]));
+
+    gtk_object_set_data(GTK_OBJECT(menu_item), "filters", filters);
+
+    gtk_signal_connect(GTK_OBJECT(menu_item),
+                       "activate",
+                       GTK_SIGNAL_FUNC(filter_item_activated),
+                       this);
+
+    gtk_menu_append(GTK_MENU(mFilterMenu), menu_item);
+    gtk_widget_show(menu_item);
+
+    nsCRT::free(foo);
+  }
+#endif
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsFilePicker::GetFile(nsIFileSpec **aFile)
+{
+  NS_ENSURE_ARG_POINTER(*aFile);
+  if (mWidget) {
+    gchar *fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION(mWidget));
+
+    nsCOMPtr<nsIFileSpec> fileSpec(do_CreateInstance("component://netscape/filespec"));
+    
+    NS_ENSURE_TRUE(fileSpec, NS_ERROR_FAILURE);
+
+    fileSpec->SetNativePath(fn);
+
+    *aFile = fileSpec;
+    NS_ADDREF(*aFile);
+  }
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::GetSelectedFilter(PRInt32 *aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+  *aType = mSelectedType;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the file + path
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::SetDefaultString(const PRUnichar *aString)
+{
+  if (mWidget) {
+    gtk_file_selection_set_filename(GTK_FILE_SELECTION(mWidget),
+                                    (const gchar*)nsAutoCString(aString));
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsFilePicker::GetDefaultString(PRUnichar **aString)
+{
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the display directory
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::SetDisplayDirectory(nsIFileSpec *aDirectory)
+{
+  mDisplayDirectory = aDirectory;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the display directory
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::GetDisplayDirectory(nsIFileSpec **aDirectory)
+{
+  *aDirectory = mDisplayDirectory;
+  NS_IF_ADDREF(*aDirectory);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsFilePicker::Create(nsIDOMWindow *aParent,
+                                   const PRUnichar *aTitle,
+                                   PRInt16 aMode)
+{
+  return nsBaseFilePicker::Create(aParent, aTitle, aMode);
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::CreateNative(nsIWidget *aParent,
+                                         const PRUnichar *aTitle,
+                                         PRInt16 aMode)
+{
+  mWidget = gtk_file_selection_new((const gchar *)nsAutoCString(aTitle));
+  gtk_signal_connect(GTK_OBJECT(mWidget),
+                     "destroy",
+                     GTK_SIGNAL_FUNC(DestroySignal),
+                     this);
+
+  gtk_button_box_set_layout(GTK_BUTTON_BOX(GTK_FILE_SELECTION(mWidget)->button_area), GTK_BUTTONBOX_SPREAD);
+
+  mOptionMenu = gtk_option_menu_new();
+
+  gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(mWidget)->main_vbox), mOptionMenu, PR_FALSE, PR_FALSE, 0);
+  gtk_widget_show(mOptionMenu);
+
+  // Hide the file column for the folder case.
+  if (aMode == nsIFilePicker::modeGetFolder) {
+    gtk_widget_hide((GTK_FILE_SELECTION(mWidget)->file_list)->parent);
+  }
+
+  return NS_OK;
+}
+
+gint
+nsFilePicker::DestroySignal(GtkWidget *  aGtkWidget,
+                            nsFilePicker* aWidget)
+{
+  aWidget->OnDestroySignal(aGtkWidget);
+  return TRUE;
+}
+
+void
+nsFilePicker::OnDestroySignal(GtkWidget* aGtkWidget)
+{
+  if (aGtkWidget == mWidget) {
+    mWidget = nsnull;
+  }
+}

mozilla/widget/src/gtk/nsFilePicker.h

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#ifndef nsFilePicker_h__
+#define nsFilePicker_h__
+
+#include "nsBaseFilePicker.h"
+
+#include <gtk/gtk.h>
+
+/**
+ * Native GTK FileSelector wrapper
+ */
+
+class nsFilePicker : public nsBaseFilePicker
+{
+public:
+  nsFilePicker(); 
+  virtual ~nsFilePicker();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIFILEPICKER
+
+protected:
+  /* method from nsBaseFilePicker */
+  NS_IMETHOD CreateNative(nsIWidget *aParent,
+                          const PRUnichar *aTitle,
+                          PRInt16 aMode);
+
+  static gint DestroySignal(GtkWidget *  aGtkWidget,
+                            nsFilePicker* aWidget);
+
+  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
+
+  GtkWidget		*mWidget;
+  GtkWidget   *mOptionMenu;
+  GtkWidget   *mFilterMenu;
+
+
+  PRUint32		    mNumberOfFilters;  
+  const nsString*	mTitles;
+  const nsString*	mFilters;
+  nsString		  mDefault;
+  nsIFileSpec  *mDisplayDirectory;
+  PRInt16       mSelectedType;
+};
+
+#endif // nsFilePicker_h__

mozilla/widget/src/gtk/nsFileWidget.cpp

@@ -0,0 +1,322 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsFileWidget.h"
+#include "nsIToolkit.h"
+
+NS_IMPL_ISUPPORTS1(nsFileWidget, nsIFileWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsFileWidget constructor
+//
+//-------------------------------------------------------------------------
+nsFileWidget::nsFileWidget() : nsIFileWidget()
+{
+  NS_INIT_REFCNT();
+  mWidget = nsnull;
+  mDisplayDirectory = nsnull;
+  mFilterMenu = nsnull;
+  mOptionMenu = nsnull;
+  mNumberOfFilters = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsFileWidget destructor
+//
+//-------------------------------------------------------------------------
+nsFileWidget::~nsFileWidget()
+{
+  if (mFilterMenu)
+  {
+    GtkWidget *menu_item;
+    GList *list = g_list_first(GTK_MENU_SHELL(mFilterMenu)->children);
+
+    for (;list; list = list->next)
+    {
+      menu_item = GTK_WIDGET(list->data);
+      gchar *data = (gchar*)gtk_object_get_data(GTK_OBJECT(menu_item), "filters");
+      
+      if (data)
+        nsCRT::free(data);
+    }
+  }
+
+  gtk_widget_destroy(mWidget);
+}
+
+
+static void file_ok_clicked(GtkWidget *w, PRBool *ret)
+{
+  g_print("user hit ok\n");
+  *ret = PR_TRUE;
+  gtk_main_quit();
+}
+
+static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
+{
+  g_print("user hit cancel\n");
+  *ret = PR_FALSE;
+  gtk_main_quit();
+}
+
+static void filter_item_activated(GtkWidget *w, gpointer data)
+{
+  //  nsFileWidget *f = (nsFileWidget*)data;
+  gchar *foo = (gchar*)gtk_object_get_data(GTK_OBJECT(w), "filters");
+  g_print("filter_item_activated(): %s\n", foo);
+}
+
+//-------------------------------------------------------------------------
+//
+// Show - Display the file dialog
+//
+//-------------------------------------------------------------------------
+PRBool nsFileWidget::Show()
+{
+  PRBool ret;
+  if (mWidget) {
+    // make things shorter
+    GtkFileSelection *fs = GTK_FILE_SELECTION(mWidget);
+
+    if (mNumberOfFilters != 0)
+    {
+      gtk_option_menu_set_menu(GTK_OPTION_MENU(mOptionMenu), mFilterMenu);
+    }
+    else
+      gtk_widget_hide(mOptionMenu);
+
+#if 0
+    if (mDisplayDirectory)
+      gtk_file_selection_complete(fs, "/");
+#endif
+
+    //    gtk_window_set_modal(GTK_WINDOW(mWidget), PR_TRUE);
+    gtk_widget_show(mWidget);
+
+    // handle close, destroy, etc on the dialog
+    gtk_signal_connect(GTK_OBJECT(fs->ok_button), "clicked",
+                       GTK_SIGNAL_FUNC(file_ok_clicked),
+                       &ret);
+    gtk_signal_connect(GTK_OBJECT(fs->cancel_button), "clicked",
+                       GTK_SIGNAL_FUNC(file_cancel_clicked),
+                       &ret);
+    // start new loop.   ret is set in the above callbacks.
+    gtk_main();
+  }
+  else {
+    ret = PR_FALSE;
+  }
+  return ret;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the list of filters
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsFileWidget::SetFilterList(PRUint32 aNumberOfFilters,
+                                          const nsString aTitles[],
+                                          const nsString aFilters[])
+{
+  GtkWidget *menu_item;
+
+  mNumberOfFilters  = aNumberOfFilters;
+  mTitles           = aTitles;
+  mFilters          = aFilters;
+
+  mFilterMenu = gtk_menu_new();
+
+  for(unsigned int i=0; i < aNumberOfFilters; i++)
+  {
+    // we need *.{htm, html, xul, etc}
+    char *foo = aTitles[i].ToNewCString();
+    char *filters = aFilters[i].ToNewCString();
+    printf("%20s %s\n", foo, filters);
+
+    menu_item = gtk_menu_item_new_with_label(nsAutoCString(aTitles[i]));
+
+    gtk_object_set_data(GTK_OBJECT(menu_item), "filters", filters);
+
+    gtk_signal_connect(GTK_OBJECT(menu_item),
+                       "activate",
+                       GTK_SIGNAL_FUNC(filter_item_activated),
+                       this);
+
+    gtk_menu_append(GTK_MENU(mFilterMenu), menu_item);
+    gtk_widget_show(menu_item);
+
+    nsCRT::free(foo);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP  nsFileWidget::GetFile(nsFileSpec& aFile)
+{
+  if (mWidget) {
+    gchar *fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION(mWidget));
+    aFile = fn; // Put the filename into the nsFileSpec instance.
+  }
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsFileWidget::GetSelectedType(PRInt16& theType)
+{
+  theType = mSelectedType;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the file + path
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsFileWidget::SetDefaultString(const nsString& aString)
+{
+  if (mWidget) {
+    gtk_file_selection_set_filename(GTK_FILE_SELECTION(mWidget),
+                                    (const gchar*)nsAutoCString(aString));
+  }
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Set the display directory
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsFileWidget::SetDisplayDirectory(const nsFileSpec& aDirectory)
+{
+  mDisplayDirectory = aDirectory;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the display directory
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsFileWidget::GetDisplayDirectory(nsFileSpec& aDirectory)
+{
+  aDirectory = mDisplayDirectory;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFileWidget::Create(nsIWidget *aParent,
+                                   const nsString& aTitle,
+                                   nsFileDlgMode aMode,
+                                   nsIDeviceContext *aContext,
+                                   nsIAppShell *aAppShell,
+                                   nsIToolkit *aToolkit,
+                                   void *aInitData)
+{
+  mMode = aMode;
+  mTitle.SetLength(0);
+  mTitle.Append(aTitle);
+
+  mWidget = gtk_file_selection_new((const gchar *)nsAutoCString(aTitle));
+  gtk_signal_connect(GTK_OBJECT(mWidget),
+                     "destroy",
+                     GTK_SIGNAL_FUNC(DestroySignal),
+                     this);
+
+  gtk_button_box_set_layout(GTK_BUTTON_BOX(GTK_FILE_SELECTION(mWidget)->button_area), GTK_BUTTONBOX_SPREAD);
+
+  mOptionMenu = gtk_option_menu_new();
+
+  gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(mWidget)->main_vbox), mOptionMenu, PR_FALSE, PR_FALSE, 0);
+  gtk_widget_show(mOptionMenu);
+
+
+  // Hide the file column for the folder case.
+  if (aMode == eMode_getfolder) {
+    gtk_widget_hide((GTK_FILE_SELECTION(mWidget)->file_list)->parent);
+  }
+
+  return NS_OK;
+}
+
+gint
+nsFileWidget::DestroySignal(GtkWidget *  aGtkWidget,
+                            nsFileWidget* aWidget)
+{
+  aWidget->OnDestroySignal(aGtkWidget);
+  return TRUE;
+}
+
+void
+nsFileWidget::OnDestroySignal(GtkWidget* aGtkWidget)
+{
+  if (aGtkWidget == mWidget) {
+    mWidget = nsnull;
+  }
+}
+
+nsFileDlgResults nsFileWidget::GetFile(nsIWidget *aParent,
+                                       const nsString &promptString,
+                                       nsFileSpec &theFileSpec)
+{
+	Create(aParent, promptString, eMode_load, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+
+  return nsFileDlgResults_Cancel;
+}
+
+nsFileDlgResults nsFileWidget::GetFolder(nsIWidget *aParent,
+                                         const nsString &promptString,
+                                         nsFileSpec &theFileSpec)
+{
+	Create(aParent, promptString, eMode_getfolder, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+
+  return nsFileDlgResults_Cancel;
+}
+
+nsFileDlgResults nsFileWidget::PutFile(nsIWidget *aParent,
+                                       const nsString &promptString,
+                                       nsFileSpec &theFileSpec)
+{ 
+	Create(aParent, promptString, eMode_save, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+  return nsFileDlgResults_Cancel; 
+}

mozilla/widget/src/gtk/nsFileWidget.h

@@ -0,0 +1,102 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsFileWidget_h__
+#define nsFileWidget_h__
+
+#include "nsIWidget.h"
+#include "nsIFileWidget.h"
+
+#include <gtk/gtk.h>
+
+class nsIToolkit;
+
+/**
+ * Native GTK FileSelector wrapper
+ */
+
+class nsFileWidget : public nsIFileWidget 
+{
+public:
+  nsFileWidget(); 
+  virtual ~nsFileWidget();
+
+  NS_DECL_ISUPPORTS
+
+  // nsIWidget interface
+  
+  NS_IMETHOD		Create(nsIWidget *aParent,
+                       const nsString& aTitle,
+                       nsFileDlgMode aMode,
+                       nsIDeviceContext *aContext = nsnull,
+                       nsIAppShell *aAppShell = nsnull,
+                       nsIToolkit *aToolkit = nsnull,
+                       void *aInitData = nsnull);
+
+  // nsIFileWidget part
+  virtual PRBool	Show();
+  NS_IMETHOD GetFile(nsFileSpec& aFile);
+  NS_IMETHOD SetDefaultString(const nsString& aFile);
+  NS_IMETHOD SetFilterList(PRUint32 aNumberOfFilters,
+                           const nsString aTitles[],
+                           const nsString aFilters[]);
+
+  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory);
+  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory);
+  
+  virtual nsFileDlgResults GetFile(nsIWidget *aParent,
+                                   const nsString &promptString,
+                                   nsFileSpec &theFileSpec);
+  
+  virtual nsFileDlgResults GetFolder(nsIWidget *aParent,
+                                     const nsString &promptString,
+                                     nsFileSpec &theFileSpec);
+
+  virtual nsFileDlgResults PutFile(nsIWidget *aParent,
+                                   const nsString &promptString,
+                                   nsFileSpec &theFileSpec);
+
+
+  NS_IMETHOD            GetSelectedType(PRInt16& theType);
+
+protected:
+  static gint DestroySignal(GtkWidget *  aGtkWidget,
+                            nsFileWidget* aWidget);
+
+  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
+
+  GtkWidget		*mWidget;
+  nsString		mTitle;
+  GtkWidget   *mOptionMenu;
+  GtkWidget   *mFilterMenu;
+
+
+  nsFileDlgMode   mMode;
+  PRUint32		    mNumberOfFilters;  
+  const nsString*	mTitles;
+  const nsString*	mFilters;
+  nsString		mDefault;
+  nsFileSpec    mDisplayDirectory;
+  PRInt16       mSelectedType;
+};
+
+#endif // nsFileWidget_h__

mozilla/widget/src/gtk/nsFontRetrieverService.cpp

@@ -0,0 +1,395 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsFontRetrieverService.h"
+#include "nsIWidget.h"
+#include <ctype.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include "X11/Xlib.h"
+#include "X11/Xutil.h"
+ 
+#include "nsFont.h"
+#include "nsVoidArray.h"
+#include "nsFontSizeIterator.h"
+ 
+NS_IMPL_ISUPPORTS2(nsFontRetrieverService, nsIFontRetrieverService, nsIFontNameIterator)
+
+//----------------------------------------------------------
+nsFontRetrieverService::nsFontRetrieverService()
+{
+  NS_INIT_REFCNT();
+
+  mFontList     = nsnull;
+  mSizeIter     = nsnull;
+  mNameIterInx  = 0;
+
+}
+
+//----------------------------------------------------------
+nsFontRetrieverService::~nsFontRetrieverService()
+{
+  if (nsnull != mFontList) {
+    for (PRInt32 i=0;i<mFontList->Count();i++) {
+      FontInfo * font = (FontInfo *)mFontList->ElementAt(i);
+      if (font->mSizes) {
+        delete font->mSizes;
+      }
+      delete font;
+    }
+    delete mFontList;
+  }
+  NS_IF_RELEASE(mSizeIter);
+}
+
+
+
+//----------------------------------------------------------
+//-- nsIFontRetrieverService
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::CreateFontNameIterator( nsIFontNameIterator** aIterator )
+{
+  if (nsnull == aIterator) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (nsnull == mFontList) {
+    LoadFontList();
+  }
+  *aIterator = this;
+  NS_ADDREF_THIS();
+  return NS_OK;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::CreateFontSizeIterator( const nsString & aFontName, 
+                                                              nsIFontSizeIterator** aIterator )
+{
+  // save value in case someone externally is using it
+  PRInt32 saveIterInx = mNameIterInx;
+
+  PRBool found = PR_FALSE;
+  Reset();
+  do {
+    nsAutoString name;
+    Get(&name);
+    if (name.Equals(aFontName)) {
+      found = PR_TRUE;
+      break;
+    }
+  } while (Advance() == NS_OK);
+
+  if (found) {
+    if (nsnull == mSizeIter) {
+      mSizeIter = new nsFontSizeIterator();
+    }
+    NS_ASSERTION( nsnull != mSizeIter, "nsFontSizeIterator instance pointer is null");
+
+    *aIterator = (nsIFontSizeIterator *)mSizeIter;
+    NS_ADDREF(mSizeIter);
+
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
+    mSizeIter->SetFontInfo(fontInfo);
+    mNameIterInx = saveIterInx;
+    return NS_OK;
+  }
+  mNameIterInx = saveIterInx;
+  return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------
+//-- nsIFontNameIterator
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Reset()
+{
+  mNameIterInx = 0;
+  return NS_OK;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Get( nsString* aFontName )
+{
+  if (mNameIterInx < mFontList->Count()) {
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
+    *aFontName = fontInfo->mName;
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Advance()
+{
+  if (mNameIterInx < mFontList->Count()-1) {
+    mNameIterInx++;
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+//------------------------------
+static FontInfo * GetFontInfo(nsVoidArray * aFontList, char * aName)
+{
+  nsAutoString name(aName);
+  PRInt32 i;
+  PRInt32 cnt = aFontList->Count();
+  for (i=0;i<cnt;i++) {
+    FontInfo * fontInfo = (FontInfo *)aFontList->ElementAt(i);
+    if (fontInfo->mName.Equals(name)) {
+      return fontInfo;
+    }
+  }
+
+  FontInfo * fontInfo   = new FontInfo();
+  fontInfo->mName       = aName;
+  //printf("Adding [%s]\n", aName);fflush(stdout); 
+  fontInfo->mIsScalable = PR_FALSE; // X fonts aren't scalable right??
+  fontInfo->mSizes      = nsnull;
+  aFontList->AppendElement(fontInfo);
+  return fontInfo;
+}
+
+//------------------------------
+static void AddSizeToFontInfo(FontInfo * aFontInfo, PRInt32 aSize)
+{
+  nsVoidArray * sizes;
+  if (nsnull == aFontInfo->mSizes) {
+    sizes = new nsVoidArray();
+    aFontInfo->mSizes = sizes;
+  } else {
+    sizes = aFontInfo->mSizes;
+  }
+  PRInt32 i;
+  PRInt32 cnt = sizes->Count();
+  for (i=0;i<cnt;i++) {
+    PRInt32 size = (int)sizes->ElementAt(i);
+    if (size == aSize) {
+      return;
+    }
+  }
+  sizes->AppendElement((void *)aSize);
+}
+
+//---------------------------------------------------
+// XXX - Hack - Parts of this will need to be reworked
+//
+// This method does brute force parcing for 4 different formats:
+//
+// 1) The format -*-*-*-*-*-* etc.
+//    -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+//
+// 2) Name-size format 
+//    lucidasans-10
+//
+// 3) Name-style-size
+//    lucidasans-bold-10
+//
+// 4) Name only (implicit size)
+//    6x13
+//
+//--------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::LoadFontList()
+{
+  char    * pattern = "*";
+  int nnames = 1024;
+
+  int available = nnames+1;
+  int i;
+  char **fonts;
+  XFontStruct *info;
+
+  if (nsnull == mFontList) { 
+    mFontList = new nsVoidArray(); 
+    if (nsnull == mFontList) { 
+      return NS_ERROR_FAILURE; 
+    } 
+  } 
+
+  /* Get list of fonts matching pattern */
+  for (;;) {
+    // the following line is VERY slow to return
+    fonts = XListFontsWithInfo(GDK_DISPLAY(), pattern, nnames, 
+                               &available, &info);
+    if (fonts == NULL || available < nnames)
+      break;
+
+    XFreeFontInfo(fonts, info, available);
+    nnames = available * 2;
+  }
+
+  if (fonts == NULL) {
+    fprintf(stderr, "pattern \"%s\" unmatched\n", pattern);
+    return NS_ERROR_FAILURE;
+  }
+
+#if 0 // debug
+  // print out all the retrieved fonts
+  printf("-----------------------------\n");
+  for (i=0; i<available; i++) {
+    printf("[%s]i\n", fonts[i]);
+  }
+  printf("-----------------------------\n");
+#endif
+
+  // this code assumes all like fonts are grouped together
+  // currentName is the current name of the font we are gathering
+  // sizes for, when the name changes we create a new FontInfo object
+  // but it also takes into account fonts of similar names when it 
+  // goes to add then and disregards duplicates
+  char buffer[1024];
+  char currentName[1024];
+  FontInfo * font = nsnull;
+
+  currentName[0]  = 0;
+  for (i=0; i<available; i++) {
+
+    // This is kind of lame, but it will have to do for now
+    strcpy(buffer, fonts[i]);
+
+    // Start by checking to see if the name begins with a dash
+    char * ptr  = buffer;
+    if (buffer[0] == '-') { //Format #1
+      
+      PRInt32 cnt = 0;
+      // skip first two '-'
+      do {
+        if (*ptr == '-') cnt++;
+        ptr++;
+      } while (cnt < 2);
+      
+      // find the dash at the end of the name
+      char * end = strchr(ptr, '-');
+      if (end) {
+        *end = 0;
+        
+        // Check to see if we need to create a new FontInfo obj
+        // and set the currentName var to this guys font name
+        if (strcmp(currentName, ptr) || NULL == font) {
+          font = GetFontInfo(mFontList, ptr);
+          strcpy(currentName, ptr);
+        }
+        if (nsnull == font->mSizes) {
+          font->mSizes = new nsVoidArray();
+        }
+        ptr = end+1; // skip past the dash that was set to zero
+        
+        cnt = 0;
+        // now skip ahead 4 dashes
+        do {
+          if (*ptr == '-') cnt++;
+          ptr++;
+        } while (cnt < 4);
+        
+        // find the dash after the size
+        end = strchr(ptr, '-');
+        
+        if (end) {
+	  *end = 0;
+          PRInt32 size;
+          sscanf(ptr, "%d", &size);
+	  AddSizeToFontInfo(font, size);
+        }
+      }
+    } else { // formats 2,3,4
+      
+      // no leading dash means the start of the 
+      // buffer is the start of the name
+      // this checks for a dash at the end of the font name
+      // which means there is a size at the end
+      char * end = strchr(buffer, '-');
+      if (end) { // Format 2,3
+        *end = 0;
+        // Check to see if we need to create a new FontInfo obj
+        // and set the currentName var to this guys font name
+        if (strcmp(currentName, buffer) || NULL == font) { 
+          font = GetFontInfo(mFontList, buffer);
+          strcpy(currentName, buffer);
+        }
+        end++; // advance past the dash
+	// check to see if we have a number
+	ptr = end;
+	if (isalpha(*ptr)) {  // Format 3
+	  // skip until next dash
+	  end = strchr(ptr, '-');
+	  if (end) {
+            *end = 0;
+	    ptr = end+1;
+	  }
+	}
+        PRInt32 size;
+        // yes, it has a dash at the end so it must have the size
+        // check to see if the size is terminated by a dash
+        // it shouldn't be
+        char * end2 = strchr(ptr, '-');
+        if (end2) *end2 = 0; // put terminator at the dash
+        sscanf(end, "%d", &size);
+	AddSizeToFontInfo(font, size);
+
+      } else { // Format #4
+        // The font has an implicit size, 
+        // so there is nothing to parse for size
+        // so we can't really do much here
+        // Check to see if we need to create a new FontInfo obj
+        // and set the currentName var to this guys font name
+        if (strcmp(currentName, buffer) || NULL == font) {
+          font = GetFontInfo(mFontList, buffer);
+          strcpy(currentName, buffer);
+        }
+      } 
+    }
+
+  }
+
+  XFreeFontInfo(fonts, info, available);
+
+  return NS_OK;
+}
+
+
+//---------------------------------------------------------- 
+NS_IMETHODIMP nsFontRetrieverService::IsFontScalable(const nsString & aFontName,
+                                                     PRBool* aResult ) 
+{ 
+  // save value in case someone externally is using it
+  PRInt32 saveIterInx = mNameIterInx;
+   
+  PRBool found = PR_FALSE; 
+  Reset(); 
+  do { 
+    nsAutoString name; 
+    Get(&name); 
+    if (name.Equals(aFontName)) { 
+      found = PR_TRUE; 
+      break; 
+    } 
+  } while (Advance() == NS_OK); 
+
+  if (found) { 
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx); 
+    *aResult = fontInfo->mIsScalable; 
+    mNameIterInx = saveIterInx;
+    return NS_OK; 
+  } 
+
+  mNameIterInx = saveIterInx;
+  return NS_ERROR_FAILURE; 
+} 

mozilla/widget/src/gtk/nsFontRetrieverService.h

@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef __nsFontRetrieverService
+#define __nsFontRetrieverService
+
+#include "nsIFontRetrieverService.h"
+#include "nsIFontNameIterator.h"
+
+class nsVoidArray;
+class nsFontSizeIterator;
+
+class nsFontRetrieverService: public nsIFontRetrieverService, 
+                              public nsIFontNameIterator
+{
+public:
+  nsFontRetrieverService();
+  virtual ~nsFontRetrieverService();
+
+  NS_DECL_ISUPPORTS
+
+  // nsIFontRetrieverService
+  NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator );
+
+  NS_IMETHOD CreateFontSizeIterator( const nsString & aFontName, nsIFontSizeIterator** aIterator );
+  NS_IMETHOD IsFontScalable( const nsString & aFontName, PRBool* aResult );
+
+  // nsIFontNameIterator
+
+  NS_IMETHOD Reset();
+  NS_IMETHOD Get( nsString* aFontName );
+  NS_IMETHOD Advance();
+
+
+
+protected:
+  NS_IMETHOD LoadFontList();
+
+  nsVoidArray * mFontList;
+
+  PRInt32 mNameIterInx;
+
+  nsFontSizeIterator * mSizeIter;
+};
+
+#endif

mozilla/widget/src/gtk/nsFontSizeIterator.cpp

@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsFontSizeIterator.h"
+
+#include "nsFont.h"
+#include "nsVoidArray.h"
+ 
+
+NS_IMPL_ADDREF(nsFontSizeIterator)
+NS_IMPL_RELEASE(nsFontSizeIterator)
+NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsIFontSizeIterator::GetIID())
+
+//----------------------------------------------------------
+nsFontSizeIterator::nsFontSizeIterator() 
+{
+  NS_INIT_REFCNT();
+  mFontInfo     = nsnull;
+  mSizeIterInx  = 0;
+
+}
+
+//----------------------------------------------------------
+nsFontSizeIterator::~nsFontSizeIterator()
+{
+}
+
+///----------------------------------------------------------
+//-- nsIFontNameIterator
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontSizeIterator::Reset()
+{
+  mSizeIterInx = 0;
+  return NS_OK;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontSizeIterator::Get( double* aFontSize  )
+{
+  if (nsnull != mFontInfo->mSizes && 
+      mFontInfo->mSizes->Count() > 0 && 
+      mSizeIterInx < mFontInfo->mSizes->Count()) {
+    PRUint32 size = (PRUint32)mFontInfo->mSizes->ElementAt(mSizeIterInx);
+    *aFontSize = (double)size;
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontSizeIterator::Advance()
+{
+  if (nsnull != mFontInfo->mSizes && 
+      mFontInfo->mSizes->Count() > 0 &&
+      mSizeIterInx < mFontInfo->mSizes->Count()-2) {
+    mSizeIterInx++;
+    return NS_OK;
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontSizeIterator::SetFontInfo( FontInfo * aFontInfo )
+{
+  mFontInfo = aFontInfo;
+  return NS_OK;
+}

mozilla/widget/src/gtk/nsFontSizeIterator.h

@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef __nsFontSizeIterator
+#define __nsFontSizeIterator
+
+#include "nsIFontSizeIterator.h"
+#include "nsString.h"
+
+class nsVoidArray;
+
+typedef struct {
+  nsString      mName;
+  PRBool        mIsScalable;
+  nsVoidArray * mSizes;
+} FontInfo;
+
+
+class nsFontSizeIterator: public nsIFontSizeIterator {
+public:
+  nsFontSizeIterator();
+  virtual ~nsFontSizeIterator();
+
+  NS_DECL_ISUPPORTS
+
+  // nsIFontSizeIterator
+	NS_IMETHOD Reset();
+	NS_IMETHOD Get( double* aFontSize );
+	NS_IMETHOD Advance();
+
+  // Native impl
+	NS_IMETHOD SetFontInfo( FontInfo * aFontInfo );
+
+protected:
+
+  FontInfo * mFontInfo;      
+  PRInt32  mSizeIterInx;   // current index of iter
+};
+
+#endif