Index: trunk/admin/install/install_lib.php =================================================================== diff -u -N -r415 -r437 --- trunk/admin/install/install_lib.php (.../install_lib.php) (revision 415) +++ trunk/admin/install/install_lib.php (.../install_lib.php) (revision 437) @@ -37,7 +37,7 @@ $version = ''; while ($file = $dir->read()) { - if ($file != "." && $file != ".." && !is_dir($dir_name.$file)) { + if ($file != "." && $file != ".." && !is_dir($admindirname.$file)) { if (strstr($file, 'inportal_upgrade_v')) { $upgrades_arr[] = $file; } @@ -50,7 +50,7 @@ $file_tmp = str_replace("inportal_upgrade_v", "", $file); $file_tmp = str_replace(".sql", "", $file_tmp); - if (ConvertVersion($file_tmp) > ConvertVersion($current_version)) { + if (ConvertVersion($file_tmp) > ConvertVersion($version)) { $version = $file_tmp; } } @@ -201,8 +201,12 @@ $sql = ereg_replace($what, $replace, $sql); $what = "DROP TABLE "; - $replace = "DROP TABLE ".$g_TablePrefix; + $replace = "DROP TABLE IF EXISTS ".$g_TablePrefix; $sql = ereg_replace($what, $replace, $sql); + + $what = "DROP TABLE IF EXISTS "; + $replace = "DROP TABLE IF EXISTS ".$g_TablePrefix; + $sql = ereg_replace($what, $replace, $sql); $what = "INSERT INTO "; $replace = "INSERT INTO ".$g_TablePrefix; Index: trunk/kernel/include/smtp.php =================================================================== diff -u -N -r13 -r437 --- trunk/kernel/include/smtp.php (.../smtp.php) (revision 13) +++ trunk/kernel/include/smtp.php (.../smtp.php) (revision 437) @@ -136,7 +136,6 @@ if(!$this->auth()) return FALSE; } - $this->mail($this->from); if(is_array($this->recipients)) foreach($this->recipients as $value) @@ -146,7 +145,7 @@ if(!$this->data()) return FALSE; - + // Transparency $headers = str_replace($CRLF.'.', $CRLF.'..', trim(implode($CRLF, $this->headers))); $body = str_replace($CRLF.'.', $CRLF.'..', $this->body); Index: trunk/kernel/include/modlist.php =================================================================== diff -u -N -r259 -r437 --- trunk/kernel/include/modlist.php (.../modlist.php) (revision 259) +++ trunk/kernel/include/modlist.php (.../modlist.php) (revision 437) @@ -117,13 +117,16 @@ } function MergeReturn($array) - { + { // merge results ganed with ExecuteFunction // method in a specific way $tmp = Array(); foreach($array as $mod_name => $mod_results) - foreach($mod_results as $mod_var => $mod_var_value) - $tmp[$mod_var][$mod_name] = $mod_var_value; + if (is_array($mod_results)) { + foreach($mod_results as $mod_var => $mod_var_value) { + $tmp[$mod_var][$mod_name] = $mod_var_value; + } + } return $tmp; } Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql =================================================================== diff -u -N -r430 -r437 --- trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql (.../inportal_upgrade_v1.0.7.sql) (revision 430) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql (.../inportal_upgrade_v1.0.7.sql) (revision 437) @@ -1,10 +1,11 @@ CREATE TABLE EmailLog (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)); - CREATE TABLE ImportScripts (is_id smallint(5) unsigned NOT NULL auto_increment, is_Module varchar(50) NOT NULL default '', is_string_id varchar(10) NOT NULL default '', is_script varchar(100) NOT NULL default '', is_label varchar(255) NOT NULL default '', is_field_prefix varchar(50) NOT NULL default '', is_requred_fields varchar(255) NOT NULL default '', is_enabled tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (is_id)); INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'time_sent', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_EmailsL', '20', 'In-Portal', ''); UPDATE ConfigurationValues SET VariableValue = 'u.CreatedOn' WHERE VariableName = 'User_SortField'; +INSERT INTO ConfigurationValues VALUES ('Perpage_CustomData', '20', 'In-Portal', ''); + ALTER TABLE ThemeFiles ADD INDEX theme (ThemeId); 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 -r397 -r437 --- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 397) +++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 437) @@ -679,7 +679,7 @@ function DeliverMail($To,$From,$Subject,$Msg,$headers, $ForceSend=0) { global $MessagesSent,$objConfig; - + if(($this->MessagesSent >$this->MessagesAtOnce) && !$ForceSend) { $this->EnqueueMail($To,$From,$Subject,$Msg,$headers); @@ -717,15 +717,15 @@ $headers = "Subject: ".trim($Subject)."\r\n".$headers; $send_params['recipients'] = array($To); // The recipients (can be multiple) + $send_params['from'] = $From; // This is used as in the MAIL FROM: cmd $send_params['headers'] = explode("\r\n",$headers); - $send_params['from'] = $From; // This is used as in the MAIL FROM: cmd // It should end up as the Return-Path: header $send_params['body'] = $Msg; // The body of the email $params['host'] = $objConfig->Get("Smtp_Server"); // The smtp server host/ip $params['port'] = 25; // The smtp server port - $params['helo'] = 'INPORTAL'; // What to use when sending the helo command. Typically, your domain/hostname + $params['hello'] = 'INPORTAL'; // What to use when sending the helo command. Typically, your domain/hostname if($objConfig->Get("Smtp_Authenticate")) // Whether to use basic authentication or not { $params['auth'] = TRUE; @@ -745,11 +745,9 @@ } } else - $SmtpServer->debug = 0; + $SmtpServer->debug = 1; $connected = $SmtpServer->connect(); - - if($connected) { if($this->LogLevel>1) @@ -766,6 +764,7 @@ $this->WriteToMailLog($l); } } + if($this->LogLevel>0) { if(count($SmtpServer->errors)>0) @@ -910,21 +909,23 @@ $msg.=$FileContent; $msg .= "--".$OB."\n"; } - + if(strlen($ToName)>0) { $To = "\"$ToName\" <$ToAddr>"; } - else + else { $To = "<".$ToAddr.">"; + } + //$headers.="To: $To\r\n"; if($this->MessagesSent>$this->MessagesAtOnce || $QueueOnly==1) { - $this->EnqueueMail($To,$f,$Subject,$msg,$headers); + $this->EnqueueMail($ToAddr,$From,$Subject,$msg,$headers); } else { - $this->DeliverMail($To,$f,$Subject,$msg,$headers); + $this->DeliverMail($ToAddr,$From,$Subject,$msg,$headers); } } Index: trunk/admin/email/do_send.php =================================================================== diff -u -N -r374 -r437 --- trunk/admin/email/do_send.php (.../do_send.php) (revision 374) +++ trunk/admin/email/do_send.php (.../do_send.php) (revision 437) @@ -118,7 +118,7 @@ if(!strlen(trim($FromAddr))) { - $FromAddr = $objConfig->Get("Default_FromAddr"); + $FromAddr = $objConfig->Get("Smtp_AdminMailFrom"); } if(!strlen(trim($FromName))) Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -N -r402 -r437 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 402) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 437) @@ -150,6 +150,7 @@ INSERT INTO ConfigurationValues VALUES ('Perpage_Images', '20', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'time_sent', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_EmailsL', '20', 'In-Portal', ''); +INSERT INTO ConfigurationValues VALUES ('Perpage_CustomData', '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)