tutos-commits Mailing List for TUTOS

Revision: 1283
          http://sourceforge.net/p/tutos/code/1283
Author:   gokohnert
Date:     2015-03-14 09:22:19 +0000 (Sat, 14 Mar 2015)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/localization/holiday_en_uk.pinc

Modified: trunk/php/localization/holiday_en_uk.pinc
===================================================================
--- trunk/php/localization/holiday_en_uk.pinc	2015-03-14 08:42:36 UTC (rev 1282)
+++ trunk/php/localization/holiday_en_uk.pinc	2015-03-14 09:22:19 UTC (rev 1283)
@@ -21,17 +21,19 @@
     array( Date => "13-02",          type => 0,    Desc => "Ash Wednesday (UK)"),
     array( Date => "14-02",          type => 0,    Desc => "St Valentines Day (UK)"),
     array( Date => "01-03",          type => 1,    Desc => "St Davids Day (UK)"),
-    array( Date => "10-03",          type => 1,    Desc => "Mothering Sunday (UK)"),
-    array( Date => "11-03",          type => 1,    Desc => "Commonwealth Day (UK)"),
+    #    array( Date => "10-03",          type => 1,    Desc => "Mothering Sunday (UK)"),
+    array( Date => "09-03-15",          type => 1,    Desc => "Commonwealth Day (UK)"),
+    array( Date => "14-03-16",          type => 1,    Desc => "Commonwealth Day (UK)"),
+    array( Date => "13-03-17",          type => 1,    Desc => "Commonwealth Day (UK)"),
     array( Date => "18-03",          type => 1,    Desc => "St Patricks Day (UK)"),
     array( Date => "01-04",          type => 1,    Desc => "April Fools Day (UK)"),
     array( Date => "21-04",          type => 1,    Desc => "Queens Birthday (UK)"),
     array( Date => "23-04",          type => 1,    Desc => "St Georges Day (UK)"),
-#        array( Date => "05-05",          type => 1,    Desc => "May Bank Holiday (UK)"),
-#        array( Date => "03-06",          type => 1,    Desc => "Golden Jubilee Bank Holiday (UK)"),
-#        array( Date => "04-06",          type => 1,    Desc => "Spring Bank Holiday (UK)"),
-#        array( Date => "16-06",          type => 1,    Desc => "Fathers Day (UK)"),
-#        array( Date => "26-08",          type => 1,    Desc => "Summer Bank Holiday (UK)"),
+    #        array( Date => "05-05",          type => 1,    Desc => "May Bank Holiday (UK)"),
+    #        array( Date => "03-06",          type => 1,    Desc => "Golden Jubilee Bank Holiday (UK)"),
+    #        array( Date => "04-06",          type => 1,    Desc => "Spring Bank Holiday (UK)"),
+    #        array( Date => "16-06",          type => 1,    Desc => "Fathers Day (UK)"),
+    #        array( Date => "26-08",          type => 1,    Desc => "Summer Bank Holiday (UK)"),
     array( Date => "GOODFRIDAY",     type => 1,    Desc => "Good Friday (UK)"),
     array( Date => "EASTERSUNDAY",   type => 1,    Desc => "Easter Sunday (UK)"),
     array( Date => "EASTERMONDAY",   type => 1,    Desc => "Easter Monday (UK)"),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1282
          http://sourceforge.net/p/tutos/code/1282
Author:   gokohnert
Date:     2015-03-14 08:42:36 +0000 (Sat, 14 Mar 2015)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/file/file_ins.php

Modified: trunk/php/file/file_ins.php
===================================================================
--- trunk/php/file/file_ins.php	2015-03-13 19:20:14 UTC (rev 1281)
+++ trunk/php/file/file_ins.php	2015-03-14 08:42:36 UTC (rev 1282)
@@ -215,13 +215,13 @@
     $farr['size'] =  filesize($farr['tmp_name']);
     if (isset($_REQUEST['ct'])) {
         $farr['type'] = $_REQUEST['ct'];
-    } else if (ereg("\.png$",$file)) {
+    } else if (preg_match("#.png$#i",$file)) {
         $farr['type'] = 'image/png';
-    } else if (ereg("\.gif$",$file)) {
+    } else if (preg_match("#.gif#i",$file)) {
         $farr['type'] = 'image/gif';
-    } else if (ereg("\.jpg$",$file)) {
+    } else if (preg_match("#.jpg$#i",$file)) {
         $farr['type'] = 'image/jpeg';
-    } else if (ereg("\.pdf$",$file)) {
+    } else if (preg_match("#.pdf$#i",$file)) {
         $farr['type'] = 'application/pdf';
     } else {
         $farr['type'] = 'any';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1281
          http://sourceforge.net/p/tutos/code/1281
Author:   gokohnert
Date:     2015-03-13 19:20:14 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/permission.p3

Modified: trunk/php/permission.p3
===================================================================
--- trunk/php/permission.p3	2015-03-13 19:19:43 UTC (rev 1280)
+++ trunk/php/permission.p3	2015-03-13 19:20:14 UTC (rev 1281)
@@ -219,7 +219,7 @@
 if ( defined('useldap') && ! function_exists('ldap_connect')) {
     $tutos[useldap] = 0;
 }
-if ( ! function_exists('imap_open')) {
+if ( defined('usemailboxes') && ! function_exists('imap_open')) {
     $tutos[usemailboxes] = 0;
 }
 if ( ($tutos[usedocmanagement] != 0) &&  (('Off' == ini_get('file_uploads')) || ('1' != ini_get('file_uploads'))) ) {
@@ -460,6 +460,8 @@
     }
 
     if ($tutos['nologin']) {
+        $dbconn = DB_Open(-3); // pseudo fake db
+        $current_user = new tutos_user($dbconn);
         $msg = addLine($msg,'Login diabled by config.');
         ReadLang($lang);
         $auth[0]->login_form($_SERVER['SCRIPT_NAME'],$auth,$msg);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1280
          http://sourceforge.net/p/tutos/code/1280
Author:   gokohnert
Date:     2015-03-13 19:19:43 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/php/file/file_config.php

Modified: trunk/php/file/file_config.php
===================================================================
--- trunk/php/file/file_config.php	2015-02-02 19:15:08 UTC (rev 1279)
+++ trunk/php/file/file_config.php	2015-03-13 19:19:43 UTC (rev 1280)
@@ -114,7 +114,7 @@
             $tutos['file_local_allow'] = ( isset($_REQUEST['file_local_allow']) ? $_REQUEST['file_local_allow']:0);
             write_config_value($this->dbconn,'file_local_allow','file');
 
-            $tutos['file_local_searchpath'] = $_REQUEST['file_local_searchpath'];
+            $tutos['file_local_searchpath'] = trim($_REQUEST['file_local_searchpath']);
             write_config_value($this->dbconn,'file_local_searchpath','file');
 
             $msg .= ' saving done ';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.