Merge branch 'new_branch_name'

Kinkrsoftware · Jan 15, 2012 · ba767eb · ba767eb
2 parents 5917d22 + e9016e5
commit ba767eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/config.php b/config.php
@@ -36,4 +36,6 @@
   define ('WEBRESOLUTIONH', '360');
 
   define ('EMERGENCY', false);
+
+  date_default_timezone_set('Europe/Amsterdam');
 ?>
diff --git a/functions.php b/functions.php
@@ -83,7 +83,7 @@ function dirtoselect($name, $dir, $active = '', $empty = false, $maxdate = 0, $e
     if (is_dir($dir)) {
       if ($dh = opendir($dir)) {
         while (($file = readdir($dh)) !== false) {
-          if (!is_dir($dir.'/'.$file)) {
+          if ($file[0] != '.' && !is_dir($dir.'/'.$file)) {
 	    if ($maxdate == 0 || (filectime($dir.'/'.$file) > $maxdate)) {
               if ($extension == '' || (substr( $file, strlen( $file ) - strlen( $extension ) ) === $extension)) {
                 $templates[]=$file;

diff --git a/template-toevoegen.php b/template-toevoegen.php
@@ -26,15 +26,18 @@
   $dbh = new PDO(DATABASE, DB_USER, DB_PASSWORD);
 
   if (active('category', 'newtemplate') != '') {
+    $param_newtemplate = active('category', 'newtemplate');
     $stmt = $dbh->prepare('SELECT title FROM content_category WHERE content_category.id=:contentcategoryid');
-    $stmt->bindParam(':contentcategoryid', active('category', 'newtemplate'), PDO::PARAM_INT);
+    $stmt->bindParam(':contentcategoryid', $param_newtemplate, PDO::PARAM_INT);
     $stmt->execute();
     $qresult = $stmt->fetchAll();
   }
 
+  $preview = '404';
+
   if (isset($qresult[0])) {
 
-  $preview = checkandpreview($safebox=1, $width=269, $height=200, $format='png', 
+  $preview = checkandpreview($safebox=1, $width=PREVIEWRESOLUTIONW, $height=PREVIEWRESOLUTIONH, $format='png', 
   			       active('title', 'newtemplate'), 'Laten we het eens zonder tekst doen.', '',
 			       'default.xsl', $dir='', $filename=md5('default.xsl'.$qresult[0]['title'].active('title', 'newtemplate').active('photo', 'newtemplate').active('w', 'newtemplate').active('h', 'newtemplate').active('x', 'newtemplate').active('y', 'newtemplate')),
 			       $qresult[0]['title'],