Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'new_branch_name'

  • Loading branch information...
commit ba767eb0bb8611ebb5ea3d76adeb6ec7526b8bf1 2 parents 5917d22 + e9016e5
@skinkie skinkie authored
Showing with 8 additions and 3 deletions.
  1. +2 −0  config.php
  2. +1 −1  functions.php
  3. +5 −2 template-toevoegen.php
View
2  config.php
@@ -36,4 +36,6 @@
define ('WEBRESOLUTIONH', '360');
define ('EMERGENCY', false);
+
+ date_default_timezone_set('Europe/Amsterdam');
?>
View
2  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;
View
7 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'],
Please sign in to comment.
Something went wrong with that request. Please try again.