Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r899 -r999
--- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 899)
+++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 999)
@@ -837,6 +837,7 @@
$del_sql = array();
$NumToSend = $MaxAllowed - $this->MessagesSent;
+ if($NumToSend < 0) $NumToSend=1; // Don't really know why, but this could happend, so issued this temp fix
$sql = "SELECT * FROM ".$this->SourceTable." ORDER BY queued ASC LIMIT $NumToSend";
$rs = $ado->Execute($sql);
Index: trunk/admin/users/addgroup_users.php
===================================================================
diff -u -r881 -r999
--- trunk/admin/users/addgroup_users.php (.../addgroup_users.php) (revision 881)
+++ trunk/admin/users/addgroup_users.php (.../addgroup_users.php) (revision 999)
@@ -230,9 +230,9 @@
$where .= $objUsers->AdminSearchWhereClause($SearchWords);
}
-$sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
-$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') as DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
-$sql .="LEFT JOIN ".$objSession->GetEditTable("UserGroup")." as ug ON (u.PortalUserId=ug.PortalUserId) AND (ug.PrimaryGroup = 1) ";
+$sql = "SELECT u.*,g.Name AS GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
+$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') AS DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
+$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup AS ug ON (u.PortalUserId=ug.PortalUserId) AND (ug.PrimaryGroup = 1) ";
$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE 1";
if(strlen($where))
Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r988 -r999
--- trunk/kernel/include/debugger.php (.../debugger.php) (revision 988)
+++ trunk/kernel/include/debugger.php (.../debugger.php) (revision 999)
@@ -241,7 +241,16 @@
function getFileLink($file, $lineno = 1, $title = '')
{
if(!$title) $title = $file;
- return ''.$title.'';
+ $is_mozilla=strpos(strtolower($_SERVER['HTTP_USER_AGENT']),'firefox')!==false?true:false;
+ if($is_mozilla)
+ {
+ return ''.$title.'';
+ }
+ else
+ {
+ return ''.$title.'';
+ }
+
}
function getLocalFile($remoteFile)
@@ -553,32 +562,33 @@
return true;
}
- function SetClipboard($data)
+ function SetClipboard(copyText)
{
- if (window.clipboardData)
- {
- window.clipboardData.setData('Text', $data);
+ if(window.clipboardData)
+ {
+ // IE send-to-clipboard method.
+ window.clipboardData.setData('Text', copyText);
}
else if (window.netscape)
{
- //netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
- var clip = Components.classes['@mozilla.org/widget/clipboard;1'].createInstance(Components.interfaces.nsIClipboard);
- if (!clip) return;
+ // You have to sign the code to enable this or allow the action in about:config by changing user_pref("signed.applets.codebase_principal_support", true);
+ netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
- var trans = Components.classes['@mozilla.org/widget/transferable;1'].createInstance(Components.interfaces.nsITransferable);
- if (!trans) return;
-
- trans.addDataFlavor('text/unicode');
- var str = new Object();
- var len = new Object();
+ // Store support string in an object.
var str = Components.classes["@mozilla.org/supports-string;1"].createInstance(Components.interfaces.nsISupportsString);
+ if (!str) return false;
+ str.data=copyText;
- var $copytext=$data;
+ // Make transferable.
+ var trans = Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
+ if (!trans) return false;
- str.data=$copytext;
+ // Specify what datatypes we want to obtain, which is text in this case.
+ trans.addDataFlavor("text/unicode");
+ trans.setTransferData("text/unicode",str,copyText.length*2);
- trans.setTransferData("text/unicode",str,$copytext.length*2);
var clipid=Components.interfaces.nsIClipboard;
+ var clip = Components.classes["@mozilla.org/widget/clipboard;1"].getService(clipid);
if (!clip) return false;
clip.setData(trans,null,clipid.kGlobalClipboard);