Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -N -r303 -r313 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 303) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 313) @@ -1166,9 +1166,8 @@ $edit_table = $objSession->GetEditTable($this->SourceTable); $sql = "SELECT * FROM $edit_table"; $rs = $this->adodbConnection->Execute($sql); + echo $sql."
"; -// echo $sql."
"; - while($rs && !$rs->EOF) { $data = $rs->fields; Index: trunk/kernel/include/language.php =================================================================== diff -u -N -r289 -r313 --- trunk/kernel/include/language.php (.../language.php) (revision 289) +++ trunk/kernel/include/language.php (.../language.php) (revision 313) @@ -121,7 +121,7 @@ //$idlist = array(); $sql = "SELECT * FROM $edit_table"; - echo "performing mass create/update
"; + //echo "performing mass create/update
"; flush(); $this->Clear(); $rs = $this->adodbConnection->Execute($sql); Index: trunk/admin/install/inportal_schema.sql =================================================================== diff -u -N -r309 -r313 --- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 309) +++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 313) @@ -500,11 +500,11 @@ ) # -------------------------------------------------------- CREATE TABLE EmailLog ( - EmailLogId INT(11) NOT NULL , - fromuser VARCHAR(200) NOT NULL , - addressto VARCHAR(255) NOT NULL , - subject VARCHAR(255) NOT NULL , - timestamp BIGINT NOT NULL , - event VARCHAR(100) NOT NULL , -PRIMARY KEY (EmailLogId) + EmailLogId int(11) NOT NULL auto_increment, + fromuser varchar(200) default NULL, + addressto varchar(255) default NULL, + subject varchar(255) default NULL, + timestamp bigint(20) default '0', + event varchar(100) default NULL, + PRIMARY KEY (EmailLogId) ) Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql =================================================================== diff -u -N -r309 -r313 --- trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql (.../inportal_upgrade_v1.0.7.sql) (revision 309) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql (.../inportal_upgrade_v1.0.7.sql) (revision 313) @@ -1,11 +1,14 @@ CREATE TABLE EmailLog ( - EmailLogId INT(11) NOT NULL , - fromuser VARCHAR(200) NOT NULL , - addressto VARCHAR(255) NOT NULL , - subject VARCHAR(255) NOT NULL , - timestamp BIGINT NOT NULL , - event VARCHAR(100) NOT NULL , -PRIMARY KEY (EmailLogId) + EmailLogId int(11) NOT NULL auto_increment, + fromuser varchar(200) default NULL, + addressto varchar(255) default NULL, + subject varchar(255) default NULL, + timestamp bigint(20) default '0', + event varchar(100) default NULL, + PRIMARY KEY (EmailLogId) ) +INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'timestamp', 'In-Portal', ''); +INSERT INTO ConfigurationValues VALUES ('Perpage_EmailsL', '20', 'In-Portal', ''); + UPDATE Modules SET Version = '1.0.7' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/kernel/include/emailmessage.php =================================================================== diff -u -N -r309 -r313 --- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 309) +++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 313) @@ -177,7 +177,8 @@ { $FromName = $objConfig->Get("Site_Name"); $FromAddr = $objConfig->Get("Smtp_AdminMailFrom"); - } + } + $charset = "ascii-us"; if($this->Get("MessageType")=="html") { @@ -190,10 +191,10 @@ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers); } - $time = time(); + /*$time = time(); $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To', '$subject', $time, '')"; - $conn->Execute($sql); + $conn->Execute($sql); */ return TRUE; } @@ -211,7 +212,7 @@ //echo "
";print_r($this->recipient); echo "
"; $this->recipient->TagPrefix="touser"; if($this->recipient->Get("PortalUserId")==$UserId) - { + { $to_addr = $this->recipient->Get("Email"); $To = trim($this->recipient->Get("FirstName")." ".$this->recipient->Get("LastName")); @@ -250,10 +251,10 @@ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers); } - $time = time(); + /*$time = time(); $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')"; - $conn->Execute($sql); + $conn->Execute($sql); */ return TRUE; } @@ -264,6 +265,8 @@ { global $objUsers, $objConfig, $objEmailQueue; + $conn = GetADODBConnection(); + $this->recipient = $objUsers->GetUser($this->Get("FromUserId")); $this->recipient->TagPrefix="touser"; if($this->recipient->Get("PortalUserId")==$this->Get("FromUserId")) @@ -289,6 +292,12 @@ $body = str_replace("
","\n",$body); $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers); } + + /* $time = time(); + + $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')"; + $conn->Execute($sql); + */ return TRUE; } } @@ -831,6 +840,12 @@ $f = "\"$FromName\" <".$From.">"; $headers = "From: $f\n"; $headers .= "MIME-Version: 1.0\n"; + + $conn = GetADODBConnection(); + $time = time(); + + $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$ToName ($ToAddr)', '$Subject', $time, '')"; + $conn->Execute($sql); if($HasFile) { Index: trunk/kernel/action.php =================================================================== diff -u -N -r293 -r313 --- trunk/kernel/action.php (.../action.php) (revision 293) +++ trunk/kernel/action.php (.../action.php) (revision 313) @@ -1943,6 +1943,13 @@ $SqlErrorNum = $ado->ErrorNo(); } break; + case "m_purge_email_log": + if($ro_perm) break; + $ado = GetADODBConnection(); + + $sql = "DELETE FROM ".GetTablePrefix()."EmailLog"; + $ado->Execute($sql); + break; case "m_session_delete": if($ro_perm) break; $ado = GetADODBConnection(); Index: trunk/admin/email/do_send.php =================================================================== diff -u -N -r271 -r313 --- trunk/admin/email/do_send.php (.../do_send.php) (revision 271) +++ trunk/admin/email/do_send.php (.../do_send.php) (revision 313) @@ -219,6 +219,7 @@ break; } + int_header(NULL,NULL,admin_language("la_Title_PleaseWait")); echo "\n"; Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -N -r282 -r313 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 282) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 313) @@ -148,6 +148,8 @@ INSERT INTO ConfigurationValues VALUES ('Perpage_Modules', '20', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_Grouplist', '20', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_Images', '20', 'In-Portal', ''); +INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'timestamp', 'In-Portal', ''); +INSERT INTO ConfigurationValues VALUES ('Perpage_EmailsL', '20', 'In-Portal', ''); INSERT INTO Events VALUES (30, 'USER.ADD', 1, 0, 'In-Portal:Users', 'la_event_user.add', 0) INSERT INTO Events VALUES (32, 'USER.ADD', 2, 0, 'In-Portal:Users', 'la_event_user.add', 1)