This commit was manufactured by cvs2svn to create branch 'CVS'.

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

mozilla/htmlparser/src/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- 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.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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/htmlparser/src/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- 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.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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/parser/htmlparser/src/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- 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.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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/parser/htmlparser/src/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- 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.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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/string/obsolete/nsStr.cpp

@@ -0,0 +1,717 @@
+/* -*- 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.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.
+ */
+  
+/******************************************************************************************
+  MODULE NOTES:
+
+  This file contains the nsStr data structure.
+  This general purpose buffer management class is used as the basis for our strings.
+  It's benefits include:
+    1. An efficient set of library style functions for manipulating nsStrs
+    2. Support for 1 and 2 byte character strings (which can easily be increased to n)
+    3. Unicode awareness and interoperability.
+
+*******************************************************************************************/
+
+#include "nsStr.h"
+#include "bufferRoutines.h"
+#include "stdio.h"  //only used for printf
+#include "nsCRT.h"
+#include "nsDeque.h"
+
+ 
+//static const char* kCallFindChar =  "For better performance, call FindChar() for targets whose length==1.";
+//static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1.";
+
+static const PRUnichar gCommonEmptyBuffer[1] = {0};
+
+/**
+ * This method initializes all the members of the nsStr structure 
+ *
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Initialize(nsStr& aDest,eCharSize aCharSize) {
+  aDest.mStr=(char*)gCommonEmptyBuffer;
+  aDest.mLength=0;
+  aDest.mCapacity=0;
+  aDest.mCharSize=aCharSize;
+  aDest.mOwnsBuffer=0;
+}
+
+/**
+ * This method initializes all the members of the nsStr structure
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer){
+  aDest.mStr=(aCString) ? aCString : (char*)gCommonEmptyBuffer;
+  aDest.mLength=aLength;
+  aDest.mCapacity=aCapacity;
+  aDest.mCharSize=aCharSize;
+  aDest.mOwnsBuffer=aOwnsBuffer;
+}
+
+
+/**
+ * This member destroys the memory buffer owned by an nsStr object (if it actually owns it)
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Destroy(nsStr& aDest) {
+  if((aDest.mStr) && (aDest.mStr!=(char*)gCommonEmptyBuffer)) {
+    Free(aDest);
+  }
+}
+
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size. The original contents are not preserved.
+ * @update  gess 3/30/98
+ * @param   aNewLength -- new capacity of string in charSize units
+ * @return  void
+ */
+PRBool nsStr::EnsureCapacity(nsStr& aString,PRUint32 aNewLength) {
+  PRBool result=PR_TRUE;
+  if(aNewLength>aString.mCapacity) {
+    result=Realloc(aString,aNewLength);
+    if(aString.mStr)
+      AddNullTerminator(aString);
+  }
+  return result;
+}
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size. The original contents ARE preserved.
+ * @update  gess 3/30/98
+ * @param   aNewLength -- new capacity of string in charSize units
+ * @return  void
+ */
+PRBool nsStr::GrowCapacity(nsStr& aDest,PRUint32 aNewLength) {
+  PRBool result=PR_TRUE;
+  if(aNewLength>aDest.mCapacity) {
+    nsStr theTempStr;
+    nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+    result=EnsureCapacity(theTempStr,aNewLength);
+    if(result) {
+      if(aDest.mLength) {
+        Append(theTempStr,aDest,0,aDest.mLength);        
+      } 
+      Free(aDest);
+      aDest.mStr = theTempStr.mStr;
+      theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+      aDest.mLength=theTempStr.mLength;
+      aDest.mCapacity=theTempStr.mCapacity;
+      aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+    }
+  }
+  return result;
+}
+
+/**
+ * Replaces the contents of aDest with aSource, up to aCount of chars.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr that gets changed.
+ * @param   aSource is where chars are copied from
+ * @param   aCount is the number of chars copied from aSource
+ */
+void nsStr::Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
+  if(&aDest!=&aSource){
+    Truncate(aDest,0);
+    Append(aDest,aSource,anOffset,aCount);
+  }
+}
+
+/**
+ * This method appends the given nsStr to this one. Note that we have to 
+ * pay attention to the underlying char-size of both structs.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be manipulated
+ * @param   aSource is where char are copied from
+ * @aCount  is the number of bytes to be copied 
+ */
+void nsStr::Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
+  if(anOffset<aSource.mLength){
+    PRUint32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
+    PRUint32 theLength=(anOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-anOffset);
+    if(0<theLength){
+      
+      PRBool isBigEnough=PR_TRUE;
+      if(aDest.mLength+theLength > aDest.mCapacity) {
+        isBigEnough=GrowCapacity(aDest,aDest.mLength+theLength);
+      }
+
+      if(isBigEnough) {
+        //now append new chars, starting at offset
+        (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDest.mLength,aSource.mStr,anOffset,theLength);
+
+        aDest.mLength+=theLength;
+        AddNullTerminator(aDest);
+      }
+    }
+  }
+}
+
+
+/**
+ * This method inserts up to "aCount" chars from a source nsStr into a dest nsStr.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr that gets changed
+ * @param   aDestOffset is where in aDest the insertion is to occur
+ * @param   aSource is where chars are copied from
+ * @param   aSrcOffset is where in aSource chars are copied from
+ * @param   aCount is the number of chars from aSource to be inserted into aDest
+ */
+void nsStr::Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount){
+  //there are a few cases for insert:
+  //  1. You're inserting chars into an empty string (assign)
+  //  2. You're inserting onto the end of a string (append)
+  //  3. You're inserting onto the 1..n-1 pos of a string (the hard case).
+  if(0<aSource.mLength){
+    if(aDest.mLength){
+      if(aDestOffset<aDest.mLength){
+        PRInt32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
+        PRInt32 theLength=(aSrcOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-aSrcOffset);
+
+        if(aSrcOffset<aSource.mLength) {
+            //here's the only new case we have to handle. 
+            //chars are really being inserted into our buffer...
+
+          if(aDest.mLength+theLength > aDest.mCapacity) {
+            nsStr theTempStr;
+            nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+            PRBool isBigEnough=EnsureCapacity(theTempStr,aDest.mLength+theLength);  //grow the temp buffer to the right size
+
+            if(isBigEnough) {
+              if(aDestOffset) {
+                Append(theTempStr,aDest,0,aDestOffset); //first copy leftmost data...
+              } 
+              
+              Append(theTempStr,aSource,0,aSource.mLength); //next copy inserted (new) data
+            
+              PRUint32 theRemains=aDest.mLength-aDestOffset;
+              if(theRemains) {
+                Append(theTempStr,aDest,aDestOffset,theRemains); //next copy rightmost data
+              }
+
+              Free(aDest);
+              aDest.mStr = theTempStr.mStr;
+              theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+              aDest.mCapacity=theTempStr.mCapacity;
+              aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+            }
+
+          }
+
+          else {
+              //shift the chars right by theDelta...
+            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+      
+            //now insert new chars, starting at offset
+            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+          }
+
+            //finally, make sure to update the string length...
+          aDest.mLength+=theLength;
+          AddNullTerminator(aDest);
+
+        }//if
+        //else nothing to do!
+      }
+      else Append(aDest,aSource,0,aCount);
+    }
+    else Append(aDest,aSource,0,aCount);
+  }
+}
+
+
+/**
+ * This method deletes up to aCount chars from aDest
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be manipulated
+ * @param   aDestOffset is where in aDest deletion is to occur
+ * @param   aCount is the number of chars to be deleted in aDest
+ */
+void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
+  if(aDestOffset<aDest.mLength){
+
+    PRUint32 theDelta=aDest.mLength-aDestOffset;
+    PRUint32 theLength=(theDelta<aCount) ? theDelta : aCount;
+
+    if(aDestOffset+theLength<aDest.mLength) {
+
+      //if you're here, it means we're cutting chars out of the middle of the string...
+      //so shift the chars left by theLength...
+      (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+      aDest.mLength-=theLength;
+      AddNullTerminator(aDest);
+    }
+    else Truncate(aDest,aDestOffset);
+  }//if
+}
+
+/**
+ * This method truncates the given nsStr at given offset
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be truncated
+ * @param   aDestOffset is where in aDest truncation is to occur
+ */
+void nsStr::Truncate(nsStr& aDest,PRUint32 aDestOffset){
+  if(aDestOffset<aDest.mLength){
+    aDest.mLength=aDestOffset;
+    AddNullTerminator(aDest);
+  }
+}
+
+
+/**
+ * This method forces the given string to upper or lowercase
+ * @update	gess1/7/99
+ * @param   aDest is the string you're going to change
+ * @param   aToUpper: if TRUE, then we go uppercase, otherwise we go lowercase
+ * @return
+ */
+void nsStr::ChangeCase(nsStr& aDest,PRBool aToUpper) {
+  // somehow UnicharUtil return failed, fallback to the old ascii only code
+  gCaseConverters[aDest.mCharSize](aDest.mStr,aDest.mLength,aToUpper);
+}
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+
+  if((aDest.mLength>0) && aSet){
+    PRInt32 theIndex=-1;
+    PRInt32 theMax=aDest.mLength;
+    PRInt32 theSetLen=nsCRT::strlen(aSet);
+
+    if(aEliminateLeading) {
+      while(++theIndex<=theMax) {
+        PRUnichar theChar=GetCharAt(aDest,theIndex);
+        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
+        if(kNotFound==thePos)
+          break;
+      }
+      if(0<theIndex) {
+        if(theIndex<theMax) {
+          Delete(aDest,0,theIndex);
+        }
+        else Truncate(aDest,0);
+      }
+    }
+
+    if(aEliminateTrailing) {
+      theIndex=aDest.mLength;
+      PRInt32 theNewLen=theIndex;
+      while(--theIndex>0) {
+        PRUnichar theChar=GetCharAt(aDest,theIndex);  //read at end now...
+        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
+        if(kNotFound<thePos) 
+          theNewLen=theIndex;
+        else break;
+      }
+      if(theNewLen<theMax) {
+        Truncate(aDest,theNewLen);
+      }
+    }
+
+  }
+}
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+  Trim(aDest,aSet,aEliminateLeading,aEliminateTrailing);
+  PRUint32 aNewLen=gCompressChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
+  aDest.mLength=aNewLen;
+}
+
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::StripChars(nsStr& aDest,const char* aSet){
+  if((0<aDest.mLength) && (aSet)) {
+    PRUint32 aNewLen=gStripChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
+    aDest.mLength=aNewLen;
+  }
+}
+
+
+  /**************************************************************
+    Searching methods...
+   **************************************************************/
+
+
+/**
+ *  This searches aDest for a given substring
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aTarget is the substring you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
+  // NS_PRECONDITION(aTarget.mLength!=1,kCallFindChar);
+
+  PRInt32 result=kNotFound;
+  
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRInt32 theMax=aDest.mLength-aTarget.mLength;
+    PRInt32 index=(0<=anOffset) ? anOffset : 0;
+    
+    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
+      PRInt32 theTargetMax=aTarget.mLength;
+      while(index<=theMax) {
+        PRInt32 theSubIndex=-1;
+        PRBool  matches=PR_TRUE;
+        while((++theSubIndex<theTargetMax) && (matches)){
+          PRUnichar theChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
+          PRUnichar theTargetChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aTarget,theSubIndex)) : GetCharAt(aTarget,theSubIndex);
+          matches=PRBool(theChar==theTargetChar);
+        }
+        if(matches) { 
+          result=index;
+          break;
+        }
+        index++;
+      } //while
+    }//if
+  }//if
+  return result;
+}
+
+
+/**
+ *  This searches aDest for a given character 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   char is the character you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
+  PRInt32 result=kNotFound;
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRUint32 index=(0<=anOffset) ? (PRUint32)anOffset : 0;
+    result=gFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
+  }
+  return result;
+}
+
+
+/**
+ *  This searches aDest for a character found in aSet. 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aSet contains a list of chars to be searched for
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aSet.mLength!=1,kCallFindChar);
+
+  PRInt32 index=(0<=anOffset) ? anOffset-1 : -1;
+  PRInt32 thePos;
+
+    //Note that the search is inverted here. We're scanning aDest, one char at a time
+    //but doing the search against the given set. That's why we use 0 as the offset below.
+  if((0<aDest.mLength) && (0<aSet.mLength)){
+    while(++index<(PRInt32)aDest.mLength) {
+      PRUnichar theChar=GetCharAt(aDest,index);
+      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
+      if(kNotFound!=thePos)
+        return index;
+    } //while
+  }
+  return kNotFound;
+}
+
+  /**************************************************************
+    Reverse Searching methods...
+   **************************************************************/
+
+
+/**
+ *  This searches aDest (in reverse) for a given substring
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aTarget is the substring you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search (counting from left)
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aTarget.mLength!=1,kCallRFindChar);
+
+  PRInt32 result=kNotFound;
+
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
+
+    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
+
+      nsStr theCopy;
+      nsStr::Initialize(theCopy,eOneByte);
+      nsStr::Assign(theCopy,aTarget,0,aTarget.mLength);
+      if(aIgnoreCase){
+        nsStr::ChangeCase(theCopy,PR_FALSE); //force to lowercase
+      }
+    
+      PRInt32   theTargetMax=theCopy.mLength;
+      while(index>=0) {
+        PRInt32 theSubIndex=-1;
+        PRBool  matches=PR_FALSE;
+        if(index+theCopy.mLength<=aDest.mLength) {
+          matches=PR_TRUE;
+          while((++theSubIndex<theTargetMax) && (matches)){
+            PRUnichar theDestChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
+            PRUnichar theTargetChar=GetCharAt(theCopy,theSubIndex);
+            matches=PRBool(theDestChar==theTargetChar);
+          } //while
+        } //if
+        if(matches) {
+          result=index;
+          break;
+        }
+        index--;
+      } //while
+      nsStr::Destroy(theCopy);
+    }//if
+  }//if
+  return result;
+}
+ 
+
+/**
+ *  This searches aDest (in reverse) for a given character 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   char is the character you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
+  PRInt32 result=kNotFound;
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRUint32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
+    result=gRFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
+  }
+  return result;
+}
+
+/**
+ *  This searches aDest (in reverese) for a character found in aSet. 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aSet contains a list of chars to be searched for
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aSet.mLength!=1,kCallRFindChar);
+
+  PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength;
+  PRInt32 thePos;
+
+    //note that the search is inverted here. We're scanning aDest, one char at a time
+    //but doing the search against the given set. That's why we use 0 as the offset below.
+  if(0<aDest.mLength) {
+    while(--index>=0) {
+      PRUnichar theChar=GetCharAt(aDest,index);
+      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
+      if(kNotFound!=thePos)
+        return index;
+    } //while
+  }
+  return kNotFound;
+}
+
+
+/**
+ * Compare source and dest strings, up to an (optional max) number of chars
+ * @param   aDest is the first str to compare
+ * @param   aSource is the second str to compare
+ * @param   aCount -- if (-1), then we use length of longer string; if (0<aCount) then it gives the max # of chars to compare
+ * @param   aIgnorecase tells us whether to search with case sensitivity
+ * @return  aDest<aSource=-1;aDest==aSource==0;aDest>aSource=1
+ */
+PRInt32 nsStr::Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  PRInt32 result=0;
+
+  if(aCount) {
+    PRInt32 minlen=(aSource.mLength<aDest.mLength) ? aSource.mLength : aDest.mLength;
+
+    if(0==minlen) {
+      if ((aDest.mLength == 0) && (aSource.mLength == 0))
+        return 0;
+      if (aDest.mLength == 0)
+        return -1;
+      return 1;
+    }
+
+    PRInt32 maxlen=(aSource.mLength<aDest.mLength) ? aDest.mLength : aSource.mLength;
+    aCount = (aCount<0) ? maxlen : MinInt(aCount,maxlen);
+    result=(*gCompare[aDest.mCharSize][aSource.mCharSize])(aDest.mStr,aSource.mStr,aCount,aIgnoreCase);
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+PRBool nsStr::Alloc(nsStr& aDest,PRUint32 aCount) {
+
+  static int mAllocCount=0;
+  mAllocCount++;
+
+  //we're given the acount value in charunits; now scale up to next multiple.
+  PRUint32	theNewCapacity=kDefaultStringSize;
+  while(theNewCapacity<aCount){ 
+		theNewCapacity<<=1;
+  }
+
+  aDest.mCapacity=theNewCapacity++;
+  PRUint32 theSize=(theNewCapacity<<aDest.mCharSize);
+  aDest.mStr = (char*)nsAllocator::Alloc(theSize);
+
+  PRBool result=PR_FALSE;
+  if(aDest.mStr) {
+    aDest.mOwnsBuffer=1;
+    result=PR_TRUE;
+  }
+  return result;
+}
+
+PRBool nsStr::Free(nsStr& aDest){
+  if(aDest.mStr){
+    if(aDest.mOwnsBuffer){
+      nsAllocator::Free(aDest.mStr);
+    }
+    aDest.mStr=0;
+    aDest.mOwnsBuffer=0;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){
+
+  nsStr temp;
+  memcpy(&temp,&aDest,sizeof(aDest));
+
+  PRBool result=Alloc(temp,aCount);
+  if(result) {
+    Free(aDest);
+    aDest.mStr=temp.mStr;
+    aDest.mCapacity=temp.mCapacity;
+    aDest.mOwnsBuffer=temp.mOwnsBuffer;
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+CBufDescriptor::CBufDescriptor(char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=aString;
+  mCharSize=eOneByte;
+  mStackBased=aStackBased;
+  mIsConst=PR_FALSE;
+  mLength=mCapacity=0;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+CBufDescriptor::CBufDescriptor(const char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eOneByte;
+  mStackBased=aStackBased;
+  mIsConst=PR_TRUE;
+  mLength=mCapacity=0;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+
+CBufDescriptor::CBufDescriptor(PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eTwoByte;
+  mStackBased=aStackBased;
+  mLength=mCapacity=0;
+  mIsConst=PR_FALSE;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+CBufDescriptor::CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eTwoByte;
+  mStackBased=aStackBased;
+  mLength=mCapacity=0;
+  mIsConst=PR_TRUE;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+//----------------------------------------------------------------------------------------
+
+

mozilla/string/obsolete/nsStr.h

@@ -0,0 +1,450 @@
+/* -*- 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.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.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+    1. There are two philosophies to building string classes:
+        A. Hide the underlying buffer & offer API's allow indirect iteration
+        B. Reveal underlying buffer, risk corruption, but gain performance
+        
+       We chose the option B for performance reasons. 
+
+    2  Our internal buffer always holds capacity+1 bytes.
+
+    The nsStr struct is a simple structure (no methods) that contains
+    the necessary info to be described as a string. This simple struct
+    is manipulated by the static methods provided in this class. 
+    (Which effectively makes this a library that works on structs).
+
+    There are also object-based versions called nsString and nsAutoString
+    which use nsStr but makes it look at feel like an object. 
+
+ ***********************************************************************/
+
+/***********************************************************************
+  ASSUMPTIONS:
+
+    1. nsStrings and nsAutoString are always null terminated. 
+    2. If you try to set a null char (via SetChar()) a new length is set
+    3. nsCStrings can be upsampled into nsString without data loss
+    4. Char searching is faster than string searching. Use char interfaces
+       if your needs will allow it.
+    5. It's easy to use the stack for nsAutostring buffer storage (fast too!).
+       See the CBufDescriptor class in this file.
+    6. It's ONLY ok to provide non-null-terminated buffers to Append() and Insert()
+       provided you specify a 0<n value for the optional count argument.
+    7. Downsampling from nsString to nsCString is lossy -- avoid it if possible!
+    8. Calls to ToNewCString() and ToNewUnicode() should be matched with calls to Recycle().
+
+ ***********************************************************************/
+
+
+/**********************************************************************************
+  
+ AND NOW FOR SOME GENERAL DOCUMENTATION ON STRING USAGE...
+
+    The fundamental datatype in the string library is nsStr. It's a structure that
+    provides the buffer storage and meta-info. It also provides a C-style library
+    of functions for direct manipulation (for those of you who prefer K&R to Bjarne). 
+
+    Here's a diagram of the class hierarchy: 
+
+      nsStr
+        |___nsString
+        |      |
+        |      ------nsAutoString
+        |
+        |___nsCString
+               |
+               ------nsCAutoString
+
+    Why so many string classes? The 4 variants give you the control you need to 
+    determine the best class for your purpose. There are 2 dimensions to this 
+    flexibility: 1) stack vs. heap; and 2) 1-byte chars vs. 2-byte chars.
+
+    Note: While nsAutoString and nsCAutoString begin life using stack-based storage,
+          they may not stay that way. Like all nsString classes, autostrings will
+          automatically grow to contain the data you provide. When autostrings
+          grow beyond their intrinsic buffer, they switch to heap based allocations.
+          (We avoid alloca to avoid considerable platform difficulties; see the 
+           GNU documentation for more details).
+
+    I should also briefly mention that all the string classes use a "memory agent" 
+    object to perform memory operations. This class proxies the standard nsAllocator
+    for actual memory calls, but knows the structure of nsStr making heap operations
+    more localized.
+    
+
+  CHOOSING A STRING CLASS:
+
+    In order to choose a string class for you purpose, use this handy table:
+
+                        heap-based    stack-based
+                    -----------------------------------
+        ascii data  |   nsCString     nsCAutoString   |
+                    |----------------------------------
+      unicode data  |    nsString      nsAutoString   |
+                    ----------------------------------- 
+    
+  
+    Note: The i18n folks will stenuously object if we get too carried away with the
+          use of nsCString's that pass interface boundaries. Try to limit your
+          use of these to external interfaces that demand them, or for your own
+          private purposes in cases where they'll never be seen by humans. 
+
+    
+  PERFORMANCE CONSIDERATIONS:
+
+    Here are a few tricks to know in order to get better string performance: 
+    
+      1) Try to limit conversions between ascii and unicode; By sticking with nsString
+         wherever possible your code will be i18n-compliant.
+
+
+      2) Preallocating your string buffer cuts down trips to the allocator. So if you
+         have need for an arbitrarily large buffer, pre-size it like this:
+
+         {
+           nsString mBuffer;
+           mBuffer.SetCapacity(aReasonableSize);
+         }
+
+      3) Allocating nsAutoString or nsCAutoString on the heap is memory inefficient
+         (after all, the whole point is to avoid a heap allocation of the buffer).
+
+
+      4) Consider using an autoString to write into your arbitrarily-sized stack buffers, rather
+         than it's own buffers.
+
+         For example, let's say you're going to call printf() to emit pretty-printed debug output 
+         of your object. You know from experience that the pretty-printed version of your object 
+         exceeds the capacity of an autostring. Ignoring memory considerations, you could simply 
+         use nsCString, appending the stringized version of each of your class's data members. 
+         This will probably result in calls to the heap manager. 
+
+         But there's a way to do this without necessarily having to call the heap manager.
+         All you do is declare a stack based buffer and instruct nsCString to use that instead 
+         of it's own internal buffer by using the CBufDescriptor class:
+         
+         {
+           char theBuffer[256];
+           CBufDescritor theBufDecriptor( theBuffer, PR_TRUE, sizeof(theBuffer), 0);
+           nsCAutoString s3( theBufDescriptor );
+           s3="HELLO, my name is inigo montoya, you killed my father, prepare to die!.";
+         }
+
+         The assignment statment to s3 will cause the given string to be written to your
+         stack-based buffer via the normal nsString/nsCString interfaces. Cool, huh?  
+         Note however that just like any other nsStringXXX use, if you write more data 
+         than will fit in the buffer, a visit to the heap manager will be in order. 
+     
+
+ **********************************************************************************/
+
+
+#ifndef _nsStr
+#define _nsStr
+
+#include "nscore.h"
+#include "nsIAllocator.h"
+#include <string.h>
+
+//----------------------------------------------------------------------------------------
+
+enum  eCharSize {eOneByte=0,eTwoByte=1};
+#define kDefaultCharSize eTwoByte
+#define kRadix10        (10)
+#define kRadix16        (16)
+#define kAutoDetect     (100)
+#define kRadixUnknown   (kAutoDetect+1)
+const   PRInt32 kDefaultStringSize = 64;
+const   PRInt32 kNotFound = -1;
+
+
+//----------------------------------------------------------------------------------------
+
+class NS_COM CBufDescriptor {
+public:
+  CBufDescriptor(char* aString,           PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(const char* aString,     PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(PRUnichar* aString,      PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+
+  char*     mBuffer;
+  eCharSize mCharSize;
+  PRUint32  mCapacity;
+  PRInt32   mLength;
+  PRBool    mStackBased;
+  PRBool    mIsConst;
+};
+
+//----------------------------------------------------------------------------------------
+
+
+struct NS_COM nsStr {  
+
+//----------------------------------------------------------------------------------------
+
+  nsStr() {
+    MOZ_COUNT_CTOR(nsStr);
+  }
+
+  ~nsStr() {
+    MOZ_COUNT_DTOR(nsStr);
+  }
+
+ /**
+  * This method initializes an nsStr for use
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be initialized
+  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
+  */
+  static void Initialize(nsStr& aDest,eCharSize aCharSize);
+
+ /**
+  * This method initializes an nsStr for use
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be initialized
+  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
+  */
+  static void Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer);
+
+ /**
+  * This method destroys the given nsStr, and *MAY* 
+  * deallocate it's memory depending on the setting
+  * of the internal mOwnsBUffer flag.
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be manipulated
+  * @param  anAgent is the allocator to be used to the nsStr
+  */
+  static void Destroy(nsStr& aDest); 
+
+ /**
+  * These methods are where memory allocation/reallocation occur. 
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be manipulated
+  * @param  anAgent is the allocator to be used on the nsStr
+  * @return  
+  */
+  static PRBool EnsureCapacity(nsStr& aString,PRUint32 aNewLength);
+  static PRBool GrowCapacity(nsStr& aString,PRUint32 aNewLength);
+
+ /**
+  * These methods are used to append content to the given nsStr
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aSource is the buffer to be copied from
+  * @param  anOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to copy
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
+
+ /**
+  * These methods are used to assign contents of a source string to dest string
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aSource is the buffer to be copied from
+  * @param  anOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to copy
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
+
+ /**
+  * These methods are used to insert content from source string to the dest nsStr
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aDestOffset tells us where in dest to start insertion
+  * @param  aSource is the buffer to be copied from
+  * @param  aSrcOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to insert
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount);
+
+ /**
+  * This method deletes chars from the given str. 
+  * The given allocator may choose to resize the str as well.
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be deleted from
+  * @param  aDestOffset tells us where in dest to start deleting
+  * @param  aCount tells us the (max) # of chars to delete
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount);
+
+ /**
+  * This method is used to truncate the given string.
+  * The given allocator may choose to resize the str as well (but it's not likely).
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aDestOffset tells us where in dest to start insertion
+  * @param  aSource is the buffer to be copied from
+  * @param  aSrcOffset tells us where in source to start copying
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Truncate(nsStr& aDest,PRUint32 aDestOffset);
+
+ /**
+  * This method is used to perform a case conversion on the given string
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be case shifted
+  * @param  toUpper tells us to go upper vs. lower
+  */
+  static void ChangeCase(nsStr& aDest,PRBool aToUpper);
+
+
+  /**
+   * This method trims chars (given in aSet) from the edges of given buffer 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to remove from given buffer
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+  
+  /**
+   * This method compresses duplicate runs of a given char from the given buffer 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to compress from given buffer
+   * @param   aChar is the replacement char
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+
+  /**
+   * This method removes all occurances of chars in given set from aDest 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to compress from given buffer
+   * @param   aChar is the replacement char
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void StripChars(nsStr& aDest,const char* aSet);
+
+  /**
+   * This method compares the data bewteen two nsStr's 
+   *
+   * @update	gess 01/04/99
+   * @param   aStr1 is the first buffer to be compared
+   * @param   aStr2 is the 2nd buffer to be compared
+   * @param   aCount is the number of chars to compare
+   * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+   * @return  -1,0,1 depending on <,==,>
+   */
+  static PRInt32  Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase);
+
+ /**
+  * These methods scan the given string for 1 or more chars in a given direction
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be searched to
+  * @param  aSource (or aChar) is the substr we're looking to find
+  * @param  aIgnoreCase tells us whether to search in a case-sensitive manner
+  * @param  anOffset tells us where in the dest string to start searching
+  * @return the index of the source (substr) in dest, or -1 (kNotFound) if not found.
+  */
+  static PRInt32 FindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
+
+  static PRInt32 RFindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
+
+
+  PRUint32        mLength;
+  PRUint32        mCapacity;
+  eCharSize       mCharSize;
+  PRBool          mOwnsBuffer;
+
+  union { 
+    char*         mStr;
+    PRUnichar*    mUStr;
+  };
+
+private:
+  static PRBool Alloc(nsStr& aString,PRUint32 aCount);
+  static PRBool Realloc(nsStr& aString,PRUint32 aCount);
+  static PRBool Free(nsStr& aString);
+
+};
+
+/**************************************************************
+  A couple of tiny helper methods used in the string classes.
+ **************************************************************/
+
+inline PRInt32 MinInt(PRInt32 anInt1,PRInt32 anInt2){
+  return (anInt1<anInt2) ? anInt1 : anInt2;
+}
+
+inline PRInt32 MaxInt(PRInt32 anInt1,PRInt32 anInt2){
+  return (anInt1<anInt2) ? anInt2 : anInt1;
+}
+
+inline void AddNullTerminator(nsStr& aDest) {
+  if(eTwoByte==aDest.mCharSize) 
+    aDest.mUStr[aDest.mLength]=0;
+  else aDest.mStr[aDest.mLength]=0;
+}
+
+/**
+ * Return the given buffer to the heap manager. Calls allocator::Free()
+ * @return string length
+ */
+inline void Recycle( char* aBuffer) { nsAllocator::Free(aBuffer); }
+inline void Recycle( PRUnichar* aBuffer) { nsAllocator::Free(aBuffer); }
+
+/**
+* This method is used to access a given char in the given string
+*
+* @update	gess 01/04/99
+* @param  aDest is the nsStr to be appended to
+* @param  anIndex tells us where in dest to get the char from
+* @return the given char, or 0 if anIndex is out of range
+*/
+inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex){
+  if(anIndex<aDest.mLength)  {
+    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : aDest.mStr[anIndex];
+  }//if
+  return 0;
+}
+
+
+#endif
+

mozilla/string/obsolete/nsString.h

@@ -0,0 +1,747 @@
+/* -*- 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.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.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+  See nsStr.h for a more general description of string classes.
+
+  This version of the nsString class offers many improvements over the
+  original version:
+    1. Wide and narrow chars
+    2. Allocators
+    3. Much smarter autostrings
+    4. Subsumable strings
+ ***********************************************************************/
+
+
+#ifndef _nsCString_
+#define _nsCString_
+
+#include "nsString2.h"
+#include "prtypes.h"
+#include "nscore.h"
+#include <stdio.h>
+#include "nsStr.h"
+#include "nsIAtom.h"
+
+
+class NS_COM nsSubsumeCStr;
+
+class NS_COM nsCString : public nsStr {
+
+public: 
+
+  /**
+   * Default constructor. 
+   */
+  nsCString();
+
+  /**
+   * This constructor accepts an isolatin string
+   * @param   aCString is a ptr to a 1-byte cstr
+   */
+  nsCString(const char* aCString,PRInt32 aLength=-1);
+
+  /**
+   * This constructor accepts a unichar string
+   * @param   aCString is a ptr to a 2-byte cstr
+   */
+  nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
+
+  /**
+   * This is a copy constructor that accepts an nsStr
+   * @param   reference to another nsCString
+   */
+  nsCString(const nsStr&);
+
+  /**
+   * This is our copy constructor 
+   * @param   reference to another nsCString
+   */
+  nsCString(const nsCString& aString);   
+
+  /**
+   * This constructor takes a subsumestr
+   * @param   reference to subsumestr
+   */
+  nsCString(nsSubsumeCStr& aSubsumeStr);   
+
+  /**
+   * Destructor
+   * 
+   */
+  virtual ~nsCString();    
+
+  /**
+   * Retrieve the length of this string
+   * @return string length
+   */
+  inline PRInt32 Length() const { return (PRInt32)mLength; }
+
+  /**
+   * Retrieve the size of this string
+   * @return string length
+   */
+  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+
+
+  /**
+   * Call this method if you want to force a different string capacity
+   * @update  gess7/30/98
+   * @param   aLength -- contains new length for mStr
+   * @return
+   */
+  void SetLength(PRUint32 aLength) { 
+    Truncate(aLength);
+  }
+
+  /**
+   * Sets the new length of the string.
+   * @param   aLength is new string length.
+   * @return  nada
+   */
+  void SetCapacity(PRUint32 aLength);
+  /**
+   * This method truncates this string to given length.
+   *
+   * @param   anIndex -- new length of string
+   * @return  nada
+   */
+  void Truncate(PRInt32 anIndex=0);
+
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in sorted order.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsOrdered(void) const;
+
+
+  /**
+   *  Determine whether or not this string has a length of 0
+   *  
+   *  @return  TRUE if empty.
+   */
+  PRBool IsEmpty(void) const {
+    return PRBool(0==mLength);
+  }
+
+  /**********************************************************************
+    Accessor methods...
+   *********************************************************************/
+
+
+   /**
+     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
+     */
+  const char* GetBuffer(void) const;
+
+
+   /**
+     * Get nth character.
+     */
+  PRUnichar operator[](PRUint32 anIndex) const;
+  PRUnichar CharAt(PRUint32 anIndex) const;
+  PRUnichar First(void) const;
+  PRUnichar Last(void) const;
+
+  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
+
+
+  /**********************************************************************
+    String creation methods...
+   *********************************************************************/
+
+  /**
+   * Create a new string by appending given string to this
+   * @param   aString -- 2nd string to be appended
+   * @return  new string
+   */
+  nsSubsumeCStr operator+(const nsCString& aString);
+
+  /**
+   * create a new string by adding this to the given char*.
+   * @param   aCString is a ptr to cstring to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeCStr operator+(const char* aCString);
+
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a char to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeCStr operator+(PRUnichar aChar);
+  nsSubsumeCStr operator+(char aChar);
+
+
+  /**********************************************************************
+    Lexomorphic transforms...
+   *********************************************************************/
+
+  /**
+   * Converts chars in this to lowercase
+   * @update  gess 7/27/98
+   */
+  void ToLowerCase();
+
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in aOut
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToLowerCase(nsCString& aString) const;
+
+  /**
+   * Converts chars in this to uppercase
+   * @update  gess 7/27/98
+   */
+  void ToUpperCase();
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in a given output string
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToUpperCase(nsCString& aString) const;
+
+
+  /**
+   *  This method is used to remove all occurances of the
+   *  characters found in aSet from this string.
+   *  
+   *  @param  aSet -- characters to be cut from this
+   *  @return *this 
+   */
+  nsCString& StripChars(const char* aSet);
+  nsCString& StripChar(char aChar);
+
+  /**
+   *  This method strips whitespace throughout the string
+   *  
+   *  @return  this
+   */
+  nsCString& StripWhitespace();
+
+  /**
+   *  swaps occurence of 1 string for another
+   *  
+   *  @return  this
+   */
+  nsCString& ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
+  nsCString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+
+  PRInt32 CountChar(PRUnichar aChar);
+
+  /**
+   *  This method trims characters found in aTrimSet from
+   *  either end of the underlying string.
+   *  
+   *  @param   aTrimSet -- contains chars to be trimmed from
+   *           both ends
+   *  @return  this
+   */
+  nsCString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsCString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**********************************************************************
+    string conversion methods...
+   *********************************************************************/
+
+      operator char*() {return mStr;}
+      operator const char*() const {return (const char*)mStr;}
+
+  /**
+   * This method constructs a new nsCString that is a clone
+   * of this string.
+   * 
+   */
+  nsCString* ToNewString() const;
+
+  /**
+   * Creates an ISOLatin1 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewCString() const;
+
+  /**
+   * Creates a unicode clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new unicode string
+   */
+  PRUnichar* ToNewUnicode() const;
+
+  /**
+   * Copies data from internal buffer onto given char* buffer
+   * NOTE: This only copies as many chars as will fit in given buffer (clips)
+   * @param aBuf is the buffer where data is stored
+   * @param aBuflength is the max # of chars to move to buffer
+   * @return ptr to given buffer
+   */
+  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
+
+  /**
+   * Perform string to float conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  float rep of string value
+   */
+  float ToFloat(PRInt32* aErrorCode) const;
+
+  /**
+   * Try to derive the radix from the value contained in this string
+   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
+   */
+  PRUint32  DetermineRadix(void);
+
+  /**
+   * Perform string to int conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  int rep of string value
+   */
+  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
+
+
+  /**********************************************************************
+    String manipulation methods...                
+   *********************************************************************/
+
+  /**
+   * Functionally equivalent to assign or operator=
+   * 
+   */
+  nsCString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsCString& SetString(const nsStr& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+
+  /**
+   * assign given string to this string
+   * @param   aStr: buffer to be assigned to this 
+   * @param   alength is the length of the given str (or -1)
+              if you want me to determine its length
+   * @return  this
+   */
+  nsCString& Assign(const nsStr& aString,PRInt32 aCount=-1);
+  nsCString& Assign(const char* aString,PRInt32 aCount=-1);
+  nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsCString& Assign(PRUnichar aChar);
+  nsCString& Assign(char aChar);
+
+  /**
+   * here come a bunch of assignment operators...
+   * @param   aString: string to be added to this
+   * @return  this
+   */
+  nsCString& operator=(const nsCString& aString) {return Assign(aString);}
+  nsCString& operator=(const nsStr& aString) {return Assign(aString);}
+  nsCString& operator=(PRUnichar aChar) {return Assign(aChar);}
+  nsCString& operator=(char aChar) {return Assign(aChar);}
+  nsCString& operator=(const char* aCString) {return Assign(aCString);}
+  nsCString& operator=(const PRUnichar* aString) {return Assign(aString);}
+  #ifdef AIX
+  nsCString& operator=(const nsSubsumeCStr& aSubsumeString);  // AIX requires a const here
+  #else
+  nsCString& operator=(nsSubsumeCStr& aSubsumeString);
+  #endif
+
+  /**
+   * Here's a bunch of methods that append varying types...
+   * @param   various...
+   * @return  this
+   */
+  nsCString& operator+=(const nsCString& aString){return Append(aString,aString.mLength);}
+  nsCString& operator+=(const char* aCString) {return Append(aCString);}
+  nsCString& operator+=(PRUnichar aChar){return Append(aChar);}
+  nsCString& operator+=(char aChar){return Append(aChar);}
+
+  /*
+   *  Appends n characters from given string to this,
+   *  This version computes the length of your given string
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @return  number of chars copied
+   */
+  nsCString& Append(const nsCString& aString) {return Append(aString,aString.mLength);}
+ 
+
+  /*
+   *  Appends n characters from given string to this,
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
+   *  @return  number of chars copied
+   */
+  nsCString& Append(const nsCString& aString,PRInt32 aCount);
+  nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
+  nsCString& Append(const char* aString,PRInt32 aCount=-1);
+  nsCString& Append(PRUnichar aChar);
+  nsCString& Append(char aChar);
+  nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
+  nsCString& Append(float aFloat);
+             
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the leftmost offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @return  number of chars copied
+   */
+  PRUint32 Left(nsCString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the given offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @param   anOffset -- position where copying begins
+   *  @return  number of chars copied
+   */
+  PRUint32 Mid(nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at rightmost char.
+   *  
+   *  
+   *  @param  aCopy -- Receiving string
+   *  @param  aCount -- number of chars to copy
+   *  @return number of chars copied
+   */
+  PRUint32 Right(nsCString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  This method inserts n chars from given string into this
+   *  string at str[anOffset].
+   *  
+   *  @param  aCopy -- String to be inserted into this
+   *  @param  anOffset -- insertion position within this str
+   *  @param  aCount -- number of chars to be copied from aCopy
+   *  @return number of chars inserted into this.
+   */
+  nsCString& Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a given string into this string at
+   * a specified offset.
+   *
+   * @param   aString* to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsCString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a single char into this string at
+   * a specified offset.
+   *
+   * @param   character to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsCString& Insert(PRUnichar aChar,PRUint32 anOffset);
+  nsCString& Insert(char aChar,PRUint32 anOffset);
+
+  /*
+   *  This method is used to cut characters in this string
+   *  starting at anOffset, continuing for aCount chars.
+   *  
+   *  @param  anOffset -- start pos for cut operation
+   *  @param  aCount -- number of chars to be cut
+   *  @return *this
+   */
+  nsCString& Cut(PRUint32 anOffset,PRInt32 aCount);
+
+
+  /**********************************************************************
+    Searching methods...                
+   *********************************************************************/
+ 
+  /**
+   *  Search for given character within this string.
+   *  This method does so by using a binary search,
+   *  so your string HAD BETTER BE ORDERED!
+   *  
+   *  @param   aChar is the unicode char to be found
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 BinarySearch(PRUnichar aChar) const;
+
+  /**
+   *  Search for given substring within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the first character
+   * found in the given charset
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**
+   * This methods scans the string backwards, looking for the given string
+   * @param   aString is substring to be sought in this
+   * @param   aIgnoreCase tells us whether or not to do caseless compare
+   * @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the last character
+   * found in the given string
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+
+  /**********************************************************************
+    Comparison methods...                
+   *********************************************************************/
+
+  /**
+   * Compares a given string type to this string. 
+   * @update  gess 7/27/98
+   * @param   S is the string to be compared
+   * @param   aIgnoreCase tells us how to treat case
+   * @param   aCount tells us how many chars to compare
+   * @return  -1,0,1
+   */
+  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  /**
+   * These methods compare a given string type to this one
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator==(const nsStr &aString) const;
+  PRBool  operator==(const char* aString) const;
+  PRBool  operator==(const PRUnichar* aString) const;
+
+  /**
+   * These methods perform a !compare of a given string type to this 
+   * @param aString is the string to be compared to this
+   * @return  TRUE 
+   */
+  PRBool  operator!=(const nsStr &aString) const;
+  PRBool  operator!=(const char* aString) const;
+  PRBool  operator!=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is < than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<(const nsStr &aString) const;
+  PRBool  operator<(const char* aString) const;
+  PRBool  operator<(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is > than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>(const nsStr &S) const;
+  PRBool  operator>(const char* aString) const;
+  PRBool  operator>(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is <= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<=(const nsStr &S) const;
+  PRBool  operator<=(const char* aString) const;
+  PRBool  operator<=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is >= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>=(const nsStr &S) const;
+  PRBool  operator>=(const char* aString) const;
+  PRBool  operator>=(const PRUnichar* aString) const;
+
+  /**
+   * Compare this to given string; note that we compare full strings here.
+   * The optional length argument just lets us know how long the given string is.
+   * If you provide a length, it is compared to length of this string as an
+   * optimization.
+   * 
+   * @param  aString -- the string to compare to this
+   * @param  aCount  -- number of chars in given string you want to compare
+   * @return TRUE if equal
+   */
+  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  PRBool  EqualsIgnoreCase(const nsStr& aString) const;
+  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
+  PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
+
+
+  static  void        Recycle(nsCString* aString);
+  static  nsCString*  CreateString(void);
+
+};
+
+extern NS_COM int fputs(const nsCString& aString, FILE* out);
+//ostream& operator<<(ostream& aStream,const nsCString& aString);
+//virtual void  DebugDump(ostream& aStream) const;
+
+
+/**************************************************************
+  Here comes the AutoString class which uses internal memory
+  (typically found on the stack) for its default buffer.
+  If the buffer needs to grow, it gets reallocated on the heap.
+ **************************************************************/
+
+class NS_COM nsCAutoString : public nsCString {
+public: 
+
+    nsCAutoString();
+    nsCAutoString(const char* aString,PRInt32 aLength=-1);
+    nsCAutoString(const CBufDescriptor& aBuffer);
+    nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+    nsCAutoString(const nsStr& aString);
+    nsCAutoString(const nsCAutoString& aString);
+
+#ifdef AIX
+    nsCAutoString(const nsSubsumeCStr& aSubsumeStr);  // AIX requires a const
+#else
+    nsCAutoString(nsSubsumeCStr& aSubsumeStr);
+#endif // AIX
+    nsCAutoString(PRUnichar aChar);
+    virtual ~nsCAutoString();
+
+    nsCAutoString& operator=(const nsCString& aString) {nsCString::Assign(aString); return *this;}
+    nsCAutoString& operator=(const char* aCString) {nsCString::Assign(aCString); return *this;}
+    nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
+    nsCAutoString& operator=(char aChar) {nsCString::Assign(aChar); return *this;}
+
+    /**
+     * Retrieve the size of this string
+     * @return string length
+     */
+    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+    
+    char mBuffer[kDefaultStringSize];
+};
+
+
+/***************************************************************
+  The subsumestr class is very unusual. 
+  It differs from a normal string in that it doesn't use normal
+  copy semantics when another string is assign to this. 
+  Instead, it "steals" the contents of the source string.
+
+  This is very handy for returning nsString classes as part of
+  an operator+(...) for example, in that it cuts down the number
+  of copy operations that must occur. 
+
+  You should probably not use this class unless you really know
+  what you're doing.
+ ***************************************************************/
+class NS_COM nsSubsumeCStr : public nsCString {
+public:
+  nsSubsumeCStr(nsStr& aString);
+  nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+  nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+
+};
+
+
+#endif
+
+

mozilla/string/obsolete/nsString2.h

@@ -0,0 +1,840 @@
+/* -*- 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.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.
+ */
+
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+  See nsStr.h for a more general description of string classes.
+
+  This version of the nsString class offers many improvements over the
+  original version:
+    1. Wide and narrow chars
+    2. Allocators
+    3. Much smarter autostrings
+    4. Subsumable strings
+ ***********************************************************************/
+
+
+#ifndef _nsString_
+#define _nsString_
+
+#include "prtypes.h"
+#include "nscore.h"
+#include <stdio.h>
+#include "nsString.h"
+#include "nsIAtom.h"
+#include "nsStr.h"
+#include "nsCRT.h"
+
+class nsISizeOfHandler;
+
+
+#define nsString2     nsString
+#define nsAutoString2 nsAutoString
+
+
+class NS_COM nsSubsumeStr;
+class NS_COM nsString : public nsStr {
+
+public: 
+
+  /**
+   * Default constructor. 
+   */
+  nsString();
+
+
+  /**
+   * This constructor accepts an isolatin string
+   * @param   aCString is a ptr to a 1-byte cstr
+   */
+  nsString(const char* aCString);
+
+  /**
+   * This constructor accepts a unichar string
+   * @param   aCString is a ptr to a 2-byte cstr
+   */
+  nsString(const PRUnichar* aString);
+
+  /**
+   * This is a copy constructor that accepts an nsStr
+   * @param   reference to another nsString
+   */
+  nsString(const nsStr&);
+
+  /**
+   * This is our copy constructor 
+   * @param   reference to another nsString
+   */
+  nsString(const nsString& aString);   
+
+  /**
+   * This constructor takes a subsumestr
+   * @param   reference to subsumestr
+   */
+  nsString(nsSubsumeStr& aSubsumeStr);   
+
+  /**
+   * Destructor
+   * 
+   */
+  virtual ~nsString();    
+
+  /**
+   * Retrieve the length of this string
+   * @return string length
+   */
+  inline PRInt32 Length() const { return (PRInt32)mLength; }
+
+  /**
+   * Retrieve the size of this string
+   * @return string length
+   */
+  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+
+
+  /**
+   * Call this method if you want to force a different string length
+   * @update  gess7/30/98
+   * @param   aLength -- contains new length for mStr
+   * @return
+   */
+  void SetLength(PRUint32 aLength) { 
+    Truncate(aLength);
+  }
+
+  /**
+   * Sets the new length of the string.
+   * @param   aLength is new string length.
+   * @return  nada
+   */
+  void SetCapacity(PRUint32 aLength);
+
+  /**
+   * This method truncates this string to given length.
+   *
+   * @param   anIndex -- new length of string
+   * @return  nada
+   */
+  void Truncate(PRInt32 anIndex=0);
+
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in sorted order.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsOrdered(void) const;
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in store as 1 or 2 byte (unicode) strings.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsUnicode(void) const {
+    PRBool result=PRBool(mCharSize==eTwoByte);
+    return result;
+  }
+
+  /**
+   *  Determine whether or not this string has a length of 0
+   *  
+   *  @return  TRUE if empty.
+   */
+  PRBool IsEmpty(void) const {
+    return PRBool(0==mLength);
+  }
+
+  /**********************************************************************
+    Getters/Setters...
+   *********************************************************************/
+
+   /**
+     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
+     */
+  const char* GetBuffer(void) const;
+  const PRUnichar* GetUnicode(void) const;
+
+
+   /**
+     * Get nth character.
+     */
+  PRUnichar operator[](PRUint32 anIndex) const;
+  PRUnichar CharAt(PRUint32 anIndex) const;
+  PRUnichar First(void) const;
+  PRUnichar Last(void) const;
+
+   /**
+     * Set nth character.
+     */
+  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
+
+
+  /**********************************************************************
+    String concatenation methods...
+   *********************************************************************/
+
+  /**
+   * Create a new string by appending given string to this
+   * @param   aString -- 2nd string to be appended
+   * @return  new subsumable string
+   */
+  nsSubsumeStr operator+(const nsStr& aString);
+  nsSubsumeStr operator+(const nsString& aString);
+
+  /**
+   * create a new string by adding this to the given cstring
+   * @param   aCString is a ptr to cstring to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(const char* aCString);
+
+  /**
+   * create a new string by adding this to the given prunichar*.
+   * @param   aString is a ptr to UC-string to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(const PRUnichar* aString);
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a char to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(char aChar);
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a unichar to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(PRUnichar aChar);
+
+  /**********************************************************************
+    Lexomorphic transforms...
+   *********************************************************************/
+
+
+  /**
+   * Converts chars in this to lowercase
+   * @update  gess 7/27/98
+   */
+  void ToLowerCase();
+
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in aOut
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToLowerCase(nsString& aString) const;
+
+  /**
+   * Converts chars in this to uppercase
+   * @update  gess 7/27/98
+   */
+  void ToUpperCase();
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in a given output string
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToUpperCase(nsString& aString) const;
+
+
+  /**
+   *  This method is used to remove all occurances of the
+   *  characters found in aSet from this string.
+   *  
+   *  @param  aSet -- characters to be cut from this
+   *  @return *this 
+   */
+  nsString& StripChars(const char* aSet);
+  nsString& StripChar(char aChar);
+
+  /**
+   *  This method strips whitespace throughout the string
+   *  
+   *  @return  this
+   */
+  nsString& StripWhitespace();
+
+  /**
+   *  swaps occurence of 1 string for another
+   *  
+   *  @return  this
+   */
+  nsString& ReplaceChar(PRUnichar anOldChar,PRUnichar aNewChar);
+  nsString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+
+  PRInt32 CountChar(PRUnichar aChar);
+
+  /**
+   *  This method trims characters found in aTrimSet from
+   *  either end of the underlying string.
+   *  
+   *  @param   aTrimSet -- contains chars to be trimmed from
+   *           both ends
+   *  @return  this
+   */
+  nsString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**********************************************************************
+    string conversion methods...
+   *********************************************************************/
+
+  /**
+   * This method constructs a new nsString is a clone of this string.
+   * 
+   */
+  nsString* ToNewString() const;
+
+  /**
+   * Creates an ISOLatin1 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewCString() const;
+
+  /**
+   * Creates an UTF8 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewUTF8String() const;
+
+  /**
+   * Creates a unicode clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new unicode string
+   */
+  PRUnichar* ToNewUnicode() const;
+
+  /**
+   * Copies data from internal buffer onto given char* buffer
+   * NOTE: This only copies as many chars as will fit in given buffer (clips)
+   * @param aBuf is the buffer where data is stored
+   * @param aBuflength is the max # of chars to move to buffer
+   * @return ptr to given buffer
+   */
+  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
+
+  /**
+   * Perform string to float conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  float rep of string value
+   */
+  float ToFloat(PRInt32* aErrorCode) const;
+
+  /**
+   * Try to derive the radix from the value contained in this string
+   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
+   */
+  PRUint32  DetermineRadix(void);
+
+  /**
+   * Perform string to int conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  int rep of string value
+   */
+  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
+
+
+  /**********************************************************************
+    String manipulation methods...                
+   *********************************************************************/
+
+  /**
+   * Functionally equivalent to assign or operator=
+   * 
+   */
+  nsString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsString& SetString(const nsString& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+
+  /**
+   * assign given string to this string
+   * @param   aStr: buffer to be assigned to this 
+   * @param   alength is the length of the given str (or -1)
+              if you want me to determine its length
+   * @return  this
+   */
+  nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
+  nsString& Assign(const char* aString,PRInt32 aCount=-1);
+  nsString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsString& Assign(char aChar);
+  nsString& Assign(PRUnichar aChar);
+
+  /**
+   * here come a bunch of assignment operators...
+   * @param   aString: string to be added to this
+   * @return  this
+   */
+  nsString& operator=(const nsString& aString) {return Assign(aString);}
+  nsString& operator=(const nsStr& aString) {return Assign(aString);}
+  nsString& operator=(char aChar) {return Assign(aChar);}
+  nsString& operator=(PRUnichar aChar) {return Assign(aChar);}
+  nsString& operator=(const char* aCString) {return Assign(aCString);}
+  nsString& operator=(const PRUnichar* aString) {return Assign(aString);}
+  #ifdef AIX
+  nsString& operator=(const nsSubsumeStr& aSubsumeString);  // AIX requires a const here
+  #else
+  nsString& operator=(nsSubsumeStr& aSubsumeString);
+  #endif
+
+  /**
+   * Here's a bunch of methods that append varying types...
+   * @param   various...
+   * @return  this
+   */
+  nsString& operator+=(const nsStr& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const nsString& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const char* aCString) {return Append(aCString);}
+  //nsString& operator+=(char aChar){return Append(aChar);}
+  nsString& operator+=(const PRUnichar* aUCString) {return Append(aUCString);}
+  nsString& operator+=(PRUnichar aChar){return Append(aChar);}
+
+  /*
+   *  Appends n characters from given string to this,
+   *  This version computes the length of your given string
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @return  number of chars copied
+   */
+  nsString& Append(const nsStr& aString) {return Append(aString,aString.mLength);}
+  nsString& Append(const nsString& aString) {return Append(aString,aString.mLength);}
+ 
+
+  /*
+   *  Appends n characters from given string to this,
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
+   *  @return  number of chars copied
+   */
+  nsString& Append(const nsStr& aString,PRInt32 aCount);
+  nsString& Append(const nsString& aString,PRInt32 aCount);
+  nsString& Append(const char* aString,PRInt32 aCount=-1);
+  nsString& Append(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsString& Append(char aChar);
+  nsString& Append(PRUnichar aChar);
+  nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
+  nsString& Append(float aFloat);
+             
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the leftmost offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @return  number of chars copied
+   */
+  PRUint32 Left(nsString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the given offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @param   anOffset -- position where copying begins
+   *  @return  number of chars copied
+   */
+  PRUint32 Mid(nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at rightmost char.
+   *  
+   *  
+   *  @param  aCopy -- Receiving string
+   *  @param  aCount -- number of chars to copy
+   *  @return number of chars copied
+   */
+  PRUint32 Right(nsString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  This method inserts n chars from given string into this
+   *  string at str[anOffset].
+   *  
+   *  @param  aCopy -- String to be inserted into this
+   *  @param  anOffset -- insertion position within this str
+   *  @param  aCount -- number of chars to be copied from aCopy
+   *  @return number of chars inserted into this.
+   */
+  nsString& Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a given string into this string at
+   * a specified offset.
+   *
+   * @param   aString* to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+  nsString& Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a single char into this string at
+   * a specified offset.
+   *
+   * @param   character to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  //nsString& Insert(char aChar,PRUint32 anOffset);
+  nsString& Insert(PRUnichar aChar,PRUint32 anOffset);
+
+  /*
+   *  This method is used to cut characters in this string
+   *  starting at anOffset, continuing for aCount chars.
+   *  
+   *  @param  anOffset -- start pos for cut operation
+   *  @param  aCount -- number of chars to be cut
+   *  @return *this
+   */
+  nsString& Cut(PRUint32 anOffset,PRInt32 aCount);
+
+
+  /**********************************************************************
+    Searching methods...                
+   *********************************************************************/
+ 
+  /**
+   *  Search for given character within this string.
+   *  This method does so by using a binary search,
+   *  so your string HAD BETTER BE ORDERED!
+   *  
+   *  @param   aChar is the unicode char to be found
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 BinarySearch(PRUnichar aChar) const;
+
+  /**
+   *  Search for given substring within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 Find(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  //PRInt32 Find(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
+  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the first character
+   * found in the given charset
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**
+   * This methods scans the string backwards, looking for the given string
+   * @param   aString is substring to be sought in this
+   * @param   aIgnoreCase tells us whether or not to do caseless compare
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   */
+  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  //PRInt32 RFind(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
+  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the last character
+   * found in the given string
+   * @param aString contains set of chars to be found
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**********************************************************************
+    Comparison methods...                
+   *********************************************************************/
+
+  /**
+   * Compares a given string type to this string. 
+   * @update  gess 7/27/98
+   * @param   S is the string to be compared
+   * @param   aIgnoreCase tells us how to treat case
+   * @param   aCount tells us how many chars to compare
+   * @return  -1,0,1
+   */
+  virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  /**
+   * These methods compare a given string type to this one
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator==(const nsString &aString) const;
+  PRBool  operator==(const nsStr &aString) const;
+  PRBool  operator==(const char *aString) const;
+  PRBool  operator==(const PRUnichar* aString) const;
+
+  /**
+   * These methods perform a !compare of a given string type to this 
+   * @param aString is the string to be compared to this
+   * @return  TRUE 
+   */
+  PRBool  operator!=(const nsString &aString) const;
+  PRBool  operator!=(const nsStr &aString) const;
+  PRBool  operator!=(const char* aString) const;
+  PRBool  operator!=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is < than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<(const nsString &aString) const;
+  PRBool  operator<(const nsStr &aString) const;
+  PRBool  operator<(const char* aString) const;
+  PRBool  operator<(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is > than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>(const nsString &aString) const;
+  PRBool  operator>(const nsStr &S) const;
+  PRBool  operator>(const char* aString) const;
+  PRBool  operator>(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is <= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<=(const nsString &aString) const;
+  PRBool  operator<=(const nsStr &S) const;
+  PRBool  operator<=(const char* aString) const;
+  PRBool  operator<=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is >= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>=(const nsString &aString) const;
+  PRBool  operator>=(const nsStr &S) const;
+  PRBool  operator>=(const char* aString) const;
+  PRBool  operator>=(const PRUnichar* aString) const;
+
+  /**
+   * Compare this to given string; note that we compare full strings here.
+   * The optional length argument just lets us know how long the given string is.
+   * If you provide a length, it is compared to length of this string as an
+   * optimization.
+   * 
+   * @param  aString -- the string to compare to this
+   * @param  aCount  -- number of chars to be compared.
+   * @return TRUE if equal
+   */
+  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const;   
+  PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2,PRBool aIgnoreCase=PR_FALSE) const;
+
+  PRBool  EqualsIgnoreCase(const nsString& aString) const;
+  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
+  PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
+  PRBool  EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
+
+  /**
+   *  Determine if given buffer is plain ascii
+   *  
+   *  @param   aBuffer -- if null, then we test *this, otherwise we test given buffer
+   *  @return  TRUE if is all ascii chars or if strlen==0
+   */
+  PRBool IsASCII(const PRUnichar* aBuffer=0);
+
+
+  /**
+   *  Determine if given char is a valid space character
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if is valid space char
+   */
+  static  PRBool IsSpace(PRUnichar ch);
+
+  /**
+   *  Determine if given char in valid alpha range
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if in alpha range
+   */
+  static  PRBool IsAlpha(PRUnichar ch);
+
+  /**
+   *  Determine if given char is valid digit
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if char is a valid digit
+   */
+  static  PRBool IsDigit(PRUnichar ch);
+
+  static  void        Recycle(nsString* aString);
+  static  nsString*  CreateString(void);
+
+};
+
+extern NS_COM int fputs(const nsString& aString, FILE* out);
+//ostream& operator<<(ostream& aStream,const nsString& aString);
+//virtual void  DebugDump(ostream& aStream) const;
+
+
+/**************************************************************
+  Here comes the AutoString class which uses internal memory
+  (typically found on the stack) for its default buffer.
+  If the buffer needs to grow, it gets reallocated on the heap.
+ **************************************************************/
+
+class NS_COM nsAutoString : public nsString {
+public: 
+
+    nsAutoString();
+    nsAutoString(const char* aCString,PRInt32 aLength=-1);
+    nsAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+
+    nsAutoString(const CBufDescriptor& aBuffer);    
+    nsAutoString(const nsStr& aString);
+    nsAutoString(const nsAutoString& aString);
+#ifdef AIX
+    nsAutoString(const nsSubsumeStr& aSubsumeStr);  // AIX requires a const
+#else
+    nsAutoString(nsSubsumeStr& aSubsumeStr);
+#endif // AIX
+    nsAutoString(PRUnichar aChar);
+    virtual ~nsAutoString();
+
+    nsAutoString& operator=(const nsStr& aString) {nsString::Assign(aString); return *this;}
+    nsAutoString& operator=(const nsAutoString& aString) {nsString::Assign(aString); return *this;}
+    nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
+    nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
+    nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
+    nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
+
+    /**
+     * Retrieve the size of this string
+     * @return string length
+     */
+    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+    
+    char mBuffer[kDefaultStringSize<<eTwoByte];
+};
+
+
+
+/***************************************************************
+  The subsumestr class is very unusual. 
+  It differs from a normal string in that it doesn't use normal
+  copy semantics when another string is assign to this. 
+  Instead, it "steals" the contents of the source string.
+
+  This is very handy for returning nsString classes as part of
+  an operator+(...) for example, in that it cuts down the number
+  of copy operations that must occur. 
+
+  You should probably not use this class unless you really know
+  what you're doing.
+ ***************************************************************/
+class NS_COM nsSubsumeStr : public nsString {
+public:
+  nsSubsumeStr(nsStr& aString);
+  nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+  nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+};
+
+
+
+#endif
+
+

mozilla/string/obsolete/nsXPIDLString.cpp

@@ -0,0 +1,179 @@
+/* -*- 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.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.
+ */
+
+#include "nsDebug.h"
+#include "nsIAllocator.h"
+#include "nsXPIDLString.h"
+#include "plstr.h"
+
+// If the allocator changes, fix it here.
+#define XPIDL_STRING_ALLOC(__len)  ((PRUnichar*) nsAllocator::Alloc((__len) * sizeof(PRUnichar)))
+#define XPIDL_CSTRING_ALLOC(__len) ((char*) nsAllocator::Alloc((__len) * sizeof(char)))
+#define XPIDL_FREE(__ptr)          (nsAllocator::Free(__ptr))
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLString
+
+nsXPIDLString::nsXPIDLString()
+    : mBuf(0),
+      mBufOwner(PR_FALSE)
+{
+}
+
+
+nsXPIDLString::~nsXPIDLString()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+}
+
+
+nsXPIDLString::operator const PRUnichar*()
+{
+    return mBuf;
+}
+
+
+PRUnichar*
+nsXPIDLString::Copy(const PRUnichar* aString)
+{
+    NS_ASSERTION(aString, "null ptr");
+    if (! aString)
+        return 0;
+
+    PRInt32 len = 0;
+
+    {
+        const PRUnichar* p = aString;
+        while (*p++)
+            len++;
+    }
+
+    PRUnichar* result = XPIDL_STRING_ALLOC(len + 1);
+    if (result) {
+        PRUnichar* q = result;
+        while (*aString) {
+            *q = *aString;
+            q++;
+            aString++;
+        }
+        *q = '\0';
+    }
+    return result;
+}
+
+
+PRUnichar**
+nsXPIDLString::StartAssignmentByValue()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_TRUE;
+    return &mBuf;
+}
+
+
+const PRUnichar**
+nsXPIDLString::StartAssignmentByReference()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_FALSE;
+    return (const PRUnichar**) &mBuf;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLCString
+
+nsXPIDLCString::nsXPIDLCString()
+    : mBuf(0),
+      mBufOwner(PR_FALSE)
+{
+}
+
+
+nsXPIDLCString::~nsXPIDLCString()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+}
+
+
+nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+	
+    mBuf = Copy(aCString);
+    mBufOwner = PR_TRUE;
+    
+    return *this;
+}
+
+
+nsXPIDLCString::operator const char*()
+{
+    return mBuf;
+}
+
+
+char*
+nsXPIDLCString::Copy(const char* aCString)
+{
+    NS_ASSERTION(aCString, "null ptr");
+    if (! aCString)
+        return 0;
+
+    PRInt32 len = PL_strlen(aCString);
+    char* result = XPIDL_CSTRING_ALLOC(len + 1);
+    if (result)
+        PL_strcpy(result, aCString);
+
+    return result;
+}
+
+
+char**
+nsXPIDLCString::StartAssignmentByValue()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_TRUE;
+    return &mBuf;
+}
+
+
+const char**
+nsXPIDLCString::StartAssignmentByReference()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_FALSE;
+    return (const char**) &mBuf;
+}
+
+

mozilla/string/obsolete/nsXPIDLString.h

@@ -0,0 +1,302 @@
+/* -*- 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.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.
+ */
+
+/*
+
+  A set of string wrapper classes that ease transition to use of XPIDL
+  interfaces. nsXPIDLString and nsXPIDLCString are to XPIDL `wstring'
+  and `string' out params as nsCOMPtr is to generic XPCOM interface
+  pointers. They help you deal with object ownership.
+
+  Consider the following interface:
+
+    interface nsIFoo {
+      attribute string Bar;
+    };
+
+  This will generate the following C++ header file:
+
+    class nsIFoo {
+      NS_IMETHOD SetBar(const PRUnichar* aValue);
+      NS_IMETHOD GetBar(PRUnichar* *aValue);
+    };
+
+  The GetBar() method will allocate a copy of the nsIFoo object's
+  "bar" attribute, and leave you to deal with freeing it:
+
+    nsIFoo* aFoo; // assume we get this somehow
+    PRUnichar* bar;
+    aFoo->GetFoo(&bar);
+    // Use bar here...
+    printf("bar is %s!\n", bar);
+    nsAllocator::Free(bar);
+
+  This makes your life harder, because you need to convolute your code
+  to ensure that you don't leak `bar'.
+
+  Enter nsXPIDLString, which manages the ownership of the allocated
+  string, and automatically destroys it when the nsXPIDLString goes
+  out of scope:
+
+    nsIFoo* aFoo;
+    nsXPIDLString bar;
+    aFoo->GetFoo( getter_Copies(bar) );
+    // Use bar here...
+    printf("bar is %s!\n", (const char*) bar);
+    // no need to remember to nsAllocator::Free().
+
+  Like nsCOMPtr, nsXPIDLString uses some syntactic sugar to make it
+  painfully clear exactly what the code expects. You need to wrap an
+  nsXPIDLString object with either `getter_Copies()' or
+  `getter_Shares()' before passing it to a getter: these tell the
+  nsXPIDLString how ownership is being handled.
+
+  In the case of `getter_Copies()', the callee is allocating a copy
+  (which is usually the case). In the case of `getter_Shares()', the
+  callee is returning a const reference to `the real deal' (this can
+  be done using the [shared] attribute in XPIDL).
+
+ */
+
+#ifndef nsXPIDLString_h__
+#define nsXPIDLString_h__
+
+#include "nsCom.h"
+#include "prtypes.h"
+
+#ifndef __PRUNICHAR__
+#define __PRUNICHAR__
+typedef PRUint16 PRUnichar;
+#endif /* __PRUNICHAR__ */
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLString
+//
+//   A wrapper for Unicode strings. With the |getter_Copies()| and
+//   |getter_Shares()| helper functions, this can be used instead of
+//   the "naked" |PRUnichar*| interface for |wstring| parameters in
+//   XPIDL interfaces.
+//
+
+class NS_COM nsXPIDLString {
+private:
+    PRUnichar* mBuf;
+    PRBool     mBufOwner;
+
+    PRUnichar** StartAssignmentByValue();
+    const PRUnichar** StartAssignmentByReference();
+
+public:
+    /**
+     * Construct a new, uninitialized wrapper for a Unicode string.
+     */
+    nsXPIDLString();
+
+    virtual ~nsXPIDLString();
+
+    /**
+     * Return a reference to the immutable Unicode string.
+     */
+    operator const PRUnichar*();
+
+    /**
+     * Make a copy of the Unicode string. Use this function in the
+     * callee to ensure that the correct memory allocator is used.
+     */
+    static PRUnichar* Copy(const PRUnichar* aString);
+
+    // A helper class for assignment-by-value. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterCopies {
+    private:
+        nsXPIDLString& mXPIDLString;
+
+    public:
+        GetterCopies(nsXPIDLString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator PRUnichar**() {
+            return mXPIDLString.StartAssignmentByValue();
+        }
+
+        friend GetterCopies getter_Copies(nsXPIDLString& aXPIDLString);
+    };
+
+    friend class GetterCopies;
+
+    // A helper class for assignment-by-reference. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterShares {
+    private:
+        nsXPIDLString& mXPIDLString;
+
+    public:
+        GetterShares(nsXPIDLString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator const PRUnichar**() {
+            return mXPIDLString.StartAssignmentByReference();
+        }
+
+        friend GetterShares getter_Shares(nsXPIDLString& aXPIDLString);
+    };
+
+    friend class GetterShares;
+
+private:
+    // not to be implemented
+    nsXPIDLString(nsXPIDLString& /* aXPIDLString */) {}
+    nsXPIDLString& operator =(nsXPIDLString& /* aXPIDLString */) { return *this; }
+};
+
+
+/**
+ * Use this function to "wrap" the nsXPIDLString object that is to
+ * receive an |out| value.
+ */
+inline nsXPIDLString::GetterCopies
+getter_Copies(nsXPIDLString& aXPIDLString)
+{
+    return nsXPIDLString::GetterCopies(aXPIDLString);
+}
+
+/**
+ * Use this function to "wrap" the nsXPIDLString object that is to
+ * receive a |[shared] out| value.
+ */
+inline nsXPIDLString::GetterShares
+getter_Shares(nsXPIDLString& aXPIDLString)
+{
+    return nsXPIDLString::GetterShares(aXPIDLString);
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLCString
+//
+//   A wrapper for Unicode strings. With the |getter_Copies()| and
+//   |getter_Shares()| helper functions, this can be used instead of
+//   the "naked" |char*| interface for |string| parameters in XPIDL
+//   interfaces.
+//
+
+class NS_COM nsXPIDLCString {
+private:
+    char*  mBuf;
+    PRBool mBufOwner;
+
+    char** StartAssignmentByValue();
+    const char** StartAssignmentByReference();
+
+public:
+    /**
+     * Construct a new, uninitialized wrapper for a single-byte string.
+     */
+    nsXPIDLCString();
+
+    virtual ~nsXPIDLCString();
+
+	/**
+	 * Assign a single-byte string to this wrapper. Copies and owns the result.
+	 */
+	nsXPIDLCString& operator =(const char* aString);
+
+    /**
+     * Return a reference to the immutable single-byte string.
+     */
+    operator const char*();
+
+    /**
+     * Make a copy of the single-byte string. Use this function in the
+     * callee to ensure that the correct memory allocator is used.
+     */
+    static char* Copy(const char* aString);
+
+    // A helper class for assignment-by-value. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterCopies {
+    private:
+        nsXPIDLCString& mXPIDLString;
+
+    public:
+        GetterCopies(nsXPIDLCString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator char**() {
+            return mXPIDLString.StartAssignmentByValue();
+        }
+
+        friend GetterCopies getter_Copies(nsXPIDLCString& aXPIDLString);
+    };
+
+    friend class GetterCopies;
+
+    // A helper class for assignment-by-reference. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterShares {
+    private:
+        nsXPIDLCString& mXPIDLString;
+
+    public:
+        GetterShares(nsXPIDLCString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator const char**() {
+            return mXPIDLString.StartAssignmentByReference();
+        }
+
+        friend GetterShares getter_Shares(nsXPIDLCString& aXPIDLString);
+    };
+
+    friend class GetterShares;
+
+private:
+    // not to be implemented
+    nsXPIDLCString(nsXPIDLCString& /* aXPIDLString */) {}
+    nsXPIDLCString& operator =(nsXPIDLCString& /* aXPIDLCString */) { return *this; }
+};
+
+/**
+ * Use this function to "wrap" the nsXPIDLCString object that is to
+ * receive an |out| value.
+ */
+inline nsXPIDLCString::GetterCopies
+getter_Copies(nsXPIDLCString& aXPIDLString)
+{
+    return nsXPIDLCString::GetterCopies(aXPIDLString);
+}
+
+
+/**
+ * Use this function to "wrap" the nsXPIDLCString object that is to
+ * receive a |[shared] out| value.
+ */
+inline nsXPIDLCString::GetterShares
+getter_Shares(nsXPIDLCString& aXPIDLString)
+{
+    return nsXPIDLCString::GetterShares(aXPIDLString);
+}
+
+
+
+#endif // nsXPIDLString_h__

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/xpcom/ds/MANIFEST

@@ -0,0 +1,30 @@
+nsAVLTree.h
+nsCppSharedAllocator.h
+nsCRT.h
+nsDeque.h
+nsEnumeratorUtils.h
+nsHashtable.h
+nsHashtableEnumerator.h
+nsIArena.h
+nsIBuffer.h
+nsIByteBuffer.h
+nsIObserverList.h
+nsIPageManager.h
+nsIProperties.h
+nsISimpleEnumerator.h
+nsISizeOfHandler.h
+nsIUnicharBuffer.h
+nsIVariant.h
+nsInt64.h
+nsQuickSort.h
+nsStr.h
+nsString.h
+nsString2.h
+nsSupportsPrimitives.h
+nsTime.h
+nsUnitConversion.h
+nsVector.h
+nsVoidArray.h
+nsXPIDLString.h
+plvector.h
+nsTextFormater.h

mozilla/xpcom/ds/MANIFEST_IDL

@@ -0,0 +1,6 @@
+nsIAtom.idl
+nsICollection.idl
+nsIEnumerator.idl
+nsIObserver.idl
+nsIObserverService.idl
+nsISupportsArray.idl

mozilla/xpcom/ds/Makefile.in

@@ -0,0 +1,113 @@
+#
+# 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
+
+MODULE		= xpcom
+XPIDL_MODULE	= xpcom_ds
+LIBRARY_NAME	= xpcomds_s
+
+REQUIRES	= xpcom uconv unicharutil
+
+CPPSRCS		= \
+		nsArena.cpp \
+		nsAtomTable.cpp \
+		nsAVLTree.cpp \
+		nsByteBuffer.cpp \
+		nsCRT.cpp \
+		nsConjoiningEnumerator.cpp \
+		nsDeque.cpp \
+		nsEmptyEnumerator.cpp \
+		nsEnumeratorUtils.cpp \
+		nsHashtable.cpp \
+		nsHashtableEnumerator.cpp \
+		nsObserver.cpp \
+		nsObserverList.cpp \
+		nsObserverService.cpp \
+		nsProperties.cpp \
+		nsQuickSort.cpp \
+		nsSizeOfHandler.cpp \
+		nsStr.cpp \
+		nsString.cpp \
+		nsString2.cpp \
+		nsSupportsArray.cpp \
+		nsSupportsArrayEnumerator.cpp \
+		nsSupportsPrimitives.cpp \
+		nsUnicharBuffer.cpp \
+		nsVariant.cpp \
+		nsVoidArray.cpp \
+		nsXPIDLString.cpp \
+		plvector.cpp \
+		nsTextFormater.cpp \
+		$(NULL)
+
+EXPORTS		= \
+		nsAVLTree.h \
+		nsCppSharedAllocator.h \
+		nsCRT.h \
+		nsDeque.h \
+		nsEnumeratorUtils.h \
+		nsHashtable.h \
+		nsHashtableEnumerator.h \
+		nsIArena.h \
+		nsIByteBuffer.h \
+		nsIObserverList.h \
+		nsIProperties.h \
+		nsISimpleEnumerator.h \
+		nsISizeOfHandler.h \
+		nsIUnicharBuffer.h \
+		nsIVariant.h \
+		nsInt64.h \
+		nsQuickSort.h \
+		nsStr.h \
+		nsString.h \
+		nsString2.h \
+		nsSupportsPrimitives.h \
+		nsTime.h \
+		nsUnitConversion.h \
+		nsVector.h \
+		nsVoidArray.h \
+		nsXPIDLString.h \
+		plvector.h \
+		nsTextFormater.h \
+		$(NULL)			
+
+XPIDLSRCS	= \
+		nsIAtom.idl \
+		nsICollection.idl \
+		nsIEnumerator.idl \
+		nsIObserver.idl \
+		nsIObserverService.idl \
+		nsISupportsArray.idl \
+		nsISupportsPrimitives.idl \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+

mozilla/xpcom/ds/bufferRoutines.h

@@ -0,0 +1,758 @@
+/* -*- 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.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.
+ */
+
+/******************************************************************************************
+  MODULE NOTES:
+
+  This file contains the workhorse copy and shift functions used in nsStrStruct.
+  Ultimately, I plan to make the function pointers in this system available for 
+  use by external modules. They'll be able to install their own "handlers".
+  Not so, today though.
+
+*******************************************************************************************/
+
+#ifndef _BUFFERROUTINES_H
+#define _BUFFERROUTINES_H
+
+#include "nsCRT.h"
+
+#ifndef RICKG_TESTBED
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+#endif
+
+#define KSHIFTLEFT  (0)
+#define KSHIFTRIGHT (1)
+
+
+inline PRUnichar GetUnicharAt(const char* aString,PRUint32 anIndex) {
+  return ((PRUnichar*)aString)[anIndex];
+}
+
+inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
+  return (PRUnichar)aString[anIndex];
+}
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to shift the contents of a char buffer.
+//  The functions are differentiated by shift direction and the underlying charsize.
+//
+
+/**
+ * This method shifts single byte characters left by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where left-shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "cut"
+ */
+void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  char*   dst = aDest+anOffset;
+  char*   src = aDest+anOffset+aCount;
+
+  memmove(dst,src,aLength-(aCount+anOffset));
+}
+
+/**
+ * This method shifts single byte characters right by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "inserted"
+ */
+void ShiftCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  char* src = aDest+anOffset;
+  char* dst = aDest+anOffset+aCount;
+
+  memmove(dst,src,aLength-anOffset);
+}
+
+/**
+ * This method shifts unicode characters by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "cut"
+ */
+void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* dst = root+anOffset;
+  PRUnichar* src = root+anOffset+aCount;
+
+  memmove(dst,src,(aLength-(aCount+anOffset))*sizeof(PRUnichar));
+}
+
+
+/**
+ * This method shifts unicode characters by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "inserted"
+ */
+void ShiftDoubleCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* src = root+anOffset;
+  PRUnichar* dst = root+anOffset+aCount;
+
+  memmove(dst,src,sizeof(PRUnichar)*(aLength-anOffset));
+}
+
+
+typedef void (*ShiftChars)(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount);
+ShiftChars gShiftChars[2][2]= {
+  {&ShiftCharsLeft,&ShiftCharsRight},
+  {&ShiftDoubleCharsLeft,&ShiftDoubleCharsRight}
+};
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to copy one buffer onto another.
+//  The functions are differentiated by the size of source and dest character sizes.
+//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
+//           We don't validate these ranges here (this should be done in higher level routines).
+//
+
+
+/**
+ * Going 1 to 1 is easy, since we assume ascii. No conversions are necessary.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars1To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+
+  char* dst = aDest+anDestOffset;
+  char* src = (char*)aSource+anOffset;
+
+  memcpy(dst,src,aCount);
+} 
+
+/**
+ * Going 1 to 2 requires a conversion from ascii to unicode. This can be expensive.
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars1To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+
+  PRUnichar* theDest=(PRUnichar*)aDest;
+  PRUnichar* to   = theDest+anDestOffset;
+  const unsigned char* first= (const unsigned char*)aSource+anOffset;
+  const unsigned char* last = first+aCount;
+
+  //now loop over characters, shifting them left...
+  while(first<last) {
+    *to=(PRUnichar)(*first);  
+    to++;
+    first++;
+  }
+}
+ 
+
+/**
+ * Going 2 to 1 requires a conversion from unicode down to ascii. This can be lossy.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars2To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+  char*             to   = aDest+anDestOffset;
+  PRUnichar*        theSource=(PRUnichar*)aSource;
+  const PRUnichar*  first= theSource+anOffset;
+  const PRUnichar*  last = first+aCount;
+
+  //now loop over characters, shifting them left...
+  while(first<last) {
+    if(*first<256)
+      *to=(char)*first;  
+    else *to='.';
+    to++;
+    first++;
+  }
+}
+
+/**
+ * Going 2 to 2 is fast and efficient.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars2To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* theDest=(PRUnichar*)aDest;
+  PRUnichar* to   = theDest+anDestOffset;
+  PRUnichar* theSource=(PRUnichar*)aSource;
+  PRUnichar* from= theSource+anOffset;
+
+  memcpy((void*)to,(void*)from,aCount*sizeof(PRUnichar));
+}
+
+
+//--------------------------------------------------------------------------------------
+
+
+typedef void (*CopyChars)(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount);
+
+CopyChars gCopyChars[2][2]={
+  {&CopyChars1To1,&CopyChars1To2},
+  {&CopyChars2To1,&CopyChars2To2}
+};
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to search a buffer looking for a char.
+//
+
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 FindChar1(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+
+  if(aIgnoreCase) {
+    char theChar=(char)nsCRT::ToUpper(aChar);
+    const char* ptr=aDest+(anOffset-1);
+    const char* last=aDest+aLength;
+    while(++ptr<last){
+      if(nsCRT::ToUpper(*ptr)==theChar)
+        return ptr-aDest;
+    }
+  }
+  else {
+
+    const char* ptr = aDest+anOffset;
+    char theChar=(char)aChar;
+    const char* result=(const char*)memchr(ptr, theChar,aLength-anOffset);
+    if(result) {
+      return result-aDest;
+    }
+  }
+  return kNotFound;
+}
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 FindChar2(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+  const PRUnichar*  root=(PRUnichar*)aDest;
+  const PRUnichar*  ptr=root+(anOffset-1);
+  const PRUnichar*  last=root+aLength;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    while(++ptr<last){
+      if(nsCRT::ToUpper(*ptr)==theChar)
+        return ptr-root;
+    }
+  }
+  else {
+    while(++ptr<last){
+      if(*ptr==aChar)
+        return (ptr-root);
+    }
+  }
+
+  return kNotFound;
+}
+
+
+/**
+ *  This methods cans the given buffer (in reverse) for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 RFindChar1(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+  PRInt32 theIndex=0;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(nsCRT::ToUpper(aDest[theIndex])==theChar)
+        return theIndex;
+    }
+  }
+  else {
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(aDest[theIndex]==aChar)
+        return theIndex;
+    }
+  }
+
+  return kNotFound;
+}
+
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 RFindChar2(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+
+  PRInt32 theIndex=0;
+  PRUnichar*  theBuf=(PRUnichar*)aDest;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(nsCRT::ToUpper(theBuf[theIndex])==theChar)
+        return theIndex;
+    }
+  }
+  else {
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(theBuf[theIndex]==aChar)
+        return theIndex;
+    }
+  }
+
+  return kNotFound;
+}
+
+typedef PRInt32 (*FindChars)(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase);
+FindChars gFindChars[]={&FindChar1,&FindChar2};
+FindChars gRFindChars[]={&RFindChar1,&RFindChar2};
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to compare one buffer onto another.
+//  The functions are differentiated by the size of source and dest character sizes.
+//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
+//           We don't validate these ranges here (this should be done in higher level routines).
+//
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare1To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result=0;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp(aStr1,aStr2,aCount);
+  else result=strncmp(aStr1,aStr2,aCount);
+  return result;
+}
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare2To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result=0;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
+  else result=nsCRT::strncmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
+  return result;
+}
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare2To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr1,aStr2,aCount);
+  else result=nsCRT::strncmp((PRUnichar*)aStr1,aStr2,aCount);
+  return result;
+}
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare1To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
+  else result=nsCRT::strncmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
+  return result;
+}
+
+
+typedef PRInt32 (*CompareChars)(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase);
+CompareChars gCompare[2][2]={
+  {&Compare1To1,&Compare1To2},
+  {&Compare2To1,&Compare2To2},
+};
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to convert the case of strings...
+//
+
+
+/**
+ * This method performs a case conversion the data in the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be case shifted
+ * @param   aCount is the number of chars to compare
+ * @param   aToUpper tells us whether to convert to upper or lower
+ * @return  0
+ */
+PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){ 
+  PRInt32 result=0;
+
+  typedef char  chartype;
+  chartype* cp = (chartype*)aString;
+  chartype* end = cp + aCount-1;
+  while (cp <= end) {
+    chartype ch = *cp;
+    if(aToUpper) {
+      if ((ch >= 'a') && (ch <= 'z')) {
+        *cp = 'A' + (ch - 'a');
+      }
+    }
+    else {
+      if ((ch >= 'A') && (ch <= 'Z')) {
+        *cp = 'a' + (ch - 'A');
+      }
+    }
+    cp++;
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+#ifndef RICKG_TESTBED
+class HandleCaseConversionShutdown3 : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown3(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown3(void) {}
+   NS_DECL_ISUPPORTS
+};
+
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
+static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
+static nsICaseConversion * gCaseConv = 0; 
+
+NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown3, kIShutdownListenerIID);
+
+nsresult HandleCaseConversionShutdown3::OnShutdown(const nsCID& cid, nsISupports* service) {
+    if (cid.Equals(kUnicharUtilCID)) {
+        NS_ASSERTION(service == gCaseConv, "wrong service!");
+        if(gCaseConv){
+          gCaseConv->Release();
+          gCaseConv = 0;
+        }
+    }
+    return NS_OK;
+}
+
+
+class CCaseConversionServiceInitializer {
+public:
+  CCaseConversionServiceInitializer(){
+    mListener = new HandleCaseConversionShutdown3();
+    if(mListener){
+      mListener->AddRef();
+      nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,(nsISupports**) &gCaseConv, mListener);
+    }
+  }
+protected:
+  HandleCaseConversionShutdown3* mListener;
+};
+
+#endif
+
+//----------------------------------------------------------------------------------------
+
+/**
+ * This method performs a case conversion the data in the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be case shifted
+ * @param   aCount is the number of chars to compare
+ * @param   aToUpper tells us whether to convert to upper or lower
+ * @return  0
+ */
+PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){ 
+  PRUnichar* cp = (PRUnichar*)aString;
+  PRUnichar* end = cp + aCount-1;
+  PRInt32 result=0;
+
+#ifndef RICKG_TESTBED
+  static CCaseConversionServiceInitializer  gCaseConversionServiceInitializer;
+
+  // I18N code begin
+  if(gCaseConv) {
+    nsresult err=(aToUpper) ? gCaseConv->ToUpper(cp, cp, aCount) : gCaseConv->ToLower(cp, cp, aCount);
+    if(NS_SUCCEEDED(err))
+      return 0;
+  }
+  // I18N code end
+#endif
+
+
+  while (cp <= end) {
+    PRUnichar ch = *cp;
+    if(aToUpper) {
+      if ((ch >= 'a') && (ch <= 'z')) {
+        *cp = 'A' + (ch - 'a');
+      }
+    }
+    else {
+      if ((ch >= 'A') && (ch <= 'Z')) {
+        *cp = 'a' + (ch - 'A');
+      }
+    }
+    cp++;
+  }
+
+  return result;
+}
+
+typedef PRInt32 (*CaseConverters)(char*,PRUint32,PRBool);
+CaseConverters gCaseConverters[]={&ConvertCase1,&ConvertCase2};
+
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used compress char sequences in a buffer...
+//
+
+
+/**
+ * This method compresses duplicate runs of a given char from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef char  chartype;
+  chartype*  from = aString;
+  chartype*  end =  aString + aLength-1;
+  chartype*  to = from;
+
+    //this code converts /n, /t, /r into normal space ' ';
+    //it also compresses runs of whitespace down to a single char...
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (from <= end) {
+      chartype theChar = *from++;
+      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++=theChar;
+        while (from <= end) {
+          theChar = *from++;
+          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+            *to++ = theChar;
+            break;
+          }
+        }
+      } else {
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+
+/**
+ * This method compresses duplicate runs of a given char from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef PRUnichar  chartype;
+  chartype*  from = (chartype*)aString;
+  chartype*  end =  from + aLength-1;
+  chartype*  to = from;
+
+    //this code converts /n, /t, /r into normal space ' ';
+    //it also compresses runs of whitespace down to a single char...
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (from <= end) {
+      chartype theChar = *from++;
+      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++=theChar;
+        while (from <= end) {
+          theChar = *from++;
+          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+            *to++ = theChar;
+            break;
+          }
+        }
+      } else {
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+typedef PRInt32 (*CompressChars)(char* aString,PRUint32 aCount,const char* aSet);
+CompressChars gCompressChars[]={&CompressChars1,&CompressChars2};
+
+/**
+ * This method strips chars in a given set from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 StripChars1(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef char  chartype;
+  chartype*  to   = aString;
+  chartype*  from = aString-1;
+  chartype*  end  = aString + aLength;
+
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (++from < end) {
+      chartype theChar = *from;
+      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+
+/**
+ * This method strips chars in a given set from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 StripChars2(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef PRUnichar  chartype;
+  chartype*  to   = (chartype*)aString;
+  chartype*  from = (chartype*)aString-1;
+  chartype*  end  = to + aLength;
+
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (++from < end) {
+      chartype theChar = *from;
+      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+typedef PRInt32 (*StripChars)(char* aString,PRUint32 aCount,const char* aSet);
+StripChars gStripChars[]={&StripChars1,&StripChars2};
+
+#endif

mozilla/xpcom/ds/makefile.win

@@ -0,0 +1,120 @@
+#!nmake
+#
+# 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=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                          \
+        nsTextFormater.h           \
+        nsAVLTree.h                \
+        nsCppSharedAllocator.h     \
+        nsCRT.h                    \
+        nsDeque.h                  \
+        nsEnumeratorUtils.h        \
+        nsHashtable.h              \
+        nsHashtableEnumerator.h    \
+        nsIArena.h                 \
+        nsIByteBuffer.h            \
+        nsIObserverList.h          \
+        nsIProperties.h            \
+        nsISimpleEnumerator.h      \
+        nsISizeOfHandler.h         \
+        nsIUnicharBuffer.h         \
+        nsIVariant.h               \
+        nsInt64.h                  \
+        nsQuickSort.h              \
+        nsStr.h                    \
+        nsString.h                 \
+        nsString2.h                \
+        nsSupportsPrimitives.h     \
+        nsTime.h                   \
+        nsUnitConversion.h         \
+        nsVector.h                 \
+        nsVoidArray.h              \
+        nsXPIDLString.h            \
+        plvector.h                 \
+        $(NULL)			
+
+XPIDL_MODULE = xpcom_ds
+
+XPIDLSRCS =                         \
+        .\nsIAtom.idl               \
+        .\nsICollection.idl         \
+        .\nsIEnumerator.idl         \
+	.\nsIObserver.idl           \
+	.\nsIObserverService.idl    \
+	.\nsISupportsArray.idl	    \
+	.\nsISupportsPrimitives.idl \
+        $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=xpcomds_s
+
+LINCS =                         \
+	-I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\uconv       \
+        -I$(PUBLIC)\unicharutil \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                                        \
+        .\$(OBJDIR)\nsTextFormater.obj            \
+        .\$(OBJDIR)\nsArena.obj                   \
+        .\$(OBJDIR)\nsAtomTable.obj               \
+        .\$(OBJDIR)\nsAVLTree.obj                 \
+        .\$(OBJDIR)\nsByteBuffer.obj              \
+        .\$(OBJDIR)\nsCRT.obj                     \
+        .\$(OBJDIR)\nsConjoiningEnumerator.obj    \
+        .\$(OBJDIR)\nsDeque.obj                   \
+        .\$(OBJDIR)\nsEmptyEnumerator.obj         \
+        .\$(OBJDIR)\nsEnumeratorUtils.obj         \
+        .\$(OBJDIR)\nsHashtable.obj               \
+        .\$(OBJDIR)\nsHashtableEnumerator.obj     \
+        .\$(OBJDIR)\nsObserver.obj                \
+        .\$(OBJDIR)\nsObserverList.obj            \
+        .\$(OBJDIR)\nsObserverService.obj         \
+        .\$(OBJDIR)\nsProperties.obj              \
+        .\$(OBJDIR)\nsQuickSort.obj               \
+        .\$(OBJDIR)\nsSizeOfHandler.obj           \
+        .\$(OBJDIR)\nsStr.obj                     \
+        .\$(OBJDIR)\nsString.obj                  \
+        .\$(OBJDIR)\nsString2.obj                 \
+        .\$(OBJDIR)\nsSupportsArray.obj           \
+        .\$(OBJDIR)\nsSupportsArrayEnumerator.obj \
+        .\$(OBJDIR)\nsSupportsPrimitives.obj      \
+        .\$(OBJDIR)\nsUnicharBuffer.obj           \
+        .\$(OBJDIR)\nsVariant.obj                 \
+        .\$(OBJDIR)\nsVoidArray.obj               \
+        .\$(OBJDIR)\nsXPIDLString.obj             \
+        .\$(OBJDIR)\plvector.obj                  \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpcom/ds/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- 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.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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/xpcom/ds/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- 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.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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/xpcom/ds/nsArena.cpp

@@ -0,0 +1,97 @@
+/* -*- 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.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.
+ */
+
+#include "nsArena.h"
+#include "nsCRT.h"
+
+ArenaImpl::ArenaImpl(void)
+  : mInitialized(PR_FALSE)
+{
+  NS_INIT_REFCNT();
+  nsCRT::memset(&mPool, 0, sizeof(PLArenaPool));
+}
+
+NS_IMETHODIMP
+ArenaImpl::Init(PRUint32 aBlockSize)
+{
+  if (aBlockSize < NS_MIN_ARENA_BLOCK_SIZE) {
+    aBlockSize = NS_DEFAULT_ARENA_BLOCK_SIZE;
+  }
+  PL_INIT_ARENA_POOL(&mPool, "nsIArena", aBlockSize);
+  mBlockSize = aBlockSize;
+  mInitialized = PR_TRUE;
+  return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS1(ArenaImpl, nsIArena)
+
+ArenaImpl::~ArenaImpl()
+{
+  if (mInitialized)
+    PL_FinishArenaPool(&mPool);
+
+  mInitialized = PR_FALSE;
+}
+
+NS_IMETHODIMP_(void*)
+ArenaImpl::Alloc(PRUint32 size)
+{
+  // Adjust size so that it's a multiple of sizeof(double)
+  PRUint32 align = size & (sizeof(double) - 1);
+  if (0 != align) {
+    size += sizeof(double) - align;
+  }
+
+  void* p;
+  PL_ARENA_ALLOCATE(p, &mPool, size);
+  return p;
+}
+
+NS_METHOD
+ArenaImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (aOuter)
+    return NS_ERROR_NO_AGGREGATION;
+  
+  ArenaImpl* it = new ArenaImpl();
+  if (nsnull == it)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(it);
+  nsresult rv = it->QueryInterface(aIID, aResult);
+  NS_RELEASE(it);
+  return rv;
+}
+
+NS_COM nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                 PRUint32 aArenaBlockSize)
+{
+  nsresult rv;
+  nsIArena* arena;
+  rv = ArenaImpl::Create(NULL, nsIArena::GetIID(), (void**)&arena);
+  if (NS_FAILED(rv)) return rv;
+    
+  rv = arena->Init(aArenaBlockSize);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(arena);
+    return rv;
+  }    
+  
+  *aInstancePtrResult = arena;
+  return rv;
+}

mozilla/xpcom/ds/nsArena.h

@@ -0,0 +1,50 @@
+/* -*- 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.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.
+ */
+
+#ifndef nsArena_h__
+#define nsArena_h__
+
+#include "nsIArena.h"
+
+#define PL_ARENA_CONST_ALIGN_MASK 7
+#include "plarena.h"
+
+// Simple arena implementation layered on plarena
+class ArenaImpl : public nsIArena {
+public:
+  ArenaImpl(void);
+  virtual ~ArenaImpl();
+
+  NS_DECL_ISUPPORTS
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  NS_IMETHOD Init(PRUint32 arenaBlockSize);
+
+  NS_IMETHOD_(void*) Alloc(PRUint32 size);
+
+protected:
+  PLArenaPool mPool;
+  PRUint32 mBlockSize;
+
+private:
+  PRBool mInitialized;
+};
+
+#endif // nsArena_h__

mozilla/xpcom/ds/nsAtomTable.cpp

@@ -0,0 +1,172 @@
+/* -*- 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.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.
+ */
+
+#include "nsAtomTable.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "plhash.h"
+#include "nsISizeOfHandler.h"
+
+/**
+ * The shared hash table for atom lookups.
+ */
+static nsrefcnt gAtoms;
+static struct PLHashTable* gAtomHashTable;
+
+#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
+static PRIntn
+DumpAtomLeaks(PLHashEntry *he, PRIntn index, void *arg)
+{
+  AtomImpl* atom = (AtomImpl*) he->value;
+  if (atom) {
+    nsAutoString tmp;
+    atom->ToString(tmp);
+    fputs(tmp, stdout);
+    fputs("\n", stdout);
+  }
+  return HT_ENUMERATE_NEXT;
+}
+#endif
+
+NS_COM void NS_PurgeAtomTable(void)
+{
+  if (gAtomHashTable) {
+#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
+    if (gAtoms) {
+      if (getenv("MOZ_DUMP_ATOM_LEAKS")) {
+        printf("*** leaking %d atoms\n", gAtoms);
+        PL_HashTableEnumerateEntries(gAtomHashTable, DumpAtomLeaks, 0);
+      }
+    }
+#endif
+    PL_HashTableDestroy(gAtomHashTable);
+    gAtomHashTable = nsnull;
+  }
+}
+
+AtomImpl::AtomImpl()
+{
+  NS_INIT_REFCNT();
+  // Every live atom holds a reference on the atom hashtable
+  gAtoms++;
+}
+
+AtomImpl::~AtomImpl()
+{
+  NS_PRECONDITION(nsnull != gAtomHashTable, "null atom hashtable");
+  if (nsnull != gAtomHashTable) {
+    PL_HashTableRemove(gAtomHashTable, mString);
+    nsrefcnt cnt = --gAtoms;
+    if (0 == cnt) {
+      // When the last atom is destroyed, the atom arena is destroyed
+      NS_ASSERTION(0 == gAtomHashTable->nentries, "bad atom table");
+      PL_HashTableDestroy(gAtomHashTable);
+      gAtomHashTable = nsnull;
+    }
+  }
+}
+
+NS_IMPL_ISUPPORTS1(AtomImpl, nsIAtom)
+
+void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
+{
+  size = size + uslen * sizeof(PRUnichar);
+  AtomImpl* ii = (AtomImpl*) ::operator new(size);
+  nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
+  ii->mString[uslen] = 0;
+  return ii;
+}
+
+NS_IMETHODIMP 
+AtomImpl::ToString(nsString& aBuf) /*FIX: const */
+{
+  aBuf.SetLength(0);
+  aBuf.Append(mString, nsCRT::strlen(mString));
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+AtomImpl::GetUnicode(const PRUnichar **aResult) /*FIX: const */
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mString;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AtomImpl::SizeOf(nsISizeOfHandler* aHandler, PRUint32* _retval) /*FIX: const */
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+  PRUint32 sum = sizeof(*this) + nsCRT::strlen(mString) * sizeof(PRUnichar);
+  *_retval = sum;
+  return NS_OK;
+}
+
+//----------------------------------------------------------------------
+
+static PLHashNumber HashKey(const PRUnichar* k)
+{
+  return (PLHashNumber) nsCRT::HashValue(k);
+}
+
+static PRIntn CompareKeys(const PRUnichar* k1, const PRUnichar* k2)
+{
+  return nsCRT::strcmp(k1, k2) == 0;
+}
+
+NS_COM nsIAtom* NS_NewAtom(const char* isolatin1)
+{
+  nsAutoString tmp(isolatin1);
+  return NS_NewAtom(tmp.GetUnicode());
+}
+
+NS_COM nsIAtom* NS_NewAtom(const nsString& aString)
+{
+  return NS_NewAtom(aString.GetUnicode());
+}
+
+NS_COM nsIAtom* NS_NewAtom(const PRUnichar* us)
+{
+  if (nsnull == gAtomHashTable) {
+    gAtomHashTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
+                                     (PLHashComparator) CompareKeys,
+                                     (PLHashComparator) nsnull,
+                                     nsnull, nsnull);
+  }
+  PRUint32 uslen;
+  PRUint32 hashCode = nsCRT::HashValue(us, &uslen);
+  PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
+  PLHashEntry* he = *hep;
+  if (nsnull != he) {
+    nsIAtom* id = (nsIAtom*) he->value;
+    NS_ADDREF(id);
+    return id;
+  }
+  AtomImpl* id = new(us, uslen) AtomImpl();
+  PL_HashTableRawAdd(gAtomHashTable, hep, hashCode, id->mString, id);
+  NS_ADDREF(id);
+  return id;
+}
+
+NS_COM nsrefcnt NS_GetNumberOfAtoms(void)
+{
+  if (nsnull != gAtomHashTable) {
+    NS_PRECONDITION(nsrefcnt(gAtomHashTable->nentries) == gAtoms, "bad atom table");
+  }
+  return gAtoms;
+}

mozilla/xpcom/ds/nsAtomTable.h

@@ -0,0 +1,43 @@
+/* -*- 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.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.
+ */
+
+#ifndef nsAtomTable_h__
+#define nsAtomTable_h__
+
+#include "nsIAtom.h"
+
+class AtomImpl : public nsIAtom {
+public:
+  AtomImpl();
+  virtual ~AtomImpl();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIATOM
+
+  void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
+
+  void operator delete(void* ptr) {
+    ::operator delete(ptr);
+  }
+
+  // Actually more; 0 terminated. This slot is reserved for the
+  // terminating zero.
+  PRUnichar mString[1];
+};
+
+#endif // nsAtomTable_h__

mozilla/xpcom/ds/nsBuffer.cpp

@@ -0,0 +1,723 @@
+/* -*- 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.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.
+ */
+
+#include "nsBuffer.h"
+#include "nsAutoLock.h"
+#include "nsCRT.h"
+#include "nsIInputStream.h"
+#include "nsIServiceManager.h"
+#include "nsIPageManager.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsBuffer::nsBuffer()
+    : mGrowBySize(0),
+      mMaxSize(0),
+      mAllocator(nsnull),
+      mObserver(nsnull),
+      mBufferSize(0),
+      mReadSegment(nsnull),
+      mReadCursor(0),
+      mWriteSegment(nsnull),
+      mWriteCursor(0),
+      mReaderClosed(PR_FALSE),
+      mCondition(NS_OK)
+{
+    NS_INIT_REFCNT();
+    PR_INIT_CLIST(&mSegments);
+}
+
+NS_IMETHODIMP
+nsBuffer::Init(PRUint32 growBySize, PRUint32 maxSize,
+               nsIBufferObserver* observer, nsIAllocator* allocator)
+{
+    NS_ASSERTION(sizeof(PRCList) <= SEGMENT_OVERHEAD,
+                 "need to change SEGMENT_OVERHEAD size");
+    NS_ASSERTION(growBySize > SEGMENT_OVERHEAD, "bad growBySize");
+    mGrowBySize = growBySize;
+    mMaxSize = maxSize;
+    mObserver = observer;
+    NS_IF_ADDREF(mObserver);
+    mAllocator = allocator;
+    NS_ADDREF(mAllocator);
+    return NS_OK;
+}
+
+nsBuffer::~nsBuffer()
+{
+    // Free any allocated pages...
+    while (!PR_CLIST_IS_EMPTY(&mSegments)) {
+        PRCList* header = (PRCList*)mSegments.next;
+        char* segment = (char*)header;
+
+        PR_REMOVE_LINK(header);     // unlink from mSegments
+        (void) mAllocator->Free(segment);
+    }
+
+    NS_IF_RELEASE(mObserver);
+    NS_IF_RELEASE(mAllocator);
+}
+
+NS_IMPL_ISUPPORTS1(nsBuffer, nsIBuffer)
+
+NS_METHOD
+nsBuffer::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    if (aOuter)
+        return NS_ERROR_NO_AGGREGATION;
+
+    nsBuffer* buf = new nsBuffer();
+    if (buf == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(buf);
+    nsresult rv = buf->QueryInterface(aIID, aResult);
+    NS_RELEASE(buf);
+    return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsresult
+nsBuffer::PushWriteSegment()
+{
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    if (mBufferSize >= mMaxSize) {
+        if (mObserver) {
+            nsresult rv = mObserver->OnFull(this);
+            if (NS_FAILED(rv)) return rv;
+        }
+        return NS_BASE_STREAM_WOULD_BLOCK;
+    }
+
+    // allocate a new segment to write into
+    PRCList* header;
+
+    header = (PRCList*)mAllocator->Alloc(mGrowBySize);
+    if (header == nsnull) 
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    mBufferSize += mGrowBySize;
+
+    PR_INSERT_BEFORE(header, &mSegments);       // insert at end
+
+    // initialize the write segment
+    mWriteSegment = header;
+    mWriteSegmentEnd = (char*)mWriteSegment + mGrowBySize;
+    mWriteCursor = (char*)mWriteSegment + sizeof(PRCList);
+
+    return NS_OK;
+}
+
+nsresult
+nsBuffer::PopReadSegment()
+{
+    nsresult rv;
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    PRCList* header = (PRCList*)mSegments.next;
+    char* segment = (char*)header;
+
+    NS_ASSERTION(mReadSegment == header, "wrong segment");
+
+    // make sure that the writer isn't still in this segment (that the
+    // reader is removing)
+    NS_ASSERTION(!(segment <= mWriteCursor && mWriteCursor < segment + mGrowBySize),
+                 "removing writer's segment");
+
+    PR_REMOVE_LINK(header);     // unlink from mSegments
+
+    mBufferSize -= mGrowBySize;
+
+    rv = mAllocator->Free(segment);
+    if (NS_FAILED(rv)) return rv;
+
+    // initialize the read segment
+    if (PR_CLIST_IS_EMPTY(&mSegments)) {
+        mReadSegment = nsnull;
+        mReadSegmentEnd = nsnull;
+        mReadCursor = nsnull;
+        if (mObserver) {
+            rv = mObserver->OnEmpty(this);
+            if (NS_FAILED(rv)) return rv;
+        }
+        return NS_BASE_STREAM_WOULD_BLOCK;
+    }
+    else {
+        mReadSegment = mSegments.next;
+        mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+        mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+    }
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIBuffer methods:
+
+NS_IMETHODIMP
+nsBuffer::ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                       PRUint32 *readCount)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsAutoCMonitor mon(this);
+    nsresult rv = NS_OK;
+    PRUint32 readBufferLen;
+    const char* readBuffer;
+
+    *readCount = 0;
+    while (count > 0) {
+        rv = GetReadSegment(0, &readBuffer, &readBufferLen);
+        if (NS_FAILED(rv) || readBufferLen == 0) {
+            return *readCount == 0 ? rv : NS_OK;
+        }
+
+        readBufferLen = PR_MIN(readBufferLen, count);
+        while (readBufferLen > 0) {
+            PRUint32 writeCount;
+            rv = writer(closure, readBuffer, *readCount, readBufferLen, &writeCount);
+			NS_ASSERTION(rv != NS_BASE_STREAM_EOF, "Write should not return EOF");
+            if (rv == NS_BASE_STREAM_WOULD_BLOCK || NS_FAILED(rv) || writeCount == 0) {
+                // if we failed to write just report what we were
+                // able to read so far
+                return *readCount == 0 ? rv : NS_OK;
+            }
+            NS_ASSERTION(writeCount <= readBufferLen, "writer returned bad writeCount");
+            readBuffer += writeCount;
+            readBufferLen -= writeCount;
+            *readCount += writeCount;
+            count -= writeCount;
+
+            if (mReadCursor + writeCount == mReadSegmentEnd) {
+                rv = PopReadSegment();
+                if (NS_FAILED(rv)) {
+                    return *readCount == 0 ? rv : NS_OK;
+                }
+            }
+            else {
+                mReadCursor += writeCount;
+            }
+        }
+    }
+    return NS_OK;
+}
+
+static NS_METHOD
+nsWriteToRawBuffer(void* closure,
+                   const char* fromRawSegment,
+                   PRUint32 offset,
+                   PRUint32 count,
+                   PRUint32 *writeCount)
+{
+    char* toBuf = (char*)closure;
+    nsCRT::memcpy(&toBuf[offset], fromRawSegment, count);
+    *writeCount = count;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount)
+{
+    return ReadSegments(nsWriteToRawBuffer, toBuf, bufLen, readCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReadSegment(PRUint32 segmentLogicalOffset, 
+                         const char* *resultSegment,
+                         PRUint32 *resultSegmentLen)
+{
+    nsAutoCMonitor mon(this);
+
+    // set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (PR_CLIST_IS_EMPTY(&mSegments)) {
+            *resultSegmentLen = 0;
+            *resultSegment = nsnull;
+            return mCondition;
+        }
+        else {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    // now search for the segment starting from segmentLogicalOffset and return it
+    PRCList* curSeg = mReadSegment;
+    char* curSegStart = mReadCursor;
+    char* curSegEnd = mReadSegmentEnd;
+    PRInt32 amt;
+    PRInt32 offset = (PRInt32)segmentLogicalOffset;
+    while (offset >= 0) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (curSegStart <= snapshotWriteCursor &&
+            snapshotWriteCursor < curSegEnd) {
+            // same segment -- read up to the snapshotWriteCursor
+            curSegEnd = snapshotWriteCursor;
+
+            amt = curSegEnd - curSegStart;
+            if (offset < amt) {
+                // segmentLogicalOffset is in this segment, so read up to its end
+                *resultSegmentLen = amt - offset;
+                *resultSegment = curSegStart + offset;
+                return NS_OK;
+            }
+            else {
+                // don't continue past the write segment
+                *resultSegmentLen = 0;
+                *resultSegment = nsnull;
+                return mCondition;
+            }
+        }
+        else {
+            amt = curSegEnd - curSegStart;
+            if (offset < amt) {
+                // segmentLogicalOffset is in this segment, so read up to its end
+                *resultSegmentLen = amt - offset;
+                *resultSegment = curSegStart + offset;
+                return NS_OK;
+            }
+            else {
+                curSeg = PR_NEXT_LINK(curSeg);
+                if (curSeg == mReadSegment) {
+                    // been all the way around
+                    *resultSegmentLen = 0;
+                    *resultSegment = nsnull;
+                    return mCondition;
+                }
+                curSegEnd = (char*)curSeg + mGrowBySize;
+                curSegStart = (char*)curSeg + sizeof(PRCList);
+                offset -= amt;
+            }
+        }
+    }
+    NS_NOTREACHED("nsBuffer::GetReadSegment failed");
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReadableAmount(PRUint32 *result)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsAutoCMonitor mon(this);
+    *result = 0; 
+
+    // first set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (PR_CLIST_IS_EMPTY(&mSegments)) {
+            return NS_OK;
+        }
+        else {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    // now search for the segment starting from segmentLogicalOffset and return it
+    PRCList* curSeg = mReadSegment;
+    char* curSegStart = mReadCursor;
+    char* curSegEnd = mReadSegmentEnd;
+    PRInt32 amt;
+    while (PR_TRUE) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (curSegStart <= snapshotWriteCursor &&
+            snapshotWriteCursor < curSegEnd) {
+            // same segment -- read up to the snapshotWriteCursor
+            curSegEnd = snapshotWriteCursor;
+
+            amt = curSegEnd - curSegStart;
+            *result += amt;
+            return NS_OK;
+        }
+        else {
+            amt = curSegEnd - curSegStart;
+            *result += amt;
+            curSeg = PR_NEXT_LINK(curSeg);
+            if (curSeg == mReadSegment) {
+                // been all the way around
+                return NS_OK;
+            }
+            curSegEnd = (char*)curSeg + mGrowBySize;
+            curSegStart = (char*)curSeg + sizeof(PRCList);
+        }
+    }
+    return NS_ERROR_FAILURE;
+}
+
+#define COMPARE(s1, s2, i)	ignoreCase ? nsCRT::strncasecmp((const char *)s1, (const char *)s2, (PRUint32)i) : nsCRT::strncmp((const char *)s1, (const char *)s2, (PRUint32)i)
+
+NS_IMETHODIMP
+nsBuffer::Search(const char* string, PRBool ignoreCase, 
+                 PRBool *found, PRUint32 *offsetSearchedTo)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsresult rv;
+    const char* bufSeg1;
+    PRUint32 bufSegLen1;
+    PRUint32 segmentPos = 0;
+    PRUint32 strLen = nsCRT::strlen(string);
+
+    rv = GetReadSegment(segmentPos, &bufSeg1, &bufSegLen1);
+    if (NS_FAILED(rv) || bufSegLen1 == 0) {
+        *found = PR_FALSE;
+        *offsetSearchedTo = segmentPos;
+        return NS_OK;
+    }
+
+    while (PR_TRUE) {
+        PRUint32 i;
+        // check if the string is in the buffer segment
+        for (i = 0; i < bufSegLen1 - strLen + 1; i++) {
+            if (COMPARE(&bufSeg1[i], string, strLen) == 0) {
+                *found = PR_TRUE;
+                *offsetSearchedTo = segmentPos + i;
+                return NS_OK;
+            }
+        }
+
+        // get the next segment
+        const char* bufSeg2;
+        PRUint32 bufSegLen2;
+        segmentPos += bufSegLen1;
+        rv = GetReadSegment(segmentPos, &bufSeg2, &bufSegLen2);
+        if (NS_FAILED(rv) || bufSegLen2 == 0) {
+            *found = PR_FALSE;
+            if (mCondition != NS_OK)    // XXX NS_FAILED?
+                *offsetSearchedTo = segmentPos - bufSegLen1;
+            else
+                *offsetSearchedTo = segmentPos - bufSegLen1 - strLen + 1;
+            return NS_OK;
+        }
+
+        // check if the string is straddling the next buffer segment
+        PRUint32 limit = PR_MIN(strLen, bufSegLen2 + 1);
+        for (i = 0; i < limit; i++) {
+            PRUint32 strPart1Len = strLen - i - 1;
+            PRUint32 strPart2Len = strLen - strPart1Len;
+            const char* strPart2 = &string[strLen - strPart2Len];
+            PRUint32 bufSeg1Offset = bufSegLen1 - strPart1Len;
+            if (COMPARE(&bufSeg1[bufSeg1Offset], string, strPart1Len) == 0 &&
+                COMPARE(bufSeg2, strPart2, strPart2Len) == 0) {
+                *found = PR_TRUE;
+                *offsetSearchedTo = segmentPos - strPart1Len;
+                return NS_OK;
+            }
+        }
+
+        // finally continue with the next buffer
+        bufSeg1 = bufSeg2;
+        bufSegLen1 = bufSegLen2;
+    }
+    NS_NOTREACHED("can't get here");
+    return NS_ERROR_FAILURE;    // keep compiler happy
+}
+
+NS_IMETHODIMP
+nsBuffer::ReaderClosed()
+{
+    nsresult rv = NS_OK;
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    // first prevent any more writing
+    mReaderClosed = PR_TRUE;
+
+    // then free any unread segments...
+    
+    // first set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (!PR_CLIST_IS_EMPTY(&mSegments)) {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    while (mReadSegment) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (mReadCursor <= snapshotWriteCursor &&
+            snapshotWriteCursor < mReadSegmentEnd) {
+            // same segment -- we've discarded all the unread segments we
+            // can, so just updatethe read cursor
+            mReadCursor = mWriteCursor;
+            break;
+        }
+        // else advance to the next segment, freeing this one
+        rv = PopReadSegment();
+        if (NS_FAILED(rv)) break;
+    }
+
+#ifdef DEBUG
+    PRUint32 amt;
+    const char* buf;
+    rv = GetReadSegment(0, &buf, &amt);
+    NS_ASSERTION(rv == NS_BASE_STREAM_EOF ||
+                 (NS_SUCCEEDED(rv) && amt == 0), "ReaderClosed failed");
+#endif
+
+    return rv;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetCondition(nsresult *result)
+{
+    *result = mCondition;
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP
+nsBuffer::WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                        PRUint32 *writeCount)
+{
+    nsresult rv = NS_OK;
+
+    nsAutoCMonitor mon(this);
+    *writeCount = 0;
+
+    if (mReaderClosed) {
+        rv = NS_BASE_STREAM_CLOSED;
+        goto done;
+    }
+
+    if (NS_FAILED(mCondition)) {
+        rv = mCondition;
+        goto done;
+    }
+
+    while (count > 0) {
+        PRUint32 writeBufLen;
+        char* writeBuf;
+        rv = GetWriteSegment(&writeBuf, &writeBufLen);
+        if (NS_FAILED(rv) || writeBufLen == 0) {
+            // if we failed to allocate a new segment, we're probably out
+            // of memory, but we don't care -- just report what we were
+            // able to write so far
+            rv = (*writeCount == 0) ? rv : NS_OK;
+            goto done;
+        }
+
+        writeBufLen = PR_MIN(writeBufLen, count);
+        while (writeBufLen > 0) {
+            PRUint32 readCount = 0;
+            rv = reader(closure, writeBuf, *writeCount, writeBufLen, &readCount);
+            if (rv == NS_BASE_STREAM_WOULD_BLOCK || readCount == 0) {
+                // if the place we're putting the data would block (probably ran
+                // out of room) just return what we were able to write so far
+                rv = (*writeCount == 0) ? rv : NS_OK;
+                goto done;
+            }
+            if (NS_FAILED(rv)) {
+                // save the failure condition so that we can get it again later
+                nsresult rv2 = SetCondition(rv);
+                NS_ASSERTION(NS_SUCCEEDED(rv2), "SetCondition failed");
+                // if we failed to read just report what we were
+                // able to write so far
+                rv = (*writeCount == 0) ? rv : NS_OK;
+                goto done;
+            }
+            NS_ASSERTION(readCount <= writeBufLen, "reader returned bad readCount");
+            writeBuf += readCount;
+            writeBufLen -= readCount;
+            *writeCount += readCount;
+            count -= readCount;
+
+            // set the write cursor after the data is valid
+            if (mWriteCursor + readCount == mWriteSegmentEnd) {
+                mWriteSegment = nsnull;      // allocate a new segment next time around
+                mWriteSegmentEnd = nsnull;
+                mWriteCursor = nsnull;
+            }
+            else
+                mWriteCursor += readCount;
+        }
+    }
+done:
+    if (mObserver && *writeCount) {
+        mObserver->OnWrite(this, *writeCount);
+    }
+    return rv;
+}
+
+static NS_METHOD
+nsReadFromRawBuffer(void* closure,
+                    char* toRawSegment,
+                    PRUint32 offset,
+                    PRUint32 count,
+                    PRUint32 *readCount)
+{
+    const char* fromBuf = (const char*)closure;
+    nsCRT::memcpy(toRawSegment, &fromBuf[offset], count);
+    *readCount = count;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount)
+{
+    return WriteSegments(nsReadFromRawBuffer, (void*)fromBuf, bufLen, writeCount);
+}
+
+static NS_METHOD
+nsReadFromInputStream(void* closure,
+                      char* toRawSegment, 
+                      PRUint32 offset,
+                      PRUint32 count,
+                      PRUint32 *readCount)
+{
+    nsIInputStream* fromStream = (nsIInputStream*)closure;
+    return fromStream->Read(toRawSegment, count, readCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount)
+{
+    return WriteSegments(nsReadFromInputStream, fromStream, count, writeCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::GetWriteSegment(char* *resultSegment,
+                          PRUint32 *resultSegmentLen)
+{
+    nsAutoCMonitor mon(this);
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    nsresult rv;
+    *resultSegmentLen = 0;
+    *resultSegment = nsnull;
+    if (mWriteSegment == nsnull) {
+        rv = PushWriteSegment();
+        if (NS_FAILED(rv) || rv == NS_BASE_STREAM_WOULD_BLOCK) return rv;
+
+        NS_ASSERTION(mWriteSegment != nsnull, "failed to allocate segment");
+    }
+
+    *resultSegmentLen = mWriteSegmentEnd - mWriteCursor;
+    *resultSegment = mWriteCursor;
+    NS_ASSERTION(*resultSegmentLen > 0, "Failed to get write segment.");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetWritableAmount(PRUint32 *amount)
+{
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    nsresult rv;
+    PRUint32 readableAmount;
+    rv = GetReadableAmount(&readableAmount);
+    if (NS_FAILED(rv)) return rv;
+    *amount = mMaxSize - readableAmount;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReaderClosed(PRBool *result)
+{
+    *result = mReaderClosed;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::SetCondition(nsresult condition)
+{
+    nsAutoCMonitor mon(this);
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    mCondition = condition;
+    mWriteSegment = nsnull;     // allows reader to free last segment w/o asserting
+    mWriteSegmentEnd = nsnull;
+    // don't reset mWriteCursor here -- we need it for the EOF point in the buffer
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_CID(kAllocatorCID, NS_ALLOCATOR_CID);
+
+NS_COM nsresult
+NS_NewBuffer(nsIBuffer* *result,
+             PRUint32 growBySize, PRUint32 maxSize,
+             nsIBufferObserver* observer)
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIAllocator, alloc, kAllocatorCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsBuffer* buf;
+    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = buf->Init(growBySize, maxSize, observer, alloc);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(buf);
+        return rv;
+    }
+
+    *result = buf;
+    return NS_OK;
+}
+
+static NS_DEFINE_CID(kPageManagerCID, NS_PAGEMANAGER_CID);
+
+NS_COM nsresult
+NS_NewPageBuffer(nsIBuffer* *result,
+                 PRUint32 growBySize, PRUint32 maxSize,
+                 nsIBufferObserver* observer)
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIAllocator, alloc, kPageManagerCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsBuffer* buf;
+    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = buf->Init(growBySize, maxSize, observer, alloc);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(buf);
+        return rv;
+    }
+
+    *result = buf;
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsBuffer.h

@@ -0,0 +1,87 @@
+/* -*- 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.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.
+ */
+
+#ifndef nsBuffer_h___
+#define nsBuffer_h___
+
+#include "nsIBuffer.h"
+#include "nscore.h"
+#include "prclist.h"
+#include "nsIAllocator.h"
+
+class nsBuffer : public nsIBuffer {
+public:
+    NS_DECL_ISUPPORTS
+
+    static NS_METHOD
+    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+    // nsIBuffer methods:
+    NS_IMETHOD Init(PRUint32 growBySize, PRUint32 maxSize,
+                    nsIBufferObserver* observer, nsIAllocator* allocator);
+    NS_IMETHOD Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount);
+    NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                            PRUint32 *readCount);
+    NS_IMETHOD GetReadSegment(PRUint32 segmentLogicalOffset, 
+                              const char* *resultSegment,
+                              PRUint32 *resultSegmentLen);
+    NS_IMETHOD GetReadableAmount(PRUint32 *amount);
+    NS_IMETHOD Search(const char* forString, PRBool ignoreCase,
+                      PRBool *found, PRUint32 *offsetSearchedTo);
+    NS_IMETHOD ReaderClosed(void);
+    NS_IMETHOD GetCondition(nsresult *result);
+
+    NS_IMETHOD Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount);
+    NS_IMETHOD WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount);
+    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                             PRUint32 *writeCount);
+    NS_IMETHOD GetWriteSegment(char* *resultSegment,
+                               PRUint32 *resultSegmentLen);
+    NS_IMETHOD GetWritableAmount(PRUint32 *amount);
+    NS_IMETHOD GetReaderClosed(PRBool *result);
+    NS_IMETHOD SetCondition(nsresult condition);
+
+    // nsBuffer methods:
+    nsBuffer();
+    virtual ~nsBuffer();
+
+    nsresult PushWriteSegment();
+    nsresult PopReadSegment();
+
+protected:
+    PRUint32            mGrowBySize;
+    PRUint32            mMaxSize;
+    nsIAllocator*       mAllocator;
+    nsIBufferObserver*  mObserver;
+
+    PRCList             mSegments;
+    PRUint32            mBufferSize;
+    
+    PRCList*            mReadSegment;
+    char*               mReadSegmentEnd;
+    char*               mReadCursor;
+
+    PRCList*            mWriteSegment;
+    char*               mWriteSegmentEnd;
+    char*               mWriteCursor;
+
+    PRBool              mReaderClosed;
+    nsresult            mCondition;
+};
+
+#endif // nsBuffer_h___

mozilla/xpcom/ds/nsBufferPoolService.h

@@ -0,0 +1,40 @@
+/* -*- 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.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.
+ */
+
+#ifndef nsBufferPoolService_h___
+#define nsBufferPoolService_h___
+
+#include "nsIBufferPoolService.h"
+
+class nsBufferPoolService : public nsIBufferPoolService {
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsIBufferPoolService methods:
+    NS_IMETHOD NewBuffer(PRUint32 minSize, PRUint32 maxSize,
+                         nsIByteBuffer* *result);
+
+    // nsBufferPoolService methods:
+    nsBufferPoolService();
+    virtual ~nsBufferPoolService();
+
+protected:
+    
+};
+
+#endif // nsBufferPoolService_h___

mozilla/xpcom/ds/nsByteBuffer.cpp

@@ -0,0 +1,151 @@
+/* -*- 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.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.
+ */
+
+#include "nsByteBuffer.h"
+#include "nsIInputStream.h"
+#include "nsCRT.h"
+
+#define MIN_BUFFER_SIZE 32
+
+ByteBufferImpl::ByteBufferImpl(void)
+  : mBuffer(NULL), mSpace(0), mLength(0)
+{
+  NS_INIT_REFCNT();
+}
+
+NS_IMETHODIMP
+ByteBufferImpl::Init(PRUint32 aBufferSize)
+{
+  if (aBufferSize < MIN_BUFFER_SIZE) {
+    aBufferSize = MIN_BUFFER_SIZE;
+  }
+  mSpace = aBufferSize;
+  mLength = 0;
+  mBuffer = new char[aBufferSize];
+  return mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMPL_ISUPPORTS1(ByteBufferImpl,nsIByteBuffer)
+
+ByteBufferImpl::~ByteBufferImpl()
+{
+  if (nsnull != mBuffer) {
+    delete[] mBuffer;
+    mBuffer = nsnull;
+  }
+  mLength = 0;
+}
+
+NS_METHOD
+ByteBufferImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (aOuter)
+    return NS_ERROR_NO_AGGREGATION;
+
+  ByteBufferImpl* it = new ByteBufferImpl();
+  if (nsnull == it) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(it);
+  nsresult rv = it->QueryInterface(aIID, (void**)aResult);
+  NS_RELEASE(it);
+  return rv;
+}
+
+NS_IMETHODIMP_(PRUint32)
+ByteBufferImpl::GetLength(void) const
+{
+  return mLength;
+}
+
+NS_IMETHODIMP_(PRUint32)
+ByteBufferImpl::GetBufferSize(void) const
+{
+  return mSpace;
+}
+
+NS_IMETHODIMP_(char*)
+ByteBufferImpl::GetBuffer(void) const
+{
+  return mBuffer;
+}
+
+NS_IMETHODIMP_(PRBool)
+ByteBufferImpl::Grow(PRUint32 aNewSize)
+{
+  if (aNewSize < MIN_BUFFER_SIZE) {
+    aNewSize = MIN_BUFFER_SIZE;
+  }
+  char* newbuf = new char[aNewSize];
+  if (nsnull != newbuf) {
+    if (0 != mLength) {
+      nsCRT::memcpy(newbuf, mBuffer, mLength);
+    }
+    delete[] mBuffer;
+    mBuffer = newbuf;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+NS_IMETHODIMP_(PRInt32)
+ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                     PRUint32 aKeep)
+{
+  NS_PRECONDITION(nsnull != aStream, "null stream");
+  NS_PRECONDITION(aKeep <= mLength, "illegal keep count");
+  if ((nsnull == aStream) || (PRUint32(aKeep) > PRUint32(mLength))) {
+    // whoops
+    *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
+    return -1;
+  }
+
+  if (0 != aKeep) {
+    // Slide over kept data
+    nsCRT::memmove(mBuffer, mBuffer + (mLength - aKeep), aKeep);
+  }
+
+  // Read in some new data
+  mLength = aKeep;
+  PRUint32 nb;
+  *aErrorCode = aStream->Read(mBuffer + aKeep, mSpace - aKeep, &nb);
+  if (NS_SUCCEEDED(*aErrorCode)) {
+    mLength += nb;
+  }
+  else
+    nb = 0;
+  return nb;
+}
+
+NS_COM nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
+                                  nsISupports* aOuter,
+                                  PRUint32 aBufferSize)
+{
+  nsresult rv;
+  nsIByteBuffer* buf;
+  rv = ByteBufferImpl::Create(aOuter, nsIByteBuffer::GetIID(), (void**)&buf);
+  if (NS_FAILED(rv)) return rv;
+    
+  rv = buf->Init(aBufferSize);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(buf);
+    return rv;
+  }
+  *aInstancePtrResult = buf;
+  return rv;
+}

mozilla/xpcom/ds/nsByteBuffer.h

@@ -0,0 +1,47 @@
+/* -*- 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.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.
+ */
+
+#ifndef nsByteBuffer_h__
+#define nsByteBuffer_h__
+
+#include "nsIByteBuffer.h"
+
+class ByteBufferImpl : public nsIByteBuffer {
+public:
+  ByteBufferImpl(void);
+  virtual ~ByteBufferImpl();
+
+  NS_DECL_ISUPPORTS
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  NS_IMETHOD Init(PRUint32 aBufferSize);
+  NS_IMETHOD_(PRUint32) GetLength(void) const;
+  NS_IMETHOD_(PRUint32) GetBufferSize(void) const;
+  NS_IMETHOD_(char*) GetBuffer() const;
+  NS_IMETHOD_(PRBool) Grow(PRUint32 aNewSize);
+  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                            PRUint32 aKeep);
+
+  char* mBuffer;
+  PRUint32 mSpace;
+  PRUint32 mLength;
+};
+
+#endif // nsByteBuffer_h__