- Company ID can now have a length of up to 255 characters (instead of just...

Falko Timme

2013-10-30 213e0bc6bc26a40cd8a29daf997a9c46b1f10ce1

 server/lib/app.inc.php

@@ -28,6 +28,9 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

//* Set timezone
if(isset($conf['timezone']) && $conf['timezone'] != '') date_default_timezone_set($conf['timezone']);

class app {
      
   var $loaded_modules = array();
@@ -46,7 +49,7 @@
               if we are in a multiserver setup
               */
               
               if($conf['dbmaster_host'] != '' && $conf['dbmaster_host'] != $conf['db_host']) {
               if($conf['dbmaster_host'] != '' && ($conf['dbmaster_host'] != $conf['db_host'] || ($conf['dbmaster_host'] == $conf['db_host'] && $conf['dbmaster_database'] != $conf['db_database']))) {
                  $this->dbmaster = new db($conf['dbmaster_host'], $conf['dbmaster_user'], $conf['dbmaster_password'], $conf['dbmaster_database']);
               } else {
                  $this->dbmaster = $this->db;
@@ -99,28 +102,31 @@
        function log($msg, $priority = 0) {
            
      global $conf;
		
      switch ($priority) {
         case 0:
            $priority_txt = 'DEBUG';
            break;
         case 1:
            $priority_txt = 'WARNING';
            break;
         case 2:
            $priority_txt = 'ERROR';
            break;
      }
      $log_msg = @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg;

      if($priority >= $conf['log_priority']) {
                        //if (is_writable($conf["log_file"])) {
                            if (!$fp = fopen ($conf['log_file'], 'a')) {
                                die('Unable to open logfile.');
                            }
                  switch ($priority) {
                     case 0:
                        $priority_txt = 'DEBUG';
                        break;
                     case 1:
                        $priority_txt = 'WARNING';
                        break;
                     case 2:
                        $priority_txt = 'ERROR';
                        break;
                  }
                     
                            if (!fwrite($fp, @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
                            if (!fwrite($fp, $log_msg."\r\n")) {
                                die('Unable to write to logfile.');
                            }
            echo @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
				
            echo $log_msg."\n";
            fclose($fp);

               // Log to database
@@ -146,8 +152,24 @@
                        //} else {
                        //    die("Unable to write to logfile.");
                        //}
					
    
                } // if
				
            if(isset($conf['admin_notify_priority']) && $priority >= $conf['admin_notify_priority'] && $conf['admin_mail'] != '') {
               // send notification to admin
               $mailBody = $log_msg;
               $mailSubject = substr($log_msg,0,50).'...';
               $mailHeaders      = "MIME-Version: 1.0" . "\n";
               $mailHeaders     .= "Content-type: text/plain; charset=utf-8" . "\n";
               $mailHeaders     .= "Content-Transfer-Encoding: 8bit" . "\n";
               $mailHeaders     .= "From: ". $conf['admin_mail'] . "\n";
               $mailHeaders     .= "Reply-To: ". $conf['admin_mail'] . "\n";

               mail($conf['admin_mail'], $mailSubject, $mailBody, $mailHeaders);
            }
        } // func
		

        /*
         0 = DEBUG