Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge

Browse source
This commit is contained in:
kaetemi 2014-09-10 05:28:14 +02:00
commit 22fc641666
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/web/private_php/ams/autoload/mail_handler.php
View file

@ -122,6 +122,7 @@ class Mail_Handler{
$id_user = $recipient;
$recipient = NULL;
}
$db = new DBLayer($db);
$db->insert("email", array('Recipient' => $recipient, 'Subject' => $subject, 'Body' => $body, 'Status' => 'NEW', 'Attempts'=> 0, 'Sender' => $from,'UserId' => $id_user, 'MessageId' => 0, 'TicketId'=> $ticket_id));
}

10
code/web/private_php/ams/autoload/sync.php
View file

@ -106,14 +106,14 @@ class Sync{
if ($OS == 2) {
$processes = explode( "\n", shell_exec( "tasklist.exe" ));
foreach( $processes as $process )
foreach( $processes as $key => $value )
{
if( strpos( "Image Name", $process ) === 0
|| strpos( "===", $process ) === 0 )
if( empty($value) != '1' && strpos( "Image Name", $value ) === 0
|| empty($value) != '1' && strpos( "===", $value ) === 0 )
continue;
$matches = false;
preg_match( "/(.*?)\s+(\d+).*$/", $process, $matches );
if ($pid = $matches[ 2 ]) {
preg_match( "/(.*?)\s+(\d+).*$/", $value, $matches );
if (isset($matches[ 2 ]) && $pid = $matches[ 2 ]) {
return true;
}
}

0
code/web/private_php/ams/mail/placeholder Normal file
View file

10
code/web/private_php/setup/config/config.php
View file

@ -71,11 +71,6 @@ $cfg['mail']['host'] = "ryzomcore.org";
$SUPPORT_GROUP_IMAP_CRYPTKEY = '%cryptKeyIMAP%';
$TICKET_MAILING_SUPPORT = false;
//You have to create this dir at first!
//The incoming emails will be backed up here and the log file keeps track of the mail_cron job.
$MAIL_DIR = "/home/username/mail";
$MAIL_LOG_PATH = "/home/username/mail/cron_mail.log";
//terms of service url location
$TOS_URL ="http://www.gnu.org/licenses/agpl-3.0.html";
@ -101,6 +96,11 @@ $AMS_TRANS = $AMS_LIB . '/translations';
$AMS_CACHEDIR = $AMS_LIB . '/cache';
$AMS_PLUGINS = $AMS_LIB . '/plugins';
$AMS_TMPDIR = $AMS_LIB . '/tmp';
//The incoming emails will be backed up here and the log file keeps track of the mail_cron job.
$MAIL_DIR = $AMS_LIB."/mail";
$MAIL_LOG_PATH = $AMS_LIB."/mail/mail.log";
// Here your inc and func resides
$SITEBASE = $PUBLIC_PHP_PATH . '/ams/' ;