diff --git a/include/class.sys.php b/include/class.sys.php deleted file mode 100644 index 33b5c830407f1b56fb1ef8eff47657e1296bb97a..0000000000000000000000000000000000000000 --- a/include/class.sys.php +++ /dev/null @@ -1,107 +0,0 @@ -<?php -/************************************************************************* - class.sys.php - - System core helper. - - Peter Rotich <peter@osticket.com> - Copyright (c) 2006-2012 osTicket - http://www.osticket.com - - Released under the GNU General Public License WITHOUT ANY WARRANTY. - See LICENSE.TXT for details. - - vim: expandtab sw=4 ts=4 sts=4: -**********************************************************************/ - -require_once(INCLUDE_DIR.'class.config.php'); //Config helper - -define('LOG_WARN',LOG_WARNING); - -class Sys { - - var $loglevel=array(1=>'Error','Warning','Debug'); - - - //Load configuration info. - function getConfig() { - $cfg= new Config(1); - return ($cfg && $cfg->getId())?$cfg:null; - } - - - function alertAdmin($subject,$message,$log=false) { - global $cfg; - - //Set admin's email address - if(!$cfg || !($to=$cfg->getAdminEmail())) - $to=ADMIN_EMAIL; - - //Try getting the alert email. - $email=null; - if($cfg && !($email=$cfg->getAlertEmail())) - $email=$cfg->getDefaultEmail(); //will take the default email. - - if($email) { - $email->send($to,$subject,$message); - }else {//no luck - try the system mail. - Email::sendmail($to,$subject,$message,sprintf('"osTicket Alerts"<%s>',$to)); - } - - //log the alert? Watch out for loops here. - if($log && is_object($cfg)) { //if $cfg is not set then it means we don't have DB connection. - Sys::log(LOG_CRIT,$subject,$message,false); //Log the entry...and make sure no alerts are resent. - } - - } - - function log($priority,$title,$message,$alert=true) { - global $cfg; - - switch($priority){ //We are providing only 3 levels of logs. Windows style. - case LOG_EMERG: - case LOG_ALERT: - case LOG_CRIT: - case LOG_ERR: - $level=1; - if($alert) { - Sys::alertAdmin($title,$message); - } - break; - case LOG_WARN: - case LOG_WARNING: - //Warning... - $level=2; - break; - case LOG_NOTICE: - case LOG_INFO: - case LOG_DEBUG: - default: - $level=3; - //debug - } - //Save log based on system log level settings. - if($cfg && $cfg->getLogLevel()>=$level){ - $loglevel=array(1=>'Error','Warning','Debug'); - $sql='INSERT INTO '.SYSLOG_TABLE.' SET created=NOW(),updated=NOW() '. - ',title='.db_input($title). - ',log_type='.db_input($loglevel[$level]). - ',log='.db_input($message). - ',ip_address='.db_input($_SERVER['REMOTE_ADDR']); - //echo $sql; - mysql_query($sql); //don't use db_query to avoid possible loop. - } - } - - function purgeLogs(){ - global $cfg; - - if($cfg && ($gp=$cfg->getLogGracePeriod()) && is_numeric($gp)) { - $sql='DELETE FROM '.SYSLOG_TABLE.' WHERE DATE_ADD(created, INTERVAL '.$gp.' MONTH)<=NOW()'; - db_query($sql); - } - - } -} - -?> diff --git a/include/mysql.php b/include/mysql.php index d1d6863d87c6ced4090eb1389d051e223c5a3c8b..85be9829966500b99fecb4714cb3be53e09c41ec 100644 --- a/include/mysql.php +++ b/include/mysql.php @@ -16,8 +16,6 @@ vim: expandtab sw=4 ts=4 sts=4: **********************************************************************/ - require_once(INCLUDE_DIR.'class.sys.php'); - function db_connect($host, $user, $passwd, $db = "") { //Assert diff --git a/main.inc.php b/main.inc.php index a84e9705c53ea8162b689926745ddb92a6ad92db..57769d32c5fc1d55a6b6d4857aa48cc5da8587fb 100644 --- a/main.inc.php +++ b/main.inc.php @@ -90,7 +90,6 @@ require(INCLUDE_DIR.'class.ostsession.php'); require(INCLUDE_DIR.'class.usersession.php'); require(INCLUDE_DIR.'class.pagenate.php'); //Pagenate helper! - require(INCLUDE_DIR.'class.sys.php'); //system loader & config & logger. require(INCLUDE_DIR.'class.log.php'); require(INCLUDE_DIR.'class.mcrypt.php'); require(INCLUDE_DIR.'class.misc.php');